|
@@ -20,6 +20,12 @@ int absPreheatHPBTemp;
|
20
|
20
|
int absPreheatFanSpeed;
|
21
|
21
|
|
22
|
22
|
|
|
23
|
+#ifdef FILAMENT_LCD_DISPLAY
|
|
24
|
+unsigned long message_millis=0;
|
|
25
|
+#endif
|
|
26
|
+
|
|
27
|
+
|
|
28
|
+
|
23
|
29
|
#ifdef ULTIPANEL
|
24
|
30
|
static float manual_feedrate[] = MANUAL_FEEDRATE;
|
25
|
31
|
#endif // ULTIPANEL
|
|
@@ -195,6 +201,9 @@ static void lcd_status_screen()
|
195
|
201
|
encoderPosition = 0;
|
196
|
202
|
lcd_quick_feedback();
|
197
|
203
|
lcd_implementation_init(); // to maybe revive the LCD if static electricity killed it.
|
|
204
|
+#ifdef FILAMENT_LCD_DISPLAY
|
|
205
|
+ message_millis=millis(); //get status message to show up for a while
|
|
206
|
+#endif
|
198
|
207
|
}
|
199
|
208
|
|
200
|
209
|
#ifdef ULTIPANEL_FEEDMULTIPLY
|
|
@@ -1321,6 +1330,9 @@ void lcd_setstatus(const char* message)
|
1321
|
1330
|
return;
|
1322
|
1331
|
strncpy(lcd_status_message, message, LCD_WIDTH);
|
1323
|
1332
|
lcdDrawUpdate = 2;
|
|
1333
|
+#ifdef FILAMENT_LCD_DISPLAY
|
|
1334
|
+ message_millis=millis(); //get status message to show up for a while
|
|
1335
|
+#endif
|
1324
|
1336
|
}
|
1325
|
1337
|
void lcd_setstatuspgm(const char* message)
|
1326
|
1338
|
{
|
|
@@ -1328,6 +1340,9 @@ void lcd_setstatuspgm(const char* message)
|
1328
|
1340
|
return;
|
1329
|
1341
|
strncpy_P(lcd_status_message, message, LCD_WIDTH);
|
1330
|
1342
|
lcdDrawUpdate = 2;
|
|
1343
|
+#ifdef FILAMENT_LCD_DISPLAY
|
|
1344
|
+ message_millis=millis(); //get status message to show up for a while
|
|
1345
|
+#endif
|
1331
|
1346
|
}
|
1332
|
1347
|
void lcd_setalertstatuspgm(const char* message)
|
1333
|
1348
|
{
|
|
@@ -1515,6 +1530,20 @@ char *ftostr32(const float &x)
|
1515
|
1530
|
return conv;
|
1516
|
1531
|
}
|
1517
|
1532
|
|
|
1533
|
+//Float to string with 1.23 format
|
|
1534
|
+char *ftostr12ns(const float &x)
|
|
1535
|
+{
|
|
1536
|
+ long xx=x*100;
|
|
1537
|
+
|
|
1538
|
+ xx=abs(xx);
|
|
1539
|
+ conv[0]=(xx/100)%10+'0';
|
|
1540
|
+ conv[1]='.';
|
|
1541
|
+ conv[2]=(xx/10)%10+'0';
|
|
1542
|
+ conv[3]=(xx)%10+'0';
|
|
1543
|
+ conv[4]=0;
|
|
1544
|
+ return conv;
|
|
1545
|
+}
|
|
1546
|
+
|
1518
|
1547
|
char *itostr31(const int &xx)
|
1519
|
1548
|
{
|
1520
|
1549
|
conv[0]=(xx>=0)?'+':'-';
|