Qrome - Fixed Temperature to an accurate rounding value
parent
7de82a8166
commit
0597e57e43
|
|
@ -286,4 +286,10 @@ String OctoPrintClient::getFilamentLength() {
|
||||||
|
|
||||||
String OctoPrintClient::getError() {
|
String OctoPrintClient::getError() {
|
||||||
return printerData.error;
|
return printerData.error;
|
||||||
|
}
|
||||||
|
|
||||||
|
String OctoPrintClient::getValueRounded(String value) {
|
||||||
|
float f = value.toFloat();
|
||||||
|
int rounded = (int)(f+0.5f);
|
||||||
|
return String(rounded);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -85,6 +85,7 @@ public:
|
||||||
String getTempToolActual();
|
String getTempToolActual();
|
||||||
String getTempToolTarget();
|
String getTempToolTarget();
|
||||||
String getFilamentLength();
|
String getFilamentLength();
|
||||||
|
String getValueRounded(String value);
|
||||||
String getError();
|
String getError();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,7 @@ SOFTWARE.
|
||||||
|
|
||||||
#include "Settings.h"
|
#include "Settings.h"
|
||||||
|
|
||||||
#define VERSION "1.6"
|
#define VERSION "1.7"
|
||||||
|
|
||||||
#define HOSTNAME "OctMon-"
|
#define HOSTNAME "OctMon-"
|
||||||
#define CONFIG "/conf.txt"
|
#define CONFIG "/conf.txt"
|
||||||
|
|
@ -630,10 +630,10 @@ void drawScreen1(OLEDDisplay *display, OLEDDisplayUiState* state, int16_t x, int
|
||||||
display->drawString(64 + x, 0 + y, "Bed / Tool Temp");
|
display->drawString(64 + x, 0 + y, "Bed / Tool Temp");
|
||||||
display->setTextAlignment(TEXT_ALIGN_LEFT);
|
display->setTextAlignment(TEXT_ALIGN_LEFT);
|
||||||
display->setFont(ArialMT_Plain_24);
|
display->setFont(ArialMT_Plain_24);
|
||||||
int bed = printerClient.getTempBedActual().toInt();
|
String bed = printerClient.getValueRounded(printerClient.getTempBedActual());
|
||||||
int tool = printerClient.getTempToolActual().toInt();
|
String tool = printerClient.getValueRounded(printerClient.getTempToolActual());
|
||||||
display->drawString(2 + x, 14 + y, String(bed) + "°");
|
display->drawString(2 + x, 14 + y, bed + "°");
|
||||||
display->drawString(64 + x, 14 + y, String(tool) + "°");
|
display->drawString(64 + x, 14 + y, tool + "°");
|
||||||
}
|
}
|
||||||
|
|
||||||
void drawScreen2(OLEDDisplay *display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
|
void drawScreen2(OLEDDisplay *display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue