Mercurial > public > ostc4
annotate Common/Inc/decom.h @ 306:2f43419102c8 cleanup-4
bugfix, cleanup: do not clip depth to 0
A real dive with the previous commits shows that testing from the simulator
cannot be fully trusted in relation to logic that is close to the depth
sensor (that is obviously bypassed using the simulator). So 1) there is
3 second interval between the stopwatch and the divetime, and 2) the depth
flips from 1m depth to surface 0m depth, and that is visible in the
profile data.
Point 2) is definitely caused by the removed code in this commit. It likely
is not right to clip the depth value at all. It is fine to base decisions like is
done in is_ambient_pressure_close_to_surface on it, but clipping the depth value
itself is seems wrong. This has become more prominent with commit eba8d1eb5bef
where the clipping depth changed from 40cm of depth to 1m of depth. When
comparing profiles from an OSTC Plus, it shows that no depth clipping is
present there, so that is one more argument to remove it here.
Point 1) The 3 sec interval is likely not a coincidence. It is the time
to travel for 1m depth with a default descend speed of 20m/min.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
| author | Jan Mulder <jlmulder@xs4all.nl> |
|---|---|
| date | Wed, 22 May 2019 14:39:04 +0200 |
| parents | 239aa58b533d |
| children | 1b995079c045 |
| rev | line source |
|---|---|
| 38 | 1 /////////////////////////////////////////////////////////////////////////////// |
| 2 /// -*- coding: UTF-8 -*- | |
| 3 /// | |
| 4 /// \file Common/Inc/decom.h | |
| 5 /// \brief This code is used to calculate desat, calculated by RTE and send to Firmware | |
| 6 /// \author Heinrichs Weikamp | |
| 7 /// \date 22-Feb-2016 | |
| 8 /// | |
| 9 /// $Id$ | |
| 10 /////////////////////////////////////////////////////////////////////////////// | |
| 11 /// \par Copyright (c) 2014-2018 Heinrichs Weikamp gmbh | |
| 12 /// | |
| 13 /// This program is free software: you can redistribute it and/or modify | |
| 14 /// it under the terms of the GNU General Public License as published by | |
| 15 /// the Free Software Foundation, either version 3 of the License, or | |
| 16 /// (at your option) any later version. | |
| 17 /// | |
| 18 /// This program is distributed in the hope that it will be useful, | |
| 19 /// but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 20 /// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 21 /// GNU General Public License for more details. | |
| 22 /// | |
| 23 /// You should have received a copy of the GNU General Public License | |
| 24 /// along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 25 ////////////////////////////////////////////////////////////////////////////// | |
| 26 | |
| 27 #ifndef DECOM_H | |
| 28 #define DECOM_H | |
| 29 | |
| 30 #include "data_central.h" | |
| 31 | |
| 32 # define WATER_VAPOUR_PRESSURE (0.0493f) // Schreiner 1971 | |
| 33 | |
| 34 void decom_get_inert_gases(const float ambient_pressure_bar,const SGas* pGas, float* fraction_nitrogen, float* fraction_helium ); | |
| 35 void decom_tissues_exposure(int period_in_seconds, SLifeData* pLifeData); | |
| 36 void decom_tissues_exposure2(int period_in_seconds, SGas* pActualGas, float pressure_ambient_bar, float *tissue_N2_selected_stage, float *tissue_He_selected_stage); | |
| 37 float decom_schreiner_equation(float *initial_inspired_gas_pressure, float *rate_change_insp_gas_pressure, float *interval_time_minutes, const float *gas_time_constant, float *initial_gas_pressure); | |
| 38 void decom_reset_with_1000mbar(SLifeData * pLifeData); | |
|
129
239aa58b533d
Added function to initialise structures with the actual ambient pressure
Ideenmodellierer
parents:
38
diff
changeset
|
39 void decom_reset_with_ambientmbar(float ambient, SLifeData * pLifeData); |
| 38 | 40 |
| 41 void decom_tissues_exposure_stage_schreiner(int period_in_seconds, SGas* pGas, float starting_ambient_pressure_bar, float ending_ambient_pressure_bar, | |
| 42 float* pTissue_nitrogen_bar, float* pTissue_helium_bar); | |
| 43 void decom_CreateGasChangeList(SDiveSettings* pInput, const SLifeData* lifeData); | |
| 44 uint8_t decom_tissue_test_tolerance(float* Tissue_nitrogen_bar, float* Tissue_helium_bar, float GF_value, float depth_in_bar_absolute); | |
| 45 void decom_tissues_desaturation_time(const SLifeData* pLifeData, SLifeData2* pOutput); | |
| 46 void test_decom_CreateGasChangeList(void); | |
| 47 | |
| 48 float decom_calc_ppO2(const float ambiant_pressure_bar, const SGas* pGas); | |
| 49 void decom_oxygen_calculate_otu(float* oxygen_otu, float pressure_oxygen_real); | |
| 50 void decom_oxygen_calculate_otu_degrade(float* oxygen_otu, long seconds_since_last_dive); | |
| 51 void decom_oxygen_calculate_cns_degrade(float* oxygen_cns, long seconds_since_last_dive); | |
| 52 void decom_oxygen_calculate_cns(float* oxygen_cns, float pressure_oxygen_real); | |
| 53 void decom_oxygen_calculate_cns_stage_SchreinerStyle(int period_in_seconds, SGas* pGas, float starting_ambient_pressure_bar, float ending_ambient_pressure_bar, float* oxygen_cns); | |
| 54 void decom_oxygen_calculate_cns_exposure(int period_in_seconds, SGas* pActualGas, float pressure_ambient_bar, float* oxygen_cns); | |
| 55 uint8_t decom_get_actual_deco_stop(SDiveState* pDiveState); | |
| 56 | |
| 57 // wird nur in smallCPU verwendet: | |
| 58 int decom_calc_desaturation_time(float* Tissue_nitrogen_bar, float* Tissue_helium_bar, float surface_pressure_bar); | |
| 59 | |
| 60 #endif /* DECOM_H */ | |
| 61 |