Mercurial > public > ostc4

comparison Discovery/Src/tMenuXtra.c @ 609:1b243c6c7067

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bugfix: CalibViewport were shown even in case the compile switch had not been set: The function calibrate viewport could be selected in the dive menu. Selection had no effect but a non functional menu item might cause confusion => removment is now covered by compile switch
author Ideenmodellierer
date Thu, 14 Jan 2021 19:17:28 +0100
parents 12f8745c8a94
children 890440ab993a
comparison
equal deleted inserted replaced
608:6738028de847 609:1b243c6c7067
33 #include "tStructure.h" 33 #include "tStructure.h"
34 #include "tMenuXtra.h" 34 #include "tMenuXtra.h"
35 #include "text_multilanguage.h" 35 #include "text_multilanguage.h"
36 #include "data_central.h" 36 #include "data_central.h"
37 #include "simulation.h" 37 #include "simulation.h"
38 #include "configuration.h"
38 39
39 /* Exported functions --------------------------------------------------------*/ 40 /* Exported functions --------------------------------------------------------*/
40 41
41 uint32_t tMXtra_refresh(uint8_t line, char *text, uint16_t *tab, char *subtext) 42 uint32_t tMXtra_refresh(uint8_t line, char *text, uint16_t *tab, char *subtext)
42 { 43 {
76 text[textPointer++] = TXT2BYTE_SetMarker; 77 text[textPointer++] = TXT2BYTE_SetMarker;
77 } 78 }
78 strcpy(&text[textPointer],"\n\r"); 79 strcpy(&text[textPointer],"\n\r");
79 textPointer += 2; 80 textPointer += 2;
80 81
82 #ifdef ENABLE_MOTION_CONTROL
81 if((line == 0) || (line == 4)) 83 if((line == 0) || (line == 4))
82 { 84 {
83 text[textPointer++] = TXT_2BYTE; 85 text[textPointer++] = TXT_2BYTE;
84 text[textPointer++] = TXT2BYTE_CalibView; 86 text[textPointer++] = TXT2BYTE_CalibView;
85 } 87 }
86 strcpy(&text[textPointer],"\n\r"); 88 strcpy(&text[textPointer],"\n\r");
87 textPointer += 2; 89 textPointer += 2;
90 #endif
88 91
89 if(is_stateUsedSetToSim()) 92 if(is_stateUsedSetToSim())
90 { 93 {
91 if((line == 0) || (line == 5)) 94 if((line == 0) || (line == 5))
92 { 95 {