Mercurial > public > ostc4
comparison Discovery/Src/tHome.c @ 807:9e2ebfc72e8c
Zusammenf?hren
author | heinrichsweikamp |
---|---|
date | Sat, 26 Aug 2023 13:37:06 +0200 |
parents | dd7ce655db26 |
children | e6827fcd7604 |
comparison
equal
deleted
inserted
replaced
806:ee3c0029ed34 | 807:9e2ebfc72e8c |
---|---|
57 static uint16_t display_toogle_count; | 57 static uint16_t display_toogle_count; |
58 static uint16_t tHome_tick_count_cview; | 58 static uint16_t tHome_tick_count_cview; |
59 static uint16_t tHome_tick_count_field; | 59 static uint16_t tHome_tick_count_field; |
60 static uint16_t tHome_tick_count_o2sens; | 60 static uint16_t tHome_tick_count_o2sens; |
61 | 61 |
62 const uint8_t cv_changelist[] = {CVIEW_Compass, CVIEW_SummaryOfLeftCorner, CVIEW_Tissues, CVIEW_Profile, CVIEW_EADTime, CVIEW_Gaslist, CVIEW_noneOrDebug, CVIEW_Decolist,CVIEW_sensors,CVIEW_sensors_mV, CVIEW_END}; | 62 const uint8_t cv_changelist[] = {CVIEW_Compass, CVIEW_SummaryOfLeftCorner, CVIEW_Tissues, CVIEW_Profile, CVIEW_EADTime, CVIEW_Gaslist, CVIEW_noneOrDebug, CVIEW_Decolist, CVIEW_sensors,CVIEW_sensors_mV, CVIEW_Timer, CVIEW_END}; |
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 |
636 { | 636 { |
637 tHome_tick_count_cview++; | 637 tHome_tick_count_cview++; |
638 if(tHome_tick_count_cview > (cview *10)) | 638 if(tHome_tick_count_cview > (cview *10)) |
639 { | 639 { |
640 tHome_tick_count_cview = 0; | 640 tHome_tick_count_cview = 0; |
641 if(settingsGetPointer()->design == 7) | 641 if (settingsGetPointer()->design == 7 && !t7_isTimerRunning(false)) { |
642 { | |
643 t7_set_customview_to_primary(); | 642 t7_set_customview_to_primary(); |
644 } | 643 } |
645 if(settingsGetPointer()->design == 3) | 644 if(settingsGetPointer()->design == 3) |
646 { | 645 { |
647 t3_set_customview_to_primary(); | 646 t3_set_customview_to_primary(); |
656 { | 655 { |
657 tHome_tick_count_o2sens = 0; | 656 tHome_tick_count_o2sens = 0; |
658 t7_select_customview(CVIEW_sensors); | 657 t7_select_customview(CVIEW_sensors); |
659 } | 658 } |
660 } | 659 } |
660 | |
661 t7_tick(); | |
661 } | 662 } |
662 | 663 |
663 | 664 |
664 uint32_t tHome_DateCode(RTC_DateTypeDef *dateInput) | 665 uint32_t tHome_DateCode(RTC_DateTypeDef *dateInput) |
665 { | 666 { |