Skip to content

Commit

Permalink
Qrome - Fixed Temperature to an accurate rounding value
Browse files Browse the repository at this point in the history
  • Loading branch information
Qrome committed Jun 7, 2018
1 parent 7de82a8 commit 0597e57
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 5 deletions.
6 changes: 6 additions & 0 deletions printermonitor/OctoPrintClient.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -286,4 +286,10 @@ String OctoPrintClient::getFilamentLength() {

String OctoPrintClient::getError() {
return printerData.error;
}

String OctoPrintClient::getValueRounded(String value) {
float f = value.toFloat();
int rounded = (int)(f+0.5f);
return String(rounded);
}
1 change: 1 addition & 0 deletions printermonitor/OctoPrintClient.h
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ class OctoPrintClient {
String getTempToolActual();
String getTempToolTarget();
String getFilamentLength();
String getValueRounded(String value);
String getError();
};

10 changes: 5 additions & 5 deletions printermonitor/printermonitor.ino
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ SOFTWARE.

#include "Settings.h"

#define VERSION "1.6"
#define VERSION "1.7"

#define HOSTNAME "OctMon-"
#define CONFIG "/conf.txt"
Expand Down Expand Up @@ -630,10 +630,10 @@ void drawScreen1(OLEDDisplay *display, OLEDDisplayUiState* state, int16_t x, int
display->drawString(64 + x, 0 + y, "Bed / Tool Temp");
display->setTextAlignment(TEXT_ALIGN_LEFT);
display->setFont(ArialMT_Plain_24);
int bed = printerClient.getTempBedActual().toInt();
int tool = printerClient.getTempToolActual().toInt();
display->drawString(2 + x, 14 + y, String(bed) + "°");
display->drawString(64 + x, 14 + y, String(tool) + "°");
String bed = printerClient.getValueRounded(printerClient.getTempBedActual());
String tool = printerClient.getValueRounded(printerClient.getTempToolActual());
display->drawString(2 + x, 14 + y, bed + "°");
display->drawString(64 + x, 14 + y, tool + "°");
}

void drawScreen2(OLEDDisplay *display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
Expand Down

0 comments on commit 0597e57

Please sign in to comment.