Mercurial > public > ostc4

comparison Discovery/Src/tMenuEditDeco.c @ 707:e81afd727993

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Menu cleanup rebreather specific settings: In the previous version the selection for Fix setpoint or sensor was in the deco menu and the Fallback option in the hardware menu. As they have a dependency and are only relevant for rebreather operation, they have been moved into the extra menu which is containing rebreather related data and which is only visible in rebreather mode.
author Ideenmodellierer
date Thu, 03 Nov 2022 20:44:21 +0100
parents 1b995079c045
children
comparison
equal deleted inserted replaced
706:10b7d271b9c4 707:e81afd727993
38 static uint8_t lineSelected = 0; 38 static uint8_t lineSelected = 0;
39 39
40 /* Private function prototypes -----------------------------------------------*/ 40 /* Private function prototypes -----------------------------------------------*/
41 41
42 static void openEdit_DiveMode(void); 42 static void openEdit_DiveMode(void);
43 static void openEdit_CCRModeSensorOrFixedSP(void);
44 static void openEdit_ppO2max(void); 43 static void openEdit_ppO2max(void);
45 static void openEdit_SafetyStop(void); 44 static void openEdit_SafetyStop(void);
46 static void openEdit_FutureTTS(void); 45 static void openEdit_FutureTTS(void);
47 static void openEdit_Salinity(void); 46 static void openEdit_Salinity(void);
48 47
57 void openEdit_Deco(uint8_t line) 56 void openEdit_Deco(uint8_t line)
58 { 57 {
59 set_globalState_Menu_Line(line); 58 set_globalState_Menu_Line(line);
60 resetMenuEdit(CLUT_MenuPageDeco); 59 resetMenuEdit(CLUT_MenuPageDeco);
61 60
62 SSettings *data = settingsGetPointer();
63
64 lineSelected = line; 61 lineSelected = line;
65
66 if((!isLoopMode(data->dive_mode)) && (line > 1))
67 line += 1;
68 62
69 switch(line) 63 switch(line)
70 { 64 {
71 case 1: 65 case 1:
72 default: 66 default:
73 openEdit_DiveMode(); 67 openEdit_DiveMode();
74 break; 68 break;
75 case 2: 69 case 2:
76 openEdit_CCRModeSensorOrFixedSP(); 70 openEdit_ppO2max();
77 break; 71 break;
78 case 3: 72 case 3:
79 openEdit_ppO2max(); 73 openEdit_SafetyStop();
80 break; 74 break;
81 case 4: 75 case 4:
82 openEdit_SafetyStop(); 76 openEdit_FutureTTS();
83 break; 77 break;
84 case 5: 78 case 5:
85 openEdit_FutureTTS();
86 break;
87 case 6:
88 openEdit_Salinity(); 79 openEdit_Salinity();
89 break; 80 break;
90 } 81 }
91 } 82 }
92 83
205 } 196 }
206 return retVal; 197 return retVal;
207 } 198 }
208 199
209 200
210 static void openEdit_CCRModeSensorOrFixedSP(void) 201
211 {
212 SSettings *pSettings = settingsGetPointer();
213
214 if(pSettings->CCR_Mode == CCRMODE_Sensors)
215 pSettings->CCR_Mode = CCRMODE_FixedSetpoint;
216 else
217 pSettings->CCR_Mode = CCRMODE_Sensors;
218
219 exitEditWithUpdate();
220 }
221 202
222 203
223 static void openEdit_SafetyStop(void) 204 static void openEdit_SafetyStop(void)
224 { 205 {
225 uint32_t safetystopDuration, safetystopDepth; 206 uint32_t safetystopDuration, safetystopDepth;