Mercurial > public > ostc4
view Discovery/Src/tMenuEditXtra.c @ 859:d32901746950 Evo_2_23
Improvment battery charger visualization:
In the previous version the green flash (charge complete) was shown even battery had not reached 100% charge. Root cause was that the pin signaling the end of charge could be raised for other reasons then a full battery. The new version will show the green flash only in case the battery is rated as full.
In addition the graph visualization has been updated to continously progress. In the previous version it only progressed in case the charge value changed. Especially at charging start the charger is doing some battery evaluation which does not increase the charge state. In such a case the graph seemed to be frozen.
author | Ideenmodellierer |
---|---|
date | Tue, 07 May 2024 21:20:33 +0200 |
parents | 17d9d6eddd8d |
children | 7755a476f164 |
line wrap: on
line source
/////////////////////////////////////////////////////////////////////////////// /// -*- coding: UTF-8 -*- /// /// \file Discovery/Src/tMenuEditXtra.c /// \brief Menu Edit Xtra - Specials in Divemode like Reset Stopwatch /// \author heinrichs weikamp gmbh /// \date 02-Mar-2015 /// /// \details /// /// $Id$ /////////////////////////////////////////////////////////////////////////////// /// \par Copyright (c) 2014-2018 Heinrichs Weikamp gmbh /// /// This program is free software: you can redistribute it and/or modify /// it under the terms of the GNU General Public License as published by /// the Free Software Foundation, either version 3 of the License, or /// (at your option) any later version. /// /// This program is distributed in the hope that it will be useful, /// but WITHOUT ANY WARRANTY; without even the implied warranty of /// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the /// GNU General Public License for more details. /// /// You should have received a copy of the GNU General Public License /// along with this program. If not, see <http://www.gnu.org/licenses/>. ////////////////////////////////////////////////////////////////////////////// /* Includes ------------------------------------------------------------------*/ #include <stdbool.h> #include "tMenuEditXtra.h" #include "gfx_fonts.h" #include "simulation.h" #include "timer.h" #include "tMenuEdit.h" #include "data_exchange_main.h" #include "motion.h" #include "configuration.h" #include "tInfoPreDive.h" /* Private function prototypes -----------------------------------------------*/ void openEdit_CompassHeading(void); void openEdit_ResetStopwatch(void); void openEdit_SimFollowDecostops(void); void openEdit_SetManualMarker(void); void openEdit_SetEndDive(void); void openEdit_CalibViewport(void); static void openEdit_CCRModeSensorOrFixedSP(void); static void openEdit_Fallback(void); static void openEdit_Scrubber(void); #ifdef ENABLE_PSCR_MODE static void openEdit_PSCR(void); #endif /* Announced function prototypes -----------------------------------------------*/ uint8_t OnAction_CompassHeading (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action); uint8_t OnAction_ScrubberTimerId(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action); static uint8_t OnAction_ScrubberTimerMax(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action); static uint8_t OnAction_ScrubberReset(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action); static uint8_t OnAction_ScrubberMode(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action); #ifdef ENABLE_PSCR_MODE static uint8_t OnAction_PSCRO2Drop(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action); static uint8_t OnAction_PSCRLungRation(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action); #endif /* Exported functions --------------------------------------------------------*/ void openEdit_Xtra(uint8_t line) { set_globalState_Menu_Line(line); /* DIVE MODE */ if(actual_menu_content != MENU_SURFACE) { resetMenuEdit(CLUT_MenuPageXtra); switch(line) { case 1: default: openEdit_ResetStopwatch(); break; case 2: openEdit_CompassHeading(); break; case 3: openEdit_SetManualMarker(); break; case 4: openEdit_CalibViewport(); break; case 5: if(is_stateUsedSetToSim()) { openEdit_SimFollowDecostops(); } else { openEdit_SetEndDive(); } break; } } else /* surface mode */ { switch(line) { case 1: openEdit_CCRModeSensorOrFixedSP(); break; case 2: openEdit_Fallback(); break; case 3: openEdit_Scrubber(); break; #ifdef ENABLE_PSCR_MODE case 4: openEdit_PSCR(); break; #endif case 5: openInfo_PreDive(); break; default: break; } } } /* Private functions ---------------------------------------------------------*/ void openEdit_ResetStopwatch(void) { timer_Stopwatch_Restart(); exitMenuEdit_to_Home(); } void openEdit_SetManualMarker(void) { stateUsedWrite->events.manualMarker = 1; exitMenuEdit_to_Home(); } void openEdit_SetEndDive(void) { dataOutGetPointer()->setEndDive = 1; exitMenuEdit_to_Home(); } void openEdit_SimFollowDecostops(void) { simulation_set_heed_decostops(!simulation_get_heed_decostops()); exitMenuEdit_to_Menu_with_Menu_Update(); } void openEdit_CalibViewport(void) { calibrateViewport(stateUsed->lifeData.compass_roll, stateUsed->lifeData.compass_pitch, stateUsed->lifeData.compass_heading); suspendMotionDetection(0); /* exit to focus mode directly */ exitMenuEdit_to_Home(); } static void openEdit_CCRModeSensorOrFixedSP(void) { SSettings *pSettings = settingsGetPointer(); if(pSettings->CCR_Mode == CCRMODE_Sensors) { pSettings->CCR_Mode = CCRMODE_FixedSetpoint; } else { pSettings->CCR_Mode = CCRMODE_Sensors; } exitEditWithUpdate(); } static void openEdit_Fallback(void) { /* does not work like this resetEnterPressedToStateBeforeButtonAction(); */ SSettings *pSettings = settingsGetPointer(); if (pSettings->CCR_Mode == CCRMODE_Sensors) { pSettings->fallbackToFixedSetpoint = (pSettings->fallbackToFixedSetpoint + 1) % 2; } exitMenuEdit_to_Menu_with_Menu_Update_do_not_write_settings_for_this_only(); } static void printScrubberResetText(char *text, SSettings *settings) { int16_t currentTimerMinutes = settings->scrubberData[settings->scubberActiveId].TimerCur; char colour = '\020'; if (currentTimerMinutes <= 0) { colour = '\025'; } else if (currentTimerMinutes <= 30) { colour = '\024'; } snprintf(text, 32, "%c\002%c%03i\016\016 %c\017", TXT_ScrubTimeReset, colour, currentTimerMinutes, TXT_Minutes); } static void openEdit_Scrubber(void) { char text[32]; uint8_t textIndex = 0; uint16_t localScrubTimer; SSettings *pSettings = settingsGetPointer(); localScrubTimer = pSettings->scrubberData[pSettings->scubberActiveId].TimerMax; resetMenuEdit(CLUT_MenuPageXtra); snprintf(&text[0], 32,"\001%c",TXT_ScrubTime); write_topline(text); snprintf(&text[0], 32,"%c \002#%d",TXT_ScrubTime,pSettings->scubberActiveId); write_field_button(StMXTRA_ScrubTimer, 20, 780, ME_Y_LINE1, &FontT48, text); snprintf(&text[textIndex], 32,\ "%c" "\016\016(%c)\017" ,TXT_ScrubTime ,TXT_Maximum); write_label_var( 20, 340, ME_Y_LINE2, &FontT48, text); snprintf(&text[textIndex], 32, "\002###\016\016 %c\017",TXT_Minutes); write_field_udigit(StMXTRA_ScrubTimer_Max, 610, 780, ME_Y_LINE2, &FontT48, text,localScrubTimer, 0, 0, 0); printScrubberResetText(text, pSettings); write_field_button(StMXTRA_ScrubTimer_Reset, 20, 780, ME_Y_LINE3, &FontT48, text); if(pSettings->scrubberData[pSettings->scubberActiveId].lastDive.WeekDay != 0) { snprintf(&text[0], 32,"%c%c\002 %02d.%02d.%02d", TXT_2BYTE, TXT2BYTE_SimDiveTime, pSettings->scrubberData[pSettings->scubberActiveId].lastDive.Date, pSettings->scrubberData[pSettings->scubberActiveId].lastDive.Month, pSettings->scrubberData[pSettings->scubberActiveId].lastDive.Year); } else { snprintf(&text[0], 32,"%c%c\002 --.--.--", TXT_2BYTE, TXT2BYTE_SimDiveTime); } write_label_var( 20, 780, ME_Y_LINE4, &FontT48, text); switch(pSettings->scrubTimerMode) { case SCRUB_TIMER_OFF: default: snprintf(&text[0], 32,"%c\002%c%c",TXT_ScrubTimeMode, TXT_2BYTE, TXT2BYTE_MoCtrlNone ); break; case SCRUB_TIMER_MINUTES: snprintf(&text[0], 32,"%c\002%c",TXT_ScrubTimeMode, TXT_Minutes ); break; case SCRUB_TIMER_PERCENT: snprintf(&text[0], 32,"%c\002%c",TXT_ScrubTimeMode, TXT_Percent ); break; } write_field_button(StMXTRA_ScrubTimer_OP_Mode, 20, 780, ME_Y_LINE5, &FontT48, text); setEvent(StMXTRA_ScrubTimer, (uint32_t)OnAction_ScrubberTimerId); setEvent(StMXTRA_ScrubTimer_Max, (uint32_t)OnAction_ScrubberTimerMax); setEvent(StMXTRA_ScrubTimer_Reset, (uint32_t)OnAction_ScrubberReset); setEvent(StMXTRA_ScrubTimer_OP_Mode, (uint32_t)OnAction_ScrubberMode); write_buttonTextline(TXT2BYTE_ButtonBack,TXT2BYTE_ButtonEnter,TXT2BYTE_ButtonNext); } static void openEdit_PSCR(void) { uint8_t localO2Drop,localLungRatio; char text[32]; SSettings *pSettings = settingsGetPointer(); localO2Drop = pSettings->pscr_o2_drop; localLungRatio = pSettings->pscr_lung_ratio; resetMenuEdit(CLUT_MenuPageXtra); snprintf(text, 32, "\001%c",TXT_PSClosedCircuit); write_topline(text); text[0] = '\002'; text[1] = '\016'; text[2] = '\016'; text[3] = '%'; text[4] = 0; write_label_fix( 20, 800, ME_Y_LINE1, &FontT48, TXT_PSCRO2Drop); write_label_var( 435, 780, ME_Y_LINE1, &FontT48, text); write_field_udigit(StMXTRA_PSCR_O2_Drop, 710, 779, ME_Y_LINE1, &FontT48, "##", (uint32_t)localO2Drop, 0, 0, 0); text[0] = '\002'; text[1] = '1'; text[2] = '/'; text[3] = 0; write_label_fix( 20, 800, ME_Y_LINE2, &FontT48, TXT_PSCRLungRatio); write_label_var( 435, 710, ME_Y_LINE2, &FontT48, text); write_field_udigit(StMXTRA_PSCR_LUNG_RATIO, 710, 779, ME_Y_LINE2, &FontT48, "##", (uint32_t)localLungRatio, 0, 0, 0); write_buttonTextline(TXT2BYTE_ButtonBack,TXT2BYTE_ButtonEnter,TXT2BYTE_ButtonNext); setEvent(StMXTRA_PSCR_O2_Drop, (uint32_t)OnAction_PSCRO2Drop); setEvent(StMXTRA_PSCR_LUNG_RATIO, (uint32_t)OnAction_PSCRLungRation); } static uint8_t OnAction_CompassHeadingClear(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action) { stateUsedWrite->diveSettings.compassHeading = 0; exitMenuEdit_to_Home_with_Menu_Update(); return EXIT_TO_HOME; } static uint8_t OnAction_CompassHeadingReset(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action) { stateUsedWrite->diveSettings.compassHeading = settingsGetPointer()->compassBearing; exitMenuEdit_to_Home_with_Menu_Update(); return EXIT_TO_HOME; } static void drawCompassHeadingMenu(bool isRefresh) { SSettings *settings = settingsGetPointer(); char text[32]; snprintf(text, 32, "\001%c%c", TXT_2BYTE, TXT2BYTE_CompassHeading); write_topline(text); uint16_t heading; if (settings->compassInertia) { heading = (uint16_t)compass_getCompensated(); } else { heading = (uint16_t)stateUsed->lifeData.compass_heading; } snprintf(text,32,"\001%03i`",heading); write_label_var(0, 800, ME_Y_LINE1, &FontT54, text); if (!isRefresh) { snprintf(text, 32, "%c%c", TXT_2BYTE, TXT2BYTE_Set); write_field_button(StMXTRA_CompassHeading, 20, 800, ME_Y_LINE2, &FontT48, text); } else { tMenuEdit_refresh_field(StMXTRA_CompassHeading); } bool headingIsSet = stateUsed->diveSettings.compassHeading; snprintf(text, 32, "%s%c%c", makeGrey(!headingIsSet), TXT_2BYTE, TXT2BYTE_Clear); if (headingIsSet) { if (!isRefresh) { write_field_button(StMXTRA_CompassHeadingClear, 20, 800, ME_Y_LINE3, &FontT48, text); } else { tMenuEdit_refresh_field(StMXTRA_CompassHeadingClear); } } else { write_label_var(20, 800, ME_Y_LINE3, &FontT48, text); } int16_t compassBearing = settings->compassBearing; bool canSetBearing = compassBearing && compassBearing != stateUsed->diveSettings.compassHeading; snprintf(text, 32, "%s%c%c (%03u`)", makeGrey(!canSetBearing), TXT_2BYTE, TXT2BYTE_Reset, compassBearing); if (canSetBearing) { if (!isRefresh) { write_field_button(StMXTRA_CompassHeadingReset, 20, 800, ME_Y_LINE4, &FontT48, text); } else { tMenuEdit_refresh_field(StMXTRA_CompassHeadingReset); } } else { write_label_var(20, 800, ME_Y_LINE4, &FontT48, text); } if (!isRefresh) { setEvent(StMXTRA_CompassHeading, (uint32_t)OnAction_CompassHeading); setEvent(StMXTRA_CompassHeadingClear, (uint32_t)OnAction_CompassHeadingClear); setEvent(StMXTRA_CompassHeadingReset, (uint32_t)OnAction_CompassHeadingReset); } write_buttonTextline(TXT2BYTE_ButtonBack, TXT2BYTE_ButtonEnter, TXT2BYTE_ButtonNext); } void refresh_CompassHeading(void) { drawCompassHeadingMenu(true); } void openEdit_CompassHeading(void) { drawCompassHeadingMenu(false); } uint8_t OnAction_CompassHeading (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action) { setCompassHeading((uint16_t)stateUsed->lifeData.compass_heading); exitMenuEdit_to_Home_with_Menu_Update(); return EXIT_TO_HOME; } uint8_t OnAction_ScrubberTimerId(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action) { char text[32]; SSettings *pSettings; pSettings = settingsGetPointer(); if(pSettings->scubberActiveId == 0) { pSettings->scubberActiveId = 1; } else { pSettings->scubberActiveId = 0; } snprintf(&text[0], 32,"%c \002#%d",TXT_ScrubTime,pSettings->scubberActiveId); tMenuEdit_newButtonText(StMXTRA_ScrubTimer, text); printScrubberResetText(text, pSettings); tMenuEdit_newButtonText(StMXTRA_ScrubTimer_Reset, text); tMenuEdit_newInput(StMXTRA_ScrubTimer_Max, pSettings->scrubberData[pSettings->scubberActiveId].TimerMax, 0, 0, 0); if(pSettings->scrubberData[pSettings->scubberActiveId].lastDive.WeekDay != 0) { snprintf(&text[0], 32,"%c%c\002 %02d.%02d.%02d", TXT_2BYTE, TXT2BYTE_SimDiveTime, pSettings->scrubberData[pSettings->scubberActiveId].lastDive.Date, pSettings->scrubberData[pSettings->scubberActiveId].lastDive.Month, pSettings->scrubberData[pSettings->scubberActiveId].lastDive.Year); } else { snprintf(&text[0], 32,"%c%c\002 --.--.--", TXT_2BYTE, TXT2BYTE_SimDiveTime); } clean_content( 20, 780, ME_Y_LINE4, &FontT48); write_label_var( 20, 780, ME_Y_LINE4, &FontT48, text); return UNSPECIFIC_RETURN; } static uint8_t OnAction_ScrubberTimerMax(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action) { SSettings *pSettings; uint8_t digitContentNew = EXIT_TO_MENU; uint32_t newScrubberTime; if(action == ACTION_BUTTON_ENTER) { return digitContent; } if(action == ACTION_BUTTON_ENTER_FINAL) { evaluateNewString(editId, &newScrubberTime, 0, 0, 0); if(newScrubberTime > MAX_SCRUBBER_TIME) newScrubberTime = MAX_SCRUBBER_TIME; pSettings = settingsGetPointer(); pSettings->scrubberData[pSettings->scubberActiveId].TimerMax = newScrubberTime; if(pSettings->scrubberData[pSettings->scubberActiveId].TimerCur > newScrubberTime) { pSettings->scrubberData[pSettings->scubberActiveId].TimerCur = newScrubberTime; } tMenuEdit_newInput(editId, newScrubberTime, 0, 0, 0); digitContentNew = UNSPECIFIC_RETURN; } if(action == ACTION_BUTTON_NEXT) { digitContentNew = digitContent + 1; if(digitContentNew > '9') digitContentNew = '0'; } if(action == ACTION_BUTTON_BACK) { digitContentNew = digitContent - 1; if(digitContentNew < '0') digitContentNew = '9'; } return digitContentNew; } uint8_t OnAction_ScrubberReset(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action) { char text[32]; SSettings *pSettings; pSettings = settingsGetPointer(); pSettings->scrubberData[pSettings->scubberActiveId].TimerCur = pSettings->scrubberData[pSettings->scubberActiveId].TimerMax; pSettings->scrubberData[pSettings->scubberActiveId].lastDive.WeekDay = 0; /* invalidate date */ printScrubberResetText(text, pSettings); tMenuEdit_newButtonText(StMXTRA_ScrubTimer_Reset, text); snprintf(&text[0], 32,"%c%c\002 --.--.--", TXT_2BYTE, TXT2BYTE_SimDiveTime); clean_content( 20, 780, ME_Y_LINE4, &FontT48); write_label_var( 20, 780, ME_Y_LINE4, &FontT48, text); return UNSPECIFIC_RETURN; } uint8_t OnAction_ScrubberMode(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action) { char text[32]; uint8_t newMode; SSettings *pSettings; pSettings = settingsGetPointer(); newMode = pSettings->scrubTimerMode + 1; if(newMode >= SCRUB_TIMER_END) { newMode = SCRUB_TIMER_OFF; } pSettings->scrubTimerMode = newMode; switch(pSettings->scrubTimerMode) { case SCRUB_TIMER_OFF: default: snprintf(&text[0], 32,"%c\002%c%c",TXT_ScrubTimeMode, TXT_2BYTE, TXT2BYTE_MoCtrlNone ); break; case SCRUB_TIMER_MINUTES: snprintf(&text[0], 32,"%c\002%c",TXT_ScrubTimeMode, TXT_Minutes ); break; case SCRUB_TIMER_PERCENT: snprintf(&text[0], 32,"%c\002%c",TXT_ScrubTimeMode, TXT_Percent ); break; } tMenuEdit_newButtonText(StMXTRA_ScrubTimer_OP_Mode, text); return UNSPECIFIC_RETURN; } #ifdef ENABLE_PSCR_MODE static uint8_t OnAction_PSCRO2Drop(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action) { SSettings *pSettings; uint8_t digitContentNew = EXIT_TO_MENU; uint32_t newO2Drop; if(action == ACTION_BUTTON_ENTER) { return digitContent; } if(action == ACTION_BUTTON_ENTER_FINAL) { evaluateNewString(editId, &newO2Drop, 0, 0, 0); if(newO2Drop > PSCR_MAX_O2_DROP) newO2Drop = PSCR_MAX_O2_DROP; pSettings = settingsGetPointer(); pSettings->pscr_o2_drop = newO2Drop; tMenuEdit_newInput(editId, newO2Drop, 0, 0, 0); digitContentNew = UPDATE_DIVESETTINGS; } if(action == ACTION_BUTTON_NEXT) { digitContentNew = digitContent + 1; if(digitContentNew > '9') digitContentNew = '0'; } if(action == ACTION_BUTTON_BACK) { digitContentNew = digitContent - 1; if(digitContentNew < '0') digitContentNew = '9'; } return digitContentNew; } static uint8_t OnAction_PSCRLungRation(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action) { SSettings *pSettings; uint8_t digitContentNew = EXIT_TO_MENU; uint32_t newLungRatio; if(action == ACTION_BUTTON_ENTER) { return digitContent; } if(action == ACTION_BUTTON_ENTER_FINAL) { evaluateNewString(editId, &newLungRatio, 0, 0, 0); if(newLungRatio > PSCR_MAX_LUNG_RATIO) newLungRatio = PSCR_MAX_LUNG_RATIO; if(newLungRatio < PSCR_MIN_LUNG_RATIO) newLungRatio = PSCR_MIN_LUNG_RATIO; pSettings = settingsGetPointer(); pSettings->pscr_lung_ratio = newLungRatio; tMenuEdit_newInput(editId, newLungRatio, 0, 0, 0); digitContentNew = UPDATE_DIVESETTINGS; } if(action == ACTION_BUTTON_NEXT) { digitContentNew = digitContent + 1; if(digitContentNew > '9') digitContentNew = '0'; } if(action == ACTION_BUTTON_BACK) { digitContentNew = digitContent - 1; if(digitContentNew < '0') digitContentNew = '9'; } return digitContentNew; } #endif