me/IronOS
1
0
Fork 1
mirror of https://github.com/Ralim/IronOS.git synced 2025-02-26 07:53:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Sleep mode bugfix and better display

Browse Source
This commit is contained in:
Ben V. Brown
2016-09-29 13:39:46 +10:00
parent bbb758fd4c
commit 5a581b7a9f
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
workspace/ts100/src/Modes.c
View File

@@ -48,15 +48,14 @@ void ProcessUI() {
//We need to check the timer for movement in case we need to goto idle
if (systemSettings.movementEnabled)
if (millis() - getLastMovement()
> (systemSettings.SleepTime * 60000)) {
operatingMode = SLEEP; //Goto Sleep Mode
return;
> (systemSettings.SleepTime * 10000)) {
if (millis() - getLastButtonPress()
> (systemSettings.SleepTime * 10000)) {
operatingMode = SLEEP;
return;
}
}
if (millis() - getLastButtonPress()
> (systemSettings.SleepTime * 60000)) {
operatingMode = SLEEP;
return;
}
//If no buttons pushed we need to perform the PID loop for the iron temp
int32_t newOutput = computePID(systemSettings.SolderingTemp);
if (newOutput >= 0) {
@@ -141,7 +140,7 @@ void ProcessUI() {
resetButtons();
return;
} else if (systemSettings.movementEnabled)
if (millis() - getLastMovement() > 100) {
if (millis() - getLastMovement() < 1000) {//moved in the last second
operatingMode = SOLDERING; //Goto active mode again
return;
}
@@ -185,7 +184,7 @@ void DrawUI() {
}
OLED_DrawThreeNumber(temp / 10, 0);
OLED_DrawChar('C', 14 * 3);
OLED_DrawChar(' ', 14 * 3);
OLED_DrawChar(' ', 14 * 5);
OLED_DrawChar(' ', 14 * 6);
@@ -227,7 +226,10 @@ void DrawUI() {
case SLEEP:
//The iron is in sleep temp mode
//Draw in temp and sleep
OLED_DrawString("SLEP ", 6);
OLED_DrawString("SLP", 3);
uint16_t temp = readIronTemp(0, 0);
OLED_DrawThreeNumber(temp / 10, 14 * 3);
break;
default:
break;