Mercurial > public > ostc4

comparison Discovery/Src/tMenuEditSystem.c @ 500:0d2449e9d659

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added possibility to switch between "classic" bigfont views and a selection with a new information combination New strings for the selection have been added and the menu handling has been updated to enable the selection.
author Ideenmodellierer
date Mon, 24 Aug 2020 19:36:18 +0200
parents aa1d71875e25
children 06b21f1e47a5
comparison
equal deleted inserted replaced
499:668471c5f410 500:0d2449e9d659
39 #include "tMenuEdit.h" 39 #include "tMenuEdit.h"
40 #include "tMenuSystem.h" 40 #include "tMenuSystem.h"
41 #include "motion.h" 41 #include "motion.h"
42 #include "t7.h" 42 #include "t7.h"
43 43
44
44 #define CV_SUBPAGE_MAX (2u) /* max number of customer view selection pages */ 45 #define CV_SUBPAGE_MAX (2u) /* max number of customer view selection pages */
45 /*#define HAVE_DEBUG_VIEW */ 46 /*#define HAVE_DEBUG_VIEW */
46 static uint8_t infoPage = 0; 47 static uint8_t infoPage = 0;
47 48
48 /* Private function prototypes -----------------------------------------------*/ 49 /* Private function prototypes -----------------------------------------------*/
940 break; 941 break;
941 /* none */ 942 /* none */
942 case EXTRADISPLAY_none: 943 case EXTRADISPLAY_none:
943 text[5] = TXT2BYTE_ExtraNone; 944 text[5] = TXT2BYTE_ExtraNone;
944 break; 945 break;
946 #ifdef ENABLE_BIGFONT_VX
947 case EXTRADISPLAY_BIGFONT2:
948 text[5] = TXT2BYTE_ExtraBigFontV2;
949 break;
950 #endif
945 default: 951 default:
946 snprintf(&text[4],2,"%u",settingsGetPointer()->extraDisplay); 952 snprintf(&text[4],2,"%u",settingsGetPointer()->extraDisplay);
947 break; 953 break;
948 } 954 }
949 text[6] = 0; 955 text[6] = 0;
1093 1099
1094 1100
1095 uint8_t OnAction_ExtraDisplay (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action) 1101 uint8_t OnAction_ExtraDisplay (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action)
1096 { 1102 {
1097 uint8_t newValue; 1103 uint8_t newValue;
1098 switch(settingsGetPointer()->extraDisplay) 1104
1099 { 1105 newValue = settingsGetPointer()->extraDisplay + 1;
1100 case EXTRADISPLAY_BIGFONT: 1106 if(newValue == EXTRADISPLAY_DECOGAME) /* Decogame not yet implemented */
1101 newValue = EXTRADISPLAY_none; 1107 {
1102 break; 1108 newValue++;
1103 case EXTRADISPLAY_DECOGAME: 1109 }
1104 newValue = EXTRADISPLAY_BIGFONT; 1110 if(newValue >= EXTRADISPLAY_END)
1105 break; 1111 {
1106 case EXTRADISPLAY_none: 1112 newValue = EXTRADISPLAY_none;
1107 newValue = EXTRADISPLAY_BIGFONT;
1108 break;
1109 default:
1110 newValue = EXTRADISPLAY_BIGFONT;
1111 break;
1112 } 1113 }
1113 settingsGetPointer()->extraDisplay = newValue; 1114 settingsGetPointer()->extraDisplay = newValue;
1114 return UNSPECIFIC_RETURN; 1115 return UNSPECIFIC_RETURN;
1115 } 1116 }
1116 1117