Mercurial > public > ostc4
view Discovery/Src/tMenuCustom.c @ 825:4bd8935f5176
Bugfix Flipscreen visualization:
In Timer and CCR overview the free custom fram coordinates were not initialized. Depending on which view was activ before the coordinates of the former view were used and sometimes resulting in a bad visualization. To fix the problem the coordinates are now initialized by the views.
The top menu bar text in the flip view did not consider spacings in the text position calculation causing an offset between color bar and text. The offset has been corrected.
author | Ideenmodellierer |
---|---|
date | Mon, 09 Oct 2023 16:50:11 +0200 |
parents | 4a6bffaa38b3 |
children |
line wrap: on
line source
/////////////////////////////////////////////////////////////////////////////// /// -*- coding: UTF-8 -*- /// /// \file Discovery/Src/tMenuCustom.c /// \brief Menu Custom - Provide access to custom view options /// \author heinrichs weikamp gmbh /// \date 25-Aug-2020 /// /// \details /// /// $Id$ /////////////////////////////////////////////////////////////////////////////// /// \par Copyright (c) 2014-2020 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 <stdio.h> #include <string.h> #include "tMenu.h" #include "tHome.h" #include "tStructure.h" #include "tMenuCustom.h" #include "text_multilanguage.h" #include "data_central.h" #include "motion.h" #include "gfx_fonts.h" #include "tInfo.h" #include "motion.h" /* Exported functions --------------------------------------------------------*/ uint32_t tMCustom_refresh(uint8_t line, char *text, uint16_t *tab, char *subtext) { uint8_t textPointer; textPointer = 0; *tab = 550; *subtext = 0; if((line == 0) || (line == 1)) { text[textPointer++] = TXT_2BYTE; text[textPointer++] = TXT2BYTE_Customviews; } text[textPointer++] = '\n'; text[textPointer++] = '\r'; text[textPointer] = 0; if((line == 0) || (line == 2)) { text[textPointer++] = TXT_2BYTE; text[textPointer++] = TXT2BYTE_ExtraDisplay; text[textPointer++] = ' '; text[textPointer++] = ' '; text[textPointer++] = TXT_2BYTE; switch(settingsGetPointer()->extraDisplay) { /* BigFont */ case EXTRADISPLAY_BIGFONT: text[textPointer++] = TXT2BYTE_ExtraBigFont; break; /* Start screen */ case EXTRADISPLAY_BFACTIVE: text[textPointer++] = TXT2BYTE_ExtraActive; break; /* none */ case EXTRADISPLAY_none: text[textPointer++] = TXT2BYTE_ExtraNone; break; default: snprintf(&text[textPointer++],4,"%u",settingsGetPointer()->extraDisplay); break; } } strcpy(&text[textPointer],"\n\r"); textPointer += 2; if((line == 0) || (line == 3)) { text[textPointer++] = TXT_2BYTE; text[textPointer++] = TXT2BYTE_SelectCustomviews; } strcpy(&text[textPointer],"\n\r"); textPointer += 2; if((line == 0) || (line == 4)) { text[textPointer++] = TXT_2BYTE; text[textPointer++] = TXT2BYTE_SelectBigFont; } strcpy(&text[textPointer],"\n\r"); textPointer += 2; #ifdef ENABLE_MOTION_CONTROL if((line == 0) || (line == 5)) { /* MotionCtrl */ text[textPointer++] = TXT_2BYTE; text[textPointer++] = TXT2BYTE_MotionCtrl; } strcpy(&text[textPointer],"\n\r"); textPointer += 2; #endif return StMCustom; }