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