|
@@ -118,10 +118,10 @@ void DGUSScreenHandler::DGUSLCD_SendWordValueToDisplay(DGUS_VP_Variable &var) {
|
118
|
118
|
if (var.memadr) {
|
119
|
119
|
//DEBUG_ECHOPAIR(" DGUS_LCD_SendWordValueToDisplay ", var.VP);
|
120
|
120
|
//DEBUG_ECHOLNPAIR(" data ", *(uint16_t *)var.memadr);
|
121
|
|
- uint8_t *tmp = (uint8_t *) var.memadr;
|
122
|
|
- uint16_t data_to_send = (tmp[0] << 8);
|
123
|
|
- if (var.size >= 1) data_to_send |= tmp[1];
|
124
|
|
- dgusdisplay.WriteVariable(var.VP, data_to_send);
|
|
121
|
+ if (var.size > 1)
|
|
122
|
+ dgusdisplay.WriteVariable(var.VP, *(int16_t*)var.memadr);
|
|
123
|
+ else
|
|
124
|
+ dgusdisplay.WriteVariable(var.VP, *(int8_t*)var.memadr);
|
125
|
125
|
}
|
126
|
126
|
}
|
127
|
127
|
|
|
@@ -132,8 +132,7 @@ void DGUSScreenHandler::DGUSLCD_SendPercentageToDisplay(DGUS_VP_Variable &var) {
|
132
|
132
|
//DEBUG_ECHOLNPAIR(" data ", *(uint16_t *)var.memadr);
|
133
|
133
|
uint16_t tmp = *(uint8_t *) var.memadr +1 ; // +1 -> avoid rounding issues for the display.
|
134
|
134
|
tmp = map(tmp, 0, 255, 0, 100);
|
135
|
|
- uint16_t data_to_send = swap16(tmp);
|
136
|
|
- dgusdisplay.WriteVariable(var.VP, data_to_send);
|
|
135
|
+ dgusdisplay.WriteVariable(var.VP, tmp);
|
137
|
136
|
}
|
138
|
137
|
}
|
139
|
138
|
|
|
@@ -142,8 +141,7 @@ void DGUSScreenHandler::DGUSLCD_SendPrintProgressToDisplay(DGUS_VP_Variable &var
|
142
|
141
|
//DEBUG_ECHOPAIR(" DGUSLCD_SendPrintProgressToDisplay ", var.VP);
|
143
|
142
|
uint16_t tmp = ExtUI::getProgress_percent();
|
144
|
143
|
//DEBUG_ECHOLNPAIR(" data ", tmp);
|
145
|
|
- uint16_t data_to_send = swap16(tmp);
|
146
|
|
- dgusdisplay.WriteVariable(var.VP, data_to_send);
|
|
144
|
+ dgusdisplay.WriteVariable(var.VP, tmp);
|
147
|
145
|
}
|
148
|
146
|
|
149
|
147
|
// Send the current print time to the display.
|
|
@@ -242,7 +240,6 @@ void DGUSScreenHandler::DGUSLCD_SendStringToDisplayPGM(DGUS_VP_Variable &var) {
|
242
|
240
|
DEBUG_ECHOLNPAIR(" data ", *(uint8_t *)var.memadr);
|
243
|
241
|
uint16_t data_to_send = 0;
|
244
|
242
|
if (*(uint8_t *) var.memadr) data_to_send = 1;
|
245
|
|
- data_to_send = swap16(data_to_send);
|
246
|
243
|
dgusdisplay.WriteVariable(var.VP, data_to_send);
|
247
|
244
|
}
|
248
|
245
|
}
|
|
@@ -255,7 +252,6 @@ void DGUSScreenHandler::DGUSLCD_SendHeaterStatusToDisplay(DGUS_VP_Variable &var)
|
255
|
252
|
DEBUG_ECHOLNPAIR(" data ", *(int16_t *)var.memadr);
|
256
|
253
|
uint16_t data_to_send = 0;
|
257
|
254
|
if (*(int16_t *) var.memadr) data_to_send = 1;
|
258
|
|
- data_to_send = swap16(data_to_send);
|
259
|
255
|
dgusdisplay.WriteVariable(var.VP, data_to_send);
|
260
|
256
|
}
|
261
|
257
|
}
|
|
@@ -268,7 +264,7 @@ void DGUSScreenHandler::DGUSLCD_SendHeaterStatusToDisplay(DGUS_VP_Variable &var)
|
268
|
264
|
//DEBUG_ECHOPAIR(" DGUSLCD_SendWaitingStatusToDisplay ", var.VP);
|
269
|
265
|
//DEBUG_ECHOLNPAIR(" data ", swap16(index));
|
270
|
266
|
if (period++ > DGUS_UI_WAITING_STATUS_PERIOD) {
|
271
|
|
- dgusdisplay.WriteVariable(var.VP, swap16(index));
|
|
267
|
+ dgusdisplay.WriteVariable(var.VP, index);
|
272
|
268
|
//DEBUG_ECHOLNPAIR(" data ", swap16(index));
|
273
|
269
|
if (++index >= DGUS_UI_WAITING_STATUS) index = 0;
|
274
|
270
|
period = 0;
|