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

Merge into default
author heinrichsweikamp
date Tue, 11 Feb 2025 18:12:00 +0100 (2 months ago)
parents 79b522fbabe6
children 22d5b477c903
line wrap: on
line diff
--- a/Common/Inc/settings.h	Tue Aug 13 13:24:54 2024 +0200
+++ b/Common/Inc/settings.h	Tue Feb 11 18:12:00 2025 +0100
@@ -120,7 +120,10 @@
 uint8_t deco:1;
 uint8_t travel:1;
 uint8_t off:1;
-uint8_t spare:3;
+#ifdef ENABLE_DECOCALC_OPTION
+uint8_t decocalc:1;
+#endif
+uint8_t spare:2;
 } gasubit8_t;
 
 typedef union{
@@ -183,6 +186,14 @@
 	uint8_t Corrections;
 } SSettingsStatus;
 
+
+typedef struct
+{
+	int8_t hours;
+	uint8_t minutes;
+} StimeZone;
+
+
 /* SSettings
 	 * gas[0] and setpoint[0] are the special ones configurable during the dive
 	 */
@@ -311,6 +322,11 @@
 	uint16_t scrubTimerCur_Obsolete;	/* have been replaced with new scrubber data format */
 	uint8_t scrubTimerMode;
 	uint8_t ext_sensor_map[8];		/* redefined in 0xFFFF0027 */
+	uint8_t cvAutofocus;
+	uint8_t slowExitTime;
+	/* new in 0xFFFF002c */
+	StimeZone timeZone;
+	uint8_t warningBuzzer;
 } SSettings;
 
 typedef struct