comparison Common/Inc/settings.h @ 981:c6c781a2e85b default

Merge into default
author heinrichsweikamp
date Tue, 11 Feb 2025 18:12:00 +0100
parents 79b522fbabe6
children 22d5b477c903
comparison
equal deleted inserted replaced
871:f7318457df4d 981:c6c781a2e85b
118 uint8_t active:1; 118 uint8_t active:1;
119 uint8_t first:1; 119 uint8_t first:1;
120 uint8_t deco:1; 120 uint8_t deco:1;
121 uint8_t travel:1; 121 uint8_t travel:1;
122 uint8_t off:1; 122 uint8_t off:1;
123 uint8_t spare:3; 123 #ifdef ENABLE_DECOCALC_OPTION
124 uint8_t decocalc:1;
125 #endif
126 uint8_t spare:2;
124 } gasubit8_t; 127 } gasubit8_t;
125 128
126 typedef union{ 129 typedef union{
127 gasubit8_t ub; 130 gasubit8_t ub;
128 uint8_t uw; 131 uint8_t uw;
180 typedef struct 183 typedef struct
181 { 184 {
182 uint8_t FirstCorrection; 185 uint8_t FirstCorrection;
183 uint8_t Corrections; 186 uint8_t Corrections;
184 } SSettingsStatus; 187 } SSettingsStatus;
188
189
190 typedef struct
191 {
192 int8_t hours;
193 uint8_t minutes;
194 } StimeZone;
195
185 196
186 /* SSettings 197 /* SSettings
187 * gas[0] and setpoint[0] are the special ones configurable during the dive 198 * gas[0] and setpoint[0] are the special ones configurable during the dive
188 */ 199 */
189 typedef struct 200 typedef struct
309 uint8_t autoSetpoint; 320 uint8_t autoSetpoint;
310 uint16_t scrubTimerMax_Obsolete; /* have been replaced with new scrubber data format */ 321 uint16_t scrubTimerMax_Obsolete; /* have been replaced with new scrubber data format */
311 uint16_t scrubTimerCur_Obsolete; /* have been replaced with new scrubber data format */ 322 uint16_t scrubTimerCur_Obsolete; /* have been replaced with new scrubber data format */
312 uint8_t scrubTimerMode; 323 uint8_t scrubTimerMode;
313 uint8_t ext_sensor_map[8]; /* redefined in 0xFFFF0027 */ 324 uint8_t ext_sensor_map[8]; /* redefined in 0xFFFF0027 */
325 uint8_t cvAutofocus;
326 uint8_t slowExitTime;
327 /* new in 0xFFFF002c */
328 StimeZone timeZone;
329 uint8_t warningBuzzer;
314 } SSettings; 330 } SSettings;
315 331
316 typedef struct 332 typedef struct
317 { 333 {
318 // 8 bytes 334 // 8 bytes