aboutsummaryrefslogtreecommitdiffhomepage
path: root/workspace/TS100/src/main.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'workspace/TS100/src/main.cpp')
-rw-r--r--workspace/TS100/src/main.cpp21
1 files changed, 12 insertions, 9 deletions
diff --git a/workspace/TS100/src/main.cpp b/workspace/TS100/src/main.cpp
index 01a13e4a..7516d679 100644
--- a/workspace/TS100/src/main.cpp
+++ b/workspace/TS100/src/main.cpp
@@ -581,14 +581,7 @@ static void gui_solderingMode() {
}
static const char *HEADERS[] = {
- __DATE__,
- "Heap: ",
- "HWMG: ",
- "HWMP: ",
- "HWMM: ",
- "Time: ",
- "Move: "
-};
+__DATE__, "Heap: ", "HWMG: ", "HWMP: ", "HWMM: ", "Time: ", "Move: ","Rtip: ","Ctip: ","Vin :" };
void showVersion(void) {
uint8_t screen = 0;
@@ -620,6 +613,15 @@ void showVersion(void) {
case 6:
lcd.printNumber(lastMovementTime / 100, 5);
break;
+ case 7:
+ lcd.printNumber(getTipRawTemp(0),5);
+ break;
+ case 8:
+ lcd.printNumber(tipMeasurementToC(getTipRawTemp(0)),5);
+ break;
+ case 9:
+ printVoltage();
+ break;
default:
break;
}
@@ -630,7 +632,7 @@ void showVersion(void) {
return;
else if (b == BUTTON_F_SHORT) {
screen++;
- screen = screen % 7;
+ screen = screen % 10;
}
GUIDelay();
}
@@ -642,6 +644,7 @@ void startGUITask(void const *argument) {
uint8_t tempWarningState = 0;
bool buttonLockout = false;
bool tempOnDisplay = false;
+ getTipRawTemp(2); //reset filter
lcd.setRotation(systemSettings.OrientationMode & 1);
uint32_t ticks = xTaskGetTickCount();
ticks += 400; //4 seconds from now