Mercurial > public > ostc4
annotate Discovery/Src/logbook.c @ 458:5dd996ed8611 minor_improvments
Added ppO2 to dummy profile data:
PPO2 calculation based on the first gas has been added to the dummy profile to enable drawing of the graph at log page four
As this increased the number of parameters to be passed to the sub functions, the complete dive header is passed as reference instead of single members to increase the code maintanability
| author | ideenmodellierer |
|---|---|
| date | Sat, 28 Mar 2020 21:41:47 +0100 |
| parents | 4bd01f48c285 |
| children | 2c2df051e554 |
| rev | line source |
|---|---|
| 38 | 1 /** |
| 2 ****************************************************************************** | |
| 3 * @copyright heinrichs weikamp | |
| 4 * @file logbook.c | |
| 5 * @author heinrichs weikamp gmbh and heinrichs weikamp gmbh | |
| 6 * @date 22-Apr-2014 | |
| 7 * @version V0.0.3 | |
| 8 * @since 03-Feb-2016 | |
| 9 * @brief Everything about creating and evaluating the logbook | |
| 10 * without the flash part which is included in externLogbookFlash.c | |
| 11 * and the USB/Bluetooth part in tComm.c | |
| 12 * CHANGE V0.0.3 hw: ppO2 sensor values | |
| 13 * CHANGE V0.0.4 hw: fix event bytes according to hwos_interface.odt dated 160610 in bitbucket hwOS | |
| 14 * @bug | |
| 15 * @warning | |
| 16 @verbatim | |
| 17 ============================================================================== | |
| 18 ##### Header ##### | |
| 19 ============================================================================== | |
| 20 [..] SLogbookHeader | |
| 21 The order has changed in comparsion to OSTC3 for perfect alignment | |
| 22 with 16bit and 32bit. The header is 256kB as well. | |
| 23 DO NOT rearrange anything but add new data to a second page | |
| 24 beyond diveHeaderEnd. Use extraPagesWithData to indicate that there is | |
| 25 data available that was not available in the OSTC3 256KB | |
| 26 This data will be behind the diveHeaderEnd. DO NOT delete diveHeaderEnd. | |
| 27 | |
| 28 [..] SLogbookHeaderOSTC3 | |
| 29 is the format used by the OSTC3. | |
| 30 logbook_getHeaderOSTC3() does the job using the global headers in logbook.c | |
| 31 | |
| 32 [..] SSmallHeader | |
| 33 - is the format used by the OSTC3 | |
| 34 | |
| 35 [..] Summary | |
| 36 The header format is not perfect and might be optimized prior to | |
| 37 releasing the diving computer. For now it is good to be compatible | |
| 38 with PC software available for checking the content of the logbook | |
| 39 | |
| 40 | |
| 41 @endverbatim | |
| 42 ****************************************************************************** | |
| 43 * @attention | |
| 44 * | |
| 45 * <h2><center>© COPYRIGHT(c) 2014 heinrichs weikamp</center></h2> | |
| 46 * | |
| 47 ****************************************************************************** | |
| 48 */ | |
| 49 | |
| 50 /* Includes ------------------------------------------------------------------*/ | |
| 51 #include <stdint.h> | |
| 52 #include <string.h> | |
| 53 #include "logbook.h" | |
| 54 //#include "test_vpm.h" | |
| 55 #include "externLogbookFlash.h" | |
| 56 #include "data_exchange.h" | |
| 57 #include "decom.h" | |
| 58 #include "tHome.h" // for tHome_findNextStop() | |
| 445 | 59 #include "settings.h" |
|
455
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
60 #include "configuration.h" |
| 38 | 61 |
| 62 /* Private types -------------------------------------------------------------*/ | |
| 63 | |
| 64 #define LOGBOOK_VERSION (0x30) | |
| 65 #define LOGBOOK_VERSION_OSTC3 (0x24) | |
| 66 | |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
67 #define DEFAULT_SAMPLES (100) /* Number of sample data bytes in case of an broken header information */ |
|
455
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
68 #define DUMMY_SAMPLES (1000) /* Maximum number of samples profided by a dummy dive profile */ |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
69 |
| 38 | 70 typedef struct /* don't forget to adjust void clear_divisor(void) */ |
| 71 { | |
| 72 uint8_t temperature; | |
| 73 uint8_t deco_ndl; | |
| 74 uint8_t gradientFactor; | |
| 75 uint8_t ppo2; | |
| 76 uint8_t decoplan; | |
| 77 uint8_t cns; | |
| 78 uint8_t tank; | |
| 79 } SDivisor; | |
| 80 | |
| 81 /* Exported variables --------------------------------------------------------*/ | |
| 82 | |
| 83 /* Private variables ---------------------------------------------------------*/ | |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
84 static SLogbookHeader gheader; |
|
194
f23b9055436f
cleanup: more trivial cleanup (logbook.c/h)
Jan Mulder <jlmulder@xs4all.nl>
parents:
149
diff
changeset
|
85 static SLogbookHeaderOSTC3 headerOSTC3; |
|
f23b9055436f
cleanup: more trivial cleanup (logbook.c/h)
Jan Mulder <jlmulder@xs4all.nl>
parents:
149
diff
changeset
|
86 static SLogbookHeaderOSTC3compact headerOSTC3compact; |
|
f23b9055436f
cleanup: more trivial cleanup (logbook.c/h)
Jan Mulder <jlmulder@xs4all.nl>
parents:
149
diff
changeset
|
87 static SSmallHeader smallHeader; |
|
f23b9055436f
cleanup: more trivial cleanup (logbook.c/h)
Jan Mulder <jlmulder@xs4all.nl>
parents:
149
diff
changeset
|
88 static SDivisor divisor; |
|
f23b9055436f
cleanup: more trivial cleanup (logbook.c/h)
Jan Mulder <jlmulder@xs4all.nl>
parents:
149
diff
changeset
|
89 static SDivisor divisorBackup; |
| 38 | 90 |
|
455
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
91 static SSmallHeader smallDummyHeader; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
92 static uint16_t dummyWriteIdx; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
93 static uint16_t dummyReadIdx; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
94 static uint8_t dummyMemoryBuffer[1000*4]; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
95 |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
96 |
| 38 | 97 /* Private function prototypes -----------------------------------------------*/ |
|
194
f23b9055436f
cleanup: more trivial cleanup (logbook.c/h)
Jan Mulder <jlmulder@xs4all.nl>
parents:
149
diff
changeset
|
98 static void clear_divisor(void); |
|
f23b9055436f
cleanup: more trivial cleanup (logbook.c/h)
Jan Mulder <jlmulder@xs4all.nl>
parents:
149
diff
changeset
|
99 static void logbook_SetAverageDepth(float average_depth_meter); |
|
f23b9055436f
cleanup: more trivial cleanup (logbook.c/h)
Jan Mulder <jlmulder@xs4all.nl>
parents:
149
diff
changeset
|
100 static void logbook_SetMinTemperature(float min_temperature_celsius); |
|
f23b9055436f
cleanup: more trivial cleanup (logbook.c/h)
Jan Mulder <jlmulder@xs4all.nl>
parents:
149
diff
changeset
|
101 static void logbook_SetMaxCNS(float max_cns_percentage); |
|
270
2e58a4094770
feature, debug: make simulator write a logbook entry
Jan Mulder <jlmulder@xs4all.nl>
parents:
269
diff
changeset
|
102 static void logbook_SetCompartmentDesaturation(const SDiveState * pStateReal); |
|
194
f23b9055436f
cleanup: more trivial cleanup (logbook.c/h)
Jan Mulder <jlmulder@xs4all.nl>
parents:
149
diff
changeset
|
103 static void logbook_SetLastStop(float last_stop_depth_bar); |
|
f23b9055436f
cleanup: more trivial cleanup (logbook.c/h)
Jan Mulder <jlmulder@xs4all.nl>
parents:
149
diff
changeset
|
104 static void logbook_writedata(void * data, int length_byte); |
|
270
2e58a4094770
feature, debug: make simulator write a logbook entry
Jan Mulder <jlmulder@xs4all.nl>
parents:
269
diff
changeset
|
105 static void logbook_UpdateHeader(const SDiveState * pStateReal); |
| 458 | 106 static void logbook_createDummyProfile(SLogbookHeader* pHeader, uint16_t length, uint16_t* depth, int16_t* temperature, uint16_t* ppo2); |
| 38 | 107 |
| 108 /* Exported functions --------------------------------------------------------*/ | |
| 109 | |
| 110 void logbook_EndDive(void) | |
| 111 { | |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
112 ext_flash_close_new_dive_log((uint8_t*) &gheader); |
| 38 | 113 } |
| 114 | |
| 115 | |
| 116 // =============================================================================== | |
| 117 // logbook_last_totalDiveCount | |
| 118 /// @brief Fix setting issues | |
| 119 /// @date 04-April-2016 | |
| 120 /// | |
| 121 /// @return diveNumber (totalDiveCounter) of latest log entry, 0 if not a valid header | |
| 122 // =============================================================================== | |
| 123 uint16_t logbook_lastDive_diveNumber(void) | |
| 124 { | |
| 125 SLogbookHeader tempLogbookHeader; | |
| 126 if(logbook_getHeader(0, &tempLogbookHeader)) | |
| 127 { | |
| 128 return tempLogbookHeader.diveNumber; | |
| 129 } | |
| 130 else | |
| 131 { | |
| 132 return 0; | |
| 133 } | |
| 134 } | |
| 135 | |
| 136 | |
| 137 /** | |
| 138 ****************************************************************************** | |
| 139 * @brief logbook_getCurrentHeader. / | |
| 281 | 140 * @author heinrichs weikamp |
| 38 | 141 * @version V0.0.1 |
| 142 * @date 22-April-2014 | |
| 143 ****************************************************************************** | |
| 144 * | |
| 145 * @return SLogbookHeader*: | |
| 146 */ | |
| 147 SLogbookHeader* logbook_getCurrentHeader(void) | |
| 148 { | |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
149 return &gheader; |
| 38 | 150 } |
| 151 | |
| 152 /** | |
| 153 ****************************************************************************** | |
| 154 * @brief logbook_getNumberOfHeaders. / | |
| 155 * @author heinrichs weikamp gmbh | |
| 156 * @version V0.0.1 | |
| 157 * @date 18-May-2016 | |
| 158 ****************************************************************************** | |
| 159 * | |
| 160 * @return uint8_t : number of valid headers (0xFAFA) found. | |
| 161 */ | |
| 162 uint8_t logbook_getNumberOfHeaders(void) | |
| 163 { | |
| 164 return ext_flash_count_dive_headers(); | |
| 165 } | |
| 166 | |
| 167 | |
| 168 /** | |
| 169 ****************************************************************************** | |
| 170 * @brief logbook_getHeader. / | |
| 281 | 171 * @author heinrichs weikamp |
| 38 | 172 * @version V0.0.1 |
| 173 * @date 22-April-2014 | |
| 174 ****************************************************************************** | |
| 175 * | |
| 176 * @param StepBackwards : 0 Last lokbook entry, 1 second to last entry, etc. | |
| 177 * @param SSLogbookHeader* pLogbookHeader: Output found LogbookHeader | |
| 178 * @return uint8_t : 1 = success | |
| 179 */ | |
| 180 uint8_t logbook_getHeader(uint8_t StepBackwards,SLogbookHeader* pLogbookHeader) | |
| 181 { | |
| 182 ext_flash_read_dive_header((uint8_t *)pLogbookHeader, StepBackwards); | |
| 183 if(pLogbookHeader->diveHeaderStart != 0xFAFA) | |
| 184 return 0; | |
| 185 else | |
| 186 return 1; | |
| 187 } | |
| 188 | |
| 189 /** | |
| 190 ****************************************************************************** | |
| 191 * @brief logbook_initNewdiveProfile. / | |
| 192 * creates header and smallHeader from diveState and global Settings | |
| 193 * and writes new lookboock entry on flash device | |
| 194 * diveState | |
| 281 | 195 * @author heinrichs weikamp |
| 38 | 196 * @version V0.0.1 |
| 197 * @date 22-April-2014 | |
| 198 ****************************************************************************** | |
| 199 * | |
| 200 * @param SDiveState* pInfo: Input | |
| 201 * @param SSettings* pSettings: Input | |
| 202 */ | |
| 203 | |
| 204 void logbook_initNewdiveProfile(const SDiveState* pInfo, SSettings* pSettings) | |
| 205 { | |
| 206 RTC_DateTypeDef Sdate; | |
| 207 RTC_TimeTypeDef Stime; | |
| 208 | |
| 209 for(int i = 0; i < sizeof(SLogbookHeader); i++) | |
| 210 { | |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
211 ((uint8_t*)(&gheader))[i] = 0; |
| 38 | 212 } |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
213 gheader.diveHeaderStart = 0xFAFA; |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
214 gheader.diveHeaderEnd = 0xFBFB; |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
215 gheader.samplingRate = 2; |
| 38 | 216 if(pInfo->diveSettings.diveMode == DIVEMODE_OC) |
| 217 { | |
| 218 for(int i = 0; i < 5; i++) | |
| 219 { | |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
220 gheader.gasordil[i].oxygen_percentage = pSettings->gas[i+1].oxygen_percentage; |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
221 gheader.gasordil[i].helium_percentage = pSettings->gas[i+1].helium_percentage; |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
222 gheader.gasordil[i].note.uw = pSettings->gas[i+1].note.uw; |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
223 gheader.gasordil[i].depth_meter = pSettings->gas[i+1].depth_meter; |
| 38 | 224 } |
| 225 } | |
| 226 else | |
| 227 { | |
| 228 for(int i = 0; i < 5; i++) | |
| 229 { | |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
230 gheader.gasordil[i].oxygen_percentage = pSettings->gas[i+6].oxygen_percentage; |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
231 gheader.gasordil[i].helium_percentage = pSettings->gas[i+6].helium_percentage; |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
232 gheader.gasordil[i].note.uw = pSettings->gas[i+6].note.uw; |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
233 gheader.gasordil[i].depth_meter = pSettings->gas[i+6].depth_meter; |
| 38 | 234 } |
| 235 | |
| 236 for(int i = 0; i < 5; i++) | |
| 237 { | |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
238 gheader.setpoint[i].setpoint_cbar = pSettings->setpoint[i+1].setpoint_cbar; |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
239 gheader.setpoint[i].depth_meter = pSettings->setpoint[i+1].depth_meter; |
| 38 | 240 } |
| 241 } | |
| 242 // header.gasordil[pInfo->lifeData.actualGas.GasIdInSettings].depth_meter = 0; | |
| 243 | |
| 244 translateDate(pInfo->lifeData.dateBinaryFormat, &Sdate); | |
| 245 translateTime(pInfo->lifeData.timeBinaryFormat, &Stime); | |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
246 gheader.dateYear = Sdate.Year; |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
247 gheader.dateMonth = Sdate.Month; |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
248 gheader.dateDay = Sdate.Date; |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
249 gheader.timeHour = Stime.Hours; |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
250 gheader.timeMinute = Stime.Minutes; |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
251 gheader.cnsAtBeginning = (uint16_t)pInfo->lifeData.cns; |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
252 gheader.surfacePressure_mbar = (uint16_t)(pInfo->lifeData.pressure_surface_bar * 1000); |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
253 gheader.firmwareVersionHigh = firmwareVersion_16bit_high(); |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
254 gheader.firmwareVersionLow = firmwareVersion_16bit_low(); |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
255 gheader.logbookProfileVersion = LOGBOOK_VERSION; |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
256 gheader.salinity = pSettings->salinity; |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
257 gheader.diveNumber = pSettings->totalDiveCounter; |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
258 gheader.personalDiveCount = pSettings->personalDiveCount; |
| 38 | 259 |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
260 gheader.diveMode = pInfo->diveSettings.diveMode; |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
261 gheader.CCRmode = pInfo->diveSettings.CCR_Mode; |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
262 gheader.lastDecostop_m = pSettings->last_stop_depth_meter; |
| 38 | 263 |
| 264 if(pInfo->diveSettings.deco_type.ub.standard == GF_MODE) | |
| 265 { | |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
266 gheader.decoModel = 1; |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
267 gheader.gfLow_or_Vpm_conservatism = pInfo->diveSettings.gf_low; |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
268 gheader.gfHigh = pInfo->diveSettings.gf_high; |
| 38 | 269 } |
| 270 else | |
| 271 { | |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
272 gheader.decoModel = 2; |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
273 gheader.gfLow_or_Vpm_conservatism = pInfo->diveSettings.vpm_conservatism; |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
274 gheader.gfHigh = 0; |
| 38 | 275 } |
| 276 | |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
277 memcpy(gheader.n2Compartments, pInfo->lifeData.tissue_nitrogen_bar, 64); |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
278 memcpy(gheader.heCompartments, pInfo->lifeData.tissue_helium_bar, 64); |
| 38 | 279 |
|
270
2e58a4094770
feature, debug: make simulator write a logbook entry
Jan Mulder <jlmulder@xs4all.nl>
parents:
269
diff
changeset
|
280 logbook_SetCompartmentDesaturation(pInfo); |
| 38 | 281 |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
282 ext_flash_start_new_dive_log_and_set_actualPointerSample((uint8_t*)&gheader); |
| 38 | 283 |
| 284 smallHeader.profileLength[0] = 0xFF; | |
| 285 smallHeader.profileLength[1] = 0xFF; | |
| 286 smallHeader.profileLength[2] = 0xFF; | |
| 287 smallHeader.samplingRate_seconds = 2; | |
| 288 smallHeader.numDivisors = 7; | |
| 289 | |
| 290 smallHeader.tempType = 0; | |
| 291 smallHeader.tempLength = 2; | |
| 292 smallHeader.tempDivisor = 6; | |
| 293 | |
| 294 smallHeader.deco_ndlType = 1; | |
| 295 smallHeader.deco_ndlLength = 2; | |
| 296 smallHeader.deco_ndlDivisor = 6; //= 6; | |
| 297 | |
| 298 /* GF in % at actual position */ | |
| 299 smallHeader.gfType = 2; | |
| 300 smallHeader.gfLength = 1; | |
| 301 smallHeader.gfDivisor = 0; //12; | |
| 302 | |
| 303 /* 3 Sensors: 8bit ppO2 in 0.01bar, 16bit voltage in 0,1mV */ | |
| 304 smallHeader.ppo2Type = 3; | |
| 305 smallHeader.ppo2Length = 9; | |
| 306 smallHeader.ppo2Divisor = 2; //2 | |
| 307 | |
| 308 /* last 15 stops in minutes (last, second_to_last, ... */ | |
| 309 /* last stop depth is defined in header */ | |
| 310 smallHeader.decoplanType = 4; | |
| 311 smallHeader.decoplanLength = 15; | |
| 312 smallHeader.decoplanDivisor = 12;//12; | |
| 313 | |
| 314 smallHeader.cnsType = 5; | |
| 315 smallHeader.cnsLength = 2; | |
| 316 smallHeader.cnsDivisor = 12; | |
| 317 | |
| 318 smallHeader.tankType = 6; | |
|
455
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
319 #ifdef ENABLE_BOTTLE_SENSOR |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
320 smallHeader.tankLength = 2; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
321 smallHeader.tankDivisor = 30; /* log tank data once a minute */ |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
322 #else |
| 38 | 323 smallHeader.tankLength = 0; |
| 324 smallHeader.tankDivisor = 0; | |
|
455
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
325 #endif |
| 38 | 326 logbook_writedata((void *) &smallHeader,sizeof(smallHeader)); |
| 327 | |
| 328 clear_divisor(); | |
| 329 } | |
| 330 | |
| 331 /** | |
| 332 ****************************************************************************** | |
| 333 * @brief clear_divisor / clears divisor struct | |
| 281 | 334 * @author heinrichs weikamp |
| 38 | 335 * @version V0.0.1 |
| 336 * @date 22-April-2014 | |
| 337 ****************************************************************************** | |
| 338 * | |
| 339 */ | |
|
194
f23b9055436f
cleanup: more trivial cleanup (logbook.c/h)
Jan Mulder <jlmulder@xs4all.nl>
parents:
149
diff
changeset
|
340 static void clear_divisor(void) |
| 38 | 341 { |
| 342 divisor.cns = smallHeader.cnsDivisor - 1; | |
| 343 divisor.decoplan = smallHeader.decoplanDivisor - 1; | |
| 344 divisor.deco_ndl = smallHeader.deco_ndlDivisor - 1; | |
| 345 divisor.gradientFactor = smallHeader.gfDivisor -1 ; | |
| 346 divisor.ppo2 = smallHeader.ppo2Divisor - 1; | |
| 347 divisor.tank = smallHeader.tankDivisor - 1; | |
| 348 divisor.temperature = smallHeader.tempDivisor - 1; | |
| 349 } | |
| 350 | |
| 351 | |
| 352 /** | |
| 353 ****************************************************************************** | |
| 354 * @brief add16. / adds 16 bit variable to 8 bit array | |
| 281 | 355 * @author heinrichs weikamp |
| 38 | 356 * @version V0.0.1 |
| 357 * @date 22-April-2014 | |
| 358 ****************************************************************************** | |
| 359 * | |
| 360 * @param uint8_t *pos: Output 8 bit array | |
| 361 * @param uint16_t var: 16 bit variable | |
| 362 */ | |
|
194
f23b9055436f
cleanup: more trivial cleanup (logbook.c/h)
Jan Mulder <jlmulder@xs4all.nl>
parents:
149
diff
changeset
|
363 static void addU16(uint8_t *pos, uint16_t var) |
| 38 | 364 { |
| 365 *((uint16_t*)pos) = var; | |
| 366 } | |
| 367 | |
|
194
f23b9055436f
cleanup: more trivial cleanup (logbook.c/h)
Jan Mulder <jlmulder@xs4all.nl>
parents:
149
diff
changeset
|
368 static void addS16(uint8_t *pos, int16_t var) |
| 38 | 369 { |
| 370 *((int16_t*)pos) = var; | |
| 371 } | |
| 372 | |
| 373 /** | |
| 374 ****************************************************************************** | |
| 375 * @brief logbook_writeSample. / Writes one logbook sampl | |
| 281 | 376 * @author heinrichs weikamp |
| 38 | 377 * @date 22-April-2014 |
| 378 * @version V0.0.2 | |
| 379 * @since 20-June-2016 | |
| 380 * @bug Deco/NDL Status fixed in V0.0.2 | |
| 381 | |
| 382 | |
| 383 ****************************************************************************** | |
| 384 * | |
| 385 * @param SDiveState state: | |
| 386 */ | |
| 387 | |
|
270
2e58a4094770
feature, debug: make simulator write a logbook entry
Jan Mulder <jlmulder@xs4all.nl>
parents:
269
diff
changeset
|
388 void logbook_writeSample(const SDiveState *state) |
| 38 | 389 { |
| 390 uint8_t sample[256]; | |
| 391 // int position = 0; | |
| 392 int length = 0; | |
| 393 // _Bool bEvent = 0; | |
| 394 uint8_t nextstopDepthMeter = 0; | |
| 395 uint16_t nextstopLengthSeconds = 0; | |
| 396 uint8_t nextstopLengthMinutes = 0; | |
| 397 bit8_Type eventByte1, eventByte2; | |
| 398 bit8_Type profileByteFlag; | |
| 399 int i = 0; | |
| 400 for(i = 0; i <256 ;i++) | |
| 401 sample[i] = 0; | |
|
269
6e78137952af
cleanup: do not pass large struct by value
Jan Mulder <jlmulder@xs4all.nl>
parents:
225
diff
changeset
|
402 addU16(sample, (uint16_t)(state->lifeData.depth_meter * 100)); |
| 38 | 403 length += 2; |
| 404 sample[2] = 0; | |
| 405 length++; | |
| 406 eventByte1.uw = 0; | |
| 407 eventByte2.uw = 0; | |
| 408 //uint16_t tmpU16 = 0; | |
|
130
b7689d9e888a
Minor changes to improved code quality and to eliminate warnings
Ideenmodellierer
parents:
38
diff
changeset
|
409 const SDecoinfo * pDecoinfo; // new hw 160620 |
| 38 | 410 |
| 411 //BuildEevntyte 1 | |
| 412 // sub old 0-3 only one at a time | |
|
269
6e78137952af
cleanup: do not pass large struct by value
Jan Mulder <jlmulder@xs4all.nl>
parents:
225
diff
changeset
|
413 if(state->events.manualMarker) |
| 38 | 414 { |
| 415 eventByte1.uw = 6; | |
| 416 } | |
| 417 else | |
|
269
6e78137952af
cleanup: do not pass large struct by value
Jan Mulder <jlmulder@xs4all.nl>
parents:
225
diff
changeset
|
418 if(state->warnings.decoMissed) |
| 38 | 419 { |
| 420 eventByte1.uw = 2; | |
| 421 } | |
| 422 else | |
|
269
6e78137952af
cleanup: do not pass large struct by value
Jan Mulder <jlmulder@xs4all.nl>
parents:
225
diff
changeset
|
423 if(state->warnings.ppO2Low) |
| 38 | 424 { |
| 425 eventByte1.uw = 4; | |
| 426 } | |
| 427 else | |
|
269
6e78137952af
cleanup: do not pass large struct by value
Jan Mulder <jlmulder@xs4all.nl>
parents:
225
diff
changeset
|
428 if(state->warnings.ppO2High) |
| 38 | 429 { |
| 430 eventByte1.uw = 5; | |
| 431 } | |
| 432 else | |
|
269
6e78137952af
cleanup: do not pass large struct by value
Jan Mulder <jlmulder@xs4all.nl>
parents:
225
diff
changeset
|
433 if(state->warnings.lowBattery) |
| 38 | 434 { |
| 435 eventByte1.uw = 7; | |
| 436 } | |
| 437 else | |
|
269
6e78137952af
cleanup: do not pass large struct by value
Jan Mulder <jlmulder@xs4all.nl>
parents:
225
diff
changeset
|
438 if(state->warnings.slowWarning) |
| 38 | 439 { |
| 440 eventByte1.uw = 1; | |
| 441 } | |
| 442 // sub bit 4 to 7 | |
| 281 | 443 if(state->events.manualGasSet) |
| 38 | 444 { |
| 445 eventByte1.ub.bit4 = 1; | |
| 446 } | |
|
269
6e78137952af
cleanup: do not pass large struct by value
Jan Mulder <jlmulder@xs4all.nl>
parents:
225
diff
changeset
|
447 if(state->events.gasChange) |
| 38 | 448 { |
| 449 eventByte1.ub.bit5 = 1; | |
| 450 } | |
|
269
6e78137952af
cleanup: do not pass large struct by value
Jan Mulder <jlmulder@xs4all.nl>
parents:
225
diff
changeset
|
451 if(state->events.setpointChange) |
| 38 | 452 { |
| 453 eventByte1.ub.bit6 = 1; | |
| 454 } | |
| 455 // sub bit 7 + eventbyte2 | |
|
269
6e78137952af
cleanup: do not pass large struct by value
Jan Mulder <jlmulder@xs4all.nl>
parents:
225
diff
changeset
|
456 if(state->events.bailout) |
| 38 | 457 { |
| 458 eventByte1.ub.bit7 = 1; | |
| 459 eventByte2.ub.bit0 = 1; | |
| 460 } | |
| 461 //Add EventByte 1 | |
| 462 if(eventByte1.uw > 0) | |
| 463 { | |
| 464 sample[length] = eventByte1.uw; | |
| 465 length++; | |
| 466 } | |
| 467 if(eventByte2.uw > 0) | |
| 468 { | |
| 469 sample[length] = eventByte2.uw; | |
| 470 length++; | |
| 471 } | |
| 472 //Add EventInfos | |
| 281 | 473 if(state->events.manualGasSet) |
| 38 | 474 { |
| 475 //manual gas in %O2 & %He | |
| 281 | 476 sample[length] = state->events.info_manualGasSetO2; |
| 38 | 477 length += 1; |
| 281 | 478 sample[length] = state->events.info_manualGasSetHe; |
| 38 | 479 length += 1; |
| 480 } | |
|
269
6e78137952af
cleanup: do not pass large struct by value
Jan Mulder <jlmulder@xs4all.nl>
parents:
225
diff
changeset
|
481 if(state->events.gasChange) |
| 38 | 482 { |
| 483 //Current gas (gasid) | |
|
269
6e78137952af
cleanup: do not pass large struct by value
Jan Mulder <jlmulder@xs4all.nl>
parents:
225
diff
changeset
|
484 sample[length] = state->events.info_GasChange; |
| 38 | 485 length += 1; |
| 486 } | |
|
269
6e78137952af
cleanup: do not pass large struct by value
Jan Mulder <jlmulder@xs4all.nl>
parents:
225
diff
changeset
|
487 if(state->events.setpointChange) |
| 38 | 488 { |
| 489 //New setpoint in cbar | |
|
269
6e78137952af
cleanup: do not pass large struct by value
Jan Mulder <jlmulder@xs4all.nl>
parents:
225
diff
changeset
|
490 sample[length] = state->events.info_SetpointChange; |
| 38 | 491 length += 1; |
| 492 } | |
|
269
6e78137952af
cleanup: do not pass large struct by value
Jan Mulder <jlmulder@xs4all.nl>
parents:
225
diff
changeset
|
493 if(state->events.bailout) |
| 38 | 494 { |
| 495 //bailout gas in % O2 & %He | |
|
269
6e78137952af
cleanup: do not pass large struct by value
Jan Mulder <jlmulder@xs4all.nl>
parents:
225
diff
changeset
|
496 sample[length] = state->events.info_bailoutO2; |
| 38 | 497 length += 1; |
|
269
6e78137952af
cleanup: do not pass large struct by value
Jan Mulder <jlmulder@xs4all.nl>
parents:
225
diff
changeset
|
498 sample[length] = state->events.info_bailoutHe; |
| 38 | 499 length += 1; |
| 500 } | |
| 501 | |
| 502 | |
| 503 if(divisor.temperature == 0) | |
| 504 { | |
| 505 divisor.temperature = smallHeader.tempDivisor - 1; | |
|
269
6e78137952af
cleanup: do not pass large struct by value
Jan Mulder <jlmulder@xs4all.nl>
parents:
225
diff
changeset
|
506 addS16(&sample[length], (int16_t)((state->lifeData.temperature_celsius * 10.0f) + 0.5f)); |
| 38 | 507 length += 2; |
| 508 } | |
| 509 else | |
| 510 { | |
| 511 divisor.temperature--; | |
| 512 } | |
| 513 | |
| 514 | |
| 515 if(smallHeader.deco_ndlDivisor > 0) | |
| 516 { | |
| 517 if(divisor.deco_ndl == 0) | |
| 518 { | |
| 519 divisor.deco_ndl = smallHeader.deco_ndlDivisor - 1; | |
| 520 | |
| 521 if(stateUsed->diveSettings.deco_type.ub.standard == GF_MODE) | |
| 522 pDecoinfo = &stateUsed->decolistBuehlmann; | |
| 523 else if(stateUsed->diveSettings.deco_type.ub.standard == VPM_MODE) | |
| 524 pDecoinfo = &stateUsed->decolistVPM; | |
| 525 else // should not happen as only GF and VPM at the moment | |
| 526 { | |
| 527 sample[length] = 0; | |
| 528 length += 1; | |
| 529 sample[length] = 0; | |
| 530 length += 1; | |
| 458 | 531 pDecoinfo = &stateUsed->decolistBuehlmann; /* use GF per default if something went wrong */ |
| 38 | 532 } |
| 533 | |
| 534 if(pDecoinfo->output_ndl_seconds > 0) | |
| 535 { | |
| 536 sample[length] = 0; | |
| 537 length += 1; | |
|
283
04cdeff80254
Bugfix: write NDL in logbook correctly
Jan Mulder <jlmulder@xs4all.nl>
parents:
281
diff
changeset
|
538 sample[length] = (uint8_t)(pDecoinfo->output_ndl_seconds / 60); |
| 281 | 539 |
| 540 // Limit stored sample within 0 to 240 mins (Since it's 8bit UINT only) | |
| 541 if ((pDecoinfo->output_ndl_seconds / 60) > 240) sample[length] = 240; | |
| 542 if ((pDecoinfo->output_ndl_seconds / 60) < 0) sample[length] = 0; | |
| 543 | |
| 38 | 544 length += 1; |
| 545 } | |
| 546 else if(pDecoinfo->output_time_to_surface_seconds) | |
| 547 { | |
| 548 tHome_findNextStop(pDecoinfo->output_stop_length_seconds, &nextstopDepthMeter, &nextstopLengthSeconds); | |
| 549 nextstopLengthMinutes = (nextstopLengthSeconds +59 ) / 60; | |
| 550 | |
| 551 sample[length] = nextstopDepthMeter; | |
| 552 length += 1; | |
| 553 sample[length] = nextstopLengthMinutes; | |
| 554 length += 1; | |
| 555 } | |
| 556 else | |
| 557 { | |
| 558 sample[length] = 0; | |
| 559 length += 1; | |
| 560 sample[length] = 0; | |
| 561 length += 1; | |
| 562 } | |
| 563 } | |
| 564 else | |
| 565 { | |
| 566 divisor.deco_ndl --; | |
| 567 } | |
| 568 } | |
| 569 | |
| 570 | |
| 571 if(smallHeader.ppo2Divisor) | |
| 572 { | |
| 573 if(divisor.ppo2 == 0) | |
| 574 { | |
| 575 divisor.ppo2 = smallHeader.ppo2Divisor - 1; | |
| 576 | |
| 577 for(int i = 0; i <3; i++) | |
| 578 { | |
|
269
6e78137952af
cleanup: do not pass large struct by value
Jan Mulder <jlmulder@xs4all.nl>
parents:
225
diff
changeset
|
579 sample[length] = (uint8_t)(state->lifeData.ppO2Sensor_bar[i] * 100.0f + 0.5f); |
| 38 | 580 length += 1; |
|
269
6e78137952af
cleanup: do not pass large struct by value
Jan Mulder <jlmulder@xs4all.nl>
parents:
225
diff
changeset
|
581 addU16(&sample[length], (uint16_t)(state->lifeData.sensorVoltage_mV[i] * 10.0f + 0.5f)); |
| 38 | 582 length += 2; |
| 583 } | |
| 584 } | |
| 585 else | |
| 586 { | |
| 587 divisor.ppo2--; | |
| 588 } | |
| 589 } | |
| 590 | |
| 591 | |
| 592 if(smallHeader.decoplanDivisor) | |
| 593 { | |
| 594 if(divisor.decoplan == 0) | |
| 595 { | |
| 596 divisor.decoplan = smallHeader.decoplanDivisor - 1; | |
|
269
6e78137952af
cleanup: do not pass large struct by value
Jan Mulder <jlmulder@xs4all.nl>
parents:
225
diff
changeset
|
597 if(state->diveSettings.deco_type.ub.standard == VPM_MODE) |
| 38 | 598 { |
| 599 for(int i = 0; i <15; i++) | |
| 600 { | |
|
269
6e78137952af
cleanup: do not pass large struct by value
Jan Mulder <jlmulder@xs4all.nl>
parents:
225
diff
changeset
|
601 sample[length] = state->decolistVPM.output_stop_length_seconds[i] / 60; |
| 38 | 602 length += 1; |
| 603 } | |
| 604 } | |
|
269
6e78137952af
cleanup: do not pass large struct by value
Jan Mulder <jlmulder@xs4all.nl>
parents:
225
diff
changeset
|
605 else if(state->diveSettings.deco_type.ub.standard == GF_MODE) |
| 38 | 606 { |
| 607 for(int i = 0; i <15; i++) | |
| 608 { | |
|
269
6e78137952af
cleanup: do not pass large struct by value
Jan Mulder <jlmulder@xs4all.nl>
parents:
225
diff
changeset
|
609 sample[length] = state->decolistBuehlmann.output_stop_length_seconds[i] / 60; |
| 38 | 610 length += 1; |
| 611 } | |
| 612 } | |
| 613 else | |
| 614 { | |
| 615 for(int i = 0; i <15; i++) | |
| 616 { | |
| 617 sample[length] = 0; | |
| 618 length += 1; | |
| 619 } | |
| 620 } | |
| 621 // add16(&sample[length], state.temperature); | |
| 622 //length += 2; | |
| 623 } | |
| 624 else | |
| 625 { | |
| 626 divisor.decoplan --; | |
| 627 } | |
| 628 } | |
| 629 if(divisor.cns == 0) | |
| 630 { | |
| 631 divisor.cns = smallHeader.cnsDivisor - 1; | |
|
269
6e78137952af
cleanup: do not pass large struct by value
Jan Mulder <jlmulder@xs4all.nl>
parents:
225
diff
changeset
|
632 addU16(&sample[length], (uint16_t)state->lifeData.cns); |
| 38 | 633 length += 2; |
| 634 } | |
| 635 else | |
| 636 { | |
| 637 divisor.cns--; | |
| 638 } | |
| 639 | |
|
455
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
640 #ifdef ENABLE_BOTTLE_SENSOR |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
641 if(smallHeader.tankDivisor) |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
642 { |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
643 if(divisor.tank == 0) |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
644 { |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
645 divisor.tank = smallHeader.tankDivisor - 1; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
646 addS16(&sample[length], ((state->lifeData.bottle_bar[state->lifeData.actualGas.GasIdInSettings]))); |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
647 length += smallHeader.tankLength; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
648 } |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
649 else |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
650 { |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
651 divisor.tank--; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
652 } |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
653 } |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
654 #endif |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
655 |
| 38 | 656 profileByteFlag.uw = length - 3; |
| 657 if(eventByte1.uw) | |
| 658 { | |
| 659 profileByteFlag.ub.bit7 = 1; | |
| 660 } | |
| 661 sample[2] = profileByteFlag.uw; | |
| 662 logbook_writedata((void *) sample,length); | |
| 663 | |
| 664 } | |
| 665 | |
| 666 /** | |
| 667 ****************************************************************************** | |
| 668 * @brief readSample. / Reads data of one logbook sample | |
| 281 | 669 * @author heinrichs weikamp |
| 38 | 670 * @version V0.0.1 |
| 671 * @date 22-April-2014 | |
| 672 ****************************************************************************** | |
| 673 * | |
| 674 * @param int32_t* depth: output Value | |
| 675 * @param int16_t * gasid: output Value | |
| 676 * @param int32_t* temperature: output Value | |
| 677 * @param int32_t* sensor1, sensor2, sensor3: output Value | |
| 678 * @param int32_t* cns: output Value | |
| 679 * @return bytes read / 0 = reading Error | |
| 680 */ | |
|
455
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
681 static uint16_t readSample(int32_t* depth, int16_t * gasid, int16_t* setpoint_cbar, int32_t* temperature, int32_t* sensor1, int32_t* sensor2, |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
682 int32_t* sensor3, int32_t* cns, SManualGas* manualGas, int16_t* bailout, int16_t* decostopDepth, uint16_t* tank) |
| 38 | 683 { |
| 684 int length = 0; | |
| 685 _Bool bEvent = 0; | |
| 686 bit8_Type eventByte1, eventByte2; | |
| 687 bit8_Type profileByteFlag; | |
| 688 | |
| 689 eventByte1.uw = 0; | |
| 690 eventByte2.uw = 0; | |
| 691 uint8_t tempU8 = 0; | |
| 692 uint16_t temp = 0; | |
| 693 uint16_t bytesRead = 0; | |
| 694 | |
| 695 if(gasid) | |
| 696 *gasid = -1; | |
| 697 if(temperature) | |
| 698 *temperature = -1000; | |
| 699 if(sensor1) | |
| 700 *sensor1 = -1; | |
| 701 if(sensor2) | |
| 702 *sensor2 = -1; | |
| 703 if(sensor3) | |
| 704 *sensor3 = -1; | |
| 705 if(cns) | |
| 706 *cns = -1; | |
| 707 if(setpoint_cbar) | |
| 708 *setpoint_cbar = -1; | |
| 709 if(bailout) | |
| 710 *bailout = -1; | |
|
455
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
711 if(tank) |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
712 *tank = 0; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
713 |
| 38 | 714 if(manualGas) |
| 715 { | |
| 716 manualGas->percentageO2 =-1; | |
| 717 manualGas->percentageHe =-1; | |
| 718 } | |
| 719 if(decostopDepth) | |
| 720 *decostopDepth = -1; | |
| 721 | |
| 722 ext_flash_read_next_sample_part( (uint8_t*)&temp, 2); | |
| 723 if(depth) | |
| 724 *depth = (int32_t)temp; | |
| 725 bytesRead += 2; | |
| 726 | |
| 727 ext_flash_read_next_sample_part( &profileByteFlag.uw, 1); | |
| 728 bytesRead ++; | |
| 729 | |
| 730 bEvent = profileByteFlag.ub.bit7; | |
| 731 profileByteFlag.ub.bit7 = 0; | |
| 732 length = profileByteFlag.uw; | |
| 733 | |
| 734 if(bEvent) | |
| 735 { | |
| 736 ext_flash_read_next_sample_part( &eventByte1.uw, 1); | |
| 737 bytesRead ++; | |
| 738 | |
| 739 length--; | |
| 740 | |
| 741 //second event byte | |
| 742 if(eventByte1.ub.bit7) | |
| 743 { | |
| 744 ext_flash_read_next_sample_part( &eventByte2.uw, 1); | |
| 745 bytesRead ++; | |
| 746 length--; | |
| 747 } | |
| 748 else | |
| 749 { | |
| 750 eventByte2.uw = 0; | |
| 751 } | |
| 752 | |
| 753 //manual Gas Set | |
| 754 if( eventByte1.ub.bit4) | |
| 755 { | |
| 756 //Evaluate manual Gas | |
| 757 ext_flash_read_next_sample_part( (uint8_t*)&tempU8, 1); | |
| 758 bytesRead +=1; | |
| 759 length -= 1; | |
| 760 manualGas->percentageO2 = tempU8; | |
| 761 ext_flash_read_next_sample_part( (uint8_t*)&tempU8, 1); | |
| 762 bytesRead +=1; | |
| 763 length -= 1; | |
| 764 manualGas->percentageHe = tempU8; | |
| 765 if(gasid) | |
| 766 *gasid = 0; | |
| 767 } | |
| 768 //gas change | |
| 769 if( eventByte1.ub.bit5) | |
| 770 { | |
| 771 ext_flash_read_next_sample_part( &tempU8, 1); | |
| 772 bytesRead +=1; | |
| 773 length -= 1; | |
| 774 if(gasid) | |
| 775 *gasid = (uint16_t)tempU8; | |
| 776 } | |
| 777 //SetpointChange | |
| 778 if( eventByte1.ub.bit6) | |
| 779 { | |
| 780 ext_flash_read_next_sample_part( &tempU8, 1); | |
| 781 *setpoint_cbar = tempU8; | |
| 782 bytesRead +=1; | |
| 783 length -= 1; | |
| 784 } | |
| 785 | |
| 786 // second event Byte | |
| 787 //bailout | |
|
298
50c26a4442af
Bugfix: fix drawing of CCR bailout profile
Jan Mulder <jlmulder@xs4all.nl>
parents:
283
diff
changeset
|
788 if(eventByte2.ub.bit0) |
| 38 | 789 { |
| 790 //evaluate bailout gas Gas | |
| 791 *bailout = 1; | |
| 792 | |
| 793 ext_flash_read_next_sample_part( (uint8_t*)&tempU8, 1); | |
| 794 bytesRead +=1; | |
| 795 length -= 1; | |
| 796 manualGas->percentageO2 = tempU8; | |
| 797 ext_flash_read_next_sample_part( (uint8_t*)&tempU8, 1); | |
| 798 bytesRead +=1; | |
| 799 length -= 1; | |
| 800 manualGas->percentageHe = tempU8; | |
| 801 | |
| 802 if(gasid) | |
| 803 *gasid = 0; | |
| 804 } | |
| 805 } | |
| 806 | |
| 807 if(divisor.temperature == 0) | |
| 808 { | |
| 809 divisor.temperature = smallHeader.tempDivisor - 1; | |
| 810 ext_flash_read_next_sample_part( (uint8_t*)&temp, 2); | |
| 811 bytesRead +=2; | |
| 812 length -= 2; | |
| 813 if(temperature) | |
| 814 { | |
| 815 *temperature = (int32_t)temp; | |
| 816 } | |
| 817 } | |
| 818 else | |
| 819 { | |
| 820 divisor.temperature--; | |
| 821 } | |
| 822 | |
| 823 if(smallHeader.deco_ndlDivisor > 0) | |
| 824 { | |
| 825 if(divisor.deco_ndl == 0) | |
| 826 { | |
| 827 divisor.deco_ndl = smallHeader.deco_ndlDivisor - 1; | |
| 828 ext_flash_read_next_sample_part( &tempU8, 1); | |
| 829 if(decostopDepth) | |
| 830 { | |
| 831 *decostopDepth = tempU8 * 100; | |
| 832 } | |
| 833 ext_flash_read_next_sample_part( &tempU8, 1); | |
| 834 bytesRead += 2; | |
| 835 length -= 2; | |
| 836 } | |
| 837 else | |
| 838 { | |
| 839 divisor.deco_ndl--; | |
| 840 } | |
| 841 } | |
| 842 | |
| 843 if(divisor.ppo2 == 0) | |
| 844 { | |
| 845 int32_t ppO2Tmp = 0; | |
| 846 divisor.ppo2 = smallHeader.ppo2Divisor -1; | |
| 847 for(int i = 0; i <3 ; i++) | |
| 848 { | |
| 849 ext_flash_read_next_sample_part( &tempU8, 1); | |
| 850 ppO2Tmp += tempU8; | |
| 851 bytesRead +=1; | |
| 852 length -= 1; | |
| 853 ext_flash_read_next_sample_part( (uint8_t*)&temp, 2); | |
| 854 bytesRead +=2; | |
| 855 length -= 2; | |
| 856 if(sensor1 && (i==0)) | |
| 857 *sensor1 = (((int32_t)tempU8) * 0xFFFF) + temp; | |
| 858 if(sensor2 && (i==1)) | |
| 859 *sensor2 = (((int32_t)tempU8) * 0xFFFF) + temp; | |
| 860 if(sensor3 && (i==2)) | |
| 861 *sensor3 = (((int32_t)tempU8) * 0xFFFF) + temp; | |
| 862 } | |
| 863 } | |
| 864 else | |
| 865 { | |
| 866 divisor.ppo2--; | |
| 867 } | |
| 868 | |
| 869 if(smallHeader.decoplanDivisor > 0) | |
| 870 { | |
| 871 if(divisor.decoplan == 0) | |
| 872 { | |
| 873 divisor.decoplan = smallHeader.decoplanDivisor - 1; | |
| 874 for(int i = 0; i <15; i++) | |
| 875 ext_flash_read_next_sample_part( &tempU8, 1); | |
| 876 bytesRead += 15; | |
| 877 length -= 15; | |
| 878 } | |
| 879 else | |
| 880 { | |
| 881 divisor.decoplan--; | |
| 882 } | |
| 883 } | |
| 884 | |
| 885 | |
| 886 | |
| 887 if(divisor.cns == 0) | |
| 888 { | |
| 889 divisor.cns = smallHeader.cnsDivisor - 1; | |
| 890 | |
| 891 ext_flash_read_next_sample_part( (uint8_t*)&temp, 2); | |
| 892 bytesRead +=2; | |
| 893 length -= 2; | |
| 894 if(cns) | |
| 895 { | |
| 896 *cns = (int32_t)temp; | |
| 897 } | |
| 898 } | |
| 899 else | |
| 900 { | |
| 901 divisor.cns--; | |
| 902 } | |
| 903 | |
|
455
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
904 #ifdef ENABLE_BOTTLE_SENSOR |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
905 if(smallHeader.tankDivisor) |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
906 { |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
907 if(divisor.tank == 0) |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
908 { |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
909 divisor.tank = smallHeader.tankDivisor - 1; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
910 ext_flash_read_next_sample_part( (uint8_t*)&temp, 2); |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
911 bytesRead +=2; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
912 length -= 2; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
913 if(tank) |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
914 { |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
915 *tank = (uint16_t)temp; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
916 } |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
917 } |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
918 else |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
919 { |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
920 divisor.tank--; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
921 } |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
922 } |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
923 #endif |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
924 |
| 38 | 925 if (length != 0) |
| 926 return 0; | |
| 927 | |
| 928 return bytesRead; | |
| 929 } | |
| 930 /** | |
| 931 ****************************************************************************** | |
| 932 * @brief logbook_readSampleData. / Reads sample data of whole logbook entry | |
| 281 | 933 * @author heinrichs weikamp |
| 38 | 934 * @version V0.0.1 |
| 935 * @date 22-April-2014 | |
| 936 ****************************************************************************** | |
| 937 * | |
| 938 * @param uint8_t StepBackwards: witch lookbook entry? | |
| 939 * @param uint16_t length : maxlength of output arrays | |
| 940 * @param int32_t* depth : output array | |
| 941 * @param int16_t * gasid : output array | |
| 942 * @param int32_t* temperature : output array | |
| 943 * @param int32_t* ppo2 : output array | |
| 944 * @param int32_t* cns : output array | |
| 945 * @return length of output | |
| 946 */ | |
|
455
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
947 uint16_t logbook_readSampleData(uint8_t StepBackwards, uint16_t length,uint16_t* depth, uint8_t* gasid, int16_t* temperature, uint16_t* ppo2, |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
948 uint16_t* setpoint, uint16_t* sensor1, uint16_t* sensor2, uint16_t* sensor3, uint16_t* cns, uint8_t* bailout, |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
949 uint16_t* decostopDepth, uint16_t* tank) |
| 38 | 950 { |
| 951 //Test read | |
| 952 //SLogbookHeader header; | |
| 953 | |
| 954 //logbook_getHeader(&header); | |
| 955 SLogbookHeader header; | |
| 458 | 956 int16_t iNum; |
| 957 int16_t firstgasid = 0; | |
| 958 uint16_t retVal = 0; | |
| 959 int16_t compression = 0; | |
| 960 int16_t i; | |
| 38 | 961 // uint32_t diveTime_seconds; |
| 962 int32_t depthVal = 0; | |
| 963 int16_t gasidVal = 0; | |
| 964 int16_t setPointVal = 0; | |
| 965 int16_t bailoutVal = 0; | |
| 966 int16_t bailoutLast = 0; | |
| 967 uint16_t setPointLast = 0; | |
| 968 int32_t temperatureVal = 0; | |
| 969 int32_t sensor1Val = 0; | |
| 970 int32_t sensor2Val = 0; | |
| 971 int32_t sensor3Val = 0; | |
| 972 int32_t sensor1Last = 0; | |
| 973 int32_t sensor2Last = 0; | |
| 974 int32_t sensor3Last = 0; | |
| 975 int32_t cnsVal = 0; | |
| 976 int32_t depthLast = 0; | |
| 977 int16_t gasidLast = 0; | |
| 978 int32_t temperatureLast = 0; | |
| 979 int32_t temperatureFirst = 0; | |
| 980 int32_t cnsLast = 0; | |
|
455
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
981 int16_t decostepDepthVal = 0; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
982 int16_t decostepDepthLast = 0; |
| 457 | 983 uint16_t tankVal = 0; |
| 38 | 984 |
| 985 SManualGas manualGasVal; | |
| 986 SManualGas manualGasLast; | |
| 987 manualGasLast.percentageO2 = 0; | |
| 988 manualGasLast.percentageHe = 0; | |
|
455
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
989 uint16_t numSamples = 0; |
| 38 | 990 |
| 991 float ambiant_pressure_bar = 0; | |
| 992 float ppO2 = 0; | |
| 993 ext_flash_read_dive_header((uint8_t*)&header, StepBackwards); | |
| 994 for(i = 0;i< 5;i++) | |
| 995 { | |
| 996 if(header.gasordil[i].note.ub.first) | |
| 997 break; | |
| 998 } | |
| 999 firstgasid = i + 1; | |
| 1000 if(header.diveMode == DIVEMODE_CCR) | |
| 1001 setPointLast = header.setpoint[0].setpoint_cbar; | |
| 1002 else | |
| 1003 setPointLast = 0; | |
| 1004 //diveTime_seconds = header.diveTime_seconds ; | |
| 1005 for(compression = 1; compression < 100; compression ++) | |
| 1006 { | |
|
455
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1007 numSamples = (header.total_diveTime_seconds / header.samplingRate)/compression; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1008 if(numSamples <= length) |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1009 { |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1010 break; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1011 } |
| 38 | 1012 } |
| 1013 | |
| 1014 | |
| 1015 for(i = 0;i< length;i++) | |
| 1016 { | |
| 1017 if(depth) | |
| 1018 depth[i] = 0; | |
| 1019 if(temperature) | |
| 1020 temperature[i] = 0; | |
| 1021 if(gasid) | |
| 1022 gasid[i] = 0; | |
| 1023 if(ppo2) | |
| 1024 ppo2[i] = 0; | |
| 1025 if(setpoint) | |
| 1026 setpoint[i] = 0; | |
| 1027 if(sensor1) | |
| 1028 sensor1[i] = 0; | |
| 1029 if(sensor2) | |
| 1030 sensor2[i] = 0; | |
| 1031 if(sensor3) | |
| 1032 sensor3[i] = 0; | |
| 1033 if(cns) | |
| 1034 cns[i] = 0; | |
|
455
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1035 if(tank) |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1036 tank[i] = 0; |
| 38 | 1037 } |
| 1038 //We start with fist gasid | |
| 1039 gasidLast = firstgasid; | |
| 1040 | |
| 1041 | |
| 1042 //uint16_t* ppo2, uint16_t* cns# | |
| 1043 uint32_t totalNumberOfBytes = 0; | |
| 1044 uint32_t bytesRead = 0; | |
| 1045 ext_flash_open_read_sample( StepBackwards,&totalNumberOfBytes); | |
| 1046 ext_flash_read_next_sample_part((uint8_t*)&smallHeader, sizeof(SSmallHeader)); | |
| 1047 bytesRead += sizeof(SSmallHeader); | |
| 1048 | |
| 1049 clear_divisor(); | |
| 1050 | |
| 1051 iNum = 0; | |
| 1052 int counter = 0; | |
| 1053 temperatureLast = -1000; | |
|
455
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1054 if(totalNumberOfBytes > 2) /* read real data */ |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1055 { |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1056 while ((bytesRead < totalNumberOfBytes) && (iNum < length)) |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1057 { |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1058 ext_flash_set_entry_point(); |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1059 divisorBackup = divisor; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1060 retVal = readSample(&depthVal,&gasidVal, &setPointVal, &temperatureVal, &sensor1Val, &sensor2Val, &sensor3Val, &cnsVal, &manualGasVal, |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1061 &bailoutVal, &decostepDepthVal, &tankVal); |
| 38 | 1062 |
|
455
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1063 if(retVal == 0) |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1064 { |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1065 //Error try to read again!!! |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1066 ext_flash_reopen_read_sample_at_entry_point(); |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1067 divisor = divisorBackup; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1068 retVal = readSample(&depthVal,&gasidVal,&setPointVal, &temperatureVal, &sensor1Val, &sensor2Val, &sensor3Val, &cnsVal, |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1069 &manualGasVal, &bailoutVal, &decostepDepthVal, &tankVal); |
| 38 | 1070 |
|
455
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1071 if(retVal == 0) |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1072 break; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1073 } |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1074 bytesRead +=retVal; |
| 38 | 1075 |
|
455
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1076 //if for some variable no new value is in the sample for (z.B. gasidVal = -1), we take the last value |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1077 if(depthVal == -1) |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1078 depthVal = depthLast; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1079 else |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1080 depthLast = depthVal; |
| 38 | 1081 |
|
455
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1082 if(gasidVal == -1) |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1083 gasidVal = gasidLast; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1084 else |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1085 gasidLast = gasidVal; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1086 |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1087 if(temperatureVal == -1000) |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1088 temperatureVal = temperatureLast; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1089 else |
| 38 | 1090 { |
|
455
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1091 if(temperatureLast == -1000) |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1092 temperatureFirst = temperatureVal; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1093 temperatureLast = temperatureVal; |
| 38 | 1094 } |
| 1095 | |
|
455
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1096 if(setPointVal == -1) |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1097 setPointVal = setPointLast; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1098 else |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1099 setPointLast = setPointVal; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1100 |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1101 if(sensor1Val == -1) |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1102 sensor1Val = sensor1Last; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1103 else |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1104 sensor1Last = sensor1Val; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1105 |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1106 if(sensor2Val == -1) |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1107 sensor2Val = sensor2Last; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1108 else |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1109 sensor2Last = sensor2Val; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1110 |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1111 if(sensor3Val == -1) |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1112 sensor3Val = sensor3Last; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1113 else |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1114 sensor3Last = sensor3Val; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1115 |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1116 if(cnsVal == -1) |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1117 cnsVal = cnsLast; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1118 else |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1119 cnsLast = cnsVal; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1120 |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1121 if(manualGasVal.percentageO2 == -1) |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1122 manualGasVal = manualGasLast; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1123 else |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1124 manualGasLast = manualGasVal; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1125 |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1126 if(bailoutVal == -1) |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1127 bailoutVal = bailoutLast; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1128 else |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1129 bailoutLast = bailoutVal; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1130 |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1131 if(decostepDepthVal == -1) |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1132 decostepDepthVal = decostepDepthLast; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1133 else |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1134 decostepDepthLast = decostepDepthVal; |
| 38 | 1135 |
|
455
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1136 counter++; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1137 // Heed compression |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1138 // Write here to arrays |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1139 if(counter == compression) |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1140 { |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1141 if(depth) |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1142 depth[iNum] = depthVal; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1143 if(gasid) |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1144 gasid[iNum] = gasidVal; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1145 if(temperature) |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1146 temperature[iNum] = temperatureVal; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1147 if(cns) |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1148 cns[iNum] = cnsVal; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1149 if(bailout) |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1150 bailout[iNum] = bailoutVal; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1151 if(decostopDepth) |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1152 decostopDepth[iNum] = decostepDepthVal; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1153 |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1154 if(ppo2) |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1155 { |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1156 //Calc ppo2 - Values |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1157 SGas gas; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1158 gas.setPoint_cbar = setPointVal; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1159 if(gasidVal > 0) |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1160 { |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1161 gas.helium_percentage = header.gasordil[gasidVal - 1].helium_percentage; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1162 gas.nitrogen_percentage = 100 - gas.helium_percentage - header.gasordil[gasidVal - 1].oxygen_percentage; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1163 } |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1164 else |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1165 { |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1166 gas.helium_percentage = manualGasVal.percentageHe; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1167 gas.nitrogen_percentage = 100 - gas.helium_percentage - manualGasVal.percentageO2; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1168 } |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1169 ambiant_pressure_bar =((float)(depthVal + header.surfacePressure_mbar))/1000; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1170 ppO2 = decom_calc_ppO2(ambiant_pressure_bar, &gas ); |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1171 ppo2[iNum] = (uint16_t) ( ppO2 * 100); |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1172 } |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1173 |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1174 if(tank) |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1175 { |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1176 tank[iNum] = tankVal; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1177 } |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1178 if(setpoint) |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1179 setpoint[iNum] = setPointVal; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1180 |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1181 if(sensor1) |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1182 sensor1[iNum] = (sensor1Val / 0xFFFF) & 0xFF; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1183 if(sensor2) |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1184 sensor2[iNum] = (sensor2Val / 0xFFFF) & 0xFF; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1185 if(sensor3) |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1186 sensor3[iNum] = (sensor3Val / 0xFFFF) & 0xFF; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1187 iNum++; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1188 counter = 0; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1189 } |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1190 } |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1191 } |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1192 else |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1193 { |
| 458 | 1194 logbook_createDummyProfile(&header, numSamples, depth, temperature, ppo2); |
|
455
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1195 iNum = numSamples; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1196 } |
| 38 | 1197 |
| 1198 // Fix first Temperature Entries 150930 hw | |
| 1199 if(temperature) | |
| 1200 { | |
| 1201 int i = 0; | |
| 1202 while((temperature[i] == -1000) && (i < iNum)) | |
| 1203 temperature[i++] = temperatureFirst; | |
| 1204 } | |
| 1205 | |
| 1206 ext_flash_close_read_sample(); | |
| 1207 return iNum; | |
| 1208 } | |
| 1209 | |
| 1210 | |
| 1211 /******************************************************************************** | |
| 1212 * @brief logbook_InitAndWrite. / Controls writing of logbook | |
| 1213 * Should be called ten times per second | |
| 1214 * Automatically Initializes logbook at beginning of dive, | |
| 1215 * write samples every 2 seconds | |
| 1216 * and finishes logbook after end of dive | |
| 1217 *********************************************************************************/ | |
| 1218 | |
|
270
2e58a4094770
feature, debug: make simulator write a logbook entry
Jan Mulder <jlmulder@xs4all.nl>
parents:
269
diff
changeset
|
1219 void logbook_InitAndWrite(const SDiveState *pStateReal) |
| 38 | 1220 { |
| 1221 SSettings *pSettings = settingsGetPointer(); | |
| 1222 static uint8_t bDiveMode = 0; | |
| 1223 static uint32_t tickstart = 0; | |
| 1224 uint32_t ticksdiff = 0; | |
| 1225 uint32_t lasttick = 0; | |
| 1226 static float min_temperature_float_celsius = 0; | |
| 1227 | |
| 1228 if(!bDiveMode) | |
| 1229 { | |
| 1230 if((pStateReal->mode == MODE_DIVE) && (pStateReal->diveSettings.diveMode != DIVEMODE_Apnea) && (pStateReal->lifeData.dive_time_seconds >= 5)) | |
| 1231 { | |
| 1232 //InitdiveProfile | |
| 1233 pSettings->totalDiveCounter++; | |
| 1234 logbook_initNewdiveProfile(pStateReal,settingsGetPointer()); | |
| 1235 min_temperature_float_celsius = pStateReal->lifeData.temperature_celsius; | |
| 1236 //Write logbook sample | |
|
269
6e78137952af
cleanup: do not pass large struct by value
Jan Mulder <jlmulder@xs4all.nl>
parents:
225
diff
changeset
|
1237 logbook_writeSample(pStateReal); |
|
270
2e58a4094770
feature, debug: make simulator write a logbook entry
Jan Mulder <jlmulder@xs4all.nl>
parents:
269
diff
changeset
|
1238 resetEvents(pStateReal); |
| 38 | 1239 tickstart = HAL_GetTick(); |
| 1240 bDiveMode = 1; | |
| 1241 } | |
| 1242 } | |
| 1243 else if((pStateReal->mode == MODE_DIVE) && (pStateReal->diveSettings.diveMode != DIVEMODE_Apnea)) | |
| 1244 { | |
| 1245 lasttick = HAL_GetTick(); | |
| 1246 ticksdiff = time_elapsed_ms(tickstart,lasttick); | |
| 1247 // | |
| 1248 if(ticksdiff >= 2000) | |
| 1249 { | |
| 1250 //Write logbook sample | |
|
269
6e78137952af
cleanup: do not pass large struct by value
Jan Mulder <jlmulder@xs4all.nl>
parents:
225
diff
changeset
|
1251 logbook_writeSample(pStateReal); |
|
270
2e58a4094770
feature, debug: make simulator write a logbook entry
Jan Mulder <jlmulder@xs4all.nl>
parents:
269
diff
changeset
|
1252 resetEvents(pStateReal); |
| 38 | 1253 if(min_temperature_float_celsius > pStateReal->lifeData.temperature_celsius) |
| 1254 min_temperature_float_celsius = pStateReal->lifeData.temperature_celsius; | |
| 1255 tickstart = lasttick; | |
| 1256 if((bDiveMode == 1) && (pStateReal->lifeData.dive_time_seconds >= pSettings->divetimeToCreateLogbook)) | |
| 1257 { | |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1258 ext_flash_create_new_dive_log((uint8_t*)&gheader); |
| 38 | 1259 /** save settings |
| 1260 * with new lastDiveLogId and time and day | |
| 1261 */ | |
| 1262 pSettings->personalDiveCount++; | |
| 1263 if(pSettings->logbookOffset) | |
| 1264 { | |
| 1265 pSettings->logbookOffset++; | |
| 1266 } | |
| 427 | 1267 ext_flash_write_settings(0); |
| 38 | 1268 ext_flash_disable_protection_for_logbook(); |
|
426
514e6269256f
Added function to analyse the sampel ringbuffer:
ideenmodellierer
parents:
411
diff
changeset
|
1269 |
|
514e6269256f
Added function to analyse the sampel ringbuffer:
ideenmodellierer
parents:
411
diff
changeset
|
1270 ext_flash_CloseSector(); /* this is just a repair function which invalidates a not used sector in case a log maintenance was called before dive */ |
| 38 | 1271 bDiveMode = 3; |
| 1272 } | |
| 1273 if(bDiveMode == 3) | |
|
270
2e58a4094770
feature, debug: make simulator write a logbook entry
Jan Mulder <jlmulder@xs4all.nl>
parents:
269
diff
changeset
|
1274 logbook_UpdateHeader(pStateReal); |
| 38 | 1275 } |
| 1276 } | |
| 1277 else if(bDiveMode == 3) | |
| 1278 { | |
| 1279 //End of Dive | |
| 1280 logbook_SetAverageDepth(pStateReal->lifeData.average_depth_meter); | |
| 1281 logbook_SetMinTemperature(min_temperature_float_celsius); | |
| 1282 logbook_SetMaxCNS(pStateReal->lifeData.cns); | |
|
270
2e58a4094770
feature, debug: make simulator write a logbook entry
Jan Mulder <jlmulder@xs4all.nl>
parents:
269
diff
changeset
|
1283 logbook_SetCompartmentDesaturation(pStateReal); |
| 38 | 1284 logbook_SetLastStop(pStateReal->diveSettings.last_stop_depth_bar); |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1285 gheader.batteryVoltage = pStateReal->lifeData.battery_voltage * 1000; |
| 38 | 1286 logbook_EndDive(); |
| 1287 bDiveMode = 0; | |
| 1288 } else | |
| 1289 { | |
| 1290 ext_flash_enable_protection(); | |
| 1291 } | |
| 1292 } | |
| 1293 | |
| 1294 | |
| 1295 /* Private functions ---------------------------------------------------------*/ | |
| 1296 | |
| 1297 /******************************************************************************** | |
| 1298 * @brief logbook_UpdateHeader. / | |
| 1299 * set date, time, max depth. etc. pp. | |
| 1300 * the internal pointer to the end of profile and length will be set by | |
| 1301 ext_flash_close_new_dive_log() in externLogbookFlash.c | |
| 1302 * @author heinrichs weikamp gmbh | |
| 1303 * @version V0.0.1 | |
| 1304 * @date 27-Nov-2014 | |
| 1305 *********************************************************************************/ | |
|
270
2e58a4094770
feature, debug: make simulator write a logbook entry
Jan Mulder <jlmulder@xs4all.nl>
parents:
269
diff
changeset
|
1306 static void logbook_UpdateHeader(const SDiveState *pStateReal) |
| 38 | 1307 { |
| 1308 // uint16_t secondsAtShallow = 0; | |
| 1309 RTC_DateTypeDef Sdate; | |
| 1310 RTC_TimeTypeDef Stime; | |
| 1311 uint32_t time1_u32, time2_u32; | |
| 1312 uint32_t divetimeHelper; | |
| 1313 | |
| 1314 /* time and day */ | |
| 1315 /* don't update CHANGE 160224 hw, maybe save actual time and date at other place | |
| 1316 translateDate(pStateReal->lifeData.dateBinaryFormat, &Sdate); | |
| 1317 translateTime(pStateReal->lifeData.timeBinaryFormat, &Stime); | |
| 1318 | |
| 1319 header.dateYear = Sdate.Year; | |
| 1320 header.dateMonth = Sdate.Month; | |
| 1321 header.dateDay = Sdate.Date; | |
| 1322 header.timeHour = Stime.Hours; | |
| 1323 header.timeMinute = Stime.Minutes; | |
| 1324 */ | |
| 1325 /// 160315 Quick fix for empty date problem | |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1326 if((!(gheader.dateYear)) || (!(gheader.dateMonth)) || (!(gheader.dateDay))) |
| 38 | 1327 { |
| 1328 translateDate(pStateReal->lifeData.dateBinaryFormat, &Sdate); | |
| 1329 translateTime(pStateReal->lifeData.timeBinaryFormat, &Stime); | |
| 1330 | |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1331 gheader.dateYear = Sdate.Year; |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1332 gheader.dateMonth = Sdate.Month; |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1333 gheader.dateDay = Sdate.Date; |
| 38 | 1334 |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1335 time1_u32 = (uint32_t)gheader.timeMinute + (uint32_t)(gheader.timeHour * 60); |
| 38 | 1336 time2_u32 = (uint32_t)Stime.Minutes + (uint32_t)(Stime.Hours * 60); |
| 1337 if(time2_u32 < time1_u32) | |
| 1338 { | |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1339 if(gheader.dateDay > 1) |
| 38 | 1340 { |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1341 gheader.dateDay -= 1; |
| 38 | 1342 } |
| 1343 else | |
| 1344 { | |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1345 gheader.dateMonth --; |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1346 if(!gheader.dateMonth) |
| 38 | 1347 { |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1348 gheader.dateYear--; |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1349 gheader.dateMonth = 12; |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1350 gheader.dateDay = 31; |
| 38 | 1351 } |
| 1352 else | |
| 1353 { | |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1354 if(gheader.dateMonth == 2) |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1355 gheader.dateDay = 28; |
| 38 | 1356 else |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1357 if((gheader.dateMonth == 4) || (gheader.dateMonth == 6) || (gheader.dateMonth == 9) || (gheader.dateMonth == 11)) |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1358 gheader.dateDay = 30; |
| 38 | 1359 else |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1360 gheader.dateDay = 31; |
| 38 | 1361 } |
| 1362 } | |
| 1363 } | |
| 1364 } | |
| 1365 | |
| 1366 /* duration */ | |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1367 gheader.total_diveTime_seconds = pStateReal->lifeData.dive_time_seconds; |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1368 gheader.maxDepth = pStateReal->lifeData.max_depth_meter * 100; |
| 38 | 1369 |
| 1370 /* old: | |
| 1371 | |
| 1372 secondsAtShallow = pSettings->timeoutDiveReachedZeroDepth; | |
| 1373 if(pStateReal->lifeData.dive_time_seconds <= secondsAtShallow) | |
| 1374 secondsAtShallow = 0; | |
| 1375 header.diveTimeMinutes = (header.total_diveTime_seconds - secondsAtShallow )/ 60; | |
| 1376 header.diveTimeSeconds = header.total_diveTime_seconds - secondsAtShallow - (header.diveTimeMinutes * 60); | |
| 1377 */ | |
| 1378 divetimeHelper = pStateReal->lifeData.dive_time_seconds_without_surface_time; | |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1379 gheader.diveTimeMinutes = (uint16_t)(divetimeHelper/60); |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1380 divetimeHelper -= 60 * (uint32_t)gheader.diveTimeMinutes; |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1381 gheader.diveTimeSeconds = (uint16_t)divetimeHelper; |
| 38 | 1382 |
| 1383 /* deco algorithm (final) */ | |
| 1384 if(pStateReal->diveSettings.deco_type.ub.standard == GF_MODE) | |
| 1385 { | |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1386 gheader.decoModel = 1; |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1387 gheader.gfLow_or_Vpm_conservatism = pStateReal->diveSettings.gf_low; |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1388 gheader.gfHigh = pStateReal->diveSettings.gf_high; |
| 38 | 1389 } |
| 1390 else | |
| 1391 { | |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1392 gheader.decoModel = 2; |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1393 gheader.gfLow_or_Vpm_conservatism = pStateReal->diveSettings.vpm_conservatism; |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1394 gheader.gfHigh = 0; |
| 38 | 1395 } |
| 1396 | |
| 1397 /* tissue load */ | |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1398 memcpy(gheader.n2Compartments, pStateReal->lifeData.tissue_nitrogen_bar, 64); |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1399 memcpy(gheader.heCompartments, pStateReal->lifeData.tissue_helium_bar, 64); |
| 38 | 1400 |
| 1401 } | |
| 1402 | |
| 1403 | |
|
194
f23b9055436f
cleanup: more trivial cleanup (logbook.c/h)
Jan Mulder <jlmulder@xs4all.nl>
parents:
149
diff
changeset
|
1404 static void logbook_SetAverageDepth(float average_depth_meter) |
| 38 | 1405 { |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1406 gheader.averageDepth_mbar = (uint16_t)(average_depth_meter * 100); |
| 38 | 1407 } |
| 1408 | |
| 1409 | |
|
194
f23b9055436f
cleanup: more trivial cleanup (logbook.c/h)
Jan Mulder <jlmulder@xs4all.nl>
parents:
149
diff
changeset
|
1410 static void logbook_SetMinTemperature(float min_temperature_celsius) |
| 38 | 1411 { |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1412 gheader.minTemp = (int16_t)((min_temperature_celsius * 10.0f) + 0.5f); |
| 38 | 1413 } |
| 1414 | |
| 1415 | |
|
194
f23b9055436f
cleanup: more trivial cleanup (logbook.c/h)
Jan Mulder <jlmulder@xs4all.nl>
parents:
149
diff
changeset
|
1416 static void logbook_SetMaxCNS(float max_cns_percentage) |
| 38 | 1417 { |
| 1418 if(max_cns_percentage < 9999) | |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1419 gheader.maxCNS = (uint16_t)(max_cns_percentage); |
| 38 | 1420 else |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1421 gheader.maxCNS = 9999; |
| 38 | 1422 } |
| 1423 | |
| 1424 | |
|
270
2e58a4094770
feature, debug: make simulator write a logbook entry
Jan Mulder <jlmulder@xs4all.nl>
parents:
269
diff
changeset
|
1425 static void logbook_SetCompartmentDesaturation(const SDiveState * pStateReal) |
| 38 | 1426 { |
|
225
2bb1db22b5f5
cleanup: random set of cleanups
Jan Mulder <jlmulder@xs4all.nl>
parents:
199
diff
changeset
|
1427 SLifeData2 secondaryInformation = { 0 }; |
| 38 | 1428 |
| 1429 decom_tissues_desaturation_time(&pStateReal->lifeData, &secondaryInformation); | |
| 1430 for(int i=0;i<16;i++) | |
| 1431 { | |
| 1432 if(secondaryInformation.tissue_nitrogen_desaturation_time_minutes[i] <= (15 * 255)) | |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1433 gheader.n2CompartDesatTime_min[i] = (uint8_t)((secondaryInformation.tissue_nitrogen_desaturation_time_minutes[i] + 14) / 15); |
| 38 | 1434 else |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1435 gheader.n2CompartDesatTime_min[i] = 255; |
| 38 | 1436 if(secondaryInformation.tissue_helium_desaturation_time_minutes[i] <= (15 * 255)) |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1437 gheader.heCompartDesatTime_min[i] = (uint8_t)((secondaryInformation.tissue_helium_desaturation_time_minutes[i] + 14 )/ 15); |
| 38 | 1438 else |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1439 gheader.heCompartDesatTime_min[i] = 255; |
| 38 | 1440 } |
| 1441 } | |
| 1442 | |
|
194
f23b9055436f
cleanup: more trivial cleanup (logbook.c/h)
Jan Mulder <jlmulder@xs4all.nl>
parents:
149
diff
changeset
|
1443 static void logbook_SetLastStop(float last_stop_depth_bar) |
| 38 | 1444 { |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1445 gheader.lastDecostop_m = (uint8_t)(last_stop_depth_bar / 10.0f); |
| 38 | 1446 } |
| 1447 | |
|
194
f23b9055436f
cleanup: more trivial cleanup (logbook.c/h)
Jan Mulder <jlmulder@xs4all.nl>
parents:
149
diff
changeset
|
1448 static void logbook_writedata(void * data, int length_byte) |
| 38 | 1449 { |
| 1450 ext_flash_write_sample(data, length_byte); | |
| 1451 } | |
| 1452 | |
| 1453 /******************************************************************************** | |
| 1454 * @brief logbook_build_ostc3header. / | |
| 1455 * @author heinrichs weikamp gmbh | |
| 1456 * @version V0.0.2 | |
| 1457 * @date 27-Nov-2014 | |
| 1458 *********************************************************************************/ | |
| 1459 SLogbookHeaderOSTC3 * logbook_build_ostc3header(SLogbookHeader* pHead) | |
| 1460 { | |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1461 convert_Type data,data2; |
|
455
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1462 uint16_t dummyLength = 0; |
| 38 | 1463 |
| 1464 memcpy(headerOSTC3.diveHeaderStart, &pHead->diveHeaderStart, 2); | |
| 1465 memcpy(headerOSTC3.pBeginProfileData, &pHead->pBeginProfileData, 3); | |
| 1466 memcpy(headerOSTC3.pEndProfileData, &pHead->pEndProfileData, 3); | |
| 1467 | |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1468 |
| 38 | 1469 data.u8bit.byteHigh = 0; |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1470 data.u8bit.byteLow = pHead->pBeginProfileData[0]; |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1471 data.u8bit.byteMidLow = pHead->pBeginProfileData[1]; |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1472 data.u8bit.byteMidHigh = pHead->pBeginProfileData[2]; |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1473 |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1474 data2.u8bit.byteHigh = 0; |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1475 data2.u8bit.byteLow = pHead->pEndProfileData[0]; |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1476 data2.u8bit.byteMidLow = pHead->pEndProfileData[1]; |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1477 data2.u8bit.byteMidHigh = pHead->pEndProfileData[2]; |
| 38 | 1478 |
|
455
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1479 if( (pHead->pBeginProfileData[0] == 0) /* no sample data available => use dummy */ |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1480 &&(pHead->pBeginProfileData[1] == 0) |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1481 &&(pHead->pBeginProfileData[2] == 0)) |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1482 { |
| 458 | 1483 dummyLength = logbook_fillDummySampleBuffer(pHead); |
|
455
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1484 |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1485 data2.u32bit = data.u32bit + dummyLength; /* calc new end address (which is equal to dummyLength) */ |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1486 data.u32bit = data2.u32bit; /* data is used below to represent the length */ |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1487 } |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1488 else |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1489 { |
|
455
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1490 /* check if sample address information are corrupted by address range. */ |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1491 /* TODO: Workaround. Better solution would be to check end of ring for 0xFF pattern */ |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1492 if((data.u32bit > data2.u32bit) && (data.u32bit < (SAMPLESTOP - 0x9000))) |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1493 { |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1494 data2.u32bit = data.u32bit + DEFAULT_SAMPLES; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1495 pHead->pEndProfileData[0] = data2.u8bit.byteLow; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1496 pHead->pEndProfileData[1] = data2.u8bit.byteMidLow; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1497 pHead->pEndProfileData[2] = data2.u8bit.byteMidHigh; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1498 data.u32bit = DEFAULT_SAMPLES; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1499 } |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1500 else |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1501 { |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1502 data.u8bit.byteHigh = 0; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1503 data.u8bit.byteLow = pHead->profileLength[0]; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1504 data.u8bit.byteMidLow = pHead->profileLength[1]; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1505 data.u8bit.byteMidHigh = pHead->profileLength[2]; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1506 } |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1507 } |
| 38 | 1508 if(data.u32bit != 0xFFFFFF) |
| 1509 data.u32bit += 3; | |
| 1510 | |
| 1511 headerOSTC3.profileLength[0] = data.u8bit.byteLow; | |
| 1512 headerOSTC3.profileLength[1] = data.u8bit.byteMidLow; | |
| 1513 headerOSTC3.profileLength[2] = data.u8bit.byteMidHigh; | |
| 1514 | |
| 1515 memcpy(headerOSTC3.gasordil, pHead->gasordil, 20); | |
| 1516 | |
| 1517 if(pHead->logbookProfileVersion == LOGBOOK_VERSION) | |
| 1518 { | |
| 1519 headerOSTC3.logbookProfileVersion = LOGBOOK_VERSION_OSTC3; | |
| 1520 memcpy(headerOSTC3.personalDiveCount, &pHead->personalDiveCount, 2); | |
| 1521 headerOSTC3.safetyDistance_10cm = 0; | |
| 1522 | |
| 1523 for(int i=0;i<5;i++) | |
| 1524 { | |
| 1525 if(!pHead->gasordil[i].note.ub.active) | |
| 1526 headerOSTC3.gasordil[3 + (i*4)] = 0; | |
| 1527 else if(pHead->gasordil[i].note.ub.first) | |
| 1528 { | |
| 1529 /* depth = 0, note = 1 */ | |
| 1530 headerOSTC3.gasordil[2 + (i*4)] = 0; | |
| 1531 headerOSTC3.gasordil[3 + (i*4)] = 1; | |
| 1532 } | |
| 1533 else if( pHead->gasordil[i].depth_meter) | |
| 1534 { | |
| 1535 /* note = 3 */ | |
| 1536 headerOSTC3.gasordil[3 + (i*4)] = 3; | |
| 1537 } | |
| 1538 } | |
| 1539 } | |
| 1540 else | |
| 1541 { | |
| 1542 headerOSTC3.logbookProfileVersion = 0xFF; | |
| 1543 headerOSTC3.personalDiveCount[0] = 0xFF; | |
| 1544 headerOSTC3.personalDiveCount[1] = 0xFF; | |
| 1545 headerOSTC3.safetyDistance_10cm = 0xFF; | |
| 1546 } | |
| 1547 | |
| 1548 headerOSTC3.dateYear = pHead->dateYear; | |
| 1549 headerOSTC3.dateMonth = pHead->dateMonth; | |
| 1550 headerOSTC3.dateDay = pHead->dateDay; | |
| 1551 headerOSTC3.timeHour = pHead->timeHour; | |
| 1552 headerOSTC3.timeMinute = pHead->timeMinute; | |
| 1553 | |
| 1554 | |
| 1555 memcpy(headerOSTC3.maxDepth, &pHead->maxDepth, 2); | |
| 1556 memcpy(headerOSTC3.diveTimeMinutes, &pHead->diveTimeMinutes, 2); | |
| 1557 | |
| 1558 headerOSTC3.diveTimeSeconds = pHead->diveTimeSeconds; | |
| 1559 | |
| 1560 memcpy(headerOSTC3.minTemp, &pHead->minTemp, 2); | |
| 1561 memcpy(headerOSTC3.surfacePressure_mbar,&pHead->surfacePressure_mbar, 2); | |
| 1562 memcpy(headerOSTC3.desaturationTime, &pHead->desaturationTime, 2); | |
| 1563 | |
| 1564 headerOSTC3.firmwareVersionHigh = pHead->firmwareVersionHigh; | |
| 1565 headerOSTC3.firmwareVersionLow = pHead->firmwareVersionLow; | |
| 1566 | |
| 1567 memcpy(headerOSTC3.batteryVoltage, &pHead->batteryVoltage, 2); | |
| 1568 | |
| 1569 headerOSTC3.samplingRate = pHead->samplingRate; | |
| 1570 | |
| 1571 memcpy(headerOSTC3.cnsAtBeginning, &pHead->cnsAtBeginning, 2); | |
| 1572 | |
| 1573 headerOSTC3.gfAtBeginning = pHead->gfAtBeginning; | |
| 1574 headerOSTC3.gfAtEnd = pHead->gfAtEnd; | |
| 1575 | |
| 1576 memcpy(headerOSTC3.setpoint, pHead->setpoint, 10); | |
| 1577 | |
| 1578 headerOSTC3.salinity = pHead->salinity; | |
| 1579 | |
| 1580 memcpy(headerOSTC3.maxCNS, &pHead->maxCNS, 2); | |
| 1581 memcpy(headerOSTC3.averageDepth_mbar, &pHead->averageDepth_mbar, 2); | |
| 1582 memcpy(headerOSTC3.total_diveTime_seconds,&pHead->total_diveTime_seconds, 2); | |
| 1583 | |
| 1584 headerOSTC3.gfLow_or_Vpm_conservatism = pHead->gfLow_or_Vpm_conservatism; | |
| 1585 headerOSTC3.gfHigh = pHead->gfHigh; | |
| 1586 headerOSTC3.decoModel = pHead->decoModel; | |
| 1587 | |
| 1588 memcpy(headerOSTC3.diveNumber, &pHead->diveNumber, 2); | |
| 1589 | |
| 1590 headerOSTC3.diveMode = pHead->diveMode; | |
| 1591 headerOSTC3.CCRmode = pHead->CCRmode; | |
| 1592 | |
| 1593 memcpy(headerOSTC3.n2CompartDesatTime_min,pHead->n2CompartDesatTime_min, 16); | |
| 1594 memcpy(headerOSTC3.n2Compartments, pHead->n2Compartments, 64); | |
| 1595 memcpy(headerOSTC3.heCompartDesatTime_min,pHead->heCompartDesatTime_min, 16); | |
| 1596 memcpy(headerOSTC3.heCompartments, pHead->heCompartments, 64); | |
| 1597 | |
| 1598 headerOSTC3.lastDecostop_m = pHead->lastDecostop_m; | |
| 1599 | |
| 1600 memcpy(headerOSTC3.hwHudBattery_mV, &pHead->hwHudBattery_mV, 2); | |
| 1601 | |
| 1602 headerOSTC3.hwHudLastStatus = pHead->hwHudLastStatus; | |
| 1603 | |
| 1604 memcpy(headerOSTC3.batteryGaugeRegisters,&pHead->batteryGaugeRegisters, 6); | |
| 1605 | |
| 1606 | |
| 1607 memcpy(headerOSTC3.diveHeaderEnd, &pHead->diveHeaderEnd, 2); | |
| 1608 | |
| 1609 return &headerOSTC3; | |
| 1610 } | |
| 1611 | |
| 1612 | |
| 1613 /******************************************************************************** | |
| 1614 * @brief logbook_build_ostc3header_compact. / | |
| 1615 * @author heinrichs weikamp gmbh | |
| 1616 * @version V0.0.1 | |
| 1617 * @date 31-Juli-2015 | |
| 1618 *********************************************************************************/ | |
| 1619 SLogbookHeaderOSTC3compact * logbook_build_ostc3header_compact(SLogbookHeader* pHead) | |
| 1620 { | |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1621 convert_Type data, data2; |
|
455
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1622 uint32_t dummyLength = 0; |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1623 |
| 38 | 1624 |
| 1625 data.u8bit.byteHigh = 0; | |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1626 data.u8bit.byteLow = pHead->pBeginProfileData[0]; |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1627 data.u8bit.byteMidLow = pHead->pBeginProfileData[1]; |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1628 data.u8bit.byteMidHigh = pHead->pBeginProfileData[2]; |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1629 |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1630 data2.u8bit.byteHigh = 0; |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1631 data2.u8bit.byteLow = pHead->pEndProfileData[0]; |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1632 data2.u8bit.byteMidLow = pHead->pEndProfileData[1]; |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1633 data2.u8bit.byteMidHigh = pHead->pEndProfileData[2]; |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1634 |
|
455
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1635 if( (pHead->pBeginProfileData[0] == 0) /* no sample data available => use dummy */ |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1636 &&(pHead->pBeginProfileData[1] == 0) |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1637 &&(pHead->pBeginProfileData[2] == 0)) |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1638 { |
| 458 | 1639 dummyLength = logbook_fillDummySampleBuffer(pHead); |
|
455
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1640 |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1641 data2.u32bit = data.u32bit + dummyLength; /* calc new end address (which is equal to dummyLength) */ |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1642 data.u32bit = data2.u32bit; /* data is used below to represent the length */ |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1643 } |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1644 else |
|
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1645 { |
|
455
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1646 /* check if sample address information are corrupted by address range. */ |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1647 /* TODO: Workaround. Better solution would be to check end of ring for 0xFF pattern */ |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1648 if((data.u32bit > data2.u32bit) && (data.u32bit < (SAMPLESTOP - 0x9000))) |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1649 { |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1650 data2.u32bit = data.u32bit + DEFAULT_SAMPLES; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1651 pHead->pEndProfileData[0] = data2.u8bit.byteLow; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1652 pHead->pEndProfileData[1] = data2.u8bit.byteMidLow; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1653 pHead->pEndProfileData[2] = data2.u8bit.byteMidHigh; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1654 data.u32bit = DEFAULT_SAMPLES; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1655 } |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1656 else |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1657 { |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1658 data.u8bit.byteHigh = 0; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1659 data.u8bit.byteLow = pHead->profileLength[0]; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1660 data.u8bit.byteMidLow = pHead->profileLength[1]; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1661 data.u8bit.byteMidHigh = pHead->profileLength[2]; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1662 } |
|
411
e908b894f107
Bugfix: Limit log length in case of corrupted sample storage:
ideenmodellierer
parents:
325
diff
changeset
|
1663 } |
| 38 | 1664 if(data.u32bit != 0xFFFFFF) |
| 1665 { | |
| 1666 data.u32bit += 3; | |
| 1667 | |
| 1668 headerOSTC3compact.profileLength[0] = data.u8bit.byteLow; | |
| 1669 headerOSTC3compact.profileLength[1] = data.u8bit.byteMidLow; | |
| 1670 headerOSTC3compact.profileLength[2] = data.u8bit.byteMidHigh; | |
| 1671 | |
| 1672 headerOSTC3compact.dateYear = pHead->dateYear; | |
| 1673 headerOSTC3compact.dateMonth = pHead->dateMonth; | |
| 1674 headerOSTC3compact.dateDay = pHead->dateDay; | |
| 1675 headerOSTC3compact.timeHour = pHead->timeHour; | |
| 1676 headerOSTC3compact.timeMinute = pHead->timeMinute; | |
| 1677 | |
| 1678 memcpy(headerOSTC3compact.maxDepth, &pHead->maxDepth, 2); | |
| 1679 memcpy(headerOSTC3compact.diveTimeMinutes, &pHead->diveTimeMinutes, 2); | |
| 1680 | |
| 1681 headerOSTC3compact.diveTimeSeconds = pHead->diveTimeSeconds; | |
| 1682 | |
| 1683 | |
| 1684 headerOSTC3compact.totalDiveNumberLow = pHead->diveNumber & 0xFF; | |
| 1685 headerOSTC3compact.totalDiveNumberHigh = (uint8_t)(pHead->diveNumber/256); | |
| 1686 headerOSTC3compact.profileVersion = 0x24; // Logbook-Profile version, 0x24 = date and time is start not end | |
| 1687 } | |
| 1688 else | |
| 1689 { | |
| 1690 memset(&headerOSTC3compact, 0xFF, sizeof(SLogbookHeaderOSTC3compact)); | |
| 1691 } | |
| 1692 return &headerOSTC3compact; | |
| 1693 } | |
| 1694 | |
| 1695 | |
| 1696 /** | |
| 1697 ****************************************************************************** | |
| 1698 * @brief logbook_readSampleData. / Reads sample data of whole logbook entry | |
| 281 | 1699 * @author heinrichs weikamp |
| 38 | 1700 * @version V0.0.1 |
| 1701 * @date 22-April-2014 | |
| 1702 ****************************************************************************** | |
| 1703 * | |
| 1704 * @param uint8_t StepBackwards: witch lookbook entry? | |
| 1705 * @param uint16_t length : maxlength of output arrays | |
| 1706 * @param int32_t* depth : output array | |
| 1707 * @param int16_t * gasid : output array | |
| 1708 * @param int32_t* temperature : output array | |
| 1709 * @param int32_t* ppo2 : output array | |
| 1710 * @param int32_t* cns : output array | |
| 1711 * @return length of output | |
| 1712 */ | |
| 1713 void logbook_recover_brokenlog(uint8_t headerId) | |
| 1714 { | |
| 1715 int16_t retVal; | |
| 1716 int32_t depthVal = 0; | |
| 1717 int16_t gasidVal = 0; | |
| 1718 int16_t setPointVal = 0; | |
| 1719 int16_t bailoutVal = 0; | |
| 1720 int32_t temperatureVal = 0; | |
| 1721 int32_t sensor1Val = 0; | |
| 1722 int32_t sensor2Val = 0; | |
| 1723 int32_t sensor3Val = 0; | |
| 1724 int32_t cnsVal = 0; | |
| 1725 SManualGas manualGasVal; | |
| 1726 | |
| 1727 //uint16_t* ppo2, uint16_t* cns# | |
| 1728 uint32_t bytesRead = 0; | |
| 1729 | |
| 1730 ext_flash_read_block_start(); | |
| 1731 ext_flash_read_next_sample_part((uint8_t*)&smallHeader, sizeof(SSmallHeader)); | |
| 1732 bytesRead += sizeof(SSmallHeader); | |
| 1733 | |
| 1734 clear_divisor(); | |
| 1735 | |
| 1736 | |
| 1737 int sampleCounter = 0; | |
| 1738 int maxdepth = 0; | |
| 1739 uint32_t avrdepth = 0; | |
| 1740 while (true) | |
| 1741 { | |
| 1742 | |
| 1743 ext_flash_set_entry_point(); | |
| 1744 divisorBackup = divisor; | |
|
455
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1745 retVal = readSample(&depthVal,&gasidVal, &setPointVal, &temperatureVal, &sensor1Val, &sensor2Val, &sensor3Val, &cnsVal, &manualGasVal, &bailoutVal, NULL, NULL); |
| 38 | 1746 if(retVal == 0) |
| 1747 { | |
| 1748 //Error try to read again!!! | |
| 1749 ext_flash_reopen_read_sample_at_entry_point(); | |
| 1750 divisor = divisorBackup; | |
|
455
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1751 retVal = readSample(&depthVal,&gasidVal, &setPointVal, &temperatureVal, &sensor1Val, &sensor2Val, &sensor3Val, &cnsVal, &manualGasVal, &bailoutVal, NULL, NULL); |
| 38 | 1752 |
| 1753 if(retVal == 0) | |
| 1754 { | |
| 1755 //Error try to read again!!! | |
| 1756 ext_flash_reopen_read_sample_at_entry_point(); | |
| 1757 divisor = divisorBackup; | |
|
455
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1758 retVal = readSample(&depthVal,&gasidVal, &setPointVal, &temperatureVal, &sensor1Val, &sensor2Val, &sensor3Val, &cnsVal, &manualGasVal, &bailoutVal, NULL, NULL); |
| 38 | 1759 |
| 1760 if(retVal == 0) | |
| 1761 { | |
| 1762 ext_flash_reopen_read_sample_at_entry_point(); | |
| 1763 break; | |
| 1764 } | |
| 1765 | |
| 1766 } | |
| 1767 } | |
| 1768 if(depthVal > maxdepth) | |
| 1769 maxdepth = depthVal; | |
| 1770 avrdepth += depthVal; | |
| 1771 sampleCounter++; | |
| 1772 bytesRead +=retVal; | |
| 1773 } | |
| 1774 avrdepth/= sampleCounter; | |
| 1775 ext_flash_close_read_sample(); | |
| 1776 SLogbookHeader header; | |
| 1777 | |
| 1778 ext_flash_read_dive_header2((uint8_t*) &header, headerId, false); | |
| 1779 header.total_diveTime_seconds = sampleCounter * header.samplingRate; | |
| 1780 header.diveTimeMinutes = header.total_diveTime_seconds /60; | |
| 1781 header.diveTimeSeconds = header.total_diveTime_seconds - header.diveTimeMinutes * 60; | |
| 1782 header.maxDepth = maxdepth; | |
| 1783 header.averageDepth_mbar = avrdepth; | |
| 1784 SSettings * settings = settingsGetPointer(); | |
| 1785 settings->lastDiveLogId = headerId; | |
| 1786 ext_flash_close_new_dive_log((uint8_t *)&header); | |
| 1787 } | |
| 1788 | |
| 458 | 1789 void logbook_createDummyProfile(SLogbookHeader* pHeader, uint16_t length, uint16_t* depth, int16_t* temperature, uint16_t* ppo2) |
|
455
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1790 { |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1791 uint8_t drawDeco = 1; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1792 uint16_t index = 0; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1793 uint16_t indexDescenStop = 0; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1794 uint16_t indexAscendStart = 0; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1795 uint16_t simDecentDepth = 0; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1796 uint16_t simDecentStep = 0; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1797 uint16_t simAcentDepth = 0; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1798 uint16_t simAcentStep = 0; |
| 458 | 1799 float ambiant_pressure_bar = 0; |
|
455
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1800 |
| 458 | 1801 simDecentStep = pHeader->maxDepth / (length / 6); /* first 1/6 for descend */ |
| 1802 simAcentStep = pHeader->maxDepth / (length / 3); /* first 1/3 for ascend */ | |
| 1803 | |
| 1804 SGas gas; | |
| 1805 | |
|
455
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1806 |
| 458 | 1807 if(ppo2) |
| 1808 { | |
| 1809 /* find first gas ID */ | |
| 1810 for(index = 0; index < NUM_GAS; index++) | |
| 1811 { | |
| 1812 if(pHeader->gasordil[index].note.ub.first) | |
| 1813 break; | |
| 1814 } | |
| 1815 if(index != NUM_GAS) | |
| 1816 { | |
| 1817 gas.helium_percentage = pHeader->gasordil[index].helium_percentage; | |
| 1818 gas.nitrogen_percentage = 100 - gas.helium_percentage - pHeader->gasordil[index].oxygen_percentage; | |
| 1819 } | |
| 1820 } | |
| 1821 | |
| 1822 while((index < length) && (simDecentDepth < pHeader->maxDepth)) /* draw decent */ | |
|
455
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1823 { |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1824 depth[index] = simDecentDepth; |
| 458 | 1825 temperature[index] = pHeader->minTemp; |
| 1826 if(ppo2) | |
| 1827 { | |
| 1828 ambiant_pressure_bar =((float)(depth[index] + pHeader->surfacePressure_mbar))/1000; | |
| 1829 ppo2[index] = (uint16_t) ((decom_calc_ppO2(ambiant_pressure_bar, &gas )) * 100); | |
| 1830 } | |
|
455
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1831 index++; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1832 simDecentDepth += simDecentStep; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1833 } |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1834 indexDescenStop = index; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1835 index = length -1; |
| 458 | 1836 while((index > indexDescenStop) && (simAcentDepth < pHeader->maxDepth)) /* draw ascend including max deco stop */ |
|
455
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1837 { |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1838 depth[index] = simAcentDepth; |
| 458 | 1839 temperature[index] = pHeader->minTemp; |
| 1840 if(ppo2) | |
| 1841 { | |
| 1842 ambiant_pressure_bar =((float)(depth[index] + pHeader->surfacePressure_mbar))/1000; | |
| 1843 ppo2[index] = (uint16_t) ((decom_calc_ppO2(ambiant_pressure_bar, &gas )) * 100); | |
| 1844 } | |
| 1845 if((drawDeco) && (simAcentDepth < pHeader->lastDecostop_m)) /* draw deco step */ | |
|
455
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1846 { |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1847 drawDeco = length / 10; |
| 458 | 1848 while(drawDeco) |
|
455
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1849 { |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1850 index--; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1851 depth[index] = simAcentDepth; |
| 458 | 1852 temperature[index] = pHeader->minTemp; |
| 1853 if(ppo2) | |
| 1854 { | |
| 1855 ambiant_pressure_bar =((float)(depth[index] + pHeader->surfacePressure_mbar))/1000; | |
| 1856 ppo2[index] = (uint16_t) ((decom_calc_ppO2(ambiant_pressure_bar, &gas )) * 100); | |
| 1857 } | |
| 1858 drawDeco--; | |
|
455
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1859 } |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1860 } |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1861 index--; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1862 simAcentDepth += simAcentStep; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1863 } |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1864 indexAscendStart = index; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1865 index = indexDescenStop; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1866 while(index <= indexAscendStart) /* draw isobar dive phase */ |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1867 { |
| 458 | 1868 depth[index] = pHeader->maxDepth; |
| 1869 temperature[index] = pHeader->minTemp; | |
| 1870 if(ppo2) | |
| 1871 { | |
| 1872 ambiant_pressure_bar =((float)(depth[index] + pHeader->surfacePressure_mbar))/1000; | |
| 1873 ppo2[index] = (uint16_t) ((decom_calc_ppO2(ambiant_pressure_bar, &gas )) * 100); | |
| 1874 } | |
|
455
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1875 index++; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1876 } |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1877 } |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1878 |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1879 void logbook_resetDummy() |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1880 { |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1881 dummyWriteIdx = 0; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1882 dummyReadIdx = 0; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1883 } |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1884 |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1885 void logbook_writeDummy(void* data, uint16_t length) |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1886 { |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1887 memcpy(&dummyMemoryBuffer[dummyWriteIdx],(uint8_t *)data, length); |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1888 dummyWriteIdx += length; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1889 } |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1890 void logbook_writeDummySample(uint16_t depth, int16_t temperature) |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1891 { |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1892 uint8_t sample[10]; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1893 int length = 0; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1894 |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1895 int i = 0; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1896 for(i = 0; i <10 ;i++) sample[i] = 0; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1897 addU16(sample, depth); |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1898 length += 2; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1899 sample[2] = 0; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1900 length++; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1901 |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1902 if(divisor.temperature == 0) |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1903 { |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1904 divisor.temperature = smallHeader.tempDivisor - 1; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1905 addS16(&sample[length], temperature); |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1906 length += 2; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1907 } |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1908 else |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1909 { |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1910 divisor.temperature--; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1911 } |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1912 |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1913 logbook_writeDummy((void *) &smallDummyHeader,sizeof(smallDummyHeader)); |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1914 } |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1915 |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1916 |
| 458 | 1917 uint16_t logbook_fillDummySampleBuffer(SLogbookHeader* pHeader) |
|
455
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1918 { |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1919 uint16_t depthArray[DUMMY_SAMPLES]; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1920 int16_t temperatureArray[DUMMY_SAMPLES]; |
| 458 | 1921 uint16_t ppo2Array[DUMMY_SAMPLES]; |
|
455
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1922 |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1923 uint16_t index = 0; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1924 uint16_t dummyBufferSize = 0; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1925 uint16_t dummyProfileLength = 0; |
| 458 | 1926 uint32_t overallSecond = pHeader->diveTimeMinutes * 60 + pHeader->diveTimeSeconds; |
|
455
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1927 |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1928 logbook_resetDummy(); |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1929 clear_divisor(); |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1930 |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1931 smallDummyHeader.profileLength[0] = 0xFF; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1932 smallDummyHeader.profileLength[1] = 0xFF; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1933 smallDummyHeader.profileLength[2] = 0xFF; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1934 smallDummyHeader.samplingRate_seconds = 2; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1935 smallDummyHeader.numDivisors = 7; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1936 |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1937 smallDummyHeader.tempType = 0; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1938 smallDummyHeader.tempLength = 2; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1939 smallDummyHeader.tempDivisor = 6; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1940 |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1941 smallDummyHeader.deco_ndlType = 1; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1942 smallDummyHeader.deco_ndlLength = 2; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1943 smallDummyHeader.deco_ndlDivisor = 0; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1944 |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1945 /* GF in % at actual position */ |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1946 smallDummyHeader.gfType = 2; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1947 smallDummyHeader.gfLength = 1; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1948 smallDummyHeader.gfDivisor = 0; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1949 |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1950 /* 3 Sensors: 8bit ppO2 in 0.01bar, 16bit voltage in 0,1mV */ |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1951 smallDummyHeader.ppo2Type = 3; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1952 smallDummyHeader.ppo2Length = 9; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1953 smallDummyHeader.ppo2Divisor = 0; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1954 |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1955 /* last 15 stops in minutes (last, second_to_last, ... */ |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1956 /* last stop depth is defined in header */ |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1957 smallDummyHeader.decoplanType = 4; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1958 smallDummyHeader.decoplanLength = 15; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1959 smallDummyHeader.decoplanDivisor = 0; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1960 |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1961 smallDummyHeader.cnsType = 5; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1962 smallDummyHeader.cnsLength = 2; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1963 smallDummyHeader.cnsDivisor = 0; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1964 |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1965 smallDummyHeader.tankType = 6; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1966 smallDummyHeader.tankLength = 2; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1967 smallDummyHeader.tankDivisor = 0; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1968 |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1969 if((overallSecond / smallDummyHeader.samplingRate_seconds) > DUMMY_SAMPLES) /* reduce sample interval to keep buffer size */ |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1970 { |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1971 smallDummyHeader.samplingRate_seconds = overallSecond / DUMMY_SAMPLES; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1972 dummyProfileLength = DUMMY_SAMPLES; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1973 } |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1974 else |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1975 { |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1976 dummyProfileLength = overallSecond / smallDummyHeader.samplingRate_seconds; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1977 } |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1978 logbook_writeDummy((void *) &smallDummyHeader,sizeof(smallDummyHeader)); |
| 458 | 1979 logbook_createDummyProfile(pHeader,dummyProfileLength, depthArray, temperatureArray, ppo2Array ); |
|
455
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1980 |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1981 for (index = 0; index < dummyProfileLength; index++) |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1982 { |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1983 logbook_writeDummySample(depthArray[index], temperatureArray[index]); |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1984 } |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1985 |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1986 dummyBufferSize = dummyWriteIdx; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1987 |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1988 return dummyBufferSize; /* return size of dummy buffer */ |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1989 } |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1990 |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1991 void logbook_readDummySamples(uint8_t* pTarget, uint16_t length) |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1992 { |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1993 memcpy(pTarget,&dummyMemoryBuffer[dummyReadIdx],length); |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1994 dummyReadIdx += length; |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1995 } |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1996 |
|
928a14568689
Reactivated samples for bottle pressure information:
ideenmodellierer
parents:
445
diff
changeset
|
1997 |
| 38 | 1998 /************************ (C) COPYRIGHT heinrichs weikamp *****END OF FILE****/ |