sv/IronOS
1
0
Fork 0
forked from me/IronOS
Code Pull Requests Activity

Refactor out the sleeping timeouts

Browse Source
This commit is contained in:
Ben V. Brown
2020-10-05 17:34:16 +11:00
parent fc5765ad22
commit 2c626d7203
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
workspace/TS100/Core/Threads/GUIThread.cpp
View File

@@ -366,7 +366,25 @@ static void display_countdown(int sleepThres) {
OLED::print(SymbolSeconds); OLED::print(SymbolSeconds);
} }
} }
static uint32_t getSleepTimeout() {
if (systemSettings.sensitivity && systemSettings.SleepTime) {
uint32_t sleepThres = 0;
if (systemSettings.SleepTime < 6)
sleepThres = systemSettings.SleepTime * 10 * 1000;
else
sleepThres = (systemSettings.SleepTime - 5) * 60 * 1000;
return sleepThres;
}
return 0;
}
static bool shouldBeSleeping() {
//Return true if the iron should be in sleep mode
if ((xTaskGetTickCount() - lastMovementTime) > getSleepTimeout() && (xTaskGetTickCount() - lastButtonTime) > getSleepTimeout()) {
return true;
}
return false;
}
static void gui_solderingMode(uint8_t jumpToSleep) { static void gui_solderingMode(uint8_t jumpToSleep) {
/* /*
* * Soldering (gui_solderingMode) * * Soldering (gui_solderingMode)
@@ -383,11 +401,6 @@ static void gui_solderingMode(uint8_t jumpToSleep) {
*/ */
bool boostModeOn = false; bool boostModeOn = false;
uint32_t sleepThres = 0;
if (systemSettings.SleepTime < 6)
sleepThres = systemSettings.SleepTime * 10 * 1000;
else
sleepThres = (systemSettings.SleepTime - 5) * 60 * 1000;
if (jumpToSleep) { if (jumpToSleep) {
if (gui_SolderingSleepingMode(jumpToSleep == 2)) { if (gui_SolderingSleepingMode(jumpToSleep == 2)) {
lastButtonTime = xTaskGetTickCount(); lastButtonTime = xTaskGetTickCount();
@@ -440,7 +453,7 @@ static void gui_solderingMode(uint8_t jumpToSleep) {
if (systemSettings.sensitivity && systemSettings.SleepTime) { if (systemSettings.sensitivity && systemSettings.SleepTime) {
OLED::print(SymbolSpace); OLED::print(SymbolSpace);
display_countdown(sleepThres); display_countdown(getSleepTimeout());
} }
OLED::setCursor(0, 8); OLED::setCursor(0, 8);
@@ -515,7 +528,7 @@ static void gui_solderingMode(uint8_t jumpToSleep) {
#endif #endif
if (systemSettings.sensitivity && systemSettings.SleepTime) if (systemSettings.sensitivity && systemSettings.SleepTime)
if (xTaskGetTickCount() - lastMovementTime > sleepThres && xTaskGetTickCount() - lastButtonTime > sleepThres) { if (shouldBeSleeping()) {
if (gui_SolderingSleepingMode(false)) { if (gui_SolderingSleepingMode(false)) {
return; // If the function returns non-0 then exit return; // If the function returns non-0 then exit
} }