Mercurial > public > ostc4
view Discovery/Src/tMenuSystem.c @ 863:0c89c6fa949c Evo_2_23
Bugfix empty line in deco plan (VPM only):
Floating numbers were used to calculate the target slot for the time entry of a deco stop. The float rounding caused a time to be written into one line above the intended one. In the next step the misplaced time was overwritten by the next shallower stop. To fix the problem the index calculation has been corrected and in addition digit numbers have generally been added to floating point operations to make the floating operation more visible.
author | Ideenmodellierer |
---|---|
date | Tue, 02 Jul 2024 20:05:08 +0200 |
parents | 9f487ad38170 |
children |
line wrap: on
line source
/////////////////////////////////////////////////////////////////////////////// /// -*- coding: UTF-8 -*- /// /// \file Discovery/Src/tMenuSystem.c /// \brief Main Template file for Menu Page System settings /// \author heinrichs weikamp gmbh /// \date 05-Aug-2014 /// /// \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 "tMenu.h" #include "tMenuSystem.h" #include "tHome.h" // for enum CUSTOMVIEWS and init_t7_compass() #include "t7.h" static uint8_t customviewsSubpage = 0; /* Private function prototypes -----------------------------------------------*/ char customview_TXT2BYTE_helper(uint8_t customViewId); void set_CustomsviewsSubpage(uint8_t page) { customviewsSubpage = page; } /* Exported functions --------------------------------------------------------*/ uint32_t tMSystem_refresh(uint8_t line, char *text, uint16_t *tab, char *subtext) { SSettings *data; int i; uint8_t textPointer; uint8_t dateFormat; uint8_t RTEhigh, RTElow; RTC_DateTypeDef Sdate; RTC_TimeTypeDef Stime; const SDiveState * pStateReal = stateRealGetPointer(); data = settingsGetPointer(); textPointer = 0; *tab = 300; *subtext = 0; resetLineMask(StMSYS); // dive mode if(actual_menu_content != MENU_SURFACE) { uint8_t id; for(i=0; i<5;i++) /* fill maximum 5 items and leave last one for sub page selection */ { id = cv_changelist[customviewsSubpage * 5 + i]; if(id == CVIEW_END) /* last list item? */ { break; } else { text[textPointer++] = '\006' - CHECK_BIT_THOME(data->cv_configuration,id); text[textPointer++] = ' '; textPointer += snprintf(&text[textPointer], 60, "%c%c\n\r", TXT_2BYTE, customview_TXT2BYTE_helper(id)); } } for(;i<5;i++) /* clear empty lines in case menu shows less than 5 entries */ { text[textPointer++]='\n'; text[textPointer++]='\r'; text[textPointer] = 0; switch(i) { case 0: disableLine(StMSYS_Custom0); break; case 1: disableLine(StMSYS_Custom1); break; case 2: disableLine(StMSYS_Custom2); break; case 3: disableLine(StMSYS_Custom3); break; case 4: disableLine(StMSYS_Custom4); break; default: case 5: disableLine(StMSYS_Custom5); break; } } text[textPointer++] = TXT_2BYTE; text[textPointer++] = TXT2BYTE_ButtonNext; text[textPointer] = 0; return StMSYS; } // surface mode getActualRTEandFONTversion(&RTEhigh,&RTElow,NULL,NULL); if((RTEhigh == 0xFF) || (RTElow == 0xFF)) { RTEhigh = 0; RTElow = 0; } if((line == 0) || (line == 1)) { translateDate(pStateReal->lifeData.dateBinaryFormat, &Sdate); translateTime(pStateReal->lifeData.timeBinaryFormat, &Stime); dateFormat = data->date_format; textPointer += snprintf(&text[textPointer], 40, "Date" "\016\016" " " ); if(dateFormat == DDMMYY) { textPointer += snprintf(&text[textPointer], 40, "DDMMYY" "\017" "\t" "%02d-%02d-%02d" " " , Sdate.Date, Sdate.Month, 2000 + Sdate.Year ); } else if(dateFormat == MMDDYY) { textPointer += snprintf(&text[textPointer], 40, "MMDDYY" "\017" "\t" "%02d-%02d-%02d" " " ,Sdate.Month, Sdate.Date, 2000 + Sdate.Year ); } else if(dateFormat == YYMMDD) { textPointer += snprintf(&text[textPointer], 40, "YYMMDD" "\017" "\t" "%02d-%02d-%02d" " " , 2000 + Sdate.Year, Sdate.Month, Sdate.Date ); } textPointer += snprintf(&text[textPointer], 60, "%02d:%02d:%02d" "\n\r" ,Stime.Hours, Stime.Minutes, Stime.Seconds ); } else { strcpy(&text[textPointer],"\n\r"); textPointer += 2; } if (line == 0 || line == 2) { if(t7_customview_disabled(CVIEW_Timer)) { text[textPointer++] = '\031'; /* change text color */ textPointer += snprintf(&text[textPointer], 21, "%c%c\t%u:%02u \016\016[m:ss]\017\n\r", TXT_2BYTE, TXT2BYTE_Timer, data->timerDurationS / 60, data->timerDurationS % 60); disableLine(StMSYS_Timer); text[textPointer++] = '\020'; /* restore text color */ } else { textPointer += snprintf(&text[textPointer], 21, "%c%c\t%u:%02u \016\016[m:ss]\017\n\r", TXT_2BYTE, TXT2BYTE_Timer, data->timerDurationS / 60, data->timerDurationS % 60); } } else { textPointer += snprintf(&text[textPointer], 3, "\n\r"); } if((line == 0) || (line == 3)) { text[textPointer++] = TXT_Language; text[textPointer++] = '\t'; text[textPointer++] = TXT_LanguageName; text[textPointer++] = '\n'; text[textPointer++] = '\r'; text[textPointer] = 0; } else { strcpy(&text[textPointer],"\n\r"); textPointer += 2; } if((line == 0) || (line == 4)) { text[textPointer++] = TXT_2BYTE; text[textPointer++] = TXT2BYTE_Layout; text[textPointer++] = '\t'; if(!data->showDebugInfo) { text[textPointer++] = TXT_2BYTE; if(data->nonMetricalSystem == 0) text[textPointer++] = TXT2BYTE_Units_metric; else text[textPointer++] = TXT2BYTE_Units_feet; if(data->tX_colorscheme != 0) { text[textPointer++] = ' '; text[textPointer++] = '/'; text[textPointer++] = '\027'; text[textPointer++] = ' '; text[textPointer++] = '0' + data->tX_colorscheme; text[textPointer++] = '\020'; } } else { if(data->nonMetricalSystem == 0) { text[textPointer++] = 'm'; text[textPointer++] = ' '; text[textPointer++] = '/'; text[textPointer++] = ' '; text[textPointer++] = 'C'; text[textPointer++] = ' '; } else { text[textPointer++] = 'f'; text[textPointer++] = 't'; text[textPointer++] = ' '; text[textPointer++] = '/'; text[textPointer++] = ' '; text[textPointer++] = 'F'; text[textPointer++] = ' '; } if(data->tX_colorscheme != 0) { text[textPointer++] = '/'; text[textPointer++] = '\027'; text[textPointer++] = ' '; text[textPointer++] = '0' + data->tX_colorscheme; text[textPointer++] = ' '; text[textPointer++] = '\020'; } text[textPointer++] = '/'; text[textPointer++] = ' '; text[textPointer++] = 'd'; text[textPointer++] = 'e'; text[textPointer++] = 'b'; text[textPointer++] = 'u'; text[textPointer++] = 'g'; } text[textPointer++] = '\n'; text[textPointer++] = '\r'; text[textPointer] = 0; } else { strcpy(&text[textPointer],"\n\r"); textPointer += 2; } if((line == 0) || (line == 5)) { text[textPointer++] = TXT_Information; text[textPointer++] = '\t'; textPointer += snprintf(&text[textPointer],29,"RTE %u.%u OS %i.%i.%i" ,RTEhigh ,RTElow ,firmwareDataGetPointer()->versionFirst ,firmwareDataGetPointer()->versionSecond ,firmwareDataGetPointer()->versionThird ); } strcpy(&text[textPointer],"\n\r"); textPointer += 2; if((line == 0) || (line == 6)) { text[textPointer++] = TXT_2BYTE; text[textPointer++] = TXT2BYTE_ResetMenu; text[textPointer] = 0; } strcpy(&text[textPointer],"\n\r"); textPointer += 2; return StMSYS; } void tMSystem_checkLineStatus(void) { uint8_t localLineMask = 0; uint8_t lineMask = getLineMask(StMSYS); if(t7_customview_disabled(CVIEW_Timer)) { localLineMask |= 1 << 2; } if(lineMask != localLineMask) { updateMenu(); } } /* Private functions ---------------------------------------------------------*/