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