comparison Discovery/Src/tMenuEdit.c @ 696:cc542448fb28

Merge
author heinrichsweikamp
date Fri, 19 Aug 2022 11:30:24 +0200
parents 1b995079c045
children e81afd727993
comparison
equal deleted inserted replaced
661:87bee7cc77b3 696:cc542448fb28
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): refreshFct = refresh_CompassHeading;
215 break; 215 break;
216 case (StMXTRA_PSCR_O2_Drop & MaskFieldDigit): if(settingsGetPointer()->dive_mode != DIVEMODE_PSCR) /* workaround because PSCR mode is set dynamic */
217 {
218 refreshFct = refresh_CO2Data;
219 }
220 break;
221 case (StMXTRA_CO2_Sensor & MaskFieldDigit): refreshFct = refresh_CO2Data;
222 break;
216 case (StMSYS4_Info & MaskFieldDigit): refreshFct = &refresh_InformationPage; 223 case (StMSYS4_Info & MaskFieldDigit): refreshFct = &refresh_InformationPage;
217 break; 224 break;
218 case (StMPLAN5_ExitResult & MaskFieldDigit): refreshFct = refresh_PlanResult; 225 case (StMPLAN5_ExitResult & MaskFieldDigit): refreshFct = refresh_PlanResult;
219 break; 226 break;
220 case (StMHARD5_Button1 & MaskFieldDigit): // will not be executed in EditFieldMode as global state is different 227 case (StMHARD5_Button1 & MaskFieldDigit): // will not be executed in EditFieldMode as global state is different
254 261
255 void tMenuEdit_writeSettingsToFlash(void) 262 void tMenuEdit_writeSettingsToFlash(void)
256 { 263 {
257 if(WriteSettings) 264 if(WriteSettings)
258 { 265 {
266 reset_SettingWarning();
259 GFX_logoAutoOff(); 267 GFX_logoAutoOff();
260 ext_flash_write_settings(0); 268 ext_flash_write_settings(0);
261 WriteSettings = 0; 269 WriteSettings = 0;
262 } 270 }
263 } 271 }