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

Patch #117 sleep temp min()

Browse Source
This commit is contained in:
Ben V. Brown
2017-11-04 14:18:44 +11:00
parent fd92271121
commit d7a9e1a9ea
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
workspace/TS100/src/main.cpp
View File

@@ -411,6 +411,12 @@ static int gui_showTipTempWarning() {
GUIDelay(); GUIDelay();
} }
} }
static uint16_t min(uint16_t a,uint16_t b)
{
if(a>b)
return b;
else return a;
}
static int gui_SolderingSleepingMode() { static int gui_SolderingSleepingMode() {
//Drop to sleep temperature and display until movement or button press //Drop to sleep temperature and display until movement or button press
@@ -424,9 +430,9 @@ static int gui_SolderingSleepingMode() {
return 1; //return non-zero on error return 1; //return non-zero on error
if (systemSettings.temperatureInF) if (systemSettings.temperatureInF)
currentlyActiveTemperatureTarget = ftoTipMeasurement(systemSettings.SleepTemp); currentlyActiveTemperatureTarget = ftoTipMeasurement(min(systemSettings.SleepTemp,systemSettings.SolderingTemp));
else else
currentlyActiveTemperatureTarget = ctoTipMeasurement(systemSettings.SleepTemp); currentlyActiveTemperatureTarget = ctoTipMeasurement(min(systemSettings.SleepTemp,systemSettings.SolderingTemp));
//draw the lcd //draw the lcd
uint16_t tipTemp; uint16_t tipTemp;
if (systemSettings.temperatureInF) if (systemSettings.temperatureInF)