Mercurial > public > ostc4
comparison Common/Inc/settings.h @ 796:75ace7af8212
Expanded Sensor map structure:
In the previous version the number of possible sensors were set to 5 based on the assumption that ADC slots are shared with digital O2 sensors. As result three of five slots would have been limited to O2 measurement usecase, leaving just two slots left for other sensors (e.g. CO2). In order to have as much flexibility (and less risk for data structure changes) the number of sensors has been set to 7 (3 ADC + 4 UART MUX)
| author | Ideenmodellierer |
|---|---|
| date | Mon, 31 Jul 2023 20:00:06 +0200 |
| parents | 4abfb8a2a435 |
| children | dd7ce655db26 |
comparison
equal
deleted
inserted
replaced
| 795:d4083ac09b5d | 796:75ace7af8212 |
|---|---|
| 241 uint8_t co2_sensor_active; /* redefined in 0xFFFF0021 */ | 241 uint8_t co2_sensor_active; /* redefined in 0xFFFF0021 */ |
| 242 uint8_t ext_uart_protocol; /* redefined in 0xFFFF0022 */ | 242 uint8_t ext_uart_protocol; /* redefined in 0xFFFF0022 */ |
| 243 | 243 |
| 244 uint8_t scubberActiveId; /* redefined in 0xFFFF0023 */ | 244 uint8_t scubberActiveId; /* redefined in 0xFFFF0023 */ |
| 245 SScrubberData scrubberData[2]; | 245 SScrubberData scrubberData[2]; |
| 246 uint8_t ext_sensor_map[5]; | 246 uint8_t ext_sensor_map_Obsolete[5]; |
| 247 uint8_t buttonLockActive; /* redefined in 0xFFFF0025 */ | 247 uint8_t buttonLockActive; /* redefined in 0xFFFF0025 */ |
| 248 int8_t compassDeclinationDeg; | 248 int8_t compassDeclinationDeg; |
| 249 uint8_t delaySetpointLow; /* redefined in 0xFFFF0026 */ | 249 uint8_t delaySetpointLow; /* redefined in 0xFFFF0026 */ |
| 250 uint8_t Future_SPARE[FUTURE_SPARE_SIZE]; /* redefined in 0xFFFF0020 (old scooter Block was 32 byte)*/ | 250 uint8_t Future_SPARE[FUTURE_SPARE_SIZE]; /* redefined in 0xFFFF0020 (old scooter Block was 32 byte)*/ |
| 251 // new in 0xFFFF0006 | 251 // new in 0xFFFF0006 |
| 252 uint8_t ppo2sensors_deactivated; | 252 uint8_t ppo2sensors_deactivated; |
| 301 /* new in 0xFFFF001F */ | 301 /* new in 0xFFFF001F */ |
| 302 uint8_t autoSetpoint; | 302 uint8_t autoSetpoint; |
| 303 uint16_t scrubTimerMax_Obsolete; /* have been replaced with new scrubber data format */ | 303 uint16_t scrubTimerMax_Obsolete; /* have been replaced with new scrubber data format */ |
| 304 uint16_t scrubTimerCur_Obsolete; /* have been replaced with new scrubber data format */ | 304 uint16_t scrubTimerCur_Obsolete; /* have been replaced with new scrubber data format */ |
| 305 uint8_t scrubTimerMode; | 305 uint8_t scrubTimerMode; |
| 306 uint8_t ext_sensor_map[8]; /* redefined in 0xFFFF0027 */ | |
| 306 } SSettings; | 307 } SSettings; |
| 307 | 308 |
| 308 typedef struct | 309 typedef struct |
| 309 { | 310 { |
| 310 // 8 bytes | 311 // 8 bytes |