comparison Discovery/Src/tMenuPlanner.c @ 696:cc542448fb28

Merge
author heinrichsweikamp
date Fri, 19 Aug 2022 11:30:24 +0200
parents 52df13712fa3
children
comparison
equal deleted inserted replaced
661:87bee7cc77b3 696:cc542448fb28
128 text[textPointer++] = TXT_2BYTE; 128 text[textPointer++] = TXT_2BYTE;
129 text[textPointer++] = TXT2BYTE_SimConsumption; 129 text[textPointer++] = TXT2BYTE_SimConsumption;
130 text[textPointer++] = '\t'; 130 text[textPointer++] = '\t';
131 textPointer += snprintf(&text[textPointer],30, 131 textPointer += snprintf(&text[textPointer],30,
132 "%u" 132 "%u"
133 "\016\016 l\\min\017", 133 "\016\016 l/min\017",
134 tMplan_gasConsumTravel); 134 tMplan_gasConsumTravel);
135 text[textPointer++] = ' '; 135 text[textPointer++] = ' ';
136 text[textPointer++] = ' '; 136 text[textPointer++] = ' ';
137 textPointer += snprintf(&text[textPointer],30, 137 textPointer += snprintf(&text[textPointer],30,
138 "\016\016deco\017" 138 "\016\016deco\017"
139 " %u" 139 " %u"
140 "\016\016 l\\min\017", 140 "\016\016 l/min\017",
141 tMplan_gasConsumDeco); 141 tMplan_gasConsumDeco);
142 } 142 }
143 strcpy(&text[textPointer],"\n\r"); 143 strcpy(&text[textPointer],"\n\r");
144 textPointer += 2; 144 textPointer += 2;
145 145