From 99ba13525a7f64309e68861c5245c6e2b25776f7 Mon Sep 17 00:00:00 2001 From: "Ben V. Brown" Date: Sun, 6 Sep 2020 16:04:41 +1000 Subject: [PATCH] Collapse Boost temp enable into setting Work for #642 --- Translation Editor/translation_bg.json | 8 -- Translation Editor/translation_cs.json | 8 -- Translation Editor/translation_da.json | 8 -- Translation Editor/translation_de.json | 8 -- Translation Editor/translation_en.json | 8 -- Translation Editor/translation_es.json | 8 -- Translation Editor/translation_fi.json | 8 -- Translation Editor/translation_fr.json | 8 -- Translation Editor/translation_hr.json | 8 -- Translation Editor/translation_hu.json | 8 -- Translation Editor/translation_it.json | 8 -- Translation Editor/translation_lt.json | 8 -- Translation Editor/translation_nl.json | 8 -- Translation Editor/translation_nl_be.json | 8 -- Translation Editor/translation_no.json | 8 -- Translation Editor/translation_pl.json | 8 -- Translation Editor/translation_pt.json | 8 -- Translation Editor/translation_ru.json | 8 -- Translation Editor/translation_sk.json | 8 -- Translation Editor/translation_sl.json | 8 -- Translation Editor/translation_sr_cyrl.json | 8 -- Translation Editor/translation_sr_latn.json | 8 -- Translation Editor/translation_sv.json | 8 -- Translation Editor/translation_tr.json | 8 -- Translation Editor/translation_uk.json | 8 -- Translation Editor/translations_def.js | 5 - workspace/TS100/Core/Inc/Settings.h | 3 +- workspace/TS100/Core/Src/Settings.cpp | 1 - workspace/TS100/Core/Src/gui.cpp | 102 ++++++++++---------- workspace/TS100/Core/Threads/GUIThread.cpp | 2 +- 30 files changed, 53 insertions(+), 260 deletions(-) diff --git a/Translation Editor/translation_bg.json b/Translation Editor/translation_bg.json index 643c13b5..3033bbb3 100644 --- a/Translation Editor/translation_bg.json +++ b/Translation Editor/translation_bg.json @@ -132,14 +132,6 @@ ], "desc": "Ориентация на дисплея " }, - "BoostEnabled": { - "text": "", - "text2": [ - "Турбо режим", - "пуснат" - ], - "desc": "Ползвай предния бутон за \"турбо\" режим с температура до 450C при запояване" - }, "BoostTemperature": { "text": "", "text2": [ diff --git a/Translation Editor/translation_cs.json b/Translation Editor/translation_cs.json index c1d66a24..de2faf02 100755 --- a/Translation Editor/translation_cs.json +++ b/Translation Editor/translation_cs.json @@ -132,14 +132,6 @@ ], "desc": "Orientace obrazovky ." }, - "BoostEnabled": { - "text": "", - "text2": [ - "Povolit", - "boost" - ], - "desc": "Povolit boost podržením předního tlačítka při pájení?" - }, "BoostTemperature": { "text": "", "text2": [ diff --git a/Translation Editor/translation_da.json b/Translation Editor/translation_da.json index 8cefa35d..d1434060 100644 --- a/Translation Editor/translation_da.json +++ b/Translation Editor/translation_da.json @@ -130,14 +130,6 @@ ], "desc": "Skærm Orientering " }, - "BoostEnabled": { - "text": "BOOST", - "text2": [ - "Boosttaste", - "aktiv?" - ], - "desc": "Vordere Taste lange drücken für Temperatur-Boostmodus beim Löten" - }, "BoostTemperature": { "text": "BTMP", "text2": [ diff --git a/Translation Editor/translation_en.json b/Translation Editor/translation_en.json index 66f58642..c267dadf 100644 --- a/Translation Editor/translation_en.json +++ b/Translation Editor/translation_en.json @@ -133,14 +133,6 @@ ], "desc": "Display orientation " }, - "BoostEnabled": { - "text": "BOOST", - "text2": [ - "Boost", - "mode" - ], - "desc": "Enable front key long press \"boost mode\" when soldering" - }, "BoostTemperature": { "text": "BTMP", "text2": [ diff --git a/Translation Editor/translation_es.json b/Translation Editor/translation_es.json index 8de00bd7..8f54ba27 100644 --- a/Translation Editor/translation_es.json +++ b/Translation Editor/translation_es.json @@ -132,14 +132,6 @@ ], "desc": "Orientación de la pantalla " }, - "BoostEnabled": { - "text": "BOOST", - "text2": [ - "Con botón de", - "temp. extra" - ], - "desc": "Permite mantener pulsado el primer botón (A) al soldar y calentar momentáneamente un poco más." - }, "BoostTemperature": { "text": "BTMP", "text2": [ diff --git a/Translation Editor/translation_fi.json b/Translation Editor/translation_fi.json index f179c530..7209aba7 100644 --- a/Translation Editor/translation_fi.json +++ b/Translation Editor/translation_fi.json @@ -130,14 +130,6 @@ ], "desc": "Näytön kierto. " }, - "BoostEnabled": { - "text": "", - "text2": [ - "Tehostus", - "käytössä" - ], - "desc": "Etupainikeella siirrytään juotettaessa tehostustilaan." - }, "BoostTemperature": { "text": "", "text2": [ diff --git a/Translation Editor/translation_fr.json b/Translation Editor/translation_fr.json index f55d9ce8..ee36eb11 100644 --- a/Translation Editor/translation_fr.json +++ b/Translation Editor/translation_fr.json @@ -130,14 +130,6 @@ ], "desc": "Orientation de l'affichage " }, - "BoostEnabled": { - "text": "", - "text2": [ - "Activation du", - "mode Boost" - ], - "desc": "Activer le mode \"Boost\" en maintenant le bouton de devant pendant la soudure" - }, "BoostTemperature": { "text": "", "text2": [ diff --git a/Translation Editor/translation_hr.json b/Translation Editor/translation_hr.json index cec60dba..d4c5de90 100644 --- a/Translation Editor/translation_hr.json +++ b/Translation Editor/translation_hr.json @@ -130,14 +130,6 @@ ], "desc": "Orijentacija ekrana. " }, - "BoostEnabled": { - "text": "BOOST", - "text2": [ - "Boost", - "način" - ], - "desc": "Držanjem prednjeg gumba prilikom lemljenja aktivira se pojačani (Boost) način." - }, "BoostTemperature": { "text": "BTMP", "text2": [ diff --git a/Translation Editor/translation_hu.json b/Translation Editor/translation_hu.json index 1b583503..d4a6cbed 100644 --- a/Translation Editor/translation_hu.json +++ b/Translation Editor/translation_hu.json @@ -130,14 +130,6 @@ ], "desc": "Kijelző tájolása " }, - "BoostEnabled": { - "text": "BOOST", - "text2": [ - "Boost", - "mód" - ], - "desc": "Elülső gombbal boost módba (450C) lép forrasztás közben" - }, "BoostTemperature": { "text": "BHŐ", "text2": [ diff --git a/Translation Editor/translation_it.json b/Translation Editor/translation_it.json index 069ca63f..a3f2b112 100644 --- a/Translation Editor/translation_it.json +++ b/Translation Editor/translation_it.json @@ -132,14 +132,6 @@ ], "desc": "Imposta l'orientamento del display " }, - "BoostEnabled": { - "text": "", - "text2": [ - "Funzione", - "«Turbo»" - ], - "desc": "Attiva la funzione «Turbo», durante la modalità Saldatura, tenendo premuto il tasto superiore" - }, "BoostTemperature": { "text": "", "text2": [ diff --git a/Translation Editor/translation_lt.json b/Translation Editor/translation_lt.json index ae489e19..fd7aeabf 100644 --- a/Translation Editor/translation_lt.json +++ b/Translation Editor/translation_lt.json @@ -130,14 +130,6 @@ ], "desc": "Ekrano orientacija " }, - "BoostEnabled": { - "text": "", - "text2": [ - "Turbo režimas", - "įjungtas" - ], - "desc": "Ar lituojant viršutinis mygtukas įjungia turbo režimą" - }, "BoostTemperature": { "text": "", "text2": [ diff --git a/Translation Editor/translation_nl.json b/Translation Editor/translation_nl.json index 7b20ed69..6c64f6a6 100644 --- a/Translation Editor/translation_nl.json +++ b/Translation Editor/translation_nl.json @@ -130,14 +130,6 @@ ], "desc": "Schermoriëntatie " }, - "BoostEnabled": { - "text": "", - "text2": [ - "Boostmodes", - "ingeschakeld?" - ], - "desc": "Soldeerbout gaat naar een hogere boost-temperatuur wanneer de voorste knop ingedrukt is." - }, "BoostTemperature": { "text": "", "text2": [ diff --git a/Translation Editor/translation_nl_be.json b/Translation Editor/translation_nl_be.json index e636024f..2a8f928f 100644 --- a/Translation Editor/translation_nl_be.json +++ b/Translation Editor/translation_nl_be.json @@ -130,14 +130,6 @@ ], "desc": "Schermoriëntatie " }, - "BoostEnabled": { - "text": "", - "text2": [ - "Temperatuurverhoging", - "ingeschakeld?" - ], - "desc": "Temperatuur verhoogt als voorste knop is ingedrukt" - }, "BoostTemperature": { "text": "", "text2": [ diff --git a/Translation Editor/translation_no.json b/Translation Editor/translation_no.json index 673a7176..38af2491 100644 --- a/Translation Editor/translation_no.json +++ b/Translation Editor/translation_no.json @@ -130,14 +130,6 @@ ], "desc": "Skjermretning " }, - "BoostEnabled": { - "text": "BOOST", - "text2": [ - "Tryb", - "boost" - ], - "desc": "Przytrzymaj przedni przycisk podczas lutowania w celu zwiększenia temperatury" - }, "BoostTemperature": { "text": "BTMP", "text2": [ diff --git a/Translation Editor/translation_pt.json b/Translation Editor/translation_pt.json index defb47b6..87cd2755 100644 --- a/Translation Editor/translation_pt.json +++ b/Translation Editor/translation_pt.json @@ -130,14 +130,6 @@ ], "desc": "Orientação da tela " }, - "BoostEnabled": { - "text": "TURBO", - "text2": [ - "Modo turbo", - "activado" - ], - "desc": "Tecla frontal activa modo \"turbo\"" - }, "BoostTemperature": { "text": "TTMP", "text2": [ diff --git a/Translation Editor/translation_ru.json b/Translation Editor/translation_ru.json index 4923001c..068e9ffb 100644 --- a/Translation Editor/translation_ru.json +++ b/Translation Editor/translation_ru.json @@ -132,14 +132,6 @@ ], "desc": "Ориентация экрана <А=Авто, Л=Левая рука, П=Правая рука>" }, - "BoostEnabled": { - "text": "Турб", - "text2": [ - "Турбо", - "режим" - ], - "desc": "Включить активацию турбо-режима удержанием ближней к жалу кнопки во время пайки" - }, "BoostTemperature": { "text": "ТемпТурб", "text2": [ diff --git a/Translation Editor/translation_sk.json b/Translation Editor/translation_sk.json index c38bb7e9..9a88f76e 100644 --- a/Translation Editor/translation_sk.json +++ b/Translation Editor/translation_sk.json @@ -130,14 +130,6 @@ ], "desc": "Orientacia displeja " }, - "BoostEnabled": { - "text": "BOOST", - "text2": [ - "", - "" - ], - "desc": "Povolit tlacidlo pre prudky nahrev " - }, "BoostTemperature": { "text": "BTMP", "text2": [ diff --git a/Translation Editor/translation_sl.json b/Translation Editor/translation_sl.json index 91c85fd6..3ce10328 100644 --- a/Translation Editor/translation_sl.json +++ b/Translation Editor/translation_sl.json @@ -131,14 +131,6 @@ ], "desc": "Orientacija zaslona " }, - "BoostEnabled": { - "text": "BOOST", - "text2": [ - "Omogoči", - "boost mode" - ], - "desc": "Omogoči, da tipka za naprej zagreje konico na 450C." - }, "BoostTemperature": { "text": "BTMP", "text2": [ diff --git a/Translation Editor/translation_sr_cyrl.json b/Translation Editor/translation_sr_cyrl.json index b96b1762..8f4f1765 100644 --- a/Translation Editor/translation_sr_cyrl.json +++ b/Translation Editor/translation_sr_cyrl.json @@ -130,14 +130,6 @@ ], "desc": "Како је окренут екран. <А=аутоматски, Л=за леворуке, Д=за десноруке>" }, - "BoostEnabled": { - "text": "Пјчње", - "text2": [ - "Појачање", - "омогућено" - ], - "desc": "Држање предњег тастера током лемљења додатно појачава температуру врха." - }, "BoostTemperature": { "text": "ТПјч", "text2": [ diff --git a/Translation Editor/translation_sr_latn.json b/Translation Editor/translation_sr_latn.json index 8a97e6ac..a4b055e0 100644 --- a/Translation Editor/translation_sr_latn.json +++ b/Translation Editor/translation_sr_latn.json @@ -130,14 +130,6 @@ ], "desc": "Kako je okrenut ekran. " }, - "BoostEnabled": { - "text": "Pjčnj", - "text2": [ - "Pojačanje", - "omogućeno" - ], - "desc": "Držanje prednjeg tastera tokom lemljenja dodatno pojačava temperaturu vrha." - }, "BoostTemperature": { "text": "TPjč", "text2": [ diff --git a/Translation Editor/translation_sv.json b/Translation Editor/translation_sv.json index 1d3d208f..1aae53a1 100644 --- a/Translation Editor/translation_sv.json +++ b/Translation Editor/translation_sv.json @@ -130,14 +130,6 @@ ], "desc": "Visningsläge " }, - "BoostEnabled": { - "text": "", - "text2": [ - "Turboläge", - "aktiverat" - ], - "desc": "Aktivera främre knappen för turboläge (temperaturhöjning) vid lödning" - }, "BoostTemperature": { "text": "", "text2": [ diff --git a/Translation Editor/translation_tr.json b/Translation Editor/translation_tr.json index a5e1ed24..99e3ca5b 100644 --- a/Translation Editor/translation_tr.json +++ b/Translation Editor/translation_tr.json @@ -130,14 +130,6 @@ ], "desc": "Görüntü Yönlendirme " }, - "BoostEnabled": { - "text": "BOOST", - "text2": [ - "", - "" - ], - "desc": "Lehimleme yaparken ön tuşa basmak Boost moduna sokar(450C)" - }, "BoostTemperature": { "text": "BTMP", "text2": [ diff --git a/Translation Editor/translation_uk.json b/Translation Editor/translation_uk.json index 787e3e16..81d9e01c 100644 --- a/Translation Editor/translation_uk.json +++ b/Translation Editor/translation_uk.json @@ -132,14 +132,6 @@ ], "desc": "Орієнтація дисплея " }, - "BoostEnabled": { - "text": "", - "text2": [ - "Режим", - "Турбо" - ], - "desc": "Турбо-режим при утриманні кнопки А при пайці" - }, "BoostTemperature": { "text": "", "text2": [ diff --git a/Translation Editor/translations_def.js b/Translation Editor/translations_def.js index 9a9cb454..df9a3df3 100644 --- a/Translation Editor/translations_def.js +++ b/Translation Editor/translations_def.js @@ -193,11 +193,6 @@ var def = "maxLen": 6, "maxLen2": 13 }, - { - "id": "BoostEnabled", - "maxLen": 6, - "maxLen2": 13 - }, { "id": "BoostTemperature", "maxLen": 4, diff --git a/workspace/TS100/Core/Inc/Settings.h b/workspace/TS100/Core/Inc/Settings.h index 05e43395..092a92cc 100644 --- a/workspace/TS100/Core/Inc/Settings.h +++ b/workspace/TS100/Core/Inc/Settings.h @@ -32,8 +32,7 @@ typedef struct { uint8_t autoStartMode :2; // Should the unit automatically jump straight // into soldering mode when power is applied uint8_t ShutdownTime; // Time until unit shuts down if left alone - uint8_t boostModeEnabled :1; // Boost mode swaps BUT_A in soldering mode to - // temporary soldering temp over-ride + uint8_t coolingTempBlink :1; // Should the temperature blink on the cool // down screen until its <50C uint8_t detailedIDLE :1; // Detailed idle screen diff --git a/workspace/TS100/Core/Src/Settings.cpp b/workspace/TS100/Core/Src/Settings.cpp index fcd8255b..77cc341f 100644 --- a/workspace/TS100/Core/Src/Settings.cpp +++ b/workspace/TS100/Core/Src/Settings.cpp @@ -63,7 +63,6 @@ void resetSettings() { systemSettings.sensitivity = SENSITIVITY; // Default high sensitivity systemSettings.voltageDiv = VOLTAGE_DIV; // Default divider from schematic systemSettings.ShutdownTime = SHUTDOWN_TIME; // How many minutes until the unit turns itself off - systemSettings.boostModeEnabled = BOOST_MODE_ENABLED; // Default to having boost mode on as most people prefer it systemSettings.BoostTemp = BOOST_TEMP; // default to 400C systemSettings.autoStartMode = AUTO_START_MODE; // Auto start off for safety systemSettings.coolingTempBlink = COOLING_TEMP_BLINK; // Blink the temperature on the cooling screen when its > 50C diff --git a/workspace/TS100/Core/Src/gui.cpp b/workspace/TS100/Core/Src/gui.cpp index 7062532b..033e5b31 100644 --- a/workspace/TS100/Core/Src/gui.cpp +++ b/workspace/TS100/Core/Src/gui.cpp @@ -46,8 +46,6 @@ static bool settings_setPowerLimit(void); static void settings_displayPowerLimit(void); static bool settings_setDisplayRotation(void); static void settings_displayDisplayRotation(void); -static bool settings_setBoostModeEnabled(void); -static void settings_displayBoostModeEnabled(void); static bool settings_setBoostTemp(void); static void settings_displayBoostTemp(void); static bool settings_setAutomaticStartMode(void); @@ -130,7 +128,7 @@ const menuitem rootSettingsMenu[] { { (const char*) SettingsDescriptions[0], settings_setInputVRange, settings_displayInputVRange }, /*Voltage input*/ #else - { (const char*) SettingsDescriptions[20], settings_setInputPRange, + { (const char*) SettingsDescriptions[19], settings_setInputPRange, settings_displayInputPRange }, /*Voltage input*/ #endif { (const char*) NULL, settings_enterSolderingMenu, @@ -150,15 +148,13 @@ const menuitem solderingMenu[] = { * Temp change short step * Temp change long step */ -{ (const char*) SettingsDescriptions[8], settings_setBoostModeEnabled, - settings_displayBoostModeEnabled }, /*Enable Boost*/ -{ (const char*) SettingsDescriptions[9], settings_setBoostTemp, +{ (const char*) SettingsDescriptions[8], settings_setBoostTemp, settings_displayBoostTemp }, /*Boost Temp*/ -{ (const char*) SettingsDescriptions[10], settings_setAutomaticStartMode, +{ (const char*) SettingsDescriptions[9], settings_setAutomaticStartMode, settings_displayAutomaticStartMode }, /*Auto start*/ -{ (const char*) SettingsDescriptions[23], settings_setTempChangeShortStep, +{ (const char*) SettingsDescriptions[22], settings_setTempChangeShortStep, settings_displayTempChangeShortStep }, /*Temp change short step*/ -{ (const char*) SettingsDescriptions[24], settings_setTempChangeLongStep, +{ (const char*) SettingsDescriptions[23], settings_setTempChangeLongStep, settings_displayTempChangeLongStep }, /*Temp change long step*/ { NULL, NULL, NULL } // end of menu marker. DO NOT REMOVE }; @@ -177,12 +173,12 @@ const menuitem UIMenu[] = { #endif { (const char*) SettingsDescriptions[7], settings_setDisplayRotation, settings_displayDisplayRotation }, /*Display Rotation*/ - { (const char*) SettingsDescriptions[11], + { (const char*) SettingsDescriptions[10], settings_setCoolingBlinkEnabled, settings_displayCoolingBlinkEnabled }, /*Cooling blink warning*/ - { (const char*) SettingsDescriptions[16], settings_setScrollSpeed, + { (const char*) SettingsDescriptions[15], settings_setScrollSpeed, settings_displayScrollSpeed }, /*Scroll Speed for descriptions*/ - { (const char*) SettingsDescriptions[22], + { (const char*) SettingsDescriptions[21], settings_setReverseButtonTempChangeEnabled, settings_displayReverseButtonTempChangeEnabled }, /* Reverse Temp change buttons + - */ { NULL, NULL, NULL } // end of menu marker. DO NOT REMOVE @@ -215,21 +211,21 @@ const menuitem advancedMenu[] = { * Reset Settings * Power Pulse */ -{ (const char*) SettingsDescriptions[21], settings_setPowerLimit, +{ (const char*) SettingsDescriptions[20], settings_setPowerLimit, settings_displayPowerLimit }, /*Power limit*/ { (const char*) SettingsDescriptions[6], settings_setAdvancedIDLEScreens, settings_displayAdvancedIDLEScreens }, /* Advanced idle screen*/ -{ (const char*) SettingsDescriptions[15], settings_setAdvancedSolderingScreens, +{ (const char*) SettingsDescriptions[14], settings_setAdvancedSolderingScreens, settings_displayAdvancedSolderingScreens }, /* Advanced soldering screen*/ -{ (const char*) SettingsDescriptions[13], settings_setResetSettings, +{ (const char*) SettingsDescriptions[12], settings_setResetSettings, settings_displayResetSettings }, /*Resets settings*/ -{ (const char*) SettingsDescriptions[12], settings_setCalibrate, +{ (const char*) SettingsDescriptions[11], settings_setCalibrate, settings_displayCalibrate }, /*Calibrate tip*/ -{ (const char*) SettingsDescriptions[14], settings_setCalibrateVIN, +{ (const char*) SettingsDescriptions[13], settings_setCalibrateVIN, settings_displayCalibrateVIN }, /*Voltage input cal*/ -{ (const char*) SettingsDescriptions[25], settings_setPowerPulse, +{ (const char*) SettingsDescriptions[24], settings_setPowerPulse, settings_displayPowerPulse }, /*Power Pulse adjustment */ -{ (const char*) SettingsDescriptions[26], settings_setTipGain, +{ (const char*) SettingsDescriptions[25], settings_setTipGain, settings_displayTipGain }, /*TipGain*/ { NULL, NULL, NULL } // end of menu marker. DO NOT REMOVE }; @@ -346,7 +342,7 @@ static bool settings_setInputPRange(void) { static void settings_displayInputPRange(void) { printShortDescription(0, 5); //0 = 9V, 1=12V (Fixed Voltages, these imply 1.5A limits) - /// TODO TS80P + // These are only used in QC3.0 modes switch (systemSettings.cutoutSetting) { case 0: OLED::printNumber(9, 2); @@ -481,7 +477,7 @@ static bool settings_setAdvancedSolderingScreens(void) { } static void settings_displayAdvancedSolderingScreens(void) { - printShortDescription(15, 7); + printShortDescription(14, 7); OLED::drawCheckbox(systemSettings.detailedSoldering); } @@ -505,7 +501,7 @@ static bool settings_setPowerLimit(void) { } static void settings_displayPowerLimit(void) { - printShortDescription(21, 5); + printShortDescription(20, 5); if (systemSettings.powerLimit == 0) { OLED::print(OffString); } else { @@ -523,7 +519,7 @@ static bool settings_setScrollSpeed(void) { } static void settings_displayScrollSpeed(void) { - printShortDescription(16, 7); + printShortDescription(15, 7); OLED::print( (systemSettings.descriptionScrollSpeed) ? SettingFastChar : SettingSlowChar); @@ -567,39 +563,43 @@ static void settings_displayDisplayRotation(void) { } } -static bool settings_setBoostModeEnabled(void) { - systemSettings.boostModeEnabled = !systemSettings.boostModeEnabled; - return false; -} - -static void settings_displayBoostModeEnabled(void) { - printShortDescription(8, 7); - - OLED::drawCheckbox(systemSettings.boostModeEnabled); -} - static bool settings_setBoostTemp(void) { #ifdef ENABLED_FAHRENHEIT_SUPPORT if (systemSettings.temperatureInF) { - systemSettings.BoostTemp += 20; // Go up 20F at a time + if (systemSettings.BoostTemp == 0) { + systemSettings.BoostTemp = 480; // loop back at 480 + } else { + systemSettings.BoostTemp += 20; // Go up 20F at a time + } + if (systemSettings.BoostTemp > 850) { - systemSettings.BoostTemp = 480; + systemSettings.BoostTemp = 0; // jump to off } return systemSettings.BoostTemp == 840; } else #endif { - systemSettings.BoostTemp += 10; // Go up 10C at a time - if (systemSettings.BoostTemp > 450) { + if (systemSettings.BoostTemp == 0) { systemSettings.BoostTemp = 250; // loop back at 250 + + } else { + systemSettings.BoostTemp += 10; // Go up 10C at a time + } + if (systemSettings.BoostTemp > 450) { + systemSettings.BoostTemp = 0; //Go to off state + } return systemSettings.BoostTemp == 450; } } static void settings_displayBoostTemp(void) { - printShortDescription(9, 5); - OLED::printNumber(systemSettings.BoostTemp, 3); + printShortDescription(8, 5); + if (systemSettings.BoostTemp) { + OLED::printNumber(systemSettings.BoostTemp, 3); + } else { + OLED::print(OffString); + } } static bool settings_setAutomaticStartMode(void) { @@ -609,7 +609,7 @@ static bool settings_setAutomaticStartMode(void) { } static void settings_displayAutomaticStartMode(void) { - printShortDescription(10, 7); + printShortDescription(9, 7); switch (systemSettings.autoStartMode) { case 0: @@ -636,7 +636,7 @@ static bool settings_setCoolingBlinkEnabled(void) { } static void settings_displayCoolingBlinkEnabled(void) { - printShortDescription(11, 7); + printShortDescription(10, 7); OLED::drawCheckbox(systemSettings.coolingTempBlink); } @@ -656,7 +656,7 @@ static bool settings_setResetSettings(void) { } static void settings_displayResetSettings(void) { - printShortDescription(13, 7); + printShortDescription(12, 7); } static void setTipOffset() { @@ -702,7 +702,7 @@ static bool settings_setCalibrate(void) { } static void settings_displayCalibrate(void) { - printShortDescription(12, 5); + printShortDescription(11, 5); } static bool settings_setCalibrateVIN(void) { @@ -809,7 +809,7 @@ static bool settings_setTipGain(void) { } static void settings_displayTipGain(void) { - printShortDescription(26, 5); + printShortDescription(25, 5); } static bool settings_setReverseButtonTempChangeEnabled(void) { @@ -819,7 +819,7 @@ static bool settings_setReverseButtonTempChangeEnabled(void) { } static void settings_displayReverseButtonTempChangeEnabled(void) { - printShortDescription(22, 7); + printShortDescription(21, 7); OLED::drawCheckbox(systemSettings.ReverseButtonTempChangeEnabled); } @@ -832,7 +832,7 @@ static bool settings_setTempChangeShortStep(void) { } static void settings_displayTempChangeShortStep(void) { - printShortDescription(23, 6); + printShortDescription(22, 6); OLED::printNumber(systemSettings.TempChangeShortStep, 2); } @@ -845,7 +845,7 @@ static bool settings_setTempChangeLongStep(void) { } static void settings_displayTempChangeLongStep(void) { - printShortDescription(24, 6); + printShortDescription(23, 6); OLED::printNumber(systemSettings.TempChangeLongStep, 2); } @@ -856,13 +856,13 @@ static bool settings_setPowerPulse(void) { return systemSettings.KeepAwakePulse == POWER_PULSE_MAX - 1; } static void settings_displayPowerPulse(void) { - printShortDescription(25, 5); + printShortDescription(24, 5); if (systemSettings.KeepAwakePulse) { OLED::printNumber(systemSettings.KeepAwakePulse / 10, 1); OLED::print(SymbolDot); OLED::printNumber(systemSettings.KeepAwakePulse % 10, 1); } else { - OLED::drawCheckbox(false); + OLED::print(OffString); } } @@ -880,7 +880,7 @@ static void displayMenu(size_t index) { } static void settings_displayCalibrateVIN(void) { - printShortDescription(14, 5); + printShortDescription(13, 5); } static void settings_displaySolderingMenu(void) { displayMenu(0); diff --git a/workspace/TS100/Core/Threads/GUIThread.cpp b/workspace/TS100/Core/Threads/GUIThread.cpp index 77a22f9d..280655b6 100644 --- a/workspace/TS100/Core/Threads/GUIThread.cpp +++ b/workspace/TS100/Core/Threads/GUIThread.cpp @@ -439,7 +439,7 @@ static void gui_solderingMode(uint8_t jumpToSleep) { break; case BUTTON_F_LONG: // if boost mode is enabled turn it on - if (systemSettings.boostModeEnabled) + if (systemSettings.BoostTemp) boostModeOn = true; break; case BUTTON_F_SHORT: