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

Closes #103

Browse Source
This commit is contained in:
Ben V. Brown
2017-10-06 16:38:13 +11:00
parent 835ef5d7de
commit cef4db8531
1 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -352,11 +352,7 @@ static void gui_settingsMenu() {
static void gui_showTipTempWarning() { static void gui_showTipTempWarning() {
for (;;) { for (;;) {
uint16_t tipTemp; uint16_t tipTemp = tipMeasurementToC(getTipRawTemp(0));
if (systemSettings.temperatureInF)
tipTemp = tipMeasurementToF(getTipRawTemp(0));
else
tipTemp = tipMeasurementToC(getTipRawTemp(0));
lcd.clearScreen(); lcd.clearScreen();
lcd.setCursor(0, 0); lcd.setCursor(0, 0);
if (systemSettings.advancedScreens) { if (systemSettings.advancedScreens) {
@@ -364,21 +360,26 @@ static void gui_showTipTempWarning() {
lcd.print(WarningAdvancedString); lcd.print(WarningAdvancedString);
lcd.setCursor(0, 8); lcd.setCursor(0, 8);
lcd.print("Tip Temp: "); lcd.print("Tip Temp: ");
lcd.printNumber(tipTemp, 3);
if (systemSettings.temperatureInF) if (systemSettings.temperatureInF) {
lcd.printNumber(tipMeasurementToF(getTipRawTemp(0)), 3);
lcd.print("F"); lcd.print("F");
else } else {
lcd.printNumber(tipMeasurementToC(getTipRawTemp(0)), 3);
lcd.print("C"); lcd.print("C");
}
} else { } else {
lcd.setFont(0); lcd.setFont(0);
lcd.print(WarningSimpleString); lcd.print(WarningSimpleString);
lcd.printNumber(tipTemp, 3); if (systemSettings.temperatureInF) {
if (systemSettings.temperatureInF) lcd.printNumber(tipMeasurementToF(getTipRawTemp(0)), 3);
lcd.drawSymbol(0); lcd.drawSymbol(0);
else } else {
lcd.printNumber(tipMeasurementToC(getTipRawTemp(0)), 3);
lcd.drawSymbol(1); lcd.drawSymbol(1);
}
} }
if (systemSettings.coolingTempBlink) { if (systemSettings.coolingTempBlink && tipTemp > 50) {
if (HAL_GetTick() % 500 < 250) if (HAL_GetTick() % 500 < 250)
lcd.clearScreen(); lcd.clearScreen();
} }
@@ -386,17 +387,13 @@ static void gui_showTipTempWarning() {
ButtonState buttons = getButtonState(); ButtonState buttons = getButtonState();
if (buttons == BUTTON_B_SHORT || buttons == BUTTON_F_SHORT || buttons == BUTTON_BOTH) if (buttons == BUTTON_B_SHORT || buttons == BUTTON_F_SHORT || buttons == BUTTON_BOTH)
return; return;
if (systemSettings.temperatureInF) {
if (tipTemp < 86) if (tipTemp < 30)
return; return;
} else {
if (tipTemp < 30)
return;
}
HAL_IWDG_Refresh(&hiwdg); HAL_IWDG_Refresh(&hiwdg);
osDelay(200); osDelay(200);
} }
} }
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
@@ -651,7 +648,7 @@ void startGUITask(void const * argument) {
HAL_IWDG_Refresh(&hiwdg); HAL_IWDG_Refresh(&hiwdg);
}*/ }*/
//^ Kept here for a way to block this thread //^ Kept here for a way to block this thread
for (;;) { for (;;) {
ButtonState buttons = getButtonState(); ButtonState buttons = getButtonState();
switch (buttons) { switch (buttons) {
@@ -747,7 +744,7 @@ void startGUITask(void const * argument) {
if (lcd.getRotation()) if (lcd.getRotation())
lcd.drawArea(12, 0, 84, 16, idleScreenBG); lcd.drawArea(12, 0, 84, 16, idleScreenBG);
else else
lcd.drawArea(12, 0, 84, 16, idleScreenBGF);//Needs to be flipped lcd.drawArea(12, 0, 84, 16, idleScreenBGF); //Needs to be flipped
lcd.setCursor(0, 0); lcd.setCursor(0, 0);
gui_drawBatteryIcon(); gui_drawBatteryIcon();