me/IronOS
1
0
Fork 1
mirror of https://github.com/Ralim/IronOS.git synced 2025-02-26 07:53:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixup drawing tip type

Browse Source
This commit is contained in:
Ben V. Brown
2024-09-22 17:58:18 +10:00
parent 3b6df3f765
commit fe2bd4fe7d
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Translations/translation_EN.json
View File

@@ -116,7 +116,7 @@
"displayText": "Safe\nMode" "displayText": "Safe\nMode"
}, },
"TipTypeAuto": { "TipTypeAuto": {
"displayText": "Auto" "displayText": "Auto\nSense"
}, },
"TipTypeT12Long": { "TipTypeT12Long": {
"displayText": "TS100\nLong" "displayText": "TS100\nLong"

4
source/Core/Src/Settings.cpp
View File

@@ -54,7 +54,7 @@ typedef struct {
} SettingConstants; } SettingConstants;
static const SettingConstants settingsConstants[(int)SettingsOptions::SettingsOptionsLength] = { 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, SOLDERING_TEMP}, // SolderingTemp
{ MIN_TEMP_C, MAX_TEMP_F, 5, 150}, // SleepTemp { MIN_TEMP_C, MAX_TEMP_F, 5, 150}, // SleepTemp
{ 0, 15, 1, SLEEP_TIME}, // SleepTime { 0, 15, 1, SLEEP_TIME}, // SleepTime
@@ -369,4 +369,4 @@ uint8_t getUserSelectedTipResistance() {
return 0; return 0;
break; break;
} }
} }

8
source/Core/Src/settingsGUI.cpp
View File

@@ -446,11 +446,11 @@ const menuitem advancedMenu[] = {
/* clang-format on */ /* clang-format on */
const menuitem *subSettingsMenus[] { const menuitem *subSettingsMenus[]{
#if defined(POW_DC) || defined(POW_QC) || defined(POW_PD) #if defined(POW_DC) || defined(POW_QC) || defined(POW_PD)
powerMenu, powerMenu,
#endif #endif
solderingMenu, PowerSavingMenu, UIMenu, advancedMenu, solderingMenu, PowerSavingMenu, UIMenu, advancedMenu,
}; };
/* ^^^ !!!ENABLE CLANG-FORMAT back!!! ^^^ */ /* ^^^ !!!ENABLE CLANG-FORMAT back!!! ^^^ */
@@ -765,7 +765,7 @@ static void displayHallEffectSleepTime(void) {
#endif /* HALL_SENSOR */ #endif /* HALL_SENSOR */
static void displaySolderingTipType(void) { static void displaySolderingTipType(void) {
// TODO wrapping X value // 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 // If there is no detection, and no options, max is 0
static bool showSolderingTipType(void) { return tipType_t::TIP_TYPE_MAX != 0; } static bool showSolderingTipType(void) { return tipType_t::TIP_TYPE_MAX != 0; }