Mercurial > public > ostc4
annotate Discovery/Src/data_exchange_main.c @ 736:8a2337c7af52
Fixed logbook download after switch from CCR to extra (OC) gas if the extra gas
was the same as the active diluent
Bugfix from mikeller
| author | heinrichsweikamp |
|---|---|
| date | Fri, 03 Mar 2023 10:41:44 +0100 |
| parents | 190e5814b2f5 |
| children | df0d43da1614 |
| 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 | |
|
728
5143e927219f
Added sensor map to Firmware <=> RTE inferface:
Ideenmodellierer
parents:
716
diff
changeset
|
376 uint8_t SensorActive[SENSOR_END]; |
|
5143e927219f
Added sensor map to Firmware <=> RTE inferface:
Ideenmodellierer
parents:
716
diff
changeset
|
377 uint8_t index = 0; |
|
5143e927219f
Added sensor map to Firmware <=> RTE inferface:
Ideenmodellierer
parents:
716
diff
changeset
|
378 |
|
5143e927219f
Added sensor map to Firmware <=> RTE inferface:
Ideenmodellierer
parents:
716
diff
changeset
|
379 |
| 38 | 380 if(get_globalState() == StStop) |
| 381 dataOut.mode = MODE_SHUTDOWN; | |
| 382 else | |
| 383 dataOut.mode = 0; | |
| 384 | |
| 385 dataOut.diveModeInfo = pStateReal->diveSettings.diveMode; // hw 170215 | |
| 386 | |
| 387 memcpy(&dataOut.data.DeviceData, stateDeviceGetPointer(), sizeof(SDevice)); | |
| 388 | |
| 389 dataOut.data.VPMconservatism = pStateReal->diveSettings.vpm_conservatism; | |
| 390 dataOut.data.actualGas = pStateReal->lifeData.actualGas; | |
| 391 dataOut.data.ambient_pressure_mbar_ceiling = (pStateReal->decolistBuehlmann.output_ceiling_meter * 100) + (pStateReal->lifeData.pressure_surface_bar * 1000); | |
| 392 dataOut.data.divetimeToCreateLogbook = settings->divetimeToCreateLogbook; | |
| 393 dataOut.data.timeoutDiveReachedZeroDepth = settings->timeoutDiveReachedZeroDepth; | |
| 394 | |
| 395 dataOut.data.offsetPressureSensor_mbar = settings->offsetPressure_mbar; | |
| 396 dataOut.data.offsetTemperatureSensor_centiDegree = settings->offsetTemperature_centigrad; | |
| 397 | |
| 691 | 398 |
|
728
5143e927219f
Added sensor map to Firmware <=> RTE inferface:
Ideenmodellierer
parents:
716
diff
changeset
|
399 memcpy(dataOut.data.externalInterface_SensorMap, settings->ext_sensor_map, 5); |
| 691 | 400 |
|
728
5143e927219f
Added sensor map to Firmware <=> RTE inferface:
Ideenmodellierer
parents:
716
diff
changeset
|
401 memset(SensorActive, 0, sizeof(SensorActive)); |
|
5143e927219f
Added sensor map to Firmware <=> RTE inferface:
Ideenmodellierer
parents:
716
diff
changeset
|
402 for (index = 0; index < EXT_INTERFACE_SENSOR_CNT; index++) |
| 691 | 403 { |
|
728
5143e927219f
Added sensor map to Firmware <=> RTE inferface:
Ideenmodellierer
parents:
716
diff
changeset
|
404 switch(settings->ext_sensor_map[index]) |
|
5143e927219f
Added sensor map to Firmware <=> RTE inferface:
Ideenmodellierer
parents:
716
diff
changeset
|
405 { |
|
5143e927219f
Added sensor map to Firmware <=> RTE inferface:
Ideenmodellierer
parents:
716
diff
changeset
|
406 case SENSOR_ANALOG: SensorActive[SENSOR_ANALOG] = 1; |
|
5143e927219f
Added sensor map to Firmware <=> RTE inferface:
Ideenmodellierer
parents:
716
diff
changeset
|
407 break; |
|
5143e927219f
Added sensor map to Firmware <=> RTE inferface:
Ideenmodellierer
parents:
716
diff
changeset
|
408 case SENSOR_DIGO2: SensorActive[SENSOR_DIGO2] = 1; |
|
5143e927219f
Added sensor map to Firmware <=> RTE inferface:
Ideenmodellierer
parents:
716
diff
changeset
|
409 break; |
|
5143e927219f
Added sensor map to Firmware <=> RTE inferface:
Ideenmodellierer
parents:
716
diff
changeset
|
410 case SENSOR_CO2: SensorActive[SENSOR_CO2] = 1; |
|
5143e927219f
Added sensor map to Firmware <=> RTE inferface:
Ideenmodellierer
parents:
716
diff
changeset
|
411 break; |
|
5143e927219f
Added sensor map to Firmware <=> RTE inferface:
Ideenmodellierer
parents:
716
diff
changeset
|
412 default: |
|
5143e927219f
Added sensor map to Firmware <=> RTE inferface:
Ideenmodellierer
parents:
716
diff
changeset
|
413 break; |
|
5143e927219f
Added sensor map to Firmware <=> RTE inferface:
Ideenmodellierer
parents:
716
diff
changeset
|
414 } |
| 691 | 415 } |
| 416 | |
|
728
5143e927219f
Added sensor map to Firmware <=> RTE inferface:
Ideenmodellierer
parents:
716
diff
changeset
|
417 if(SensorActive[SENSOR_ANALOG]) |
|
5143e927219f
Added sensor map to Firmware <=> RTE inferface:
Ideenmodellierer
parents:
716
diff
changeset
|
418 { |
|
5143e927219f
Added sensor map to Firmware <=> RTE inferface:
Ideenmodellierer
parents:
716
diff
changeset
|
419 externalInterface_Cmd |= EXT_INTERFACE_ADC_ON | EXT_INTERFACE_33V_ON; |
|
5143e927219f
Added sensor map to Firmware <=> RTE inferface:
Ideenmodellierer
parents:
716
diff
changeset
|
420 } |
|
5143e927219f
Added sensor map to Firmware <=> RTE inferface:
Ideenmodellierer
parents:
716
diff
changeset
|
421 if(SensorActive[SENSOR_DIGO2]) |
|
702
6d7c812fc173
Added digital o2 sensor to settings and data exchange:
Ideenmodellierer
parents:
691
diff
changeset
|
422 { |
|
728
5143e927219f
Added sensor map to Firmware <=> RTE inferface:
Ideenmodellierer
parents:
716
diff
changeset
|
423 externalInterface_Cmd |= EXT_INTERFACE_33V_ON | EXT_INTERFACE_UART_O2; |
|
5143e927219f
Added sensor map to Firmware <=> RTE inferface:
Ideenmodellierer
parents:
716
diff
changeset
|
424 } |
|
5143e927219f
Added sensor map to Firmware <=> RTE inferface:
Ideenmodellierer
parents:
716
diff
changeset
|
425 else if(SensorActive[SENSOR_CO2]) /* TODO: at the moment only one serial sensor is supported => else condition. to be changed once multiplexing is available */ |
|
5143e927219f
Added sensor map to Firmware <=> RTE inferface:
Ideenmodellierer
parents:
716
diff
changeset
|
426 { |
|
5143e927219f
Added sensor map to Firmware <=> RTE inferface:
Ideenmodellierer
parents:
716
diff
changeset
|
427 externalInterface_Cmd |= EXT_INTERFACE_33V_ON | EXT_INTERFACE_UART_CO2; /* CO2 sensor has to be activated via auto detection */ |
|
702
6d7c812fc173
Added digital o2 sensor to settings and data exchange:
Ideenmodellierer
parents:
691
diff
changeset
|
428 } |
|
6d7c812fc173
Added digital o2 sensor to settings and data exchange:
Ideenmodellierer
parents:
691
diff
changeset
|
429 |
| 691 | 430 #ifdef ENABLE_SENTINEL_MODE |
| 431 if(settings->ppo2sensors_source == O2_SENSOR_SOURCE_SENTINEL) | |
| 432 { | |
| 433 externalInterface_Cmd |= EXT_INTERFACE_33V_ON | EXT_INTERFACE_UART_SENTINEL; | |
| 434 externalInterface_Cmd &= (~EXT_INTERFACE_ADC_ON); | |
| 435 } | |
| 436 #endif | |
| 437 | |
| 662 | 438 dataOut.data.externalInterface_Cmd = externalInterface_Cmd; |
| 439 externalInterface_Cmd = 0; | |
| 440 | |
| 38 | 441 if((hardwareDataGetPointer()->primarySerial <= 32) || (((hardwareDataGetPointer()->primarySerial == 72) && (hardwareDataGetPointer()->secondarySerial == 15)))) |
| 442 { | |
| 443 dataOut.revisionHardware = 0x00; | |
| 444 dataOut.revisionCRCx0x7A = 0x7A; | |
| 445 } | |
| 446 else | |
| 447 if(hardwareDataGetPointer()->primarySerial < 0xFFFF) | |
| 448 { | |
| 449 dataOut.revisionHardware = hardwareDataGetPointer()->revision8bit; | |
| 450 dataOut.revisionCRCx0x7A = hardwareDataGetPointer()->revision8bit ^ 0x7A; | |
| 451 } | |
| 452 else | |
| 453 { | |
| 454 dataOut.revisionHardware = 0xFF; | |
| 455 dataOut.revisionCRCx0x7A = 0xFF; | |
| 456 } | |
| 457 | |
| 458 if(DataEX_check_header_and_footer_ok() && !told_reset_logik_alles_ok) | |
| 459 { | |
| 460 MX_tell_reset_logik_alles_ok(); | |
| 461 told_reset_logik_alles_ok = 1; | |
| 462 } | |
| 463 | |
| 464 if(DataEX_check_header_and_footer_ok() && (dataIn.power_on_reset == 1)) | |
| 465 { | |
| 466 if(!wasUpdateNotPowerOn) | |
| 467 wasPowerOn = 1; | |
| 468 | |
| 469 settingsHelperButtonSens_keepPercentageValues(settingsGetPointerStandard()->ButtonResponsiveness[3], settings->ButtonResponsiveness); | |
| 470 setButtonResponsiveness(settings->ButtonResponsiveness); | |
|
728
5143e927219f
Added sensor map to Firmware <=> RTE inferface:
Ideenmodellierer
parents:
716
diff
changeset
|
471 DataEX_setExtInterface_Cmd(EXT_INTERFACE_COPY_SENSORMAP); |
| 38 | 472 } |
| 473 } | |
| 474 | |
| 475 | |
| 476 void DataEX_copy_to_deco(void) | |
| 477 { | |
| 478 if(decoLock == DECO_CALC_running) | |
| 479 return; | |
| 480 | |
| 481 if(decoLock == DECO_CALC_init_as_is_start_of_dive) | |
| 482 { | |
|
288
ba229a012ac7
cleanup: no useless checks for simulator state
Jan Mulder <jlmulder@xs4all.nl>
parents:
278
diff
changeset
|
483 vpm_init(&stateUsedWrite->vpm, stateUsedWrite->diveSettings.vpm_conservatism, 0, 0); |
| 38 | 484 buehlmann_init(); |
| 485 timer_init(); | |
|
288
ba229a012ac7
cleanup: no useless checks for simulator state
Jan Mulder <jlmulder@xs4all.nl>
parents:
278
diff
changeset
|
486 resetEvents(stateUsedWrite); |
|
ba229a012ac7
cleanup: no useless checks for simulator state
Jan Mulder <jlmulder@xs4all.nl>
parents:
278
diff
changeset
|
487 stateUsedWrite->diveSettings.internal__pressure_first_stop_ambient_bar_as_upper_limit_for_gf_low_otherwise_zero = 0; |
| 38 | 488 } |
| 489 | |
| 490 if(decoLock == DECO_CALC_FINSHED_Buehlmann) | |
| 491 { | |
| 492 | |
| 493 } | |
| 494 switch(decoLock) | |
| 495 { | |
| 496 | |
| 497 //Deco_calculation finished | |
| 498 case DECO_CALC_FINSHED_vpm: | |
|
288
ba229a012ac7
cleanup: no useless checks for simulator state
Jan Mulder <jlmulder@xs4all.nl>
parents:
278
diff
changeset
|
499 memcpy(&stateUsedWrite->decolistVPM,&stateDeco.decolistVPM,sizeof(SDecoinfo)); |
|
ba229a012ac7
cleanup: no useless checks for simulator state
Jan Mulder <jlmulder@xs4all.nl>
parents:
278
diff
changeset
|
500 stateUsedWrite->decolistVPM.tickstamp = HAL_GetTick(); |
|
ba229a012ac7
cleanup: no useless checks for simulator state
Jan Mulder <jlmulder@xs4all.nl>
parents:
278
diff
changeset
|
501 stateUsedWrite->vpm.deco_zone_reached = stateDeco.vpm.deco_zone_reached; |
| 38 | 502 for(int i = 0; i< 16; i++) |
| 503 { | |
|
288
ba229a012ac7
cleanup: no useless checks for simulator state
Jan Mulder <jlmulder@xs4all.nl>
parents:
278
diff
changeset
|
504 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
|
505 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
|
506 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
|
507 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
|
508 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
|
509 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
|
510 stateUsedWrite->vpm.max_actual_gradient[i] = stateDeco.vpm.max_actual_gradient[i]; |
| 38 | 511 } |
| 512 break; | |
| 513 case DECO_CALC_FINSHED_Buehlmann: | |
|
288
ba229a012ac7
cleanup: no useless checks for simulator state
Jan Mulder <jlmulder@xs4all.nl>
parents:
278
diff
changeset
|
514 memcpy(&stateUsedWrite->decolistBuehlmann,&stateDeco.decolistBuehlmann,sizeof(SDecoinfo)); |
|
ba229a012ac7
cleanup: no useless checks for simulator state
Jan Mulder <jlmulder@xs4all.nl>
parents:
278
diff
changeset
|
515 stateUsedWrite->decolistBuehlmann.tickstamp = HAL_GetTick(); |
| 38 | 516 //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
|
517 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 | 518 break; |
| 519 case DECO_CALC_FINSHED_FutureBuehlmann: | |
|
288
ba229a012ac7
cleanup: no useless checks for simulator state
Jan Mulder <jlmulder@xs4all.nl>
parents:
278
diff
changeset
|
520 memcpy(&stateUsedWrite->decolistFutureBuehlmann,&stateDeco.decolistFutureBuehlmann,sizeof(SDecoinfo)); |
|
ba229a012ac7
cleanup: no useless checks for simulator state
Jan Mulder <jlmulder@xs4all.nl>
parents:
278
diff
changeset
|
521 stateUsedWrite->decolistFutureBuehlmann.tickstamp = HAL_GetTick(); |
| 38 | 522 break; |
| 523 case DECO_CALC_FINSHED_Futurevpm: | |
|
288
ba229a012ac7
cleanup: no useless checks for simulator state
Jan Mulder <jlmulder@xs4all.nl>
parents:
278
diff
changeset
|
524 memcpy(&stateUsedWrite->decolistFutureVPM,&stateDeco.decolistFutureVPM,sizeof(SDecoinfo)); |
|
ba229a012ac7
cleanup: no useless checks for simulator state
Jan Mulder <jlmulder@xs4all.nl>
parents:
278
diff
changeset
|
525 stateUsedWrite->decolistFutureVPM.tickstamp = HAL_GetTick(); |
| 38 | 526 break; |
| 527 } | |
| 528 | |
| 529 //Copy Inputdata from stateReal to stateDeco | |
|
288
ba229a012ac7
cleanup: no useless checks for simulator state
Jan Mulder <jlmulder@xs4all.nl>
parents:
278
diff
changeset
|
530 memcpy(&stateDeco.lifeData,&stateUsedWrite->lifeData,sizeof(SLifeData)); |
|
ba229a012ac7
cleanup: no useless checks for simulator state
Jan Mulder <jlmulder@xs4all.nl>
parents:
278
diff
changeset
|
531 memcpy(&stateDeco.diveSettings,&stateUsedWrite->diveSettings,sizeof(SDiveSettings)); |
| 38 | 532 |
|
288
ba229a012ac7
cleanup: no useless checks for simulator state
Jan Mulder <jlmulder@xs4all.nl>
parents:
278
diff
changeset
|
533 stateDeco.vpm.deco_zone_reached = stateUsedWrite->vpm.deco_zone_reached; |
| 38 | 534 // memcpy(&stateDeco.vpm,&pStateUsed->vpm,sizeof(SVpm)); |
| 535 for(int i = 0; i< 16; i++) | |
| 536 { | |
|
288
ba229a012ac7
cleanup: no useless checks for simulator state
Jan Mulder <jlmulder@xs4all.nl>
parents:
278
diff
changeset
|
537 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
|
538 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
|
539 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
|
540 stateDeco.vpm.adjusted_critical_radius_n2[i] = stateUsedWrite->vpm.adjusted_critical_radius_n2[i]; |
| 38 | 541 } |
| 542 decoLock = DECO_CALC_ready; | |
| 543 } | |
| 544 | |
| 545 | |
|
198
878dc9e0dbc5
cleanup: another cleanup session (data_exchange_main.c)
Jan Mulder <jlmulder@xs4all.nl>
parents:
197
diff
changeset
|
546 static void DataEX_helper_copy_deviceData(SDeviceLine *lineWrite, const SDeviceLine *lineRead) |
| 38 | 547 { |
| 548 lineWrite->date_rtc_dr = lineRead->date_rtc_dr; | |
| 549 lineWrite->time_rtc_tr = lineRead->time_rtc_tr; | |
| 550 lineWrite->value_int32 = lineRead->value_int32; | |
| 551 } | |
| 552 | |
|
198
878dc9e0dbc5
cleanup: another cleanup session (data_exchange_main.c)
Jan Mulder <jlmulder@xs4all.nl>
parents:
197
diff
changeset
|
553 static void DataEX_helper_SetTime(RTC_TimeTypeDef inStimestructure, uint32_t *outTimetmpreg) |
| 38 | 554 { |
| 555 inStimestructure.TimeFormat = RTC_HOURFORMAT_24; | |
| 556 | |
| 557 *outTimetmpreg = (uint32_t)(((uint32_t)RTC_ByteToBcd2(inStimestructure.Hours) << 16U) | \ | |
| 558 ((uint32_t)RTC_ByteToBcd2(inStimestructure.Minutes) << 8U) | \ | |
| 559 ((uint32_t)RTC_ByteToBcd2(inStimestructure.Seconds)) | \ | |
| 560 (((uint32_t)inStimestructure.TimeFormat) << 16U)); | |
| 561 } | |
| 562 | |
| 563 | |
|
198
878dc9e0dbc5
cleanup: another cleanup session (data_exchange_main.c)
Jan Mulder <jlmulder@xs4all.nl>
parents:
197
diff
changeset
|
564 static void DataEX_helper_SetDate(RTC_DateTypeDef inSdatestructure, uint32_t *outDatetmpreg) |
| 38 | 565 { |
| 566 *outDatetmpreg = (((uint32_t)RTC_ByteToBcd2(inSdatestructure.Year) << 16U) | \ | |
| 567 ((uint32_t)RTC_ByteToBcd2(inSdatestructure.Month) << 8U) | \ | |
| 568 ((uint32_t)RTC_ByteToBcd2(inSdatestructure.Date)) | \ | |
| 569 ((uint32_t)inSdatestructure.WeekDay << 13U)); | |
| 570 } | |
| 571 | |
| 572 | |
|
198
878dc9e0dbc5
cleanup: another cleanup session (data_exchange_main.c)
Jan Mulder <jlmulder@xs4all.nl>
parents:
197
diff
changeset
|
573 static void DataEX_helper_set_Unknown_Date_deviceData(SDeviceLine *lineWrite) |
| 38 | 574 { |
| 575 RTC_DateTypeDef sdatestructure; | |
| 576 RTC_TimeTypeDef stimestructure; | |
| 577 | |
|
406
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
578 stimestructure.Hours = UNKNOWN_TIME_HOURS; |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
579 stimestructure.Minutes = UNKNOWN_TIME_MINUTES; |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
580 stimestructure.Seconds = UNKNOWN_TIME_SECOND; |
| 38 | 581 |
|
406
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
582 sdatestructure.Date = UNKNOWN_DATE_DAY; |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
583 sdatestructure.Month = UNKNOWN_DATE_MONTH; |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
584 sdatestructure.Year = UNKNOWN_DATE_YEAR; |
| 38 | 585 setWeekday(&sdatestructure); |
| 586 | |
| 587 DataEX_helper_SetTime(stimestructure, &lineWrite->time_rtc_tr); | |
| 588 DataEX_helper_SetDate(sdatestructure, &lineWrite->date_rtc_dr); | |
| 589 } | |
| 590 | |
| 591 | |
|
198
878dc9e0dbc5
cleanup: another cleanup session (data_exchange_main.c)
Jan Mulder <jlmulder@xs4all.nl>
parents:
197
diff
changeset
|
592 static uint8_t DataEX_helper_Check_And_Correct_Date_deviceData(SDeviceLine *lineWrite) |
| 38 | 593 { |
|
406
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
594 uint8_t retval = 0; |
| 38 | 595 RTC_DateTypeDef sdatestructure; |
| 596 RTC_TimeTypeDef stimestructure; | |
| 597 | |
| 598 // from lineWrite to structure | |
| 599 translateDate(lineWrite->date_rtc_dr, &sdatestructure); | |
| 600 translateTime(lineWrite->time_rtc_tr, &stimestructure); | |
|
406
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
601 |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
602 /* Check if date is out of range */ |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
603 if(!( (sdatestructure.Year >= 15) |
| 38 | 604 && (sdatestructure.Year <= 30) |
|
406
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
605 && (sdatestructure.Month <= 12))) |
|
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 DataEX_helper_set_Unknown_Date_deviceData(lineWrite); |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
608 retval = 1; |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
609 } |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
610 return retval; |
| 38 | 611 } |
| 612 | |
| 613 | |
|
406
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
614 static uint8_t DataEX_helper_Check_And_Correct_Value_deviceData(SDeviceLine *lineWrite, int32_t from, int32_t to, uint8_t defaulttofrom) |
| 38 | 615 { |
|
406
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
616 uint8_t retval = 0; |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
617 RTC_DateTypeDef sdatestructure; |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
618 |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
619 /* Is value out of valid range? */ |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
620 if(!(lineWrite->value_int32 >= from && lineWrite->value_int32 <= to)) |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
621 { |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
622 if(defaulttofrom) |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
623 { |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
624 lineWrite->value_int32 = from; |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
625 } |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
626 else |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
627 { |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
628 lineWrite->value_int32 = to; |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
629 } |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
630 DataEX_helper_set_Unknown_Date_deviceData(lineWrite); |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
631 } |
| 38 | 632 |
|
406
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
633 /* 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
|
634 if(((lineWrite->value_int32 == to) && defaulttofrom ) |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
635 || ((lineWrite->value_int32 == from) && !defaulttofrom )) |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
636 { |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
637 translateDate(lineWrite->date_rtc_dr, &sdatestructure); |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
638 if(sdatestructure.Year == UNKNOWN_DATE_YEAR) |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
639 { |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
640 if(defaulttofrom) |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
641 { |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
642 lineWrite->value_int32 = from; |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
643 } |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
644 else |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
645 { |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
646 lineWrite->value_int32 = to; |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
647 } |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
648 } |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
649 } |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
650 return retval; |
| 38 | 651 } |
| 652 | |
| 653 | |
|
198
878dc9e0dbc5
cleanup: another cleanup session (data_exchange_main.c)
Jan Mulder <jlmulder@xs4all.nl>
parents:
197
diff
changeset
|
654 static void DataEX_check_DeviceData(void) |
| 38 | 655 { |
| 656 SDevice *DeviceData = stateDeviceGetPointerWrite(); | |
| 657 | |
| 658 DataEX_helper_Check_And_Correct_Date_deviceData(&DeviceData->batteryChargeCompleteCycles); | |
| 659 DataEX_helper_Check_And_Correct_Date_deviceData(&DeviceData->batteryChargeCycles); | |
| 660 DataEX_helper_Check_And_Correct_Date_deviceData(&DeviceData->depthMaximum); | |
| 661 DataEX_helper_Check_And_Correct_Date_deviceData(&DeviceData->diveCycles); | |
| 662 DataEX_helper_Check_And_Correct_Date_deviceData(&DeviceData->hoursOfOperation); | |
| 663 DataEX_helper_Check_And_Correct_Date_deviceData(&DeviceData->temperatureMaximum); | |
| 664 DataEX_helper_Check_And_Correct_Date_deviceData(&DeviceData->temperatureMinimum); | |
| 665 DataEX_helper_Check_And_Correct_Date_deviceData(&DeviceData->voltageMinimum); | |
| 666 | |
|
406
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
667 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
|
668 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
|
669 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
|
670 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
|
671 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
|
672 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
|
673 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
|
674 DataEX_helper_Check_And_Correct_Value_deviceData(&DeviceData->voltageMinimum, 2*1000, 6*1000,0); |
| 38 | 675 } |
| 676 | |
| 677 | |
|
198
878dc9e0dbc5
cleanup: another cleanup session (data_exchange_main.c)
Jan Mulder <jlmulder@xs4all.nl>
parents:
197
diff
changeset
|
678 static void DataEX_merge_DeviceData_and_store(void) |
| 38 | 679 { |
| 680 uint16_t dataLengthRead; | |
| 681 SDevice DeviceDataFlash; | |
| 682 SDevice *DeviceData = stateDeviceGetPointerWrite(); | |
| 683 | |
| 684 dataLengthRead = ext_flash_read_devicedata((uint8_t *)&DeviceDataFlash,sizeof(SDevice)); | |
| 685 | |
| 686 if(dataLengthRead == 0) | |
| 687 { | |
|
421
3f7d80f37bfc
Enable sequentionel writing of device data:
ideenmodellierer
parents:
407
diff
changeset
|
688 ext_flash_write_devicedata(false); |
| 38 | 689 return; |
| 690 } | |
| 691 | |
| 692 /* max values */ | |
| 693 if(DeviceData->batteryChargeCompleteCycles.value_int32 < DeviceDataFlash.batteryChargeCompleteCycles.value_int32) | |
| 694 { | |
| 695 DataEX_helper_copy_deviceData(&DeviceData->batteryChargeCompleteCycles, &DeviceDataFlash.batteryChargeCompleteCycles); | |
| 696 } | |
| 697 if(DeviceData->batteryChargeCycles.value_int32 < DeviceDataFlash.batteryChargeCycles.value_int32) | |
| 698 { | |
| 699 DataEX_helper_copy_deviceData(&DeviceData->batteryChargeCycles, &DeviceDataFlash.batteryChargeCycles); | |
| 700 } | |
| 701 if(DeviceData->temperatureMaximum.value_int32 < DeviceDataFlash.temperatureMaximum.value_int32) | |
| 702 { | |
| 703 DataEX_helper_copy_deviceData(&DeviceData->temperatureMaximum, &DeviceDataFlash.temperatureMaximum); | |
| 704 } | |
| 705 if(DeviceData->depthMaximum.value_int32 < DeviceDataFlash.depthMaximum.value_int32) | |
| 706 { | |
| 707 DataEX_helper_copy_deviceData(&DeviceData->depthMaximum, &DeviceDataFlash.depthMaximum); | |
| 708 } | |
| 709 if(DeviceData->diveCycles.value_int32 < DeviceDataFlash.diveCycles.value_int32) | |
| 710 { | |
| 711 DataEX_helper_copy_deviceData(&DeviceData->diveCycles, &DeviceDataFlash.diveCycles); | |
| 712 } | |
|
406
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
713 if(DeviceData->hoursOfOperation.value_int32 < DeviceDataFlash.hoursOfOperation.value_int32) |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
714 { |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
715 DataEX_helper_copy_deviceData(&DeviceData->hoursOfOperation, &DeviceDataFlash.hoursOfOperation); |
|
439874690f85
Bugfix Min max values for device data checks:
ideenmodellierer
parents:
342
diff
changeset
|
716 } |
| 38 | 717 |
|
407
b11e50415982
Bugfix parallel call of external flash functions:
ideenmodellierer
parents:
406
diff
changeset
|
718 |
| 38 | 719 /* min values */ |
| 720 if(DeviceData->temperatureMinimum.value_int32 > DeviceDataFlash.temperatureMinimum.value_int32) | |
| 721 { | |
| 722 DataEX_helper_copy_deviceData(&DeviceData->temperatureMinimum, &DeviceDataFlash.temperatureMinimum); | |
| 723 } | |
| 724 if(DeviceData->voltageMinimum.value_int32 > DeviceDataFlash.voltageMinimum.value_int32) | |
| 725 { | |
| 726 DataEX_helper_copy_deviceData(&DeviceData->voltageMinimum, &DeviceDataFlash.voltageMinimum); | |
| 727 } | |
| 728 | |
| 729 DataEX_check_DeviceData (); | |
|
421
3f7d80f37bfc
Enable sequentionel writing of device data:
ideenmodellierer
parents:
407
diff
changeset
|
730 ext_flash_write_devicedata(false); |
| 38 | 731 } |
| 732 | |
| 733 | |
|
198
878dc9e0dbc5
cleanup: another cleanup session (data_exchange_main.c)
Jan Mulder <jlmulder@xs4all.nl>
parents:
197
diff
changeset
|
734 static void DataEX_copy_to_DeviceData(void) |
| 38 | 735 { |
| 736 SDataExchangeSlaveToMasterDeviceData * dataInDevice = (SDataExchangeSlaveToMasterDeviceData *)&dataIn; | |
| 737 SDevice * pDeviceState = stateDeviceGetPointerWrite(); | |
| 738 | |
| 739 memcpy(pDeviceState, &dataInDevice->DeviceData[dataInDevice->boolDeviceData], sizeof(SDevice)); | |
| 559 | 740 memcpy(&hw_Info, &dataInDevice->hw_Info, sizeof(dataInDevice->hw_Info)); |
| 741 | |
|
407
b11e50415982
Bugfix parallel call of external flash functions:
ideenmodellierer
parents:
406
diff
changeset
|
742 DeviceDataUpdated = 1; /* indicate new data to be written to flash by background task (at last op hour count will be updated) */ |
| 38 | 743 } |
| 744 | |
| 745 | |
|
198
878dc9e0dbc5
cleanup: another cleanup session (data_exchange_main.c)
Jan Mulder <jlmulder@xs4all.nl>
parents:
197
diff
changeset
|
746 static void DataEX_copy_to_VpmRepetitiveData(void) |
| 38 | 747 { |
| 748 SDataExchangeSlaveToMasterDeviceData * dataInDevice = (SDataExchangeSlaveToMasterDeviceData *)&dataIn; | |
| 749 SVpmRepetitiveData * pVpmState = stateVpmRepetitiveDataGetPointerWrite(); | |
| 750 | |
| 751 if(dataInDevice->boolVpmRepetitiveDataValid) | |
| 752 { | |
| 753 memcpy(pVpmState, &dataInDevice->VpmRepetitiveData, sizeof(SVpmRepetitiveData)); | |
| 754 pVpmState->is_data_from_RTE_CPU = 1; | |
| 755 } | |
| 756 } | |
| 757 | |
| 758 | |
| 759 void DataEX_control_connection_while_asking_for_sleep(void) | |
| 760 { | |
| 761 if(!DataEX_check_header_and_footer_ok()) | |
| 762 { | |
| 763 if(DataEX_check_header_and_footer_devicedata()) | |
| 764 { | |
| 765 data_old__lost_connection_to_slave_counter_retry = 0; | |
| 766 data_old__lost_connection_to_slave_counter_temp = 0; | |
| 767 stateRealGetPointerWrite()->data_old__lost_connection_to_slave = 0; | |
| 208 | 768 dataOut.header.checkCode[SPI_HEADER_INDEX_RX_STATE] = SPI_RX_STATE_OK; |
| 38 | 769 } |
| 770 else | |
| 771 { | |
| 772 stateRealGetPointerWrite()->data_old__lost_connection_to_slave = 1; | |
| 773 data_old__lost_connection_to_slave_counter_temp += 1; | |
| 774 data_old__lost_connection_to_slave_counter_total += 1; | |
| 775 } | |
| 776 } | |
| 777 } | |
| 778 | |
|
173
05c770dc2911
Bugfix: make max depth move with current depth (part 1)
Jan Mulder <jlmulder@xs4all.nl>
parents:
156
diff
changeset
|
779 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
|
780 { |
|
342
ea3fda8eb93e
Removed averaging of pressure and temperatur values
ideenmodellierer
parents:
309
diff
changeset
|
781 float ambient = 0; |
|
ea3fda8eb93e
Removed averaging of pressure and temperatur values
ideenmodellierer
parents:
309
diff
changeset
|
782 float surface = 0; |
|
ea3fda8eb93e
Removed averaging of pressure and temperatur values
ideenmodellierer
parents:
309
diff
changeset
|
783 float depth = 0; |
|
ea3fda8eb93e
Removed averaging of pressure and temperatur values
ideenmodellierer
parents:
309
diff
changeset
|
784 float density = 0; |
|
173
05c770dc2911
Bugfix: make max depth move with current depth (part 1)
Jan Mulder <jlmulder@xs4all.nl>
parents:
156
diff
changeset
|
785 |
|
342
ea3fda8eb93e
Removed averaging of pressure and temperatur values
ideenmodellierer
parents:
309
diff
changeset
|
786 ambient = d->data[d->boolPressureData].pressure_mbar / 1000.0f; |
|
ea3fda8eb93e
Removed averaging of pressure and temperatur values
ideenmodellierer
parents:
309
diff
changeset
|
787 surface = d->data[d->boolPressureData].surface_mbar / 1000.0f; |
|
ea3fda8eb93e
Removed averaging of pressure and temperatur values
ideenmodellierer
parents:
309
diff
changeset
|
788 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
|
789 |
|
497
5757edda56b7
Added worst case plausibility check (disabled by compile switch)
Ideenmodellierer
parents:
451
diff
changeset
|
790 #ifdef TESTBENCH |
|
5757edda56b7
Added worst case plausibility check (disabled by compile switch)
Ideenmodellierer
parents:
451
diff
changeset
|
791 /* do plausibility check (typically only needed at debug hardware) */ |
|
5757edda56b7
Added worst case plausibility check (disabled by compile switch)
Ideenmodellierer
parents:
451
diff
changeset
|
792 if(ambient < 0) |
|
5757edda56b7
Added worst case plausibility check (disabled by compile switch)
Ideenmodellierer
parents:
451
diff
changeset
|
793 { |
|
5757edda56b7
Added worst case plausibility check (disabled by compile switch)
Ideenmodellierer
parents:
451
diff
changeset
|
794 ambient = 1.0; |
|
5757edda56b7
Added worst case plausibility check (disabled by compile switch)
Ideenmodellierer
parents:
451
diff
changeset
|
795 } |
|
5757edda56b7
Added worst case plausibility check (disabled by compile switch)
Ideenmodellierer
parents:
451
diff
changeset
|
796 if(surface < 0) |
|
5757edda56b7
Added worst case plausibility check (disabled by compile switch)
Ideenmodellierer
parents:
451
diff
changeset
|
797 { |
|
5757edda56b7
Added worst case plausibility check (disabled by compile switch)
Ideenmodellierer
parents:
451
diff
changeset
|
798 surface = 1.0; |
|
5757edda56b7
Added worst case plausibility check (disabled by compile switch)
Ideenmodellierer
parents:
451
diff
changeset
|
799 } |
|
5757edda56b7
Added worst case plausibility check (disabled by compile switch)
Ideenmodellierer
parents:
451
diff
changeset
|
800 #endif |
|
342
ea3fda8eb93e
Removed averaging of pressure and temperatur values
ideenmodellierer
parents:
309
diff
changeset
|
801 ds->lifeData.pressure_ambient_bar = ambient; |
|
ea3fda8eb93e
Removed averaging of pressure and temperatur values
ideenmodellierer
parents:
309
diff
changeset
|
802 ds->lifeData.pressure_surface_bar = surface; |
|
ea3fda8eb93e
Removed averaging of pressure and temperatur values
ideenmodellierer
parents:
309
diff
changeset
|
803 depth = (ambient - surface) / (0.09807f * density); |
|
ea3fda8eb93e
Removed averaging of pressure and temperatur values
ideenmodellierer
parents:
309
diff
changeset
|
804 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
|
805 |
|
342
ea3fda8eb93e
Removed averaging of pressure and temperatur values
ideenmodellierer
parents:
309
diff
changeset
|
806 return depth; |
|
173
05c770dc2911
Bugfix: make max depth move with current depth (part 1)
Jan Mulder <jlmulder@xs4all.nl>
parents:
156
diff
changeset
|
807 } |
| 38 | 808 |
|
189
8b8074080d7b
Bugfix: average temperature on arrival from RTE instead of display time
Jan Mulder <jlmulder@xs4all.nl>
parents:
173
diff
changeset
|
809 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
|
810 { |
|
342
ea3fda8eb93e
Removed averaging of pressure and temperatur values
ideenmodellierer
parents:
309
diff
changeset
|
811 float temp = 0; |
|
ea3fda8eb93e
Removed averaging of pressure and temperatur values
ideenmodellierer
parents:
309
diff
changeset
|
812 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
|
813 |
|
497
5757edda56b7
Added worst case plausibility check (disabled by compile switch)
Ideenmodellierer
parents:
451
diff
changeset
|
814 #ifdef TESTBENCH |
|
5757edda56b7
Added worst case plausibility check (disabled by compile switch)
Ideenmodellierer
parents:
451
diff
changeset
|
815 /* do plausibility check (typically only needed at debug hardware */ |
|
5757edda56b7
Added worst case plausibility check (disabled by compile switch)
Ideenmodellierer
parents:
451
diff
changeset
|
816 if(temp < -40.0) |
|
5757edda56b7
Added worst case plausibility check (disabled by compile switch)
Ideenmodellierer
parents:
451
diff
changeset
|
817 { |
|
5757edda56b7
Added worst case plausibility check (disabled by compile switch)
Ideenmodellierer
parents:
451
diff
changeset
|
818 temp = 20.0; |
|
5757edda56b7
Added worst case plausibility check (disabled by compile switch)
Ideenmodellierer
parents:
451
diff
changeset
|
819 } |
|
5757edda56b7
Added worst case plausibility check (disabled by compile switch)
Ideenmodellierer
parents:
451
diff
changeset
|
820 #endif |
|
342
ea3fda8eb93e
Removed averaging of pressure and temperatur values
ideenmodellierer
parents:
309
diff
changeset
|
821 return temp; |
|
189
8b8074080d7b
Bugfix: average temperature on arrival from RTE instead of display time
Jan Mulder <jlmulder@xs4all.nl>
parents:
173
diff
changeset
|
822 } |
|
8b8074080d7b
Bugfix: average temperature on arrival from RTE instead of display time
Jan Mulder <jlmulder@xs4all.nl>
parents:
173
diff
changeset
|
823 |
| 38 | 824 void DataEX_copy_to_LifeData(_Bool *modeChangeFlag) |
| 825 { | |
| 662 | 826 static uint16_t getDeviceDataAfterStartOfMainCPU = 20; |
| 827 | |
|
173
05c770dc2911
Bugfix: make max depth move with current depth (part 1)
Jan Mulder <jlmulder@xs4all.nl>
parents:
156
diff
changeset
|
828 SDiveState *pStateReal = stateRealGetPointerWrite(); |
|
577
9bb9a52d6ae5
Handle o2 voltage values < 0.5mV as invalid:
Ideenmodellierer
parents:
559
diff
changeset
|
829 uint8_t idx; |
| 662 | 830 float meter = 0; |
| 831 SSettings *pSettings; | |
| 832 | |
| 833 | |
| 38 | 834 |
| 835 // wireless - �ltere daten aufr�umen | |
|
446
f1257a32f2d4
Introduced configuration header for variant managment:
ideenmodellierer
parents:
436
diff
changeset
|
836 #if 0 |
|
51
8f8ea3a32e82
Resolved warnings pointing to possible invalid memory access
Ideenmodellierer
parents:
38
diff
changeset
|
837 for(int i=0;i<(2*NUM_GASES+1);i++) |
| 38 | 838 { |
| 839 if(pStateReal->lifeData.bottle_bar[i]) | |
| 840 { | |
| 841 if((pStateReal->lifeData.bottle_bar_age_MilliSeconds[i] == 0) || (pStateReal->lifeData.bottle_bar_age_MilliSeconds[i] > 60000)) | |
| 842 { | |
| 843 pStateReal->lifeData.bottle_bar_age_MilliSeconds[i] = 0; | |
| 844 pStateReal->lifeData.bottle_bar[i] = 0; | |
| 845 } | |
| 846 else | |
| 847 pStateReal->lifeData.bottle_bar_age_MilliSeconds[i] += 100; | |
| 848 } | |
| 849 } | |
|
446
f1257a32f2d4
Introduced configuration header for variant managment:
ideenmodellierer
parents:
436
diff
changeset
|
850 #else |
|
451
c2e02b87774f
Allocate received bar value to active gas (was static allocated to gas[1])
ideenmodellierer
parents:
446
diff
changeset
|
851 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
|
852 { |
|
451
c2e02b87774f
Allocate received bar value to active gas (was static allocated to gas[1])
ideenmodellierer
parents:
446
diff
changeset
|
853 stateRealGetPointerWrite()->lifeData.bottle_bar_age_MilliSeconds[stateRealGetPointer()->lifeData.actualGas.GasIdInSettings]++; |
|
446
f1257a32f2d4
Introduced configuration header for variant managment:
ideenmodellierer
parents:
436
diff
changeset
|
854 } |
|
f1257a32f2d4
Introduced configuration header for variant managment:
ideenmodellierer
parents:
436
diff
changeset
|
855 #endif |
| 38 | 856 if(!DataEX_check_header_and_footer_ok()) |
| 857 { | |
| 858 if(DataEX_check_header_and_footer_devicedata()) | |
| 859 { | |
| 860 DataEX_copy_to_DeviceData(); | |
| 861 DataEX_copy_to_VpmRepetitiveData(); | |
| 862 data_old__lost_connection_to_slave_counter_temp = 0; | |
| 863 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
|
864 /* 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
|
865 /* pStateReal->data_old__lost_connection_to_slave = 0; */ |
| 208 | 866 dataOut.header.checkCode[SPI_HEADER_INDEX_RX_STATE] = SPI_RX_STATE_OK; |
| 38 | 867 } |
| 868 else | |
| 869 { | |
| 870 pStateReal->data_old__lost_connection_to_slave = 1; | |
| 871 data_old__lost_connection_to_slave_counter_temp += 1; | |
| 872 data_old__lost_connection_to_slave_counter_total += 1; | |
| 873 } | |
| 874 return; | |
| 875 } | |
| 141 | 876 else /* RX data OK */ |
| 877 { | |
| 878 data_old__lost_connection_to_slave_counter_temp = 0; | |
| 879 data_old__lost_connection_to_slave_counter_retry = 0; | |
| 880 pStateReal->data_old__lost_connection_to_slave = 0; | |
| 208 | 881 dataOut.header.checkCode[SPI_HEADER_INDEX_RX_STATE] = SPI_RX_STATE_OK; |
| 141 | 882 } |
| 38 | 883 |
| 884 if(getDeviceDataAfterStartOfMainCPU) | |
| 885 { | |
| 886 getDeviceDataAfterStartOfMainCPU--; | |
| 887 if(getDeviceDataAfterStartOfMainCPU == 0) | |
| 888 { | |
| 889 dataOut.getDeviceDataNow = 1; | |
| 141 | 890 getDeviceDataAfterStartOfMainCPU = 10*60*10; /* * 100ms = 60 second => update device data every 10 minutes */ |
| 38 | 891 } |
| 892 } | |
| 893 | |
| 662 | 894 if((requestNecessary.uw != 0) && (dataIn.confirmRequest.uw != 0)) |
| 38 | 895 { |
| 896 if(((dataIn.confirmRequest.uw) & CRBUTTON) != 0) | |
| 897 { | |
| 898 requestNecessary.ub.button = 0; | |
| 899 } | |
| 662 | 900 if(((dataIn.confirmRequest.uw) & CRCLEARDECO) != 0) |
| 901 { | |
| 902 requestNecessary.ub.clearDeco = 0; | |
| 903 } | |
| 904 if(((dataIn.confirmRequest.uw) & CRDATE) != 0) | |
| 905 { | |
| 906 requestNecessary.ub.date = 0; | |
| 907 } | |
| 908 if(((dataIn.confirmRequest.uw) & CRTIME) != 0) | |
| 909 { | |
| 910 requestNecessary.ub.time = 0; | |
| 911 } | |
| 912 if(((dataIn.confirmRequest.uw) & CRCOMPASS) != 0) | |
| 913 { | |
| 914 requestNecessary.ub.compass = 0; | |
| 915 } | |
| 916 if(((dataIn.confirmRequest.uw) & CRDEVICEDATA) != 0) | |
| 917 { | |
| 918 requestNecessary.ub.devicedata = 0; | |
| 919 } | |
| 920 if(((dataIn.confirmRequest.uw) & CRBATTERY) != 0) | |
| 921 { | |
| 922 requestNecessary.ub.batterygauge = 0; | |
| 923 } | |
| 924 if(((dataIn.confirmRequest.uw) & CRACCIDENT) != 0) | |
| 925 { | |
| 926 requestNecessary.ub.accident = 0; | |
| 927 } | |
| 38 | 928 |
| 662 | 929 if(requestNecessary.ub.button == 1) /* send button values to RTE */ |
| 38 | 930 { |
| 931 setButtonResponsiveness(settingsGetPointer()->ButtonResponsiveness); | |
| 932 } | |
| 933 } | |
| 149 | 934 |
| 38 | 935 /* uint8_t IAmStolenPleaseKillMe; |
| 936 */ | |
|
51
8f8ea3a32e82
Resolved warnings pointing to possible invalid memory access
Ideenmodellierer
parents:
38
diff
changeset
|
937 pSettings = settingsGetPointer(); |
|
8f8ea3a32e82
Resolved warnings pointing to possible invalid memory access
Ideenmodellierer
parents:
38
diff
changeset
|
938 |
|
8f8ea3a32e82
Resolved warnings pointing to possible invalid memory access
Ideenmodellierer
parents:
38
diff
changeset
|
939 if(pSettings->IAmStolenPleaseKillMe > 3) |
| 38 | 940 { |
| 941 pSettings->salinity = 0; | |
| 942 dataIn.data[dataIn.boolPressureData].surface_mbar = 999; | |
| 943 dataIn.data[dataIn.boolPressureData].pressure_mbar = 98971; | |
| 944 dataIn.mode = MODE_DIVE; | |
| 945 } | |
| 946 | |
|
556
eb2060caca7d
Switch source of o2 sensor data depending on availability of external ADC:
Ideenmodellierer
parents:
539
diff
changeset
|
947 |
|
eb2060caca7d
Switch source of o2 sensor data depending on availability of external ADC:
Ideenmodellierer
parents:
539
diff
changeset
|
948 /* internal sensor: HUD data */ |
| 559 | 949 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
|
950 { |
|
716
74cfd91199bd
Added customizable data area for specific sensor data:
Ideenmodellierer
parents:
702
diff
changeset
|
951 pStateReal->lifeData.extIf_sensor_Id = 0; |
|
556
eb2060caca7d
Switch source of o2 sensor data depending on availability of external ADC:
Ideenmodellierer
parents:
539
diff
changeset
|
952 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
|
953 { |
|
eb2060caca7d
Switch source of o2 sensor data depending on availability of external ADC:
Ideenmodellierer
parents:
539
diff
changeset
|
954 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
|
955 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
|
956 } |
|
eb2060caca7d
Switch source of o2 sensor data depending on availability of external ADC:
Ideenmodellierer
parents:
539
diff
changeset
|
957 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
|
958 } |
|
eb2060caca7d
Switch source of o2 sensor data depending on availability of external ADC:
Ideenmodellierer
parents:
539
diff
changeset
|
959 else /* use data from external ADC */ |
|
eb2060caca7d
Switch source of o2 sensor data depending on availability of external ADC:
Ideenmodellierer
parents:
539
diff
changeset
|
960 { |
|
eb2060caca7d
Switch source of o2 sensor data depending on availability of external ADC:
Ideenmodellierer
parents:
539
diff
changeset
|
961 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
|
962 { |
|
577
9bb9a52d6ae5
Handle o2 voltage values < 0.5mV as invalid:
Ideenmodellierer
parents:
559
diff
changeset
|
963 for(idx = 0; idx < 3; idx++) |
|
9bb9a52d6ae5
Handle o2 voltage values < 0.5mV as invalid:
Ideenmodellierer
parents:
559
diff
changeset
|
964 { |
| 691 | 965 pStateReal->lifeData.sensorVoltage_mV[idx] = dataIn.data[(dataIn.boolADCO2Data && DATA_BUFFER_ADC)].extADC_voltage[idx]; |
|
577
9bb9a52d6ae5
Handle o2 voltage values < 0.5mV as invalid:
Ideenmodellierer
parents:
559
diff
changeset
|
966 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
|
967 { |
|
9bb9a52d6ae5
Handle o2 voltage values < 0.5mV as invalid:
Ideenmodellierer
parents:
559
diff
changeset
|
968 pStateReal->lifeData.sensorVoltage_mV[idx] = 0.0; |
|
9bb9a52d6ae5
Handle o2 voltage values < 0.5mV as invalid:
Ideenmodellierer
parents:
559
diff
changeset
|
969 pStateReal->lifeData.ppO2Sensor_bar[idx] = 0; |
|
9bb9a52d6ae5
Handle o2 voltage values < 0.5mV as invalid:
Ideenmodellierer
parents:
559
diff
changeset
|
970 } |
|
9bb9a52d6ae5
Handle o2 voltage values < 0.5mV as invalid:
Ideenmodellierer
parents:
559
diff
changeset
|
971 else |
|
9bb9a52d6ae5
Handle o2 voltage values < 0.5mV as invalid:
Ideenmodellierer
parents:
559
diff
changeset
|
972 { |
|
728
5143e927219f
Added sensor map to Firmware <=> RTE inferface:
Ideenmodellierer
parents:
716
diff
changeset
|
973 if(dataIn.data[(dataIn.boolADCO2Data && DATA_BUFFER_ADC)].sensor_map[idx] == SENSOR_DIGO2) |
|
702
6d7c812fc173
Added digital o2 sensor to settings and data exchange:
Ideenmodellierer
parents:
691
diff
changeset
|
974 { |
|
6d7c812fc173
Added digital o2 sensor to settings and data exchange:
Ideenmodellierer
parents:
691
diff
changeset
|
975 pStateReal->lifeData.ppO2Sensor_bar[idx] = pStateReal->lifeData.sensorVoltage_mV[idx] / 100.0; |
|
6d7c812fc173
Added digital o2 sensor to settings and data exchange:
Ideenmodellierer
parents:
691
diff
changeset
|
976 } |
|
6d7c812fc173
Added digital o2 sensor to settings and data exchange:
Ideenmodellierer
parents:
691
diff
changeset
|
977 else |
|
6d7c812fc173
Added digital o2 sensor to settings and data exchange:
Ideenmodellierer
parents:
691
diff
changeset
|
978 { |
|
6d7c812fc173
Added digital o2 sensor to settings and data exchange:
Ideenmodellierer
parents:
691
diff
changeset
|
979 pStateReal->lifeData.ppO2Sensor_bar[idx] = pStateReal->lifeData.sensorVoltage_mV[idx] * pSettings->ppo2sensors_calibCoeff[idx]; |
|
6d7c812fc173
Added digital o2 sensor to settings and data exchange:
Ideenmodellierer
parents:
691
diff
changeset
|
980 } |
|
577
9bb9a52d6ae5
Handle o2 voltage values < 0.5mV as invalid:
Ideenmodellierer
parents:
559
diff
changeset
|
981 } |
|
716
74cfd91199bd
Added customizable data area for specific sensor data:
Ideenmodellierer
parents:
702
diff
changeset
|
982 } |
|
556
eb2060caca7d
Switch source of o2 sensor data depending on availability of external ADC:
Ideenmodellierer
parents:
539
diff
changeset
|
983 } |
|
eb2060caca7d
Switch source of o2 sensor data depending on availability of external ADC:
Ideenmodellierer
parents:
539
diff
changeset
|
984 } |
|
eb2060caca7d
Switch source of o2 sensor data depending on availability of external ADC:
Ideenmodellierer
parents:
539
diff
changeset
|
985 |
|
137
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
986 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
|
987 { |
|
734
190e5814b2f5
Removed interface selection from sensor menu:
Ideenmodellierer
parents:
728
diff
changeset
|
988 |
|
190e5814b2f5
Removed interface selection from sensor menu:
Ideenmodellierer
parents:
728
diff
changeset
|
989 pStateReal->lifeData.extIf_sensor_Id = dataIn.data[(dataIn.boolADCO2Data && DATA_BUFFER_ADC)].externalInterface_SensorID; |
|
190e5814b2f5
Removed interface selection from sensor menu:
Ideenmodellierer
parents:
728
diff
changeset
|
990 if(pStateReal->lifeData.extIf_sensor_Id != 0) |
|
190e5814b2f5
Removed interface selection from sensor menu:
Ideenmodellierer
parents:
728
diff
changeset
|
991 { |
|
190e5814b2f5
Removed interface selection from sensor menu:
Ideenmodellierer
parents:
728
diff
changeset
|
992 memcpy(pStateReal->lifeData.extIf_sensor_data, dataIn.data[(dataIn.boolADCO2Data && DATA_BUFFER_ADC)].sensor_data, 32); |
|
190e5814b2f5
Removed interface selection from sensor menu:
Ideenmodellierer
parents:
728
diff
changeset
|
993 } |
|
190e5814b2f5
Removed interface selection from sensor menu:
Ideenmodellierer
parents:
728
diff
changeset
|
994 memcpy(pStateReal->lifeData.extIf_sensor_map, dataIn.data[(dataIn.boolADCO2Data && DATA_BUFFER_ADC)].sensor_map, EXT_INTERFACE_SENSOR_CNT); |
|
190e5814b2f5
Removed interface selection from sensor menu:
Ideenmodellierer
parents:
728
diff
changeset
|
995 |
|
190e5814b2f5
Removed interface selection from sensor menu:
Ideenmodellierer
parents:
728
diff
changeset
|
996 |
|
173
05c770dc2911
Bugfix: make max depth move with current depth (part 1)
Jan Mulder <jlmulder@xs4all.nl>
parents:
156
diff
changeset
|
997 meter = getSampleDepth(&dataIn, pStateReal); |
| 38 | 998 |
|
137
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
999 pStateReal->pressure_uTick_old = pStateReal->pressure_uTick_new; |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1000 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
|
1001 pStateReal->pressure_uTick_local_new = HAL_GetTick(); |
| 38 | 1002 |
|
137
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1003 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
|
1004 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
|
1005 } |
| 38 | 1006 |
| 141 | 1007 if(pStateReal->data_old__lost_connection_to_slave == 0) |
| 38 | 1008 { |
| 141 | 1009 //Start of diveMode? |
| 1010 if(pStateReal->mode != MODE_DIVE && dataIn.mode == MODE_DIVE) | |
| 1011 { | |
| 1012 if(modeChangeFlag) | |
| 1013 { | |
| 1014 *modeChangeFlag = 1; | |
| 1015 } | |
| 1016 if(stateUsed == stateSimGetPointer()) | |
| 38 | 1017 { |
| 1018 simulation_exit(); | |
| 1019 } | |
| 141 | 1020 // new 170508 |
| 38 | 1021 settingsGetPointer()->bluetoothActive = 0; |
| 1022 MX_Bluetooth_PowerOff(); | |
| 1023 //Init dive Mode | |
| 141 | 1024 decoLock = DECO_CALC_init_as_is_start_of_dive; |
| 1025 pStateReal->lifeData.boolResetAverageDepth = 1; | |
| 38 | 1026 } |
| 141 | 1027 |
|
197
c853f5d23bb7
cleanup: fix (harmless) use before assign
Jan Mulder <jlmulder@xs4all.nl>
parents:
189
diff
changeset
|
1028 pStateReal->lifeData.cns = dataIn.data[dataIn.boolToxicData].cns; |
|
c853f5d23bb7
cleanup: fix (harmless) use before assign
Jan Mulder <jlmulder@xs4all.nl>
parents:
189
diff
changeset
|
1029 pStateReal->lifeData.otu = dataIn.data[dataIn.boolToxicData].otu; |
|
c853f5d23bb7
cleanup: fix (harmless) use before assign
Jan Mulder <jlmulder@xs4all.nl>
parents:
189
diff
changeset
|
1030 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
|
1031 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
|
1032 |
| 141 | 1033 //End of diveMode? |
| 1034 if(pStateReal->mode == MODE_DIVE && dataIn.mode != MODE_DIVE) | |
| 1035 { | |
| 1036 if(modeChangeFlag) | |
| 1037 { | |
| 1038 *modeChangeFlag = 1; | |
| 1039 } | |
| 1040 createDiveSettings(); | |
| 38 | 1041 |
| 141 | 1042 if(pStateReal->warnings.cnsHigh) |
| 1043 { | |
| 1044 if(pStateReal->lifeData.cns >= 130) | |
| 1045 dataOut.setAccidentFlag += ACCIDENT_CNSLVL2; | |
| 1046 else if(pStateReal->lifeData.cns >= 100) | |
| 1047 dataOut.setAccidentFlag += ACCIDENT_CNS; | |
| 1048 } | |
| 1049 if(pStateReal->warnings.decoMissed) | |
| 1050 dataOut.setAccidentFlag += ACCIDENT_DECOSTOP; | |
| 1051 } | |
| 1052 pStateReal->mode = dataIn.mode; | |
| 1053 pStateReal->chargeStatus = dataIn.chargeStatus; | |
|
137
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1054 |
|
306
2f43419102c8
bugfix, cleanup: do not clip depth to 0
Jan Mulder <jlmulder@xs4all.nl>
parents:
288
diff
changeset
|
1055 pStateReal->lifeData.depth_meter = meter; |
| 141 | 1056 |
|
189
8b8074080d7b
Bugfix: average temperature on arrival from RTE instead of display time
Jan Mulder <jlmulder@xs4all.nl>
parents:
173
diff
changeset
|
1057 pStateReal->lifeData.temperature_celsius = getTemperature(&dataIn); |
|
137
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1058 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
|
1059 if(pStateReal->mode != MODE_DIVE) |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1060 pStateReal->lifeData.max_depth_meter = 0; |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1061 else |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1062 { |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1063 if(meter > pStateReal->lifeData.max_depth_meter) |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1064 pStateReal->lifeData.max_depth_meter = meter; |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1065 } |
| 38 | 1066 |
| 662 | 1067 if(requestNecessary.ub.clearDeco == 0) /* No "reset deco" is send to RTE ? */ |
| 1068 { | |
| 1069 if(dataIn.accidentFlags & ACCIDENT_DECOSTOP) | |
| 1070 { | |
| 1071 pStateReal->decoMissed_at_the_end_of_dive = 1; | |
| 1072 } | |
| 1073 else | |
| 1074 { | |
| 1075 pStateReal->decoMissed_at_the_end_of_dive = 0; | |
| 1076 } | |
| 1077 if(dataIn.accidentFlags & ACCIDENT_CNS) | |
| 1078 { | |
| 1079 pStateReal->cnsHigh_at_the_end_of_dive = 1; | |
| 1080 } | |
| 1081 else | |
| 1082 { | |
| 1083 pStateReal->cnsHigh_at_the_end_of_dive = 0; | |
| 1084 } | |
| 1085 } | |
|
137
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1086 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
|
1087 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
|
1088 pStateReal->lifeData.counterSecondsShallowDepth = dataIn.data[dataIn.boolTimeData].counterSecondsShallowDepth; |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1089 pStateReal->lifeData.surface_time_seconds = (int32_t)dataIn.data[dataIn.boolTimeData].surfacetime_seconds; |
| 38 | 1090 |
|
137
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1091 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
|
1092 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
|
1093 { |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1094 pStateReal->lifeData.compass_heading -= 180.0; |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1095 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
|
1096 } |
|
109
65a6e352ce08
Consider computer heading in case of a flipped display
Ideenmodellierer
parents:
51
diff
changeset
|
1097 |
|
137
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1098 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
|
1099 pStateReal->lifeData.compass_pitch = dataIn.data[dataIn.boolCompassData].compass_pitch; |
| 38 | 1100 |
|
137
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1101 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
|
1102 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
|
1103 pStateReal->lifeData.compass_DZ_f = dataIn.data[dataIn.boolCompassData].compass_DZ_f; |
| 38 | 1104 |
|
137
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1105 pStateReal->compass_uTick_old = pStateReal->compass_uTick_new; |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1106 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
|
1107 pStateReal->compass_uTick_local_new = HAL_GetTick(); |
|
539
d784f281833a
Added inertia simulation for compass heading:
Ideenmodellierer
parents:
497
diff
changeset
|
1108 compass_Inertia(pStateReal->lifeData.compass_heading); |
|
137
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1109 |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1110 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
|
1111 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
|
1112 |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1113 if(pStateReal->mode == MODE_DIVE) |
| 38 | 1114 { |
|
137
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1115 for(int i= 0; i <16; i++) |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1116 { |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1117 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
|
1118 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
|
1119 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
|
1120 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
|
1121 } |
| 38 | 1122 } |
| 1123 | |
|
137
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1124 /* battery and ambient light sensors |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1125 */ |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1126 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
|
1127 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
|
1128 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
|
1129 |
|
189387bf23a8
Do not mark data as valid if devicedata is received.
ideenmodellierer
parents:
232
diff
changeset
|
1130 /* PIC data |
|
189387bf23a8
Do not mark data as valid if devicedata is received.
ideenmodellierer
parents:
232
diff
changeset
|
1131 */ |
|
189387bf23a8
Do not mark data as valid if devicedata is received.
ideenmodellierer
parents:
232
diff
changeset
|
1132 for(int i=0;i<4;i++) |
|
189387bf23a8
Do not mark data as valid if devicedata is received.
ideenmodellierer
parents:
232
diff
changeset
|
1133 { |
|
189387bf23a8
Do not mark data as valid if devicedata is received.
ideenmodellierer
parents:
232
diff
changeset
|
1134 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
|
1135 } |
|
189387bf23a8
Do not mark data as valid if devicedata is received.
ideenmodellierer
parents:
232
diff
changeset
|
1136 |
|
189387bf23a8
Do not mark data as valid if devicedata is received.
ideenmodellierer
parents:
232
diff
changeset
|
1137 /* sensorErrors |
|
189387bf23a8
Do not mark data as valid if devicedata is received.
ideenmodellierer
parents:
232
diff
changeset
|
1138 */ |
|
189387bf23a8
Do not mark data as valid if devicedata is received.
ideenmodellierer
parents:
232
diff
changeset
|
1139 pStateReal->sensorErrorsRTE = dataIn.sensorErrors; |
| 662 | 1140 |
| 1141 /* data from CO2 sensor */ | |
| 691 | 1142 pStateReal->lifeData.CO2_data.CO2_ppm = dataIn.data[(dataIn.boolADCO2Data && DATA_BUFFER_CO2)].CO2_ppm; |
| 1143 pStateReal->lifeData.CO2_data.signalStrength = dataIn.data[(dataIn.boolADCO2Data && DATA_BUFFER_CO2)].CO2_signalStrength; | |
|
137
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1144 } |
| 38 | 1145 |
| 1146 /* apnea specials | |
| 1147 */ | |
| 1148 if(pStateReal->diveSettings.diveMode == DIVEMODE_Apnea) | |
| 1149 { | |
| 1150 if(pStateReal->mode != MODE_DIVE) | |
| 1151 { | |
| 1152 pStateReal->lifeData.apnea_total_max_depth_meter = 0; | |
| 1153 pStateReal->lifeData.apnea_last_dive_time_seconds = 0; | |
| 1154 pStateReal->lifeData.apnea_last_max_depth_meter = 0; | |
| 1155 } | |
| 1156 else | |
| 1157 { | |
| 1158 if(pStateReal->lifeData.max_depth_meter > pStateReal->lifeData.apnea_total_max_depth_meter) | |
| 1159 pStateReal->lifeData.apnea_total_max_depth_meter = pStateReal->lifeData.max_depth_meter; | |
| 1160 } | |
| 1161 | |
| 1162 if(pStateReal->lifeData.dive_time_seconds > 15) | |
| 1163 { | |
| 1164 pStateReal->lifeData.apnea_last_dive_time_seconds = pStateReal->lifeData.dive_time_seconds; | |
| 1165 } | |
| 1166 | |
| 1167 if(pStateReal->lifeData.counterSecondsShallowDepth) | |
| 1168 { | |
| 1169 if(pStateReal->lifeData.max_depth_meter > 1.5f) | |
| 1170 { | |
| 1171 pStateReal->lifeData.apnea_last_max_depth_meter = pStateReal->lifeData.max_depth_meter; | |
| 1172 } | |
|
173
05c770dc2911
Bugfix: make max depth move with current depth (part 1)
Jan Mulder <jlmulder@xs4all.nl>
parents:
156
diff
changeset
|
1173 // reset max_depth_meter, average_depth_meter and internal values |
| 38 | 1174 pStateReal->lifeData.max_depth_meter = 0; |
| 1175 pStateReal->lifeData.boolResetAverageDepth = 1; | |
| 1176 } | |
| 1177 } | |
| 1178 | |
|
308
1203255481e4
cleanup: introduce function setAvgDepth
Jan Mulder <jlmulder@xs4all.nl>
parents:
307
diff
changeset
|
1179 setAvgDepth(pStateReal); |
|
1203255481e4
cleanup: introduce function setAvgDepth
Jan Mulder <jlmulder@xs4all.nl>
parents:
307
diff
changeset
|
1180 } |
|
1203255481e4
cleanup: introduce function setAvgDepth
Jan Mulder <jlmulder@xs4all.nl>
parents:
307
diff
changeset
|
1181 |
|
1203255481e4
cleanup: introduce function setAvgDepth
Jan Mulder <jlmulder@xs4all.nl>
parents:
307
diff
changeset
|
1182 void setAvgDepth(SDiveState *pStateReal) { |
|
1203255481e4
cleanup: introduce function setAvgDepth
Jan Mulder <jlmulder@xs4all.nl>
parents:
307
diff
changeset
|
1183 |
| 38 | 1184 float *AvgDepthValue = &pStateReal->lifeData.average_depth_meter; |
| 1185 float DepthNow = pStateReal->lifeData.depth_meter; | |
|
309
b0045281cb2d
cleanup: factor out SHelper typedef (and more)
Jan Mulder <jlmulder@xs4all.nl>
parents:
308
diff
changeset
|
1186 static uint32_t AvgDepthCount = 0; |
|
b0045281cb2d
cleanup: factor out SHelper typedef (and more)
Jan Mulder <jlmulder@xs4all.nl>
parents:
308
diff
changeset
|
1187 static uint32_t AvgDepthTimer = 0; |
| 38 | 1188 uint32_t AvgSecondsSinceLast; |
| 1189 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
|
1190 |
| 38 | 1191 if(pStateReal->lifeData.boolResetAverageDepth) |
| 1192 { | |
| 1193 *AvgDepthValue = DepthNow; | |
|
309
b0045281cb2d
cleanup: factor out SHelper typedef (and more)
Jan Mulder <jlmulder@xs4all.nl>
parents:
308
diff
changeset
|
1194 AvgDepthCount = 0; |
|
b0045281cb2d
cleanup: factor out SHelper typedef (and more)
Jan Mulder <jlmulder@xs4all.nl>
parents:
308
diff
changeset
|
1195 AvgDepthTimer = DiveTime; |
| 38 | 1196 pStateReal->lifeData.boolResetAverageDepth = 0; |
| 1197 } | |
|
309
b0045281cb2d
cleanup: factor out SHelper typedef (and more)
Jan Mulder <jlmulder@xs4all.nl>
parents:
308
diff
changeset
|
1198 else if (DiveTime > AvgDepthTimer) |
| 38 | 1199 { |
|
309
b0045281cb2d
cleanup: factor out SHelper typedef (and more)
Jan Mulder <jlmulder@xs4all.nl>
parents:
308
diff
changeset
|
1200 AvgSecondsSinceLast = DiveTime - AvgDepthTimer; |
| 38 | 1201 for(int i=0;i<AvgSecondsSinceLast;i++) |
| 1202 { | |
|
309
b0045281cb2d
cleanup: factor out SHelper typedef (and more)
Jan Mulder <jlmulder@xs4all.nl>
parents:
308
diff
changeset
|
1203 *AvgDepthValue = (*AvgDepthValue * AvgDepthCount + DepthNow) / (AvgDepthCount + 1); |
|
b0045281cb2d
cleanup: factor out SHelper typedef (and more)
Jan Mulder <jlmulder@xs4all.nl>
parents:
308
diff
changeset
|
1204 AvgDepthCount += 1; |
| 38 | 1205 } |
|
309
b0045281cb2d
cleanup: factor out SHelper typedef (and more)
Jan Mulder <jlmulder@xs4all.nl>
parents:
308
diff
changeset
|
1206 AvgDepthTimer = DiveTime; |
| 38 | 1207 } |
|
309
b0045281cb2d
cleanup: factor out SHelper typedef (and more)
Jan Mulder <jlmulder@xs4all.nl>
parents:
308
diff
changeset
|
1208 if(AvgDepthCount == 0) |
|
b0045281cb2d
cleanup: factor out SHelper typedef (and more)
Jan Mulder <jlmulder@xs4all.nl>
parents:
308
diff
changeset
|
1209 *AvgDepthValue = DepthNow; |
| 38 | 1210 } |
| 1211 | |
| 1212 | |
| 1213 uint8_t DataEX_check_RTE_version__needs_update(void) | |
| 1214 { | |
| 1215 if(data_old__lost_connection_to_slave_counter_retry > 10) | |
| 1216 return 1; | |
| 1217 else | |
| 1218 { | |
| 1219 if(stateRealGetPointer()->data_old__lost_connection_to_slave == 0) | |
| 1220 { | |
| 1221 setActualRTEversion(dataIn.RTE_VERSION_high, dataIn.RTE_VERSION_low); | |
| 1222 | |
| 1223 if(RTEminimum_required_high() < dataIn.RTE_VERSION_high) | |
| 1224 return 0; | |
| 1225 else | |
| 1226 if((RTEminimum_required_high() == dataIn.RTE_VERSION_high) && (RTEminimum_required_low() <= dataIn.RTE_VERSION_low)) | |
| 1227 return 0; | |
| 1228 else | |
| 1229 return 1; | |
| 1230 } | |
| 1231 else | |
| 1232 return 0; | |
| 1233 } | |
| 1234 } | |
| 1235 | |
| 1236 | |
| 1237 /* Private functions ---------------------------------------------------------*/ | |
| 1238 | |
|
198
878dc9e0dbc5
cleanup: another cleanup session (data_exchange_main.c)
Jan Mulder <jlmulder@xs4all.nl>
parents:
197
diff
changeset
|
1239 /* 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
|
1240 * 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
|
1241 */ |
|
198
878dc9e0dbc5
cleanup: another cleanup session (data_exchange_main.c)
Jan Mulder <jlmulder@xs4all.nl>
parents:
197
diff
changeset
|
1242 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
|
1243 { |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1244 uint8_t ret = 1; |
| 141 | 1245 if((dataIn.footer.checkCode[0] == 0x00) |
| 1246 && (dataIn.footer.checkCode[1] == 0x00) | |
| 1247 && (dataIn.footer.checkCode[2] == 0x00) | |
| 1248 && (dataIn.footer.checkCode[3] == 0x00)) { ret = 0; } | |
|
137
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1249 |
| 141 | 1250 if((dataIn.footer.checkCode[0] == 0xff) |
| 1251 && (dataIn.footer.checkCode[1] == 0xff) | |
| 1252 && (dataIn.footer.checkCode[2] == 0xff) | |
| 1253 && (dataIn.footer.checkCode[3] == 0xff)) { ret = 0; } | |
|
137
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1254 |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1255 return ret; |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1256 } |
|
9eda5a75c5fd
Only copy data if data connection to RTE is valid
Ideenmodellierer
parents:
133
diff
changeset
|
1257 |
|
198
878dc9e0dbc5
cleanup: another cleanup session (data_exchange_main.c)
Jan Mulder <jlmulder@xs4all.nl>
parents:
197
diff
changeset
|
1258 static uint8_t DataEX_check_header_and_footer_ok(void) |
| 38 | 1259 { |
| 1260 if(dataIn.header.checkCode[0] != 0xA1) | |
| 1261 return 0; | |
| 141 | 1262 #if USE_OLD_HEADER_FORMAT |
| 38 | 1263 if(dataIn.header.checkCode[1] != 0xA2) |
| 1264 return 0; | |
| 1265 if(dataIn.header.checkCode[2] != 0xA3) | |
| 1266 return 0; | |
| 141 | 1267 #endif |
| 38 | 1268 if(dataIn.header.checkCode[3] != 0xA4) |
| 1269 return 0; | |
| 1270 if(dataIn.footer.checkCode[0] != 0xE1) | |
| 1271 return 0; | |
| 1272 if(dataIn.footer.checkCode[1] != 0xE2) | |
| 1273 return 0; | |
| 1274 if(dataIn.footer.checkCode[2] != 0xE3) | |
| 1275 return 0; | |
| 1276 if(dataIn.footer.checkCode[3] != 0xE4) | |
| 1277 return 0; | |
| 1278 | |
| 1279 return 1; | |
| 1280 } | |
| 1281 | |
|
198
878dc9e0dbc5
cleanup: another cleanup session (data_exchange_main.c)
Jan Mulder <jlmulder@xs4all.nl>
parents:
197
diff
changeset
|
1282 static uint8_t DataEX_check_header_and_footer_devicedata(void) |
| 38 | 1283 { |
| 1284 if(dataIn.header.checkCode[0] != 0xDF) | |
| 1285 return 0; | |
| 1286 if(dataIn.header.checkCode[1] != 0xDE) | |
| 1287 return 0; | |
| 1288 if(dataIn.header.checkCode[2] != 0xDD) | |
| 1289 return 0; | |
| 1290 if(dataIn.header.checkCode[3] != 0xDC) | |
| 1291 return 0; | |
| 1292 if(dataIn.footer.checkCode[0] != 0xE1) | |
| 1293 return 0; | |
| 1294 if(dataIn.footer.checkCode[1] != 0xE2) | |
| 1295 return 0; | |
| 1296 if(dataIn.footer.checkCode[2] != 0xE3) | |
| 1297 return 0; | |
| 1298 if(dataIn.footer.checkCode[3] != 0xE4) | |
| 1299 return 0; | |
| 1300 | |
| 1301 return 1; | |
| 1302 } | |
|
407
b11e50415982
Bugfix parallel call of external flash functions:
ideenmodellierer
parents:
406
diff
changeset
|
1303 |
|
b11e50415982
Bugfix parallel call of external flash functions:
ideenmodellierer
parents:
406
diff
changeset
|
1304 void DataEX_merge_devicedata(void) |
|
b11e50415982
Bugfix parallel call of external flash functions:
ideenmodellierer
parents:
406
diff
changeset
|
1305 { |
|
b11e50415982
Bugfix parallel call of external flash functions:
ideenmodellierer
parents:
406
diff
changeset
|
1306 if(DeviceDataUpdated) |
|
b11e50415982
Bugfix parallel call of external flash functions:
ideenmodellierer
parents:
406
diff
changeset
|
1307 { |
|
b11e50415982
Bugfix parallel call of external flash functions:
ideenmodellierer
parents:
406
diff
changeset
|
1308 DeviceDataUpdated = 0; |
|
b11e50415982
Bugfix parallel call of external flash functions:
ideenmodellierer
parents:
406
diff
changeset
|
1309 DataEX_merge_DeviceData_and_store(); |
|
b11e50415982
Bugfix parallel call of external flash functions:
ideenmodellierer
parents:
406
diff
changeset
|
1310 } |
|
b11e50415982
Bugfix parallel call of external flash functions:
ideenmodellierer
parents:
406
diff
changeset
|
1311 } |
|
556
eb2060caca7d
Switch source of o2 sensor data depending on availability of external ADC:
Ideenmodellierer
parents:
539
diff
changeset
|
1312 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
|
1313 { |
|
eb2060caca7d
Switch source of o2 sensor data depending on availability of external ADC:
Ideenmodellierer
parents:
539
diff
changeset
|
1314 uint8_t retval; |
| 559 | 1315 retval = hw_Info.extADC; |
|
556
eb2060caca7d
Switch source of o2 sensor data depending on availability of external ADC:
Ideenmodellierer
parents:
539
diff
changeset
|
1316 |
|
eb2060caca7d
Switch source of o2 sensor data depending on availability of external ADC:
Ideenmodellierer
parents:
539
diff
changeset
|
1317 return retval; |
|
eb2060caca7d
Switch source of o2 sensor data depending on availability of external ADC:
Ideenmodellierer
parents:
539
diff
changeset
|
1318 } |
| 662 | 1319 |
| 1320 void DataEX_setExtInterface_Cmd(uint16_t Cmd) | |
| 1321 { | |
| 1322 externalInterface_Cmd = Cmd; | |
| 1323 return; | |
| 1324 } | |
| 1325 |