Mercurial > public > ostc4
comparison Discovery/Src/tHome.c @ 981:c6c781a2e85b default
Merge into default
| author | heinrichsweikamp |
|---|---|
| date | Tue, 11 Feb 2025 18:12:00 +0100 |
| parents | aed39d19269c |
| children | 5b913cdaa9dc |
comparison
equal
deleted
inserted
replaced
| 871:f7318457df4d | 981:c6c781a2e85b |
|---|---|
| 63 const uint8_t cv_changelist_BS[] = {CVIEW_T3_Decostop, CVIEW_sensors, CVIEW_Compass, CVIEW_T3_MaxDepth,CVIEW_T3_StopWatch, CVIEW_T3_TTS, CVIEW_T3_GasList, CVIEW_T3_ppO2andGas, CVIEW_noneOrDebug, | 63 const uint8_t cv_changelist_BS[] = {CVIEW_T3_Decostop, CVIEW_sensors, CVIEW_Compass, CVIEW_T3_MaxDepth,CVIEW_T3_StopWatch, CVIEW_T3_TTS, CVIEW_T3_GasList, CVIEW_T3_ppO2andGas, CVIEW_noneOrDebug, |
| 64 CVIEW_T3_Navigation, CVIEW_T3_DepthData, CVIEW_T3_DecoTTS, | 64 CVIEW_T3_Navigation, CVIEW_T3_DepthData, CVIEW_T3_DecoTTS, |
| 65 #ifdef ENABLE_T3_PROFILE_VIEW | 65 #ifdef ENABLE_T3_PROFILE_VIEW |
| 66 CVIEW_T3_Profile, | 66 CVIEW_T3_Profile, |
| 67 #endif | 67 #endif |
| 68 CVIEW_T3_Temperature, | |
| 68 CVIEW_T3_END}; | 69 CVIEW_T3_END}; |
| 69 | 70 |
| 70 /* Private function prototypes -----------------------------------------------*/ | 71 /* Private function prototypes -----------------------------------------------*/ |
| 71 | 72 |
| 72 #define AUTORETURN_O2SENS (200u) /* return to sensor view after 20 seconds in case sensor is connected */ | 73 #define AUTORETURN_O2SENS (200u) /* return to sensor view after 20 seconds in case sensor is connected */ |
| 76 | 77 |
| 77 void set_globalState_tHome(void) | 78 void set_globalState_tHome(void) |
| 78 { | 79 { |
| 79 if(stateUsed->mode == MODE_DIVE) | 80 if(stateUsed->mode == MODE_DIVE) |
| 80 { | 81 { |
| 81 if(settingsGetPointer()->extraDisplay == EXTRADISPLAY_BFACTIVE) | |
| 82 { | |
| 83 settingsGetPointer()->design = 3; | |
| 84 } | |
| 85 set_globalState(StD); | 82 set_globalState(StD); |
| 86 } | 83 } |
| 87 else | 84 else |
| 88 set_globalState(StS); | 85 set_globalState(StS); |
| 89 | 86 |
| 233 case CVIEW_T3_StopWatch: set_globalState(StDRAVG); | 230 case CVIEW_T3_StopWatch: set_globalState(StDRAVG); |
| 234 break; | 231 break; |
| 235 case CVIEW_T3_GasList: if(stateUsed->warnings.betterGas) | 232 case CVIEW_T3_GasList: if(stateUsed->warnings.betterGas) |
| 236 { | 233 { |
| 237 set_globalState(StDMGAS); | 234 set_globalState(StDMGAS); |
| 235 } | |
| 236 else | |
| 237 { | |
| 238 set_globalState(StDMENU); | |
| 238 } | 239 } |
| 239 break; | 240 break; |
| 240 #ifdef ENABLE_T3_PPO_SIM | 241 #ifdef ENABLE_T3_PPO_SIM |
| 241 case CVIEW_sensors: if(is_stateUsedSetToSim()) | 242 case CVIEW_sensors: if(is_stateUsedSetToSim()) |
| 242 { | 243 { |
