Mercurial > public > ostc4
comparison Common/Inc/settings.h @ 560:5d80bb8d22cb
Added O2 sensor source and calibration parameters to setting structure
author | Ideenmodellierer |
---|---|
date | Sun, 15 Nov 2020 19:53:09 +0100 |
parents | af1c3e3abd5f |
children | 1c95f811967c |
comparison
equal
deleted
inserted
replaced
559:84a4e1200726 | 560:5d80bb8d22cb |
---|---|
66 #define DDMMYY 1 | 66 #define DDMMYY 1 |
67 #define YYMMDD 2 | 67 #define YYMMDD 2 |
68 | 68 |
69 #define PRESSURE_OFFSET_LIMIT_MBAR 50 | 69 #define PRESSURE_OFFSET_LIMIT_MBAR 50 |
70 | 70 |
71 #define MAX_COMPASS_COMP (2u) | 71 #define MAX_COMPASS_COMP (2u) |
72 #define MAX_VIEWPORT_MODE (0x1F) | 72 #define MAX_VIEWPORT_MODE (0x1F) |
73 | |
74 typedef enum | |
75 { | |
76 O2_SENSOR_SOURCE_OPTIC = 0, | |
77 O2_SENSOR_SOURCE_ANALOG, | |
78 O2_SENSOR_SOURCE_MAX | |
79 } SensorSource; | |
80 #define MAX_O2_SENSOR_SOURCE (2u) | |
73 | 81 |
74 /* 2015 Jan 30, hw, deco and travel added for MenuEditGas | 82 /* 2015 Jan 30, hw, deco and travel added for MenuEditGas |
75 * can be used for buehlmann, vpm, etc. later but be carefull | 83 * can be used for buehlmann, vpm, etc. later but be carefull |
76 * with current implemenation */ | 84 * with current implemenation */ |
77 typedef struct{ | 85 typedef struct{ |
171 uint8_t serialLow; | 179 uint8_t serialLow; |
172 // SUFirmware firmwareVersion16to32bit; | 180 // SUFirmware firmwareVersion16to32bit; |
173 uint32_t backup_localtime_rtc_tr; | 181 uint32_t backup_localtime_rtc_tr; |
174 uint32_t backup_localtime_rtc_dr; | 182 uint32_t backup_localtime_rtc_dr; |
175 uint16_t totalDiveCounter; | 183 uint16_t totalDiveCounter; |
176 uint16_t personalDiveCount; | 184 uint16_t personalDiveCount; |
177 uint8_t showDebugInfo; | 185 uint8_t showDebugInfo; |
178 uint8_t ButtonResponsiveness[4];// changed content in 0xFFFF0016 | 186 uint8_t ButtonResponsiveness[4];// changed content in 0xFFFF0016 |
179 uint8_t nonMetricalSystem; | 187 uint8_t nonMetricalSystem; |
180 uint8_t fallbackToFixedSetpoint; | 188 uint8_t fallbackToFixedSetpoint; |
181 uint8_t bluetoothActive; /* will be set to zero on each startup at the moment */ | 189 uint8_t bluetoothActive; /* will be set to zero on each startup at the moment */ |
232 /* new in 0xFFFF001D */ | 240 /* new in 0xFFFF001D */ |
233 uint8_t viewPortMode; | 241 uint8_t viewPortMode; |
234 uint16_t viewRoll; | 242 uint16_t viewRoll; |
235 uint16_t viewPitch; | 243 uint16_t viewPitch; |
236 uint16_t viewYaw; | 244 uint16_t viewYaw; |
245 /* new in 0xFFFF001E */ | |
246 uint8_t ppo2sensors_source; | |
247 float ppo2sensors_calibCoeff[3]; | |
237 } SSettings; | 248 } SSettings; |
238 | 249 |
239 typedef struct | 250 typedef struct |
240 { | 251 { |
241 // 8 bytes | 252 // 8 bytes |