Mercurial > public > ostc4
annotate Discovery/Src/data_exchange_main.c @ 910:7bd347bdaa81 Evo_2_23
Devbugfix Sample time resolution for longer dives:
If a dive is longer than the provided replay buffer then the sample data is compressed. This compression was not considered in the previous version. As result the dive was replayed with double speed because a single sample were interpretated as 2 seconds instead of e.g. 4 seconds for a compressed sample. The comprassion rate is now considered in the simulator replay function
| author | Ideenmodellierer |
|---|---|
| date | Tue, 15 Oct 2024 19:12:05 +0200 |
| parents | 46a21ff3f5ab |
| children | a2523e19f59a |
| rev | line source |
|---|---|
| 38 | 1 /** |
| 2 ****************************************************************************** | |
| 3 * @file data_exchange_main.c | |
| 4 * @author heinrichs weikamp gmbh | |
| 5 * @date 13-Oct-2014 | |
| 6 * @version V0.0.3 | |
| 7 * @since 17-Feb-2016 | |
| 8 | |
| 9 * @brief Communication with the second CPU == RTE system | |
| 10 * | |
| 11 @verbatim | |
| 12 ============================================================================== | |
| 13 ##### Version Changes ##### | |
| 14 ============================================================================== | |
| 15 160217 V0.0.3 pStateUsed->decolistXXXXX.tickstamp = HAL_GetTick(); added | |
| 16 150627 V0.0.2 | |
| 17 | |
| 18 ============================================================================== | |
| 19 ##### How to use ##### | |
| 20 ============================================================================== | |
| 21 | |
| 22 ============================================================================== | |
| 23 ##### Button, Set Time, Clear Deco etc Request ##### | |
| 24 ============================================================================== | |
| 25 was updated (151207) for buttons and clear deco at the moment only | |
| 26 using requestNecessary and checking in DataEX_copy_to_LifeData() | |
| 27 Hence if there is no confirm from the smallCPU on the data after the request | |
| 28 the request will be send again. | |
| 29 | |
| 30 ============================================================================== | |
| 31 ##### Device Data ##### | |
| 32 ============================================================================== | |
| 33 | |
| 34 main CPU always sends the device data info that it has at the moment | |
| 35 | |
| 36 on start it is INT32_MIN, INT32_MAX and 0 | |
| 37 as initialized in data_central.c variable declaration | |
| 38 | |
| 39 second small CPU gets request to send its device data | |
| 40 | |
|
198
878dc9e0dbc5
cleanup: another cleanup session (data_exchange_main.c)
Jan Mulder <jlmulder@xs4all.nl>
parents:
197
diff
changeset
|
41 on reception the data is merged with the data in externLogbookFlash, |
| 38 | 42 stored on the externLogbookFlash and from now on send to small CPU |
| 43 | |
| 44 ============================================================================== | |
| 45 ##### Magnet Reset ##### | |
| 46 ============================================================================== | |
| 47 | |
| 48 @endverbatim | |
| 49 ****************************************************************************** | |
| 50 * @attention | |
| 51 * | |
| 52 * <h2><center>© COPYRIGHT(c) 2014 heinrichs weikamp</center></h2> | |
| 53 * | |
| 54 ****************************************************************************** | |
| 55 */ | |
| 56 | |
| 57 /* Includes ------------------------------------------------------------------*/ | |
|
133
acc98f5bd8c4
Intoduced transfer abort function for data exchange recovery
Ideenmodellierer
parents:
115
diff
changeset
|
58 #include <stdlib.h> |
|
198
878dc9e0dbc5
cleanup: another cleanup session (data_exchange_main.c)
Jan Mulder <jlmulder@xs4all.nl>
parents:
197
diff
changeset
|
59 #include <string.h> // for memcpy |
|
747
df0d43da1614
Added pressure compensation to CO2 detection:
Ideenmodellierer
parents:
734
diff
changeset
|
60 #include <math.h> |
| 38 | 61 #include "stm32f4xx_hal.h" |
| 62 #include "stdio.h" | |
| 63 #include "ostc.h" | |
| 64 #include "settings.h" | |
| 65 #include "data_central.h" | |
| 66 #include "data_exchange_main.h" | |
| 67 #include "base.h" | |
| 68 #include "decom.h" | |
| 69 #include "calc_crush.h" /* for vpm_init */ | |
| 70 #include "simulation.h" | |
| 71 #include "tCCR.h" | |
| 72 #include "timer.h" | |
| 73 #include "buehlmann.h" | |
| 74 #include "externLogbookFlash.h" | |
| 75 | |
| 662 | 76 /* #define TESTBENCH */ |
| 38 | 77 |
|
173
05c770dc2911
Bugfix: make max depth move with current depth (part 1)
Jan Mulder <jlmulder@xs4all.nl>
parents:
156
diff
changeset
|
78 /* Exported variables --------------------------------------------------------*/ |
|
198
878dc9e0dbc5
cleanup: another cleanup session (data_exchange_main.c)
Jan Mulder <jlmulder@xs4all.nl>
parents:
197
diff
changeset
|
79 static uint8_t wasPowerOn = 0; |
|
878dc9e0dbc5
cleanup: another cleanup session (data_exchange_main.c)
Jan Mulder <jlmulder@xs4all.nl>
parents:
197
diff
changeset
|
80 static confirmbit8_Type requestNecessary = { .uw = 0 }; |
|
878dc9e0dbc5
cleanup: another cleanup session (data_exchange_main.c)
Jan Mulder <jlmulder@xs4all.nl>
parents:
197
diff
changeset
|
81 static uint8_t wasUpdateNotPowerOn = 0; |
| 38 | 82 |
| 83 /* Private variables with external access ------------------------------------*/ | |
| 84 | |
| 85 /* Private variables ---------------------------------------------------------*/ | |
|
198
878dc9e0dbc5
cleanup: another cleanup session (data_exchange_main.c)
Jan Mulder <jlmulder@xs4all.nl>
parents:
197
diff
changeset
|
86 static uint8_t told_reset_logik_alles_ok = 0; |
| 559 | 87 static hw_Info_t hw_Info; |
| 38 | 88 |
|
198
878dc9e0dbc5
cleanup: another cleanup session (data_exchange_main.c)
Jan Mulder <jlmulder@xs4all.nl>
parents:
197
diff
changeset
|
89 static SDataReceiveFromMaster dataOut; |
|
878dc9e0dbc5
cleanup: another cleanup session (data_exchange_main.c)
Jan Mulder <jlmulder@xs4all.nl>
parents:
197
diff
changeset
|
90 static SDataExchangeSlaveToMaster dataIn; |
| 38 | 91 |
|
198
878dc9e0dbc5
cleanup: another cleanup session (data_exchange_main.c)
Jan Mulder <jlmulder@xs4all.nl>
parents:
197
diff
changeset
|
92 static uint8_t data_old__lost_connection_to_slave_counter_temp = 0; |
|
878dc9e0dbc5
cleanup: another cleanup session (data_exchange_main.c)
Jan Mulder <jlmulder@xs4all.nl>
parents:
197
diff
changeset
|
93 static uint8_t data_old__lost_connection_to_slave_counter_retry = 0; |
|
878dc9e0dbc5
cleanup: another cleanup session (data_exchange_main.c)
Jan Mulder <jlmulder@xs4all.nl>
parents:
197
diff
changeset
|
94 static uint32_t data_old__lost_connection_to_slave_counter_total = 0; |
| 38 | 95 |
|
406
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
96 static uint8_t DeviceDataUpdated = 0; |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
97 |
| 662 | 98 static uint16_t externalInterface_Cmd = 0; |
| 99 | |
| 38 | 100 /* Private types -------------------------------------------------------------*/ |
|
406
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
101 #define UNKNOWN_TIME_HOURS 1 |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
102 #define UNKNOWN_TIME_MINUTES 0 |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
103 #define UNKNOWN_TIME_SECOND 0 |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
104 #define UNKNOWN_DATE_DAY 1 |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
105 #define UNKNOWN_DATE_MONTH 1 |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
106 #define UNKNOWN_DATE_YEAR 16 |
| 38 | 107 |
|
577
9bb9a52d6ae5
Handle o2 voltage values < 0.5mV as invalid:
Ideenmodellierer
parents:
559
diff
changeset
|
108 |
| 38 | 109 /* Private function prototypes -----------------------------------------------*/ |
|
198
878dc9e0dbc5
cleanup: another cleanup session (data_exchange_main.c)
Jan Mulder <jlmulder@xs4all.nl>
parents:
197
diff
changeset
|
110 static uint8_t DataEX_check_header_and_footer_ok(void); |
|
878dc9e0dbc5
cleanup: another cleanup session (data_exchange_main.c)
Jan Mulder <jlmulder@xs4all.nl>
parents:
197
diff
changeset
|
111 static uint8_t DataEX_check_header_and_footer_shifted(void); |
|
878dc9e0dbc5
cleanup: another cleanup session (data_exchange_main.c)
Jan Mulder <jlmulder@xs4all.nl>
parents:
197
diff
changeset
|
112 static uint8_t DataEX_check_header_and_footer_devicedata(void); |
|
878dc9e0dbc5
cleanup: another cleanup session (data_exchange_main.c)
Jan Mulder <jlmulder@xs4all.nl>
parents:
197
diff
changeset
|
113 static void DataEX_check_DeviceData(void); |
| 38 | 114 |
| 115 /* Exported functions --------------------------------------------------------*/ | |
| 116 uint8_t DataEX_was_power_on(void) | |
| 117 { | |
| 118 return wasPowerOn; | |
| 119 } | |
| 120 | |
|
198
878dc9e0dbc5
cleanup: another cleanup session (data_exchange_main.c)
Jan Mulder <jlmulder@xs4all.nl>
parents:
197
diff
changeset
|
121 static uint8_t count_DataEX_Error_Handler = 0; |
|
878dc9e0dbc5
cleanup: another cleanup session (data_exchange_main.c)
Jan Mulder <jlmulder@xs4all.nl>
parents:
197
diff
changeset
|
122 static uint8_t last_error_DataEX_Error_Handler = 0; |
| 38 | 123 |
|
198
878dc9e0dbc5
cleanup: another cleanup session (data_exchange_main.c)
Jan Mulder <jlmulder@xs4all.nl>
parents:
197
diff
changeset
|
124 static void DataEX_Error_Handler(uint8_t answer) |
| 38 | 125 { |
| 126 count_DataEX_Error_Handler++; | |
| 127 last_error_DataEX_Error_Handler = answer; | |
|
133
acc98f5bd8c4
Intoduced transfer abort function for data exchange recovery
Ideenmodellierer
parents:
115
diff
changeset
|
128 |
|
156
1fbdb45db701
Removed special indicator for DMA transfer error
Ideenmodellierer
parents:
154
diff
changeset
|
129 /* A wrong footer indicates a communication interrupt. State machine is waiting for new data which is not received because no new transmission is triggered */ |
|
133
acc98f5bd8c4
Intoduced transfer abort function for data exchange recovery
Ideenmodellierer
parents:
115
diff
changeset
|
130 /* ==> Abort data exchange to enable a new RX / TX cycle */ |
|
acc98f5bd8c4
Intoduced transfer abort function for data exchange recovery
Ideenmodellierer
parents:
115
diff
changeset
|
131 if(answer == HAL_BUSY) |
|
acc98f5bd8c4
Intoduced transfer abort function for data exchange recovery
Ideenmodellierer
parents:
115
diff
changeset
|
132 { |
|
acc98f5bd8c4
Intoduced transfer abort function for data exchange recovery
Ideenmodellierer
parents:
115
diff
changeset
|
133 HAL_SPI_Abort_IT(&cpu2DmaSpi); |
|
acc98f5bd8c4
Intoduced transfer abort function for data exchange recovery
Ideenmodellierer
parents:
115
diff
changeset
|
134 } |
|
137
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
135 |
| 38 | 136 return; |
| 137 } | |
| 138 | |
| 139 | |
| 140 uint32_t DataEX_lost_connection_count(void) | |
| 141 { | |
| 142 return data_old__lost_connection_to_slave_counter_total; | |
| 143 } | |
| 144 | |
| 145 | |
|
198
878dc9e0dbc5
cleanup: another cleanup session (data_exchange_main.c)
Jan Mulder <jlmulder@xs4all.nl>
parents:
197
diff
changeset
|
146 SDataReceiveFromMaster *dataOutGetPointer(void) |
| 38 | 147 { |
| 148 return &dataOut; | |
| 149 } | |
| 150 | |
| 151 void DataEX_init(void) | |
| 152 { | |
| 153 SDiveState * pStateReal = stateRealGetPointerWrite(); | |
| 99 | 154 pStateReal->data_old__lost_connection_to_slave = 0; //initial value |
| 38 | 155 data_old__lost_connection_to_slave_counter_temp = 0; |
| 156 data_old__lost_connection_to_slave_counter_total = 0; | |
|
407
b11e50415982
Bugfix parallel call of external flash functions:
ideenmodellierer
parents:
406
diff
changeset
|
157 DeviceDataUpdated = 0; |
| 38 | 158 |
| 159 memset((void *)&dataOut, 0, sizeof(SDataReceiveFromMaster)); | |
| 160 | |
| 161 dataOut.header.checkCode[0] = 0xBB; | |
| 208 | 162 dataOut.header.checkCode[1] = SPI_RX_STATE_OK; |
| 163 dataOut.header.checkCode[2] = SPI_RX_STATE_OK; | |
| 38 | 164 dataOut.header.checkCode[3] = 0xBB; |
| 165 | |
| 166 dataOut.footer.checkCode[0] = 0xF4; | |
| 167 dataOut.footer.checkCode[1] = 0xF3; | |
| 168 dataOut.footer.checkCode[2] = 0xF2; | |
| 169 dataOut.footer.checkCode[3] = 0xF1; | |
| 170 } | |
| 171 | |
| 172 | |
|
198
878dc9e0dbc5
cleanup: another cleanup session (data_exchange_main.c)
Jan Mulder <jlmulder@xs4all.nl>
parents:
197
diff
changeset
|
173 static void DataEx_call_helper_requests(void) |
| 38 | 174 { |
| 175 static uint8_t setDateWasSend = 0; | |
| 176 static uint8_t setTimeWasSend = 0; | |
| 177 static uint8_t calibrateCompassWasSend = 0; | |
| 178 static uint8_t setButtonSensitivityWasSend = 0; | |
| 179 static uint8_t clearDecoWasSend = 0; | |
| 180 static uint8_t getDeviceDataWasSend = 0; | |
| 181 static uint8_t setAccidentFlagWasSend = 0; | |
| 182 static uint8_t setEndDiveWasSend = 0; | |
| 183 | |
| 184 if(getDeviceDataWasSend) | |
| 185 { | |
| 186 dataOut.getDeviceDataNow = 0; | |
| 187 } | |
| 188 getDeviceDataWasSend = 0; | |
| 189 if(dataOut.getDeviceDataNow) | |
| 190 { | |
| 191 getDeviceDataWasSend = 1; | |
| 662 | 192 requestNecessary.ub.devicedata = 1; |
| 38 | 193 } |
| 194 | |
| 195 if(setEndDiveWasSend) | |
| 196 { | |
| 197 dataOut.setEndDive = 0; | |
| 198 //requestNecessary.ub.XXX = 1; not implemented and no space here | |
| 199 } | |
| 200 setEndDiveWasSend = 0; | |
| 201 if(dataOut.setEndDive) | |
| 202 { | |
| 203 setEndDiveWasSend = 1; | |
| 204 } | |
| 205 | |
| 206 if(setAccidentFlagWasSend) | |
| 207 { | |
| 208 dataOut.setAccidentFlag = 0; | |
| 209 } | |
| 210 setAccidentFlagWasSend = 0; | |
| 211 if(dataOut.setAccidentFlag) | |
| 212 { | |
| 213 setAccidentFlagWasSend = 1; | |
| 662 | 214 requestNecessary.ub.accident = 1; |
| 38 | 215 } |
| 216 | |
| 217 if(setDateWasSend) | |
| 218 { | |
| 219 dataOut.setDateNow = 0; | |
| 220 } | |
| 221 setDateWasSend = 0; | |
| 222 if(dataOut.setDateNow) | |
| 223 { | |
| 224 setDateWasSend = 1; | |
| 662 | 225 requestNecessary.ub.date = 1; |
| 38 | 226 } |
| 227 | |
| 228 if(setTimeWasSend) | |
| 229 { | |
| 230 dataOut.setTimeNow = 0; | |
| 231 } | |
| 232 setTimeWasSend = 0; | |
| 233 if(dataOut.setTimeNow) | |
| 234 { | |
| 235 setTimeWasSend = 1; | |
| 662 | 236 requestNecessary.ub.time = 1; |
| 38 | 237 } |
| 238 | |
| 239 if(calibrateCompassWasSend) | |
| 240 { | |
| 241 dataOut.calibrateCompassNow = 0; | |
| 242 } | |
| 243 calibrateCompassWasSend = 0; | |
| 244 if(dataOut.calibrateCompassNow) | |
| 245 { | |
| 246 calibrateCompassWasSend = 1; | |
| 247 } | |
| 248 | |
| 249 if(clearDecoWasSend) | |
| 250 { | |
| 251 dataOut.clearDecoNow = 0; | |
| 662 | 252 requestNecessary.ub.compass = 1; |
| 38 | 253 } |
| 254 if(dataOut.clearDecoNow) | |
| 255 { | |
| 256 clearDecoWasSend = 1; | |
| 662 | 257 requestNecessary.ub.clearDeco = 1; |
| 38 | 258 } |
| 259 | |
| 260 if(setButtonSensitivityWasSend) | |
| 261 { | |
| 262 dataOut.setButtonSensitivityNow = 0; | |
| 263 } | |
| 264 setButtonSensitivityWasSend = 0; | |
| 265 if(dataOut.setButtonSensitivityNow) | |
| 266 { | |
| 267 setButtonSensitivityWasSend = 1; | |
| 662 | 268 requestNecessary.ub.button = 1; |
| 38 | 269 } |
| 270 } | |
| 271 | |
| 272 | |
| 273 uint8_t DataEX_call(void) | |
| 274 { | |
| 208 | 275 static uint32_t RTEOfflineCnt = 0; |
| 276 static uint8_t SusppressCom = 0; | |
| 277 | |
| 38 | 278 uint8_t SPI_DMA_answer = 0; |
| 141 | 279 |
| 208 | 280 if(SusppressCom) |
| 38 | 281 { |
| 208 | 282 SusppressCom--; |
| 38 | 283 } |
| 149 | 284 else |
| 285 { | |
|
763
aa6006975e76
increase HAL_Delay to 10ms for cold-start-button reset
heinrichsweikamp
parents:
747
diff
changeset
|
286 if(data_old__lost_connection_to_slave_counter_temp >= 2) /* error reaction is triggered whenever communication could not be reestablished within two cycles */ |
| 208 | 287 { |
| 288 data_old__lost_connection_to_slave_counter_temp = 0; | |
| 289 if(DataEX_check_header_and_footer_shifted()) | |
| 290 { | |
| 291 if(RTEOfflineCnt > 1) /* RTE restarted communication after a longer silent time => restart error handling to recover */ | |
| 292 { | |
| 293 data_old__lost_connection_to_slave_counter_retry = 0; | |
| 294 RTEOfflineCnt = 0; | |
| 295 } | |
| 38 | 296 |
| 208 | 297 /* We received shifted data. Step one. Reset DMA to see if the problem is located at main */ |
| 298 if (data_old__lost_connection_to_slave_counter_retry == 0) | |
| 299 { | |
| 300 HAL_SPI_Abort_IT(&cpu2DmaSpi); | |
| 301 } | |
|
763
aa6006975e76
increase HAL_Delay to 10ms for cold-start-button reset
heinrichsweikamp
parents:
747
diff
changeset
|
302 /* reset of own DMA does not work ==> request reset of slave dma by indicating shifted reception */ |
| 208 | 303 if (data_old__lost_connection_to_slave_counter_retry == 1) |
| 304 { | |
| 305 dataOut.header.checkCode[SPI_HEADER_INDEX_RX_STATE] = SPI_RX_STATE_SHIFTED; | |
| 306 } | |
| 307 | |
| 308 /* stop communication with RTE to trigger RTE timeout reaction */ | |
| 309 if (data_old__lost_connection_to_slave_counter_retry == 2) | |
| 310 { | |
| 311 SusppressCom = 3; | |
| 312 } | |
| 38 | 313 |
| 208 | 314 data_old__lost_connection_to_slave_counter_retry++; |
| 315 } | |
| 316 else | |
| 317 { | |
| 318 RTEOfflineCnt++; /* based on footer status the RTE does not seem to provide data in time */ | |
| 319 dataOut.header.checkCode[SPI_HEADER_INDEX_RX_STATE] = SPI_RX_STATE_OFFLINE; | |
| 320 } | |
| 321 } | |
| 322 #if USE_OLD_SYNC_METHOD | |
| 323 /* one cycle with NotChipSelect true to clear slave spi buffer */ | |
| 324 else | |
| 325 { | |
| 326 HAL_GPIO_WritePin(SMALLCPU_CSB_GPIO_PORT,SMALLCPU_CSB_PIN,GPIO_PIN_RESET); | |
| 327 } | |
| 328 #endif | |
|
133
acc98f5bd8c4
Intoduced transfer abort function for data exchange recovery
Ideenmodellierer
parents:
115
diff
changeset
|
329 |
| 208 | 330 DataEx_call_helper_requests(); |
| 331 | |
| 332 //HAL_GPIO_WritePin(OSCILLOSCOPE2_GPIO_PORT,OSCILLOSCOPE2_PIN,GPIO_PIN_RESET); /* only for testing with Oscilloscope */ | |
| 333 | |
| 334 if(SusppressCom == 0) | |
| 335 { | |
| 336 HAL_GPIO_WritePin(SMALLCPU_CSB_GPIO_PORT,SMALLCPU_CSB_PIN,GPIO_PIN_RESET); | |
| 337 | |
| 338 SPI_DMA_answer = HAL_SPI_TransmitReceive_DMA(&cpu2DmaSpi, (uint8_t *)&dataOut, (uint8_t *)&dataIn, EXCHANGE_BUFFERSIZE); | |
| 339 if(SPI_DMA_answer != HAL_OK) | |
| 340 { | |
| 341 DataEX_Error_Handler(SPI_DMA_answer); | |
| 342 } | |
| 343 } | |
| 344 } | |
| 104 | 345 // HAL_GPIO_WritePin(SMALLCPU_CSB_GPIO_PORT,SMALLCPU_CSB_PIN,GPIO_PIN_SET); |
| 38 | 346 //HAL_Delay(3); |
| 347 //HAL_GPIO_WritePin(OSCILLOSCOPE2_GPIO_PORT,OSCILLOSCOPE2_PIN,GPIO_PIN_SET); /* only for testing with Oscilloscope */ | |
| 348 | |
| 349 return 1; | |
| 350 } | |
| 351 | |
| 82 | 352 |
|
198
878dc9e0dbc5
cleanup: another cleanup session (data_exchange_main.c)
Jan Mulder <jlmulder@xs4all.nl>
parents:
197
diff
changeset
|
353 static uint32_t SPI_CALLBACKS; |
| 82 | 354 uint32_t get_num_SPI_CALLBACKS(void){ |
| 355 return SPI_CALLBACKS; | |
| 356 } | |
| 357 | |
| 358 SDataExchangeSlaveToMaster* get_dataInPointer(void){ | |
| 359 return &dataIn; | |
| 360 } | |
| 361 | |
| 362 void HAL_SPI_TxRxCpltCallback(SPI_HandleTypeDef *hspi) | |
| 363 { | |
| 364 if(hspi == &cpu2DmaSpi) | |
| 365 { | |
| 154 | 366 HAL_GPIO_WritePin(SMALLCPU_CSB_GPIO_PORT,SMALLCPU_CSB_PIN,GPIO_PIN_SET); |
| 82 | 367 SPI_CALLBACKS+=1; |
| 368 } | |
| 369 } | |
| 370 | |
| 371 | |
| 38 | 372 void DateEx_copy_to_dataOut(void) |
| 373 { | |
| 374 const SDiveState * pStateReal = stateRealGetPointer(); | |
| 375 SSettings *settings = settingsGetPointer(); | |
| 376 | |
|
728
5143e927219f
Added sensor map to Firmware <=> RTE inferface:
Ideenmodellierer
parents:
716
diff
changeset
|
377 uint8_t SensorActive[SENSOR_END]; |
|
5143e927219f
Added sensor map to Firmware <=> RTE inferface:
Ideenmodellierer
parents:
716
diff
changeset
|
378 uint8_t index = 0; |
|
5143e927219f
Added sensor map to Firmware <=> RTE inferface:
Ideenmodellierer
parents:
716
diff
changeset
|
379 |
|
5143e927219f
Added sensor map to Firmware <=> RTE inferface:
Ideenmodellierer
parents:
716
diff
changeset
|
380 |
| 38 | 381 if(get_globalState() == StStop) |
| 382 dataOut.mode = MODE_SHUTDOWN; | |
| 383 else | |
| 384 dataOut.mode = 0; | |
| 385 | |
| 386 dataOut.diveModeInfo = pStateReal->diveSettings.diveMode; // hw 170215 | |
| 387 | |
| 388 memcpy(&dataOut.data.DeviceData, stateDeviceGetPointer(), sizeof(SDevice)); | |
| 389 | |
| 390 dataOut.data.VPMconservatism = pStateReal->diveSettings.vpm_conservatism; | |
| 391 dataOut.data.actualGas = pStateReal->lifeData.actualGas; | |
| 392 dataOut.data.ambient_pressure_mbar_ceiling = (pStateReal->decolistBuehlmann.output_ceiling_meter * 100) + (pStateReal->lifeData.pressure_surface_bar * 1000); | |
| 393 dataOut.data.divetimeToCreateLogbook = settings->divetimeToCreateLogbook; | |
| 394 dataOut.data.timeoutDiveReachedZeroDepth = settings->timeoutDiveReachedZeroDepth; | |
| 395 | |
| 396 dataOut.data.offsetPressureSensor_mbar = settings->offsetPressure_mbar; | |
| 397 dataOut.data.offsetTemperatureSensor_centiDegree = settings->offsetTemperature_centigrad; | |
| 398 | |
| 691 | 399 |
| 796 | 400 memcpy(dataOut.data.externalInterface_SensorMap, settings->ext_sensor_map, EXT_INTERFACE_SENSOR_CNT); |
| 691 | 401 |
|
728
5143e927219f
Added sensor map to Firmware <=> RTE inferface:
Ideenmodellierer
parents:
716
diff
changeset
|
402 memset(SensorActive, 0, sizeof(SensorActive)); |
|
5143e927219f
Added sensor map to Firmware <=> RTE inferface:
Ideenmodellierer
parents:
716
diff
changeset
|
403 for (index = 0; index < EXT_INTERFACE_SENSOR_CNT; index++) |
| 691 | 404 { |
|
728
5143e927219f
Added sensor map to Firmware <=> RTE inferface:
Ideenmodellierer
parents:
716
diff
changeset
|
405 switch(settings->ext_sensor_map[index]) |
|
5143e927219f
Added sensor map to Firmware <=> RTE inferface:
Ideenmodellierer
parents:
716
diff
changeset
|
406 { |
|
5143e927219f
Added sensor map to Firmware <=> RTE inferface:
Ideenmodellierer
parents:
716
diff
changeset
|
407 case SENSOR_ANALOG: SensorActive[SENSOR_ANALOG] = 1; |
|
5143e927219f
Added sensor map to Firmware <=> RTE inferface:
Ideenmodellierer
parents:
716
diff
changeset
|
408 break; |
| 796 | 409 case SENSOR_DIGO2M: SensorActive[SENSOR_DIGO2] = 1; |
|
728
5143e927219f
Added sensor map to Firmware <=> RTE inferface:
Ideenmodellierer
parents:
716
diff
changeset
|
410 break; |
|
5143e927219f
Added sensor map to Firmware <=> RTE inferface:
Ideenmodellierer
parents:
716
diff
changeset
|
411 case SENSOR_CO2: SensorActive[SENSOR_CO2] = 1; |
|
5143e927219f
Added sensor map to Firmware <=> RTE inferface:
Ideenmodellierer
parents:
716
diff
changeset
|
412 break; |
|
747
df0d43da1614
Added pressure compensation to CO2 detection:
Ideenmodellierer
parents:
734
diff
changeset
|
413 #ifdef ENABLE_SENTINEL_MODE |
|
df0d43da1614
Added pressure compensation to CO2 detection:
Ideenmodellierer
parents:
734
diff
changeset
|
414 case SENSOR_SENTINEL: SensorActive[SENSOR_SENTINEL] = 1; |
|
df0d43da1614
Added pressure compensation to CO2 detection:
Ideenmodellierer
parents:
734
diff
changeset
|
415 break; |
|
df0d43da1614
Added pressure compensation to CO2 detection:
Ideenmodellierer
parents:
734
diff
changeset
|
416 #endif |
|
728
5143e927219f
Added sensor map to Firmware <=> RTE inferface:
Ideenmodellierer
parents:
716
diff
changeset
|
417 default: |
|
5143e927219f
Added sensor map to Firmware <=> RTE inferface:
Ideenmodellierer
parents:
716
diff
changeset
|
418 break; |
|
5143e927219f
Added sensor map to Firmware <=> RTE inferface:
Ideenmodellierer
parents:
716
diff
changeset
|
419 } |
| 691 | 420 } |
| 421 | |
|
728
5143e927219f
Added sensor map to Firmware <=> RTE inferface:
Ideenmodellierer
parents:
716
diff
changeset
|
422 if(SensorActive[SENSOR_ANALOG]) |
|
5143e927219f
Added sensor map to Firmware <=> RTE inferface:
Ideenmodellierer
parents:
716
diff
changeset
|
423 { |
|
5143e927219f
Added sensor map to Firmware <=> RTE inferface:
Ideenmodellierer
parents:
716
diff
changeset
|
424 externalInterface_Cmd |= EXT_INTERFACE_ADC_ON | EXT_INTERFACE_33V_ON; |
|
5143e927219f
Added sensor map to Firmware <=> RTE inferface:
Ideenmodellierer
parents:
716
diff
changeset
|
425 } |
| 839 | 426 if((SensorActive[SENSOR_DIGO2]) || (SensorActive[SENSOR_CO2])) |
|
702
6d7c812fc173
Added digital o2 sensor to settings and data exchange:
Ideenmodellierer
parents:
691
diff
changeset
|
427 { |
| 839 | 428 externalInterface_Cmd |= EXT_INTERFACE_33V_ON; |
|
702
6d7c812fc173
Added digital o2 sensor to settings and data exchange:
Ideenmodellierer
parents:
691
diff
changeset
|
429 } |
|
6d7c812fc173
Added digital o2 sensor to settings and data exchange:
Ideenmodellierer
parents:
691
diff
changeset
|
430 |
| 691 | 431 #ifdef ENABLE_SENTINEL_MODE |
|
747
df0d43da1614
Added pressure compensation to CO2 detection:
Ideenmodellierer
parents:
734
diff
changeset
|
432 if(SensorActive[SENSOR_SENTINEL]) |
| 691 | 433 { |
|
842
c3dd461ca3f9
Migrated Sentinel protocol to new UART structure:
Ideenmodellierer
parents:
839
diff
changeset
|
434 externalInterface_Cmd |= EXT_INTERFACE_33V_ON; |
| 691 | 435 externalInterface_Cmd &= (~EXT_INTERFACE_ADC_ON); |
| 436 } | |
| 437 #endif | |
| 438 | |
| 662 | 439 dataOut.data.externalInterface_Cmd = externalInterface_Cmd; |
| 440 externalInterface_Cmd = 0; | |
| 441 | |
| 38 | 442 if((hardwareDataGetPointer()->primarySerial <= 32) || (((hardwareDataGetPointer()->primarySerial == 72) && (hardwareDataGetPointer()->secondarySerial == 15)))) |
| 443 { | |
| 444 dataOut.revisionHardware = 0x00; | |
| 445 dataOut.revisionCRCx0x7A = 0x7A; | |
| 446 } | |
| 447 else | |
| 448 if(hardwareDataGetPointer()->primarySerial < 0xFFFF) | |
| 449 { | |
| 450 dataOut.revisionHardware = hardwareDataGetPointer()->revision8bit; | |
| 451 dataOut.revisionCRCx0x7A = hardwareDataGetPointer()->revision8bit ^ 0x7A; | |
| 452 } | |
| 453 else | |
| 454 { | |
| 455 dataOut.revisionHardware = 0xFF; | |
| 456 dataOut.revisionCRCx0x7A = 0xFF; | |
| 457 } | |
| 458 | |
| 459 if(DataEX_check_header_and_footer_ok() && !told_reset_logik_alles_ok) | |
| 460 { | |
| 461 MX_tell_reset_logik_alles_ok(); | |
| 462 told_reset_logik_alles_ok = 1; | |
| 463 } | |
| 464 | |
| 465 if(DataEX_check_header_and_footer_ok() && (dataIn.power_on_reset == 1)) | |
| 466 { | |
| 467 if(!wasUpdateNotPowerOn) | |
| 468 wasPowerOn = 1; | |
| 469 | |
| 470 settingsHelperButtonSens_keepPercentageValues(settingsGetPointerStandard()->ButtonResponsiveness[3], settings->ButtonResponsiveness); | |
| 471 setButtonResponsiveness(settings->ButtonResponsiveness); | |
|
728
5143e927219f
Added sensor map to Firmware <=> RTE inferface:
Ideenmodellierer
parents:
716
diff
changeset
|
472 DataEX_setExtInterface_Cmd(EXT_INTERFACE_COPY_SENSORMAP); |
| 38 | 473 } |
| 474 } | |
| 475 | |
| 476 | |
| 477 void DataEX_copy_to_deco(void) | |
| 478 { | |
| 479 if(decoLock == DECO_CALC_running) | |
| 480 return; | |
| 481 | |
|
899
2225c467f1e9
Added data path and visualization for position data:
Ideenmodellierer
parents:
842
diff
changeset
|
482 if(decoLock == DECO_CALC_init_as_is_start_of_dive) |
|
2225c467f1e9
Added data path and visualization for position data:
Ideenmodellierer
parents:
842
diff
changeset
|
483 { |
| 907 | 484 vpm_table_init(); |
|
288
ba229a012ac7
cleanup: no useless checks for simulator state
Jan Mulder <jlmulder@xs4all.nl>
parents:
278
diff
changeset
|
485 vpm_init(&stateUsedWrite->vpm, stateUsedWrite->diveSettings.vpm_conservatism, 0, 0); |
| 38 | 486 buehlmann_init(); |
| 487 timer_init(); | |
|
288
ba229a012ac7
cleanup: no useless checks for simulator state
Jan Mulder <jlmulder@xs4all.nl>
parents:
278
diff
changeset
|
488 resetEvents(stateUsedWrite); |
|
ba229a012ac7
cleanup: no useless checks for simulator state
Jan Mulder <jlmulder@xs4all.nl>
parents:
278
diff
changeset
|
489 stateUsedWrite->diveSettings.internal__pressure_first_stop_ambient_bar_as_upper_limit_for_gf_low_otherwise_zero = 0; |
|
899
2225c467f1e9
Added data path and visualization for position data:
Ideenmodellierer
parents:
842
diff
changeset
|
490 } |
| 38 | 491 |
|
899
2225c467f1e9
Added data path and visualization for position data:
Ideenmodellierer
parents:
842
diff
changeset
|
492 if(decoLock == DECO_CALC_FINSHED_Buehlmann) |
| 38 | 493 { |
| 494 | |
| 495 } | |
| 496 switch(decoLock) | |
| 497 { | |
| 498 | |
| 499 //Deco_calculation finished | |
| 500 case DECO_CALC_FINSHED_vpm: | |
|
288
ba229a012ac7
cleanup: no useless checks for simulator state
Jan Mulder <jlmulder@xs4all.nl>
parents:
278
diff
changeset
|
501 memcpy(&stateUsedWrite->decolistVPM,&stateDeco.decolistVPM,sizeof(SDecoinfo)); |
|
ba229a012ac7
cleanup: no useless checks for simulator state
Jan Mulder <jlmulder@xs4all.nl>
parents:
278
diff
changeset
|
502 stateUsedWrite->decolistVPM.tickstamp = HAL_GetTick(); |
|
ba229a012ac7
cleanup: no useless checks for simulator state
Jan Mulder <jlmulder@xs4all.nl>
parents:
278
diff
changeset
|
503 stateUsedWrite->vpm.deco_zone_reached = stateDeco.vpm.deco_zone_reached; |
| 38 | 504 for(int i = 0; i< 16; i++) |
| 505 { | |
|
288
ba229a012ac7
cleanup: no useless checks for simulator state
Jan Mulder <jlmulder@xs4all.nl>
parents:
278
diff
changeset
|
506 stateUsedWrite->vpm.adjusted_critical_radius_he[i] = stateDeco.vpm.adjusted_critical_radius_he[i]; |
|
ba229a012ac7
cleanup: no useless checks for simulator state
Jan Mulder <jlmulder@xs4all.nl>
parents:
278
diff
changeset
|
507 stateUsedWrite->vpm.adjusted_critical_radius_n2[i] = stateDeco.vpm.adjusted_critical_radius_n2[i]; |
|
ba229a012ac7
cleanup: no useless checks for simulator state
Jan Mulder <jlmulder@xs4all.nl>
parents:
278
diff
changeset
|
508 stateUsedWrite->vpm.adjusted_crushing_pressure_he[i] = stateDeco.vpm.adjusted_crushing_pressure_he[i]; |
|
ba229a012ac7
cleanup: no useless checks for simulator state
Jan Mulder <jlmulder@xs4all.nl>
parents:
278
diff
changeset
|
509 stateUsedWrite->vpm.adjusted_crushing_pressure_n2[i] = stateDeco.vpm.adjusted_crushing_pressure_n2[i]; |
|
ba229a012ac7
cleanup: no useless checks for simulator state
Jan Mulder <jlmulder@xs4all.nl>
parents:
278
diff
changeset
|
510 stateUsedWrite->vpm.initial_allowable_gradient_he[i] = stateDeco.vpm.initial_allowable_gradient_he[i]; |
|
ba229a012ac7
cleanup: no useless checks for simulator state
Jan Mulder <jlmulder@xs4all.nl>
parents:
278
diff
changeset
|
511 stateUsedWrite->vpm.initial_allowable_gradient_n2[i] = stateDeco.vpm.initial_allowable_gradient_n2[i]; |
|
ba229a012ac7
cleanup: no useless checks for simulator state
Jan Mulder <jlmulder@xs4all.nl>
parents:
278
diff
changeset
|
512 stateUsedWrite->vpm.max_actual_gradient[i] = stateDeco.vpm.max_actual_gradient[i]; |
| 38 | 513 } |
| 514 break; | |
| 515 case DECO_CALC_FINSHED_Buehlmann: | |
|
288
ba229a012ac7
cleanup: no useless checks for simulator state
Jan Mulder <jlmulder@xs4all.nl>
parents:
278
diff
changeset
|
516 memcpy(&stateUsedWrite->decolistBuehlmann,&stateDeco.decolistBuehlmann,sizeof(SDecoinfo)); |
|
ba229a012ac7
cleanup: no useless checks for simulator state
Jan Mulder <jlmulder@xs4all.nl>
parents:
278
diff
changeset
|
517 stateUsedWrite->decolistBuehlmann.tickstamp = HAL_GetTick(); |
| 38 | 518 //Copy Data to be stored if regular Buehlmann, not FutureBuehlmann |
|
288
ba229a012ac7
cleanup: no useless checks for simulator state
Jan Mulder <jlmulder@xs4all.nl>
parents:
278
diff
changeset
|
519 stateUsedWrite->diveSettings.internal__pressure_first_stop_ambient_bar_as_upper_limit_for_gf_low_otherwise_zero = stateDeco.diveSettings.internal__pressure_first_stop_ambient_bar_as_upper_limit_for_gf_low_otherwise_zero; |
| 38 | 520 break; |
| 521 case DECO_CALC_FINSHED_FutureBuehlmann: | |
|
288
ba229a012ac7
cleanup: no useless checks for simulator state
Jan Mulder <jlmulder@xs4all.nl>
parents:
278
diff
changeset
|
522 memcpy(&stateUsedWrite->decolistFutureBuehlmann,&stateDeco.decolistFutureBuehlmann,sizeof(SDecoinfo)); |
|
ba229a012ac7
cleanup: no useless checks for simulator state
Jan Mulder <jlmulder@xs4all.nl>
parents:
278
diff
changeset
|
523 stateUsedWrite->decolistFutureBuehlmann.tickstamp = HAL_GetTick(); |
| 38 | 524 break; |
| 525 case DECO_CALC_FINSHED_Futurevpm: | |
|
288
ba229a012ac7
cleanup: no useless checks for simulator state
Jan Mulder <jlmulder@xs4all.nl>
parents:
278
diff
changeset
|
526 memcpy(&stateUsedWrite->decolistFutureVPM,&stateDeco.decolistFutureVPM,sizeof(SDecoinfo)); |
|
ba229a012ac7
cleanup: no useless checks for simulator state
Jan Mulder <jlmulder@xs4all.nl>
parents:
278
diff
changeset
|
527 stateUsedWrite->decolistFutureVPM.tickstamp = HAL_GetTick(); |
| 38 | 528 break; |
| 529 } | |
| 530 | |
| 531 //Copy Inputdata from stateReal to stateDeco | |
|
288
ba229a012ac7
cleanup: no useless checks for simulator state
Jan Mulder <jlmulder@xs4all.nl>
parents:
278
diff
changeset
|
532 memcpy(&stateDeco.lifeData,&stateUsedWrite->lifeData,sizeof(SLifeData)); |
|
ba229a012ac7
cleanup: no useless checks for simulator state
Jan Mulder <jlmulder@xs4all.nl>
parents:
278
diff
changeset
|
533 memcpy(&stateDeco.diveSettings,&stateUsedWrite->diveSettings,sizeof(SDiveSettings)); |
|
899
2225c467f1e9
Added data path and visualization for position data:
Ideenmodellierer
parents:
842
diff
changeset
|
534 memcpy(&stateDeco.decolistVPM,&stateUsedWrite->decolistVPM,sizeof(SDecoinfo)); |
| 38 | 535 |
|
288
ba229a012ac7
cleanup: no useless checks for simulator state
Jan Mulder <jlmulder@xs4all.nl>
parents:
278
diff
changeset
|
536 stateDeco.vpm.deco_zone_reached = stateUsedWrite->vpm.deco_zone_reached; |
| 38 | 537 // memcpy(&stateDeco.vpm,&pStateUsed->vpm,sizeof(SVpm)); |
| 538 for(int i = 0; i< 16; i++) | |
| 539 { | |
|
288
ba229a012ac7
cleanup: no useless checks for simulator state
Jan Mulder <jlmulder@xs4all.nl>
parents:
278
diff
changeset
|
540 stateDeco.vpm.max_crushing_pressure_he[i] = stateUsedWrite->vpm.max_crushing_pressure_he[i]; |
|
ba229a012ac7
cleanup: no useless checks for simulator state
Jan Mulder <jlmulder@xs4all.nl>
parents:
278
diff
changeset
|
541 stateDeco.vpm.max_crushing_pressure_n2[i] = stateUsedWrite->vpm.max_crushing_pressure_n2[i]; |
|
ba229a012ac7
cleanup: no useless checks for simulator state
Jan Mulder <jlmulder@xs4all.nl>
parents:
278
diff
changeset
|
542 stateDeco.vpm.adjusted_critical_radius_he[i] = stateUsedWrite->vpm.adjusted_critical_radius_he[i]; |
|
ba229a012ac7
cleanup: no useless checks for simulator state
Jan Mulder <jlmulder@xs4all.nl>
parents:
278
diff
changeset
|
543 stateDeco.vpm.adjusted_critical_radius_n2[i] = stateUsedWrite->vpm.adjusted_critical_radius_n2[i]; |
| 38 | 544 } |
|
899
2225c467f1e9
Added data path and visualization for position data:
Ideenmodellierer
parents:
842
diff
changeset
|
545 decoLock = DECO_CALC_ready; |
| 38 | 546 } |
| 547 | |
| 548 | |
|
198
878dc9e0dbc5
cleanup: another cleanup session (data_exchange_main.c)
Jan Mulder <jlmulder@xs4all.nl>
parents:
197
diff
changeset
|
549 static void DataEX_helper_copy_deviceData(SDeviceLine *lineWrite, const SDeviceLine *lineRead) |
| 38 | 550 { |
| 551 lineWrite->date_rtc_dr = lineRead->date_rtc_dr; | |
| 552 lineWrite->time_rtc_tr = lineRead->time_rtc_tr; | |
| 553 lineWrite->value_int32 = lineRead->value_int32; | |
| 554 } | |
| 555 | |
|
198
878dc9e0dbc5
cleanup: another cleanup session (data_exchange_main.c)
Jan Mulder <jlmulder@xs4all.nl>
parents:
197
diff
changeset
|
556 static void DataEX_helper_SetTime(RTC_TimeTypeDef inStimestructure, uint32_t *outTimetmpreg) |
| 38 | 557 { |
| 558 inStimestructure.TimeFormat = RTC_HOURFORMAT_24; | |
| 559 | |
| 560 *outTimetmpreg = (uint32_t)(((uint32_t)RTC_ByteToBcd2(inStimestructure.Hours) << 16U) | \ | |
| 561 ((uint32_t)RTC_ByteToBcd2(inStimestructure.Minutes) << 8U) | \ | |
| 562 ((uint32_t)RTC_ByteToBcd2(inStimestructure.Seconds)) | \ | |
| 563 (((uint32_t)inStimestructure.TimeFormat) << 16U)); | |
| 564 } | |
| 565 | |
| 566 | |
|
198
878dc9e0dbc5
cleanup: another cleanup session (data_exchange_main.c)
Jan Mulder <jlmulder@xs4all.nl>
parents:
197
diff
changeset
|
567 static void DataEX_helper_SetDate(RTC_DateTypeDef inSdatestructure, uint32_t *outDatetmpreg) |
| 38 | 568 { |
| 569 *outDatetmpreg = (((uint32_t)RTC_ByteToBcd2(inSdatestructure.Year) << 16U) | \ | |
| 570 ((uint32_t)RTC_ByteToBcd2(inSdatestructure.Month) << 8U) | \ | |
| 571 ((uint32_t)RTC_ByteToBcd2(inSdatestructure.Date)) | \ | |
| 572 ((uint32_t)inSdatestructure.WeekDay << 13U)); | |
| 573 } | |
| 574 | |
| 575 | |
|
198
878dc9e0dbc5
cleanup: another cleanup session (data_exchange_main.c)
Jan Mulder <jlmulder@xs4all.nl>
parents:
197
diff
changeset
|
576 static void DataEX_helper_set_Unknown_Date_deviceData(SDeviceLine *lineWrite) |
| 38 | 577 { |
| 578 RTC_DateTypeDef sdatestructure; | |
| 579 RTC_TimeTypeDef stimestructure; | |
| 580 | |
|
406
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
581 stimestructure.Hours = UNKNOWN_TIME_HOURS; |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
582 stimestructure.Minutes = UNKNOWN_TIME_MINUTES; |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
583 stimestructure.Seconds = UNKNOWN_TIME_SECOND; |
| 38 | 584 |
|
406
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
585 sdatestructure.Date = UNKNOWN_DATE_DAY; |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
586 sdatestructure.Month = UNKNOWN_DATE_MONTH; |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
587 sdatestructure.Year = UNKNOWN_DATE_YEAR; |
| 38 | 588 setWeekday(&sdatestructure); |
| 589 | |
| 590 DataEX_helper_SetTime(stimestructure, &lineWrite->time_rtc_tr); | |
| 591 DataEX_helper_SetDate(sdatestructure, &lineWrite->date_rtc_dr); | |
| 592 } | |
| 593 | |
| 594 | |
|
198
878dc9e0dbc5
cleanup: another cleanup session (data_exchange_main.c)
Jan Mulder <jlmulder@xs4all.nl>
parents:
197
diff
changeset
|
595 static uint8_t DataEX_helper_Check_And_Correct_Date_deviceData(SDeviceLine *lineWrite) |
| 38 | 596 { |
|
406
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
597 uint8_t retval = 0; |
| 38 | 598 RTC_DateTypeDef sdatestructure; |
| 599 RTC_TimeTypeDef stimestructure; | |
| 600 | |
| 601 // from lineWrite to structure | |
| 602 translateDate(lineWrite->date_rtc_dr, &sdatestructure); | |
| 603 translateTime(lineWrite->time_rtc_tr, &stimestructure); | |
|
406
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
604 |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
605 /* Check if date is out of range */ |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
606 if(!( (sdatestructure.Year >= 15) |
| 38 | 607 && (sdatestructure.Year <= 30) |
|
406
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
608 && (sdatestructure.Month <= 12))) |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
609 { |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
610 DataEX_helper_set_Unknown_Date_deviceData(lineWrite); |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
611 retval = 1; |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
612 } |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
613 return retval; |
| 38 | 614 } |
| 615 | |
| 616 | |
|
406
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
617 static uint8_t DataEX_helper_Check_And_Correct_Value_deviceData(SDeviceLine *lineWrite, int32_t from, int32_t to, uint8_t defaulttofrom) |
| 38 | 618 { |
|
406
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
619 uint8_t retval = 0; |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
620 RTC_DateTypeDef sdatestructure; |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
621 |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
622 /* Is value out of valid range? */ |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
623 if(!(lineWrite->value_int32 >= from && lineWrite->value_int32 <= to)) |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
624 { |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
625 if(defaulttofrom) |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
626 { |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
627 lineWrite->value_int32 = from; |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
628 } |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
629 else |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
630 { |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
631 lineWrite->value_int32 = to; |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
632 } |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
633 DataEX_helper_set_Unknown_Date_deviceData(lineWrite); |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
634 } |
| 38 | 635 |
|
406
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
636 /* This is just a repair function to restore metric if a corruption occurred in an older fw version */ |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
637 if(((lineWrite->value_int32 == to) && defaulttofrom ) |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
638 || ((lineWrite->value_int32 == from) && !defaulttofrom )) |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
639 { |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
640 translateDate(lineWrite->date_rtc_dr, &sdatestructure); |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
641 if(sdatestructure.Year == UNKNOWN_DATE_YEAR) |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
642 { |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
643 if(defaulttofrom) |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
644 { |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
645 lineWrite->value_int32 = from; |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
646 } |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
647 else |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
648 { |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
649 lineWrite->value_int32 = to; |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
650 } |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
651 } |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
652 } |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
653 return retval; |
| 38 | 654 } |
| 655 | |
| 656 | |
|
198
878dc9e0dbc5
cleanup: another cleanup session (data_exchange_main.c)
Jan Mulder <jlmulder@xs4all.nl>
parents:
197
diff
changeset
|
657 static void DataEX_check_DeviceData(void) |
| 38 | 658 { |
| 659 SDevice *DeviceData = stateDeviceGetPointerWrite(); | |
| 660 | |
| 661 DataEX_helper_Check_And_Correct_Date_deviceData(&DeviceData->batteryChargeCompleteCycles); | |
| 662 DataEX_helper_Check_And_Correct_Date_deviceData(&DeviceData->batteryChargeCycles); | |
| 663 DataEX_helper_Check_And_Correct_Date_deviceData(&DeviceData->depthMaximum); | |
| 664 DataEX_helper_Check_And_Correct_Date_deviceData(&DeviceData->diveCycles); | |
| 665 DataEX_helper_Check_And_Correct_Date_deviceData(&DeviceData->hoursOfOperation); | |
| 666 DataEX_helper_Check_And_Correct_Date_deviceData(&DeviceData->temperatureMaximum); | |
| 667 DataEX_helper_Check_And_Correct_Date_deviceData(&DeviceData->temperatureMinimum); | |
| 668 DataEX_helper_Check_And_Correct_Date_deviceData(&DeviceData->voltageMinimum); | |
| 669 | |
|
406
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
670 DataEX_helper_Check_And_Correct_Value_deviceData(&DeviceData->batteryChargeCompleteCycles, 0, 10000,1); |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
671 DataEX_helper_Check_And_Correct_Value_deviceData(&DeviceData->batteryChargeCycles, 0, 20000,1); |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
672 DataEX_helper_Check_And_Correct_Value_deviceData(&DeviceData->depthMaximum, 0, (500*100)+1000,1); |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
673 DataEX_helper_Check_And_Correct_Value_deviceData(&DeviceData->diveCycles, 0, 20000,1); |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
674 DataEX_helper_Check_And_Correct_Value_deviceData(&DeviceData->hoursOfOperation, 0, 1000000,1); |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
675 DataEX_helper_Check_And_Correct_Value_deviceData(&DeviceData->temperatureMaximum, -30*100, 150*100,1); |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
676 DataEX_helper_Check_And_Correct_Value_deviceData(&DeviceData->temperatureMinimum, -30*100, 150*100,0); |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
677 DataEX_helper_Check_And_Correct_Value_deviceData(&DeviceData->voltageMinimum, 2*1000, 6*1000,0); |
| 38 | 678 } |
| 679 | |
| 680 | |
|
198
878dc9e0dbc5
cleanup: another cleanup session (data_exchange_main.c)
Jan Mulder <jlmulder@xs4all.nl>
parents:
197
diff
changeset
|
681 static void DataEX_merge_DeviceData_and_store(void) |
| 38 | 682 { |
| 683 uint16_t dataLengthRead; | |
| 684 SDevice DeviceDataFlash; | |
| 685 SDevice *DeviceData = stateDeviceGetPointerWrite(); | |
| 686 | |
| 687 dataLengthRead = ext_flash_read_devicedata((uint8_t *)&DeviceDataFlash,sizeof(SDevice)); | |
| 688 | |
| 689 if(dataLengthRead == 0) | |
| 690 { | |
|
421
3f7d80f37bfc
Enable sequentionel writing of device data:
ideenmodellierer
parents:
407
diff
changeset
|
691 ext_flash_write_devicedata(false); |
| 38 | 692 return; |
| 693 } | |
| 694 | |
| 695 /* max values */ | |
| 696 if(DeviceData->batteryChargeCompleteCycles.value_int32 < DeviceDataFlash.batteryChargeCompleteCycles.value_int32) | |
| 697 { | |
| 698 DataEX_helper_copy_deviceData(&DeviceData->batteryChargeCompleteCycles, &DeviceDataFlash.batteryChargeCompleteCycles); | |
| 699 } | |
| 700 if(DeviceData->batteryChargeCycles.value_int32 < DeviceDataFlash.batteryChargeCycles.value_int32) | |
| 701 { | |
| 702 DataEX_helper_copy_deviceData(&DeviceData->batteryChargeCycles, &DeviceDataFlash.batteryChargeCycles); | |
| 703 } | |
| 704 if(DeviceData->temperatureMaximum.value_int32 < DeviceDataFlash.temperatureMaximum.value_int32) | |
| 705 { | |
| 706 DataEX_helper_copy_deviceData(&DeviceData->temperatureMaximum, &DeviceDataFlash.temperatureMaximum); | |
| 707 } | |
| 708 if(DeviceData->depthMaximum.value_int32 < DeviceDataFlash.depthMaximum.value_int32) | |
| 709 { | |
| 710 DataEX_helper_copy_deviceData(&DeviceData->depthMaximum, &DeviceDataFlash.depthMaximum); | |
| 711 } | |
| 712 if(DeviceData->diveCycles.value_int32 < DeviceDataFlash.diveCycles.value_int32) | |
| 713 { | |
| 714 DataEX_helper_copy_deviceData(&DeviceData->diveCycles, &DeviceDataFlash.diveCycles); | |
| 715 } | |
|
406
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
716 if(DeviceData->hoursOfOperation.value_int32 < DeviceDataFlash.hoursOfOperation.value_int32) |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
717 { |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
718 DataEX_helper_copy_deviceData(&DeviceData->hoursOfOperation, &DeviceDataFlash.hoursOfOperation); |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
719 } |
| 38 | 720 |
|
407
b11e50415982
Bugfix parallel call of external flash functions:
ideenmodellierer
parents:
406
diff
changeset
|
721 |
| 38 | 722 /* min values */ |
| 723 if(DeviceData->temperatureMinimum.value_int32 > DeviceDataFlash.temperatureMinimum.value_int32) | |
| 724 { | |
| 725 DataEX_helper_copy_deviceData(&DeviceData->temperatureMinimum, &DeviceDataFlash.temperatureMinimum); | |
| 726 } | |
| 727 if(DeviceData->voltageMinimum.value_int32 > DeviceDataFlash.voltageMinimum.value_int32) | |
| 728 { | |
| 729 DataEX_helper_copy_deviceData(&DeviceData->voltageMinimum, &DeviceDataFlash.voltageMinimum); | |
| 730 } | |
| 731 | |
| 732 DataEX_check_DeviceData (); | |
|
421
3f7d80f37bfc
Enable sequentionel writing of device data:
ideenmodellierer
parents:
407
diff
changeset
|
733 ext_flash_write_devicedata(false); |
| 38 | 734 } |
| 735 | |
| 736 | |
|
198
878dc9e0dbc5
cleanup: another cleanup session (data_exchange_main.c)
Jan Mulder <jlmulder@xs4all.nl>
parents:
197
diff
changeset
|
737 static void DataEX_copy_to_DeviceData(void) |
| 38 | 738 { |
| 739 SDataExchangeSlaveToMasterDeviceData * dataInDevice = (SDataExchangeSlaveToMasterDeviceData *)&dataIn; | |
| 740 SDevice * pDeviceState = stateDeviceGetPointerWrite(); | |
| 741 | |
| 742 memcpy(pDeviceState, &dataInDevice->DeviceData[dataInDevice->boolDeviceData], sizeof(SDevice)); | |
| 559 | 743 memcpy(&hw_Info, &dataInDevice->hw_Info, sizeof(dataInDevice->hw_Info)); |
| 744 | |
|
407
b11e50415982
Bugfix parallel call of external flash functions:
ideenmodellierer
parents:
406
diff
changeset
|
745 DeviceDataUpdated = 1; /* indicate new data to be written to flash by background task (at last op hour count will be updated) */ |
| 38 | 746 } |
| 747 | |
| 748 | |
|
198
878dc9e0dbc5
cleanup: another cleanup session (data_exchange_main.c)
Jan Mulder <jlmulder@xs4all.nl>
parents:
197
diff
changeset
|
749 static void DataEX_copy_to_VpmRepetitiveData(void) |
| 38 | 750 { |
| 751 SDataExchangeSlaveToMasterDeviceData * dataInDevice = (SDataExchangeSlaveToMasterDeviceData *)&dataIn; | |
| 752 SVpmRepetitiveData * pVpmState = stateVpmRepetitiveDataGetPointerWrite(); | |
| 753 | |
| 754 if(dataInDevice->boolVpmRepetitiveDataValid) | |
| 755 { | |
| 756 memcpy(pVpmState, &dataInDevice->VpmRepetitiveData, sizeof(SVpmRepetitiveData)); | |
| 757 pVpmState->is_data_from_RTE_CPU = 1; | |
| 758 } | |
| 759 } | |
| 760 | |
| 761 | |
| 762 void DataEX_control_connection_while_asking_for_sleep(void) | |
| 763 { | |
| 764 if(!DataEX_check_header_and_footer_ok()) | |
| 765 { | |
| 766 if(DataEX_check_header_and_footer_devicedata()) | |
| 767 { | |
| 768 data_old__lost_connection_to_slave_counter_retry = 0; | |
| 769 data_old__lost_connection_to_slave_counter_temp = 0; | |
| 770 stateRealGetPointerWrite()->data_old__lost_connection_to_slave = 0; | |
| 208 | 771 dataOut.header.checkCode[SPI_HEADER_INDEX_RX_STATE] = SPI_RX_STATE_OK; |
| 38 | 772 } |
| 773 else | |
| 774 { | |
| 775 stateRealGetPointerWrite()->data_old__lost_connection_to_slave = 1; | |
| 776 data_old__lost_connection_to_slave_counter_temp += 1; | |
| 777 data_old__lost_connection_to_slave_counter_total += 1; | |
| 778 } | |
| 779 } | |
| 780 } | |
| 781 | |
|
173
05c770dc2911
Bugfix: make max depth move with current depth (part 1)
Jan Mulder <jlmulder@xs4all.nl>
parents:
156
diff
changeset
|
782 static float getSampleDepth(SDataExchangeSlaveToMaster *d, SDiveState *ds) |
|
05c770dc2911
Bugfix: make max depth move with current depth (part 1)
Jan Mulder <jlmulder@xs4all.nl>
parents:
156
diff
changeset
|
783 { |
|
342
ea3fda8eb93e
Removed averaging of pressure and temperatur values
ideenmodellierer
parents:
309
diff
changeset
|
784 float ambient = 0; |
|
ea3fda8eb93e
Removed averaging of pressure and temperatur values
ideenmodellierer
parents:
309
diff
changeset
|
785 float surface = 0; |
|
ea3fda8eb93e
Removed averaging of pressure and temperatur values
ideenmodellierer
parents:
309
diff
changeset
|
786 float depth = 0; |
|
ea3fda8eb93e
Removed averaging of pressure and temperatur values
ideenmodellierer
parents:
309
diff
changeset
|
787 float density = 0; |
|
173
05c770dc2911
Bugfix: make max depth move with current depth (part 1)
Jan Mulder <jlmulder@xs4all.nl>
parents:
156
diff
changeset
|
788 |
|
342
ea3fda8eb93e
Removed averaging of pressure and temperatur values
ideenmodellierer
parents:
309
diff
changeset
|
789 ambient = d->data[d->boolPressureData].pressure_mbar / 1000.0f; |
|
ea3fda8eb93e
Removed averaging of pressure and temperatur values
ideenmodellierer
parents:
309
diff
changeset
|
790 surface = d->data[d->boolPressureData].surface_mbar / 1000.0f; |
|
ea3fda8eb93e
Removed averaging of pressure and temperatur values
ideenmodellierer
parents:
309
diff
changeset
|
791 density = ((float)( 100 + settingsGetPointer()->salinity)) / 100.0f; |
|
173
05c770dc2911
Bugfix: make max depth move with current depth (part 1)
Jan Mulder <jlmulder@xs4all.nl>
parents:
156
diff
changeset
|
792 |
|
497
5757edda56b7
Added worst case plausibility check (disabled by compile switch)
Ideenmodellierer
parents:
451
diff
changeset
|
793 #ifdef TESTBENCH |
|
5757edda56b7
Added worst case plausibility check (disabled by compile switch)
Ideenmodellierer
parents:
451
diff
changeset
|
794 /* do plausibility check (typically only needed at debug hardware) */ |
|
5757edda56b7
Added worst case plausibility check (disabled by compile switch)
Ideenmodellierer
parents:
451
diff
changeset
|
795 if(ambient < 0) |
|
5757edda56b7
Added worst case plausibility check (disabled by compile switch)
Ideenmodellierer
parents:
451
diff
changeset
|
796 { |
|
5757edda56b7
Added worst case plausibility check (disabled by compile switch)
Ideenmodellierer
parents:
451
diff
changeset
|
797 ambient = 1.0; |
|
5757edda56b7
Added worst case plausibility check (disabled by compile switch)
Ideenmodellierer
parents:
451
diff
changeset
|
798 } |
|
5757edda56b7
Added worst case plausibility check (disabled by compile switch)
Ideenmodellierer
parents:
451
diff
changeset
|
799 if(surface < 0) |
|
5757edda56b7
Added worst case plausibility check (disabled by compile switch)
Ideenmodellierer
parents:
451
diff
changeset
|
800 { |
|
5757edda56b7
Added worst case plausibility check (disabled by compile switch)
Ideenmodellierer
parents:
451
diff
changeset
|
801 surface = 1.0; |
|
5757edda56b7
Added worst case plausibility check (disabled by compile switch)
Ideenmodellierer
parents:
451
diff
changeset
|
802 } |
|
5757edda56b7
Added worst case plausibility check (disabled by compile switch)
Ideenmodellierer
parents:
451
diff
changeset
|
803 #endif |
|
342
ea3fda8eb93e
Removed averaging of pressure and temperatur values
ideenmodellierer
parents:
309
diff
changeset
|
804 ds->lifeData.pressure_ambient_bar = ambient; |
|
ea3fda8eb93e
Removed averaging of pressure and temperatur values
ideenmodellierer
parents:
309
diff
changeset
|
805 ds->lifeData.pressure_surface_bar = surface; |
|
ea3fda8eb93e
Removed averaging of pressure and temperatur values
ideenmodellierer
parents:
309
diff
changeset
|
806 depth = (ambient - surface) / (0.09807f * density); |
|
ea3fda8eb93e
Removed averaging of pressure and temperatur values
ideenmodellierer
parents:
309
diff
changeset
|
807 ds->lifeData.bool_temp1 = d->data[d->boolPressureData].SPARE1; |
|
173
05c770dc2911
Bugfix: make max depth move with current depth (part 1)
Jan Mulder <jlmulder@xs4all.nl>
parents:
156
diff
changeset
|
808 |
|
342
ea3fda8eb93e
Removed averaging of pressure and temperatur values
ideenmodellierer
parents:
309
diff
changeset
|
809 return depth; |
|
173
05c770dc2911
Bugfix: make max depth move with current depth (part 1)
Jan Mulder <jlmulder@xs4all.nl>
parents:
156
diff
changeset
|
810 } |
| 38 | 811 |
|
189
8b8074080d7b
Bugfix: average temperature on arrival from RTE instead of display time
Jan Mulder <jlmulder@xs4all.nl>
parents:
173
diff
changeset
|
812 static float getTemperature(SDataExchangeSlaveToMaster *d) |
|
8b8074080d7b
Bugfix: average temperature on arrival from RTE instead of display time
Jan Mulder <jlmulder@xs4all.nl>
parents:
173
diff
changeset
|
813 { |
|
342
ea3fda8eb93e
Removed averaging of pressure and temperatur values
ideenmodellierer
parents:
309
diff
changeset
|
814 float temp = 0; |
|
ea3fda8eb93e
Removed averaging of pressure and temperatur values
ideenmodellierer
parents:
309
diff
changeset
|
815 temp = d->data[d->boolPressureData].temperature; |
|
189
8b8074080d7b
Bugfix: average temperature on arrival from RTE instead of display time
Jan Mulder <jlmulder@xs4all.nl>
parents:
173
diff
changeset
|
816 |
|
497
5757edda56b7
Added worst case plausibility check (disabled by compile switch)
Ideenmodellierer
parents:
451
diff
changeset
|
817 #ifdef TESTBENCH |
|
5757edda56b7
Added worst case plausibility check (disabled by compile switch)
Ideenmodellierer
parents:
451
diff
changeset
|
818 /* do plausibility check (typically only needed at debug hardware */ |
|
5757edda56b7
Added worst case plausibility check (disabled by compile switch)
Ideenmodellierer
parents:
451
diff
changeset
|
819 if(temp < -40.0) |
|
5757edda56b7
Added worst case plausibility check (disabled by compile switch)
Ideenmodellierer
parents:
451
diff
changeset
|
820 { |
|
5757edda56b7
Added worst case plausibility check (disabled by compile switch)
Ideenmodellierer
parents:
451
diff
changeset
|
821 temp = 20.0; |
|
5757edda56b7
Added worst case plausibility check (disabled by compile switch)
Ideenmodellierer
parents:
451
diff
changeset
|
822 } |
|
5757edda56b7
Added worst case plausibility check (disabled by compile switch)
Ideenmodellierer
parents:
451
diff
changeset
|
823 #endif |
|
342
ea3fda8eb93e
Removed averaging of pressure and temperatur values
ideenmodellierer
parents:
309
diff
changeset
|
824 return temp; |
|
189
8b8074080d7b
Bugfix: average temperature on arrival from RTE instead of display time
Jan Mulder <jlmulder@xs4all.nl>
parents:
173
diff
changeset
|
825 } |
|
8b8074080d7b
Bugfix: average temperature on arrival from RTE instead of display time
Jan Mulder <jlmulder@xs4all.nl>
parents:
173
diff
changeset
|
826 |
| 38 | 827 void DataEX_copy_to_LifeData(_Bool *modeChangeFlag) |
| 828 { | |
| 662 | 829 static uint16_t getDeviceDataAfterStartOfMainCPU = 20; |
| 830 | |
|
173
05c770dc2911
Bugfix: make max depth move with current depth (part 1)
Jan Mulder <jlmulder@xs4all.nl>
parents:
156
diff
changeset
|
831 SDiveState *pStateReal = stateRealGetPointerWrite(); |
|
577
9bb9a52d6ae5
Handle o2 voltage values < 0.5mV as invalid:
Ideenmodellierer
parents:
559
diff
changeset
|
832 uint8_t idx; |
| 662 | 833 float meter = 0; |
| 834 SSettings *pSettings; | |
|
747
df0d43da1614
Added pressure compensation to CO2 detection:
Ideenmodellierer
parents:
734
diff
changeset
|
835 |
|
df0d43da1614
Added pressure compensation to CO2 detection:
Ideenmodellierer
parents:
734
diff
changeset
|
836 #ifdef ENABLE_EXTERNAL_PRESSURE |
|
df0d43da1614
Added pressure compensation to CO2 detection:
Ideenmodellierer
parents:
734
diff
changeset
|
837 float CO2Corr = 0.0; |
|
df0d43da1614
Added pressure compensation to CO2 detection:
Ideenmodellierer
parents:
734
diff
changeset
|
838 #endif |
| 662 | 839 |
| 38 | 840 // wireless - �ltere daten aufr�umen |
|
446
f1257a32f2d4
Introduced configuration header for variant managment:
ideenmodellierer
parents:
436
diff
changeset
|
841 #if 0 |
|
51
8f8ea3a32e82
Resolved warnings pointing to possible invalid memory access
Ideenmodellierer
parents:
38
diff
changeset
|
842 for(int i=0;i<(2*NUM_GASES+1);i++) |
| 38 | 843 { |
| 844 if(pStateReal->lifeData.bottle_bar[i]) | |
| 845 { | |
| 846 if((pStateReal->lifeData.bottle_bar_age_MilliSeconds[i] == 0) || (pStateReal->lifeData.bottle_bar_age_MilliSeconds[i] > 60000)) | |
| 847 { | |
| 848 pStateReal->lifeData.bottle_bar_age_MilliSeconds[i] = 0; | |
| 849 pStateReal->lifeData.bottle_bar[i] = 0; | |
| 850 } | |
| 851 else | |
| 852 pStateReal->lifeData.bottle_bar_age_MilliSeconds[i] += 100; | |
| 853 } | |
| 854 } | |
|
446
f1257a32f2d4
Introduced configuration header for variant managment:
ideenmodellierer
parents:
436
diff
changeset
|
855 #else |
|
451
c2e02b87774f
Allocate received bar value to active gas (was static allocated to gas[1])
ideenmodellierer
parents:
446
diff
changeset
|
856 if(stateRealGetPointer()->lifeData.bottle_bar_age_MilliSeconds[stateRealGetPointer()->lifeData.actualGas.GasIdInSettings] < 6000) /* max age after ten minutes */ |
|
446
f1257a32f2d4
Introduced configuration header for variant managment:
ideenmodellierer
parents:
436
diff
changeset
|
857 { |
|
451
c2e02b87774f
Allocate received bar value to active gas (was static allocated to gas[1])
ideenmodellierer
parents:
446
diff
changeset
|
858 stateRealGetPointerWrite()->lifeData.bottle_bar_age_MilliSeconds[stateRealGetPointer()->lifeData.actualGas.GasIdInSettings]++; |
|
446
f1257a32f2d4
Introduced configuration header for variant managment:
ideenmodellierer
parents:
436
diff
changeset
|
859 } |
|
f1257a32f2d4
Introduced configuration header for variant managment:
ideenmodellierer
parents:
436
diff
changeset
|
860 #endif |
| 38 | 861 if(!DataEX_check_header_and_footer_ok()) |
| 862 { | |
| 863 if(DataEX_check_header_and_footer_devicedata()) | |
| 864 { | |
| 865 DataEX_copy_to_DeviceData(); | |
| 866 DataEX_copy_to_VpmRepetitiveData(); | |
| 867 data_old__lost_connection_to_slave_counter_temp = 0; | |
| 868 data_old__lost_connection_to_slave_counter_retry = 0; | |
|
275
189387bf23a8
Do not mark data as valid if devicedata is received.
ideenmodellierer
parents:
232
diff
changeset
|
869 /* Do not yet reset state. Wait till common data has been received in next cycle. Otherwise invalid data may be forwarded for processing */ |
|
189387bf23a8
Do not mark data as valid if devicedata is received.
ideenmodellierer
parents:
232
diff
changeset
|
870 /* pStateReal->data_old__lost_connection_to_slave = 0; */ |
| 208 | 871 dataOut.header.checkCode[SPI_HEADER_INDEX_RX_STATE] = SPI_RX_STATE_OK; |
| 38 | 872 } |
| 873 else | |
| 874 { | |
| 875 pStateReal->data_old__lost_connection_to_slave = 1; | |
| 876 data_old__lost_connection_to_slave_counter_temp += 1; | |
| 877 data_old__lost_connection_to_slave_counter_total += 1; | |
| 878 } | |
| 879 return; | |
| 880 } | |
| 141 | 881 else /* RX data OK */ |
| 882 { | |
| 883 data_old__lost_connection_to_slave_counter_temp = 0; | |
| 884 data_old__lost_connection_to_slave_counter_retry = 0; | |
| 885 pStateReal->data_old__lost_connection_to_slave = 0; | |
| 208 | 886 dataOut.header.checkCode[SPI_HEADER_INDEX_RX_STATE] = SPI_RX_STATE_OK; |
| 141 | 887 } |
| 38 | 888 |
| 889 if(getDeviceDataAfterStartOfMainCPU) | |
| 890 { | |
| 891 getDeviceDataAfterStartOfMainCPU--; | |
| 892 if(getDeviceDataAfterStartOfMainCPU == 0) | |
| 893 { | |
| 894 dataOut.getDeviceDataNow = 1; | |
| 141 | 895 getDeviceDataAfterStartOfMainCPU = 10*60*10; /* * 100ms = 60 second => update device data every 10 minutes */ |
| 38 | 896 } |
| 897 } | |
| 898 | |
| 662 | 899 if((requestNecessary.uw != 0) && (dataIn.confirmRequest.uw != 0)) |
| 38 | 900 { |
| 901 if(((dataIn.confirmRequest.uw) & CRBUTTON) != 0) | |
| 902 { | |
| 903 requestNecessary.ub.button = 0; | |
| 904 } | |
| 662 | 905 if(((dataIn.confirmRequest.uw) & CRCLEARDECO) != 0) |
| 906 { | |
| 907 requestNecessary.ub.clearDeco = 0; | |
| 908 } | |
| 909 if(((dataIn.confirmRequest.uw) & CRDATE) != 0) | |
| 910 { | |
| 911 requestNecessary.ub.date = 0; | |
| 912 } | |
| 913 if(((dataIn.confirmRequest.uw) & CRTIME) != 0) | |
| 914 { | |
| 915 requestNecessary.ub.time = 0; | |
| 916 } | |
| 917 if(((dataIn.confirmRequest.uw) & CRCOMPASS) != 0) | |
| 918 { | |
| 919 requestNecessary.ub.compass = 0; | |
| 920 } | |
| 921 if(((dataIn.confirmRequest.uw) & CRDEVICEDATA) != 0) | |
| 922 { | |
| 923 requestNecessary.ub.devicedata = 0; | |
| 924 } | |
| 925 if(((dataIn.confirmRequest.uw) & CRBATTERY) != 0) | |
| 926 { | |
| 927 requestNecessary.ub.batterygauge = 0; | |
| 928 } | |
| 929 if(((dataIn.confirmRequest.uw) & CRACCIDENT) != 0) | |
| 930 { | |
| 931 requestNecessary.ub.accident = 0; | |
| 932 } | |
| 38 | 933 |
| 662 | 934 if(requestNecessary.ub.button == 1) /* send button values to RTE */ |
| 38 | 935 { |
| 936 setButtonResponsiveness(settingsGetPointer()->ButtonResponsiveness); | |
| 937 } | |
| 938 } | |
| 149 | 939 |
| 38 | 940 /* uint8_t IAmStolenPleaseKillMe; |
| 941 */ | |
|
51
8f8ea3a32e82
Resolved warnings pointing to possible invalid memory access
Ideenmodellierer
parents:
38
diff
changeset
|
942 pSettings = settingsGetPointer(); |
|
8f8ea3a32e82
Resolved warnings pointing to possible invalid memory access
Ideenmodellierer
parents:
38
diff
changeset
|
943 |
|
8f8ea3a32e82
Resolved warnings pointing to possible invalid memory access
Ideenmodellierer
parents:
38
diff
changeset
|
944 if(pSettings->IAmStolenPleaseKillMe > 3) |
| 38 | 945 { |
| 946 pSettings->salinity = 0; | |
| 947 dataIn.data[dataIn.boolPressureData].surface_mbar = 999; | |
| 948 dataIn.data[dataIn.boolPressureData].pressure_mbar = 98971; | |
| 949 dataIn.mode = MODE_DIVE; | |
| 950 } | |
| 951 | |
|
556
eb2060caca7d
Switch source of o2 sensor data depending on availability of external ADC:
Ideenmodellierer
parents:
539
diff
changeset
|
952 |
|
eb2060caca7d
Switch source of o2 sensor data depending on availability of external ADC:
Ideenmodellierer
parents:
539
diff
changeset
|
953 /* internal sensor: HUD data */ |
| 559 | 954 if(pSettings->ppo2sensors_source == O2_SENSOR_SOURCE_OPTIC) |
|
556
eb2060caca7d
Switch source of o2 sensor data depending on availability of external ADC:
Ideenmodellierer
parents:
539
diff
changeset
|
955 { |
|
716
74cfd91199bd
Added customizable data area for specific sensor data:
Ideenmodellierer
parents:
702
diff
changeset
|
956 pStateReal->lifeData.extIf_sensor_Id = 0; |
|
556
eb2060caca7d
Switch source of o2 sensor data depending on availability of external ADC:
Ideenmodellierer
parents:
539
diff
changeset
|
957 for(int i=0;i<3;i++) |
|
eb2060caca7d
Switch source of o2 sensor data depending on availability of external ADC:
Ideenmodellierer
parents:
539
diff
changeset
|
958 { |
|
eb2060caca7d
Switch source of o2 sensor data depending on availability of external ADC:
Ideenmodellierer
parents:
539
diff
changeset
|
959 pStateReal->lifeData.ppO2Sensor_bar[i] = get_ppO2Sensor_bar(i); |
|
eb2060caca7d
Switch source of o2 sensor data depending on availability of external ADC:
Ideenmodellierer
parents:
539
diff
changeset
|
960 pStateReal->lifeData.sensorVoltage_mV[i] = get_sensorVoltage_mV(i); |
|
eb2060caca7d
Switch source of o2 sensor data depending on availability of external ADC:
Ideenmodellierer
parents:
539
diff
changeset
|
961 } |
|
eb2060caca7d
Switch source of o2 sensor data depending on availability of external ADC:
Ideenmodellierer
parents:
539
diff
changeset
|
962 pStateReal->lifeData.HUD_battery_voltage_V = get_HUD_battery_voltage_V(); |
|
eb2060caca7d
Switch source of o2 sensor data depending on availability of external ADC:
Ideenmodellierer
parents:
539
diff
changeset
|
963 } |
|
eb2060caca7d
Switch source of o2 sensor data depending on availability of external ADC:
Ideenmodellierer
parents:
539
diff
changeset
|
964 else /* use data from external ADC */ |
|
eb2060caca7d
Switch source of o2 sensor data depending on availability of external ADC:
Ideenmodellierer
parents:
539
diff
changeset
|
965 { |
|
eb2060caca7d
Switch source of o2 sensor data depending on availability of external ADC:
Ideenmodellierer
parents:
539
diff
changeset
|
966 if(pStateReal->data_old__lost_connection_to_slave == 0) |
|
eb2060caca7d
Switch source of o2 sensor data depending on availability of external ADC:
Ideenmodellierer
parents:
539
diff
changeset
|
967 { |
|
577
9bb9a52d6ae5
Handle o2 voltage values < 0.5mV as invalid:
Ideenmodellierer
parents:
559
diff
changeset
|
968 for(idx = 0; idx < 3; idx++) |
|
9bb9a52d6ae5
Handle o2 voltage values < 0.5mV as invalid:
Ideenmodellierer
parents:
559
diff
changeset
|
969 { |
| 691 | 970 pStateReal->lifeData.sensorVoltage_mV[idx] = dataIn.data[(dataIn.boolADCO2Data && DATA_BUFFER_ADC)].extADC_voltage[idx]; |
|
577
9bb9a52d6ae5
Handle o2 voltage values < 0.5mV as invalid:
Ideenmodellierer
parents:
559
diff
changeset
|
971 if(pStateReal->lifeData.sensorVoltage_mV[idx] < IGNORE_O2_VOLTAGE_LEVEL_MV) |
|
9bb9a52d6ae5
Handle o2 voltage values < 0.5mV as invalid:
Ideenmodellierer
parents:
559
diff
changeset
|
972 { |
|
9bb9a52d6ae5
Handle o2 voltage values < 0.5mV as invalid:
Ideenmodellierer
parents:
559
diff
changeset
|
973 pStateReal->lifeData.sensorVoltage_mV[idx] = 0.0; |
|
9bb9a52d6ae5
Handle o2 voltage values < 0.5mV as invalid:
Ideenmodellierer
parents:
559
diff
changeset
|
974 pStateReal->lifeData.ppO2Sensor_bar[idx] = 0; |
|
9bb9a52d6ae5
Handle o2 voltage values < 0.5mV as invalid:
Ideenmodellierer
parents:
559
diff
changeset
|
975 } |
|
9bb9a52d6ae5
Handle o2 voltage values < 0.5mV as invalid:
Ideenmodellierer
parents:
559
diff
changeset
|
976 else |
|
9bb9a52d6ae5
Handle o2 voltage values < 0.5mV as invalid:
Ideenmodellierer
parents:
559
diff
changeset
|
977 { |
| 796 | 978 if(dataIn.data[(dataIn.boolADCO2Data && DATA_BUFFER_ADC)].sensor_map[idx] == SENSOR_DIGO2M) |
|
702
6d7c812fc173
Added digital o2 sensor to settings and data exchange:
Ideenmodellierer
parents:
691
diff
changeset
|
979 { |
|
6d7c812fc173
Added digital o2 sensor to settings and data exchange:
Ideenmodellierer
parents:
691
diff
changeset
|
980 pStateReal->lifeData.ppO2Sensor_bar[idx] = pStateReal->lifeData.sensorVoltage_mV[idx] / 100.0; |
|
6d7c812fc173
Added digital o2 sensor to settings and data exchange:
Ideenmodellierer
parents:
691
diff
changeset
|
981 } |
|
6d7c812fc173
Added digital o2 sensor to settings and data exchange:
Ideenmodellierer
parents:
691
diff
changeset
|
982 else |
|
6d7c812fc173
Added digital o2 sensor to settings and data exchange:
Ideenmodellierer
parents:
691
diff
changeset
|
983 { |
|
6d7c812fc173
Added digital o2 sensor to settings and data exchange:
Ideenmodellierer
parents:
691
diff
changeset
|
984 pStateReal->lifeData.ppO2Sensor_bar[idx] = pStateReal->lifeData.sensorVoltage_mV[idx] * pSettings->ppo2sensors_calibCoeff[idx]; |
|
6d7c812fc173
Added digital o2 sensor to settings and data exchange:
Ideenmodellierer
parents:
691
diff
changeset
|
985 } |
|
577
9bb9a52d6ae5
Handle o2 voltage values < 0.5mV as invalid:
Ideenmodellierer
parents:
559
diff
changeset
|
986 } |
|
716
74cfd91199bd
Added customizable data area for specific sensor data:
Ideenmodellierer
parents:
702
diff
changeset
|
987 } |
|
556
eb2060caca7d
Switch source of o2 sensor data depending on availability of external ADC:
Ideenmodellierer
parents:
539
diff
changeset
|
988 } |
|
eb2060caca7d
Switch source of o2 sensor data depending on availability of external ADC:
Ideenmodellierer
parents:
539
diff
changeset
|
989 } |
|
eb2060caca7d
Switch source of o2 sensor data depending on availability of external ADC:
Ideenmodellierer
parents:
539
diff
changeset
|
990 |
|
137
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
991 if(pStateReal->data_old__lost_connection_to_slave == 0) |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
992 { |
|
734
190e5814b2f5
Removed interface selection from sensor menu:
Ideenmodellierer
parents:
728
diff
changeset
|
993 |
|
190e5814b2f5
Removed interface selection from sensor menu:
Ideenmodellierer
parents:
728
diff
changeset
|
994 pStateReal->lifeData.extIf_sensor_Id = dataIn.data[(dataIn.boolADCO2Data && DATA_BUFFER_ADC)].externalInterface_SensorID; |
| 786 | 995 if(pStateReal->lifeData.extIf_sensor_Id < 3) |
|
734
190e5814b2f5
Removed interface selection from sensor menu:
Ideenmodellierer
parents:
728
diff
changeset
|
996 { |
| 780 | 997 |
| 786 | 998 memcpy(pStateReal->lifeData.extIf_sensor_data[pStateReal->lifeData.extIf_sensor_Id], dataIn.data[(dataIn.boolADCO2Data && DATA_BUFFER_ADC)].sensor_data, 32); |
|
734
190e5814b2f5
Removed interface selection from sensor menu:
Ideenmodellierer
parents:
728
diff
changeset
|
999 } |
|
190e5814b2f5
Removed interface selection from sensor menu:
Ideenmodellierer
parents:
728
diff
changeset
|
1000 memcpy(pStateReal->lifeData.extIf_sensor_map, dataIn.data[(dataIn.boolADCO2Data && DATA_BUFFER_ADC)].sensor_map, EXT_INTERFACE_SENSOR_CNT); |
|
190e5814b2f5
Removed interface selection from sensor menu:
Ideenmodellierer
parents:
728
diff
changeset
|
1001 |
|
190e5814b2f5
Removed interface selection from sensor menu:
Ideenmodellierer
parents:
728
diff
changeset
|
1002 |
|
173
05c770dc2911
Bugfix: make max depth move with current depth (part 1)
Jan Mulder <jlmulder@xs4all.nl>
parents:
156
diff
changeset
|
1003 meter = getSampleDepth(&dataIn, pStateReal); |
| 38 | 1004 |
|
137
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1005 pStateReal->pressure_uTick_old = pStateReal->pressure_uTick_new; |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1006 pStateReal->pressure_uTick_new = dataIn.data[dataIn.boolPressureData].pressure_uTick; |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1007 pStateReal->pressure_uTick_local_new = HAL_GetTick(); |
| 38 | 1008 |
|
137
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1009 pStateReal->lifeData.dateBinaryFormat = dataIn.data[dataIn.boolTimeData].localtime_rtc_dr; |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1010 pStateReal->lifeData.timeBinaryFormat = dataIn.data[dataIn.boolTimeData].localtime_rtc_tr; |
|
899
2225c467f1e9
Added data path and visualization for position data:
Ideenmodellierer
parents:
842
diff
changeset
|
1011 |
|
2225c467f1e9
Added data path and visualization for position data:
Ideenmodellierer
parents:
842
diff
changeset
|
1012 pStateReal->lifeData.gnssPosition.Latitude = dataIn.data[0].fLat; |
|
2225c467f1e9
Added data path and visualization for position data:
Ideenmodellierer
parents:
842
diff
changeset
|
1013 pStateReal->lifeData.gnssPosition.Longitude = dataIn.data[0].fLon; |
|
137
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1014 } |
| 38 | 1015 |
| 141 | 1016 if(pStateReal->data_old__lost_connection_to_slave == 0) |
| 38 | 1017 { |
| 141 | 1018 //Start of diveMode? |
| 1019 if(pStateReal->mode != MODE_DIVE && dataIn.mode == MODE_DIVE) | |
| 1020 { | |
| 1021 if(modeChangeFlag) | |
| 1022 { | |
| 1023 *modeChangeFlag = 1; | |
| 1024 } | |
| 1025 if(stateUsed == stateSimGetPointer()) | |
| 38 | 1026 { |
| 1027 simulation_exit(); | |
| 1028 } | |
|
805
dd7ce655db26
Adds a simple countdown timer, available as a custom view in surface and dive mode.
heinrichsweikamp
parents:
796
diff
changeset
|
1029 disableTimer(); |
|
dd7ce655db26
Adds a simple countdown timer, available as a custom view in surface and dive mode.
heinrichsweikamp
parents:
796
diff
changeset
|
1030 |
| 141 | 1031 // new 170508 |
| 38 | 1032 settingsGetPointer()->bluetoothActive = 0; |
| 1033 MX_Bluetooth_PowerOff(); | |
| 1034 //Init dive Mode | |
| 141 | 1035 decoLock = DECO_CALC_init_as_is_start_of_dive; |
| 1036 pStateReal->lifeData.boolResetAverageDepth = 1; | |
| 38 | 1037 } |
| 141 | 1038 |
|
197
c853f5d23bb7
cleanup: fix (harmless) use before assign
Jan Mulder <jlmulder@xs4all.nl>
parents:
189
diff
changeset
|
1039 pStateReal->lifeData.cns = dataIn.data[dataIn.boolToxicData].cns; |
|
c853f5d23bb7
cleanup: fix (harmless) use before assign
Jan Mulder <jlmulder@xs4all.nl>
parents:
189
diff
changeset
|
1040 pStateReal->lifeData.otu = dataIn.data[dataIn.boolToxicData].otu; |
|
c853f5d23bb7
cleanup: fix (harmless) use before assign
Jan Mulder <jlmulder@xs4all.nl>
parents:
189
diff
changeset
|
1041 pStateReal->lifeData.no_fly_time_minutes = dataIn.data[dataIn.boolToxicData].no_fly_time_minutes; |
|
c853f5d23bb7
cleanup: fix (harmless) use before assign
Jan Mulder <jlmulder@xs4all.nl>
parents:
189
diff
changeset
|
1042 pStateReal->lifeData.desaturation_time_minutes = dataIn.data[dataIn.boolToxicData].desaturation_time_minutes; |
|
c853f5d23bb7
cleanup: fix (harmless) use before assign
Jan Mulder <jlmulder@xs4all.nl>
parents:
189
diff
changeset
|
1043 |
| 141 | 1044 //End of diveMode? |
| 1045 if(pStateReal->mode == MODE_DIVE && dataIn.mode != MODE_DIVE) | |
| 1046 { | |
| 1047 if(modeChangeFlag) | |
| 1048 { | |
| 1049 *modeChangeFlag = 1; | |
| 1050 } | |
| 1051 createDiveSettings(); | |
| 38 | 1052 |
|
805
dd7ce655db26
Adds a simple countdown timer, available as a custom view in surface and dive mode.
heinrichsweikamp
parents:
796
diff
changeset
|
1053 disableTimer(); |
|
dd7ce655db26
Adds a simple countdown timer, available as a custom view in surface and dive mode.
heinrichsweikamp
parents:
796
diff
changeset
|
1054 |
| 141 | 1055 if(pStateReal->warnings.cnsHigh) |
| 1056 { | |
| 1057 if(pStateReal->lifeData.cns >= 130) | |
| 1058 dataOut.setAccidentFlag += ACCIDENT_CNSLVL2; | |
| 1059 else if(pStateReal->lifeData.cns >= 100) | |
| 1060 dataOut.setAccidentFlag += ACCIDENT_CNS; | |
| 1061 } | |
| 1062 if(pStateReal->warnings.decoMissed) | |
| 1063 dataOut.setAccidentFlag += ACCIDENT_DECOSTOP; | |
| 1064 } | |
| 1065 pStateReal->mode = dataIn.mode; | |
| 1066 pStateReal->chargeStatus = dataIn.chargeStatus; | |
|
137
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1067 |
|
306
2f43419102c8
bugfix, cleanup: do not clip depth to 0
Jan Mulder <jlmulder@xs4all.nl>
parents:
288
diff
changeset
|
1068 pStateReal->lifeData.depth_meter = meter; |
| 141 | 1069 |
|
189
8b8074080d7b
Bugfix: average temperature on arrival from RTE instead of display time
Jan Mulder <jlmulder@xs4all.nl>
parents:
173
diff
changeset
|
1070 pStateReal->lifeData.temperature_celsius = getTemperature(&dataIn); |
|
137
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1071 pStateReal->lifeData.ascent_rate_meter_per_min = dataIn.data[dataIn.boolPressureData].ascent_rate_meter_per_min; |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1072 if(pStateReal->mode != MODE_DIVE) |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1073 pStateReal->lifeData.max_depth_meter = 0; |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1074 else |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1075 { |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1076 if(meter > pStateReal->lifeData.max_depth_meter) |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1077 pStateReal->lifeData.max_depth_meter = meter; |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1078 } |
| 38 | 1079 |
| 662 | 1080 if(requestNecessary.ub.clearDeco == 0) /* No "reset deco" is send to RTE ? */ |
| 1081 { | |
| 1082 if(dataIn.accidentFlags & ACCIDENT_DECOSTOP) | |
| 1083 { | |
| 1084 pStateReal->decoMissed_at_the_end_of_dive = 1; | |
| 1085 } | |
| 1086 else | |
| 1087 { | |
| 1088 pStateReal->decoMissed_at_the_end_of_dive = 0; | |
| 1089 } | |
| 1090 if(dataIn.accidentFlags & ACCIDENT_CNS) | |
| 1091 { | |
| 1092 pStateReal->cnsHigh_at_the_end_of_dive = 1; | |
| 1093 } | |
| 1094 else | |
| 1095 { | |
| 1096 pStateReal->cnsHigh_at_the_end_of_dive = 0; | |
| 1097 } | |
| 1098 } | |
|
137
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1099 pStateReal->lifeData.dive_time_seconds = (int32_t)dataIn.data[dataIn.boolTimeData].divetime_seconds; |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1100 pStateReal->lifeData.dive_time_seconds_without_surface_time = (int32_t)dataIn.data[dataIn.boolTimeData].dive_time_seconds_without_surface_time; |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1101 pStateReal->lifeData.counterSecondsShallowDepth = dataIn.data[dataIn.boolTimeData].counterSecondsShallowDepth; |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1102 pStateReal->lifeData.surface_time_seconds = (int32_t)dataIn.data[dataIn.boolTimeData].surfacetime_seconds; |
| 38 | 1103 |
|
137
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1104 pStateReal->lifeData.compass_heading = dataIn.data[dataIn.boolCompassData].compass_heading; |
|
776
45b8f3c2acce
Add support for a configurable compass declination in a range of -99 to 99 degrees.
heinrichsweikamp
parents:
763
diff
changeset
|
1105 if (pStateReal->lifeData.compass_heading != -1) { |
|
45b8f3c2acce
Add support for a configurable compass declination in a range of -99 to 99 degrees.
heinrichsweikamp
parents:
763
diff
changeset
|
1106 if (pSettings->FlipDisplay) { /* consider that diver is targeting into the opposite direction */ |
|
45b8f3c2acce
Add support for a configurable compass declination in a range of -99 to 99 degrees.
heinrichsweikamp
parents:
763
diff
changeset
|
1107 pStateReal->lifeData.compass_heading -= 180.0; |
|
45b8f3c2acce
Add support for a configurable compass declination in a range of -99 to 99 degrees.
heinrichsweikamp
parents:
763
diff
changeset
|
1108 } |
|
45b8f3c2acce
Add support for a configurable compass declination in a range of -99 to 99 degrees.
heinrichsweikamp
parents:
763
diff
changeset
|
1109 |
|
45b8f3c2acce
Add support for a configurable compass declination in a range of -99 to 99 degrees.
heinrichsweikamp
parents:
763
diff
changeset
|
1110 if (pSettings->compassDeclinationDeg != 0) { |
|
45b8f3c2acce
Add support for a configurable compass declination in a range of -99 to 99 degrees.
heinrichsweikamp
parents:
763
diff
changeset
|
1111 pStateReal->lifeData.compass_heading = pStateReal->lifeData.compass_heading + pSettings->compassDeclinationDeg - 360.0; |
|
45b8f3c2acce
Add support for a configurable compass declination in a range of -99 to 99 degrees.
heinrichsweikamp
parents:
763
diff
changeset
|
1112 } |
|
45b8f3c2acce
Add support for a configurable compass declination in a range of -99 to 99 degrees.
heinrichsweikamp
parents:
763
diff
changeset
|
1113 |
|
45b8f3c2acce
Add support for a configurable compass declination in a range of -99 to 99 degrees.
heinrichsweikamp
parents:
763
diff
changeset
|
1114 while (pStateReal->lifeData.compass_heading < 0) { |
|
45b8f3c2acce
Add support for a configurable compass declination in a range of -99 to 99 degrees.
heinrichsweikamp
parents:
763
diff
changeset
|
1115 pStateReal->lifeData.compass_heading += 360.0; |
|
45b8f3c2acce
Add support for a configurable compass declination in a range of -99 to 99 degrees.
heinrichsweikamp
parents:
763
diff
changeset
|
1116 } |
|
45b8f3c2acce
Add support for a configurable compass declination in a range of -99 to 99 degrees.
heinrichsweikamp
parents:
763
diff
changeset
|
1117 } |
|
109
65a6e352ce08
Consider computer heading in case of a flipped display
Ideenmodellierer
parents:
51
diff
changeset
|
1118 |
|
137
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1119 pStateReal->lifeData.compass_roll = dataIn.data[dataIn.boolCompassData].compass_roll; |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1120 pStateReal->lifeData.compass_pitch = dataIn.data[dataIn.boolCompassData].compass_pitch; |
| 38 | 1121 |
|
137
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1122 pStateReal->lifeData.compass_DX_f = dataIn.data[dataIn.boolCompassData].compass_DX_f; |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1123 pStateReal->lifeData.compass_DY_f = dataIn.data[dataIn.boolCompassData].compass_DY_f; |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1124 pStateReal->lifeData.compass_DZ_f = dataIn.data[dataIn.boolCompassData].compass_DZ_f; |
| 38 | 1125 |
|
137
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1126 pStateReal->compass_uTick_old = pStateReal->compass_uTick_new; |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1127 pStateReal->compass_uTick_new = dataIn.data[dataIn.boolCompassData].compass_uTick; |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1128 pStateReal->compass_uTick_local_new = HAL_GetTick(); |
|
539
d784f281833a
Added inertia simulation for compass heading:
Ideenmodellierer
parents:
497
diff
changeset
|
1129 compass_Inertia(pStateReal->lifeData.compass_heading); |
|
137
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1130 |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1131 memcpy(pStateReal->lifeData.tissue_nitrogen_bar, dataIn.data[dataIn.boolTisssueData].tissue_nitrogen_bar,sizeof(pStateReal->lifeData.tissue_nitrogen_bar)); |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1132 memcpy(pStateReal->lifeData.tissue_helium_bar, dataIn.data[dataIn.boolTisssueData].tissue_helium_bar,sizeof(pStateReal->lifeData.tissue_helium_bar)); |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1133 |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1134 if(pStateReal->mode == MODE_DIVE) |
| 38 | 1135 { |
|
137
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1136 for(int i= 0; i <16; i++) |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1137 { |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1138 pStateReal->vpm.max_crushing_pressure_he[i] = dataIn.data[dataIn.boolCrushingData].max_crushing_pressure_he[i]; |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1139 pStateReal->vpm.max_crushing_pressure_n2[i] = dataIn.data[dataIn.boolCrushingData].max_crushing_pressure_n2[i]; |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1140 pStateReal->vpm.adjusted_critical_radius_he[i] = dataIn.data[dataIn.boolCrushingData].adjusted_critical_radius_he[i]; |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1141 pStateReal->vpm.adjusted_critical_radius_n2[i] = dataIn.data[dataIn.boolCrushingData].adjusted_critical_radius_n2[i]; |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1142 } |
| 38 | 1143 } |
| 1144 | |
|
137
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1145 /* battery and ambient light sensors |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1146 */ |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1147 pStateReal->lifeData.ambient_light_level = dataIn.data[dataIn.boolAmbientLightData].ambient_light_level; |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1148 pStateReal->lifeData.battery_charge = dataIn.data[dataIn.boolBatteryData].battery_charge; |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1149 pStateReal->lifeData.battery_voltage = dataIn.data[dataIn.boolBatteryData].battery_voltage; |
|
275
189387bf23a8
Do not mark data as valid if devicedata is received.
ideenmodellierer
parents:
232
diff
changeset
|
1150 |
|
189387bf23a8
Do not mark data as valid if devicedata is received.
ideenmodellierer
parents:
232
diff
changeset
|
1151 /* PIC data |
|
189387bf23a8
Do not mark data as valid if devicedata is received.
ideenmodellierer
parents:
232
diff
changeset
|
1152 */ |
|
189387bf23a8
Do not mark data as valid if devicedata is received.
ideenmodellierer
parents:
232
diff
changeset
|
1153 for(int i=0;i<4;i++) |
|
189387bf23a8
Do not mark data as valid if devicedata is received.
ideenmodellierer
parents:
232
diff
changeset
|
1154 { |
|
189387bf23a8
Do not mark data as valid if devicedata is received.
ideenmodellierer
parents:
232
diff
changeset
|
1155 pStateReal->lifeData.buttonPICdata[i] = dataIn.data[dataIn.boolPICdata].button_setting[i]; |
|
189387bf23a8
Do not mark data as valid if devicedata is received.
ideenmodellierer
parents:
232
diff
changeset
|
1156 } |
|
189387bf23a8
Do not mark data as valid if devicedata is received.
ideenmodellierer
parents:
232
diff
changeset
|
1157 |
|
189387bf23a8
Do not mark data as valid if devicedata is received.
ideenmodellierer
parents:
232
diff
changeset
|
1158 /* sensorErrors |
|
189387bf23a8
Do not mark data as valid if devicedata is received.
ideenmodellierer
parents:
232
diff
changeset
|
1159 */ |
|
189387bf23a8
Do not mark data as valid if devicedata is received.
ideenmodellierer
parents:
232
diff
changeset
|
1160 pStateReal->sensorErrorsRTE = dataIn.sensorErrors; |
| 662 | 1161 |
| 1162 /* data from CO2 sensor */ | |
| 831 | 1163 pStateReal->lifeData.CO2_data.CO2_ppm = dataIn.data[(dataIn.boolADCO2Data && DATA_BUFFER_CO2)].CO2_ppm; |
| 691 | 1164 pStateReal->lifeData.CO2_data.signalStrength = dataIn.data[(dataIn.boolADCO2Data && DATA_BUFFER_CO2)].CO2_signalStrength; |
|
747
df0d43da1614
Added pressure compensation to CO2 detection:
Ideenmodellierer
parents:
734
diff
changeset
|
1165 |
|
df0d43da1614
Added pressure compensation to CO2 detection:
Ideenmodellierer
parents:
734
diff
changeset
|
1166 #ifdef ENABLE_EXTERNAL_PRESSURE |
|
df0d43da1614
Added pressure compensation to CO2 detection:
Ideenmodellierer
parents:
734
diff
changeset
|
1167 CO2Corr = 2.811*pow(10,-38)*pow(pStateReal->lifeData.CO2_data.CO2_ppm,6)- 9.817*pow(10,-32)*pow(pStateReal->lifeData.CO2_data.CO2_ppm,5)+1.304*pow(10,-25)*pow(pStateReal->lifeData.CO2_data.CO2_ppm,4) |
|
df0d43da1614
Added pressure compensation to CO2 detection:
Ideenmodellierer
parents:
734
diff
changeset
|
1168 -8.216*pow(10,-20)*pow(pStateReal->lifeData.CO2_data.CO2_ppm,3)+2.311*pow(10,-14)*pow(pStateReal->lifeData.CO2_data.CO2_ppm,2) - 2.195*pow(10,-9)*pStateReal->lifeData.CO2_data.CO2_ppm - 1.471*pow(10,-3); |
|
df0d43da1614
Added pressure compensation to CO2 detection:
Ideenmodellierer
parents:
734
diff
changeset
|
1169 pStateReal->lifeData.CO2_data.CO2_ppm = pStateReal->lifeData.CO2_data.CO2_ppm / (1.0 + (CO2Corr * ((stateRealGetPointer()->lifeData.pressure_surface_bar * 1000) - ((stateRealGetPointer()->lifeData.ppO2Sensor_bar[2] *1000))))); |
|
df0d43da1614
Added pressure compensation to CO2 detection:
Ideenmodellierer
parents:
734
diff
changeset
|
1170 #endif |
|
137
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1171 } |
| 38 | 1172 |
| 1173 /* apnea specials | |
| 1174 */ | |
| 1175 if(pStateReal->diveSettings.diveMode == DIVEMODE_Apnea) | |
| 1176 { | |
| 1177 if(pStateReal->mode != MODE_DIVE) | |
| 1178 { | |
| 1179 pStateReal->lifeData.apnea_total_max_depth_meter = 0; | |
| 1180 pStateReal->lifeData.apnea_last_dive_time_seconds = 0; | |
| 1181 pStateReal->lifeData.apnea_last_max_depth_meter = 0; | |
| 1182 } | |
| 1183 else | |
| 1184 { | |
| 1185 if(pStateReal->lifeData.max_depth_meter > pStateReal->lifeData.apnea_total_max_depth_meter) | |
| 1186 pStateReal->lifeData.apnea_total_max_depth_meter = pStateReal->lifeData.max_depth_meter; | |
| 1187 } | |
| 1188 | |
| 1189 if(pStateReal->lifeData.dive_time_seconds > 15) | |
| 1190 { | |
| 1191 pStateReal->lifeData.apnea_last_dive_time_seconds = pStateReal->lifeData.dive_time_seconds; | |
| 1192 } | |
| 1193 | |
| 1194 if(pStateReal->lifeData.counterSecondsShallowDepth) | |
| 1195 { | |
| 1196 if(pStateReal->lifeData.max_depth_meter > 1.5f) | |
| 1197 { | |
| 1198 pStateReal->lifeData.apnea_last_max_depth_meter = pStateReal->lifeData.max_depth_meter; | |
| 1199 } | |
|
173
05c770dc2911
Bugfix: make max depth move with current depth (part 1)
Jan Mulder <jlmulder@xs4all.nl>
parents:
156
diff
changeset
|
1200 // reset max_depth_meter, average_depth_meter and internal values |
| 38 | 1201 pStateReal->lifeData.max_depth_meter = 0; |
| 1202 pStateReal->lifeData.boolResetAverageDepth = 1; | |
| 1203 } | |
| 1204 } | |
| 1205 | |
|
308
1203255481e4
cleanup: introduce function setAvgDepth
Jan Mulder <jlmulder@xs4all.nl>
parents:
307
diff
changeset
|
1206 setAvgDepth(pStateReal); |
|
1203255481e4
cleanup: introduce function setAvgDepth
Jan Mulder <jlmulder@xs4all.nl>
parents:
307
diff
changeset
|
1207 } |
|
1203255481e4
cleanup: introduce function setAvgDepth
Jan Mulder <jlmulder@xs4all.nl>
parents:
307
diff
changeset
|
1208 |
|
1203255481e4
cleanup: introduce function setAvgDepth
Jan Mulder <jlmulder@xs4all.nl>
parents:
307
diff
changeset
|
1209 void setAvgDepth(SDiveState *pStateReal) { |
|
1203255481e4
cleanup: introduce function setAvgDepth
Jan Mulder <jlmulder@xs4all.nl>
parents:
307
diff
changeset
|
1210 |
| 38 | 1211 float *AvgDepthValue = &pStateReal->lifeData.average_depth_meter; |
| 1212 float DepthNow = pStateReal->lifeData.depth_meter; | |
|
309
b0045281cb2d
cleanup: factor out SHelper typedef (and more)
Jan Mulder <jlmulder@xs4all.nl>
parents:
308
diff
changeset
|
1213 static uint32_t AvgDepthCount = 0; |
|
b0045281cb2d
cleanup: factor out SHelper typedef (and more)
Jan Mulder <jlmulder@xs4all.nl>
parents:
308
diff
changeset
|
1214 static uint32_t AvgDepthTimer = 0; |
| 38 | 1215 uint32_t AvgSecondsSinceLast; |
| 1216 uint32_t DiveTime = pStateReal->lifeData.dive_time_seconds_without_surface_time; | |
|
308
1203255481e4
cleanup: introduce function setAvgDepth
Jan Mulder <jlmulder@xs4all.nl>
parents:
307
diff
changeset
|
1217 |
| 38 | 1218 if(pStateReal->lifeData.boolResetAverageDepth) |
| 1219 { | |
| 1220 *AvgDepthValue = DepthNow; | |
|
309
b0045281cb2d
cleanup: factor out SHelper typedef (and more)
Jan Mulder <jlmulder@xs4all.nl>
parents:
308
diff
changeset
|
1221 AvgDepthCount = 0; |
|
b0045281cb2d
cleanup: factor out SHelper typedef (and more)
Jan Mulder <jlmulder@xs4all.nl>
parents:
308
diff
changeset
|
1222 AvgDepthTimer = DiveTime; |
| 38 | 1223 pStateReal->lifeData.boolResetAverageDepth = 0; |
| 1224 } | |
|
309
b0045281cb2d
cleanup: factor out SHelper typedef (and more)
Jan Mulder <jlmulder@xs4all.nl>
parents:
308
diff
changeset
|
1225 else if (DiveTime > AvgDepthTimer) |
| 38 | 1226 { |
|
309
b0045281cb2d
cleanup: factor out SHelper typedef (and more)
Jan Mulder <jlmulder@xs4all.nl>
parents:
308
diff
changeset
|
1227 AvgSecondsSinceLast = DiveTime - AvgDepthTimer; |
| 38 | 1228 for(int i=0;i<AvgSecondsSinceLast;i++) |
| 1229 { | |
|
309
b0045281cb2d
cleanup: factor out SHelper typedef (and more)
Jan Mulder <jlmulder@xs4all.nl>
parents:
308
diff
changeset
|
1230 *AvgDepthValue = (*AvgDepthValue * AvgDepthCount + DepthNow) / (AvgDepthCount + 1); |
|
b0045281cb2d
cleanup: factor out SHelper typedef (and more)
Jan Mulder <jlmulder@xs4all.nl>
parents:
308
diff
changeset
|
1231 AvgDepthCount += 1; |
| 38 | 1232 } |
|
309
b0045281cb2d
cleanup: factor out SHelper typedef (and more)
Jan Mulder <jlmulder@xs4all.nl>
parents:
308
diff
changeset
|
1233 AvgDepthTimer = DiveTime; |
| 38 | 1234 } |
|
309
b0045281cb2d
cleanup: factor out SHelper typedef (and more)
Jan Mulder <jlmulder@xs4all.nl>
parents:
308
diff
changeset
|
1235 if(AvgDepthCount == 0) |
|
b0045281cb2d
cleanup: factor out SHelper typedef (and more)
Jan Mulder <jlmulder@xs4all.nl>
parents:
308
diff
changeset
|
1236 *AvgDepthValue = DepthNow; |
| 38 | 1237 } |
| 1238 | |
| 1239 | |
| 1240 uint8_t DataEX_check_RTE_version__needs_update(void) | |
| 1241 { | |
| 1242 if(data_old__lost_connection_to_slave_counter_retry > 10) | |
| 1243 return 1; | |
| 1244 else | |
| 1245 { | |
| 1246 if(stateRealGetPointer()->data_old__lost_connection_to_slave == 0) | |
| 1247 { | |
| 1248 setActualRTEversion(dataIn.RTE_VERSION_high, dataIn.RTE_VERSION_low); | |
| 1249 | |
| 1250 if(RTEminimum_required_high() < dataIn.RTE_VERSION_high) | |
| 1251 return 0; | |
| 1252 else | |
| 1253 if((RTEminimum_required_high() == dataIn.RTE_VERSION_high) && (RTEminimum_required_low() <= dataIn.RTE_VERSION_low)) | |
| 1254 return 0; | |
| 1255 else | |
| 1256 return 1; | |
| 1257 } | |
| 1258 else | |
| 1259 return 0; | |
| 1260 } | |
| 1261 } | |
| 1262 | |
| 1263 | |
| 1264 /* Private functions ---------------------------------------------------------*/ | |
| 1265 | |
|
198
878dc9e0dbc5
cleanup: another cleanup session (data_exchange_main.c)
Jan Mulder <jlmulder@xs4all.nl>
parents:
197
diff
changeset
|
1266 /* Check if there is an empty frame provided by RTE (all 0) or even no data provided by RTE (all 0xFF) |
|
137
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1267 * If that is not the case the DMA is somehow not in sync |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1268 */ |
|
198
878dc9e0dbc5
cleanup: another cleanup session (data_exchange_main.c)
Jan Mulder <jlmulder@xs4all.nl>
parents:
197
diff
changeset
|
1269 static uint8_t DataEX_check_header_and_footer_shifted() |
|
137
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1270 { |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1271 uint8_t ret = 1; |
| 141 | 1272 if((dataIn.footer.checkCode[0] == 0x00) |
| 1273 && (dataIn.footer.checkCode[1] == 0x00) | |
| 1274 && (dataIn.footer.checkCode[2] == 0x00) | |
| 1275 && (dataIn.footer.checkCode[3] == 0x00)) { ret = 0; } | |
|
137
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1276 |
| 141 | 1277 if((dataIn.footer.checkCode[0] == 0xff) |
| 1278 && (dataIn.footer.checkCode[1] == 0xff) | |
| 1279 && (dataIn.footer.checkCode[2] == 0xff) | |
| 1280 && (dataIn.footer.checkCode[3] == 0xff)) { ret = 0; } | |
|
137
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1281 |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1282 return ret; |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1283 } |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1284 |
|
198
878dc9e0dbc5
cleanup: another cleanup session (data_exchange_main.c)
Jan Mulder <jlmulder@xs4all.nl>
parents:
197
diff
changeset
|
1285 static uint8_t DataEX_check_header_and_footer_ok(void) |
| 38 | 1286 { |
| 1287 if(dataIn.header.checkCode[0] != 0xA1) | |
| 1288 return 0; | |
| 141 | 1289 #if USE_OLD_HEADER_FORMAT |
| 38 | 1290 if(dataIn.header.checkCode[1] != 0xA2) |
| 1291 return 0; | |
| 1292 if(dataIn.header.checkCode[2] != 0xA3) | |
| 1293 return 0; | |
| 141 | 1294 #endif |
| 38 | 1295 if(dataIn.header.checkCode[3] != 0xA4) |
| 1296 return 0; | |
| 1297 if(dataIn.footer.checkCode[0] != 0xE1) | |
| 1298 return 0; | |
| 1299 if(dataIn.footer.checkCode[1] != 0xE2) | |
| 1300 return 0; | |
| 1301 if(dataIn.footer.checkCode[2] != 0xE3) | |
| 1302 return 0; | |
| 1303 if(dataIn.footer.checkCode[3] != 0xE4) | |
| 1304 return 0; | |
| 1305 | |
| 1306 return 1; | |
| 1307 } | |
| 1308 | |
|
198
878dc9e0dbc5
cleanup: another cleanup session (data_exchange_main.c)
Jan Mulder <jlmulder@xs4all.nl>
parents:
197
diff
changeset
|
1309 static uint8_t DataEX_check_header_and_footer_devicedata(void) |
| 38 | 1310 { |
| 1311 if(dataIn.header.checkCode[0] != 0xDF) | |
| 1312 return 0; | |
| 1313 if(dataIn.header.checkCode[1] != 0xDE) | |
| 1314 return 0; | |
| 1315 if(dataIn.header.checkCode[2] != 0xDD) | |
| 1316 return 0; | |
| 1317 if(dataIn.header.checkCode[3] != 0xDC) | |
| 1318 return 0; | |
| 1319 if(dataIn.footer.checkCode[0] != 0xE1) | |
| 1320 return 0; | |
| 1321 if(dataIn.footer.checkCode[1] != 0xE2) | |
| 1322 return 0; | |
| 1323 if(dataIn.footer.checkCode[2] != 0xE3) | |
| 1324 return 0; | |
| 1325 if(dataIn.footer.checkCode[3] != 0xE4) | |
| 1326 return 0; | |
| 1327 | |
| 1328 return 1; | |
| 1329 } | |
|
407
b11e50415982
Bugfix parallel call of external flash functions:
ideenmodellierer
parents:
406
diff
changeset
|
1330 |
|
b11e50415982
Bugfix parallel call of external flash functions:
ideenmodellierer
parents:
406
diff
changeset
|
1331 void DataEX_merge_devicedata(void) |
|
b11e50415982
Bugfix parallel call of external flash functions:
ideenmodellierer
parents:
406
diff
changeset
|
1332 { |
|
b11e50415982
Bugfix parallel call of external flash functions:
ideenmodellierer
parents:
406
diff
changeset
|
1333 if(DeviceDataUpdated) |
|
b11e50415982
Bugfix parallel call of external flash functions:
ideenmodellierer
parents:
406
diff
changeset
|
1334 { |
|
b11e50415982
Bugfix parallel call of external flash functions:
ideenmodellierer
parents:
406
diff
changeset
|
1335 DeviceDataUpdated = 0; |
|
b11e50415982
Bugfix parallel call of external flash functions:
ideenmodellierer
parents:
406
diff
changeset
|
1336 DataEX_merge_DeviceData_and_store(); |
|
b11e50415982
Bugfix parallel call of external flash functions:
ideenmodellierer
parents:
406
diff
changeset
|
1337 } |
|
b11e50415982
Bugfix parallel call of external flash functions:
ideenmodellierer
parents:
406
diff
changeset
|
1338 } |
|
556
eb2060caca7d
Switch source of o2 sensor data depending on availability of external ADC:
Ideenmodellierer
parents:
539
diff
changeset
|
1339 uint8_t DataEX_external_ADC_Present(void) |
|
eb2060caca7d
Switch source of o2 sensor data depending on availability of external ADC:
Ideenmodellierer
parents:
539
diff
changeset
|
1340 { |
|
eb2060caca7d
Switch source of o2 sensor data depending on availability of external ADC:
Ideenmodellierer
parents:
539
diff
changeset
|
1341 uint8_t retval; |
| 559 | 1342 retval = hw_Info.extADC; |
|
556
eb2060caca7d
Switch source of o2 sensor data depending on availability of external ADC:
Ideenmodellierer
parents:
539
diff
changeset
|
1343 |
|
eb2060caca7d
Switch source of o2 sensor data depending on availability of external ADC:
Ideenmodellierer
parents:
539
diff
changeset
|
1344 return retval; |
|
eb2060caca7d
Switch source of o2 sensor data depending on availability of external ADC:
Ideenmodellierer
parents:
539
diff
changeset
|
1345 } |
| 662 | 1346 |
| 1347 void DataEX_setExtInterface_Cmd(uint16_t Cmd) | |
| 1348 { | |
| 1349 externalInterface_Cmd = Cmd; | |
| 1350 return; | |
| 1351 } | |
| 1352 |