diff --git a/Translations/translation_EN.json b/Translations/translation_EN.json index 16a968b37..2953d85da 100644 --- a/Translations/translation_EN.json +++ b/Translations/translation_EN.json @@ -116,7 +116,7 @@ "displayText": "Safe\nMode" }, "TipTypeAuto": { - "displayText": "Auto" + "displayText": "Auto\nSense" }, "TipTypeT12Long": { "displayText": "TS100\nLong" diff --git a/source/Core/Src/Settings.cpp b/source/Core/Src/Settings.cpp index 423528643..82f0dad00 100644 --- a/source/Core/Src/Settings.cpp +++ b/source/Core/Src/Settings.cpp @@ -54,7 +54,7 @@ typedef struct { } SettingConstants; static const SettingConstants settingsConstants[(int)SettingsOptions::SettingsOptionsLength] = { - //{ min, max, increment, default} + //{ min, max, increment, default} { MIN_TEMP_C, MAX_TEMP_F, 5, SOLDERING_TEMP}, // SolderingTemp { MIN_TEMP_C, MAX_TEMP_F, 5, 150}, // SleepTemp { 0, 15, 1, SLEEP_TIME}, // SleepTime @@ -369,4 +369,4 @@ uint8_t getUserSelectedTipResistance() { return 0; break; } -} \ No newline at end of file +} diff --git a/source/Core/Src/settingsGUI.cpp b/source/Core/Src/settingsGUI.cpp index e77e5f77d..0a4f91730 100644 --- a/source/Core/Src/settingsGUI.cpp +++ b/source/Core/Src/settingsGUI.cpp @@ -446,11 +446,11 @@ const menuitem advancedMenu[] = { /* clang-format on */ -const menuitem *subSettingsMenus[] { +const menuitem *subSettingsMenus[]{ #if defined(POW_DC) || defined(POW_QC) || defined(POW_PD) - powerMenu, + powerMenu, #endif - solderingMenu, PowerSavingMenu, UIMenu, advancedMenu, + solderingMenu, PowerSavingMenu, UIMenu, advancedMenu, }; /* ^^^ !!!ENABLE CLANG-FORMAT back!!! ^^^ */ @@ -765,7 +765,7 @@ static void displayHallEffectSleepTime(void) { #endif /* HALL_SENSOR */ static void displaySolderingTipType(void) { // TODO wrapping X value - OLED::print(lookupTipName(), FontStyle::SMALL); + OLED::print(lookupTipName(), FontStyle::SMALL, 255, OLED::getCursorX()); } // If there is no detection, and no options, max is 0 static bool showSolderingTipType(void) { return tipType_t::TIP_TYPE_MAX != 0; }