Skip to content

Commit

Permalink
Fixup drawing tip type
Browse files Browse the repository at this point in the history
  • Loading branch information
Ralim committed Sep 22, 2024
1 parent 709a279 commit 571ad17
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Translations/translation_EN.json
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
"displayText": "Safe\nMode"
},
"TipTypeAuto": {
"displayText": "Auto"
"displayText": "Auto\nSense"
},
"TipTypeT12Long": {
"displayText": "TS100\nLong"
Expand Down
4 changes: 2 additions & 2 deletions source/Core/Src/Settings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -369,4 +369,4 @@ uint8_t getUserSelectedTipResistance() {
return 0;
break;
}
}
}
8 changes: 4 additions & 4 deletions source/Core/Src/settingsGUI.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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!!! ^^^ */

Expand Down Expand Up @@ -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; }
Expand Down

0 comments on commit 571ad17

Please sign in to comment.