Mercurial > public > ostc4
comparison Discovery/Src/tMenuEdit.c @ 707:e81afd727993
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 | b9f699d2e3d0 |
comparison
equal
deleted
inserted
replaced
706:10b7d271b9c4 | 707:e81afd727993 |
---|---|
209 case (StMHARD3_O2_Calibrate): | 209 case (StMHARD3_O2_Calibrate): |
210 case (StMHARD3_O2_Source): refreshFct = refresh_O2Sensors; | 210 case (StMHARD3_O2_Source): refreshFct = refresh_O2Sensors; |
211 break; | 211 break; |
212 case (StMHARD2_Compass_SetCourse & MaskFieldDigit): refreshFct = refresh_CompassEdit; | 212 case (StMHARD2_Compass_SetCourse & MaskFieldDigit): refreshFct = refresh_CompassEdit; |
213 break; | 213 break; |
214 case (StMXTRA_CompassHeading & MaskFieldDigit): refreshFct = refresh_CompassHeading; | 214 /* case (StMXTRA_CompassHeading & MaskFieldDigit): StMXTRA_CompassHeading and StMXTRA_PSCR_O2_Drop share the same menu ID => select function based on divemode */ |
215 break; | 215 case (StMXTRA_PSCR_O2_Drop & MaskFieldDigit): |
216 case (StMXTRA_PSCR_O2_Drop & MaskFieldDigit): if(settingsGetPointer()->dive_mode != DIVEMODE_PSCR) /* workaround because PSCR mode is set dynamic */ | 216 if(actual_menu_content == MENU_SURFACE) |
217 { | 217 { |
218 refreshFct = refresh_CO2Data; | 218 if(settingsGetPointer()->dive_mode != DIVEMODE_PSCR) /* workaround because PSCR mode is set dynamic */ |
219 } | 219 { |
220 refreshFct = refresh_CO2Data; | |
221 } | |
222 } | |
223 else | |
224 { | |
225 refreshFct = refresh_CompassHeading; | |
226 } | |
220 break; | 227 break; |
221 case (StMXTRA_CO2_Sensor & MaskFieldDigit): refreshFct = refresh_CO2Data; | 228 case (StMXTRA_CO2_Sensor & MaskFieldDigit): refreshFct = refresh_CO2Data; |
222 break; | 229 break; |
223 case (StMSYS4_Info & MaskFieldDigit): refreshFct = &refresh_InformationPage; | 230 case (StMSYS4_Info & MaskFieldDigit): refreshFct = &refresh_InformationPage; |
224 break; | 231 break; |