aboutsummaryrefslogtreecommitdiffhomepage
path: root/source
diff options
context:
space:
mode:
authorIvan Zorin <[email protected]>2024-12-24 05:30:39 +0300
committerGitHub <[email protected]>2024-12-24 05:30:39 +0300
commit5347385b28e946638bba003bcaa790f5bfd05d5a (patch)
treec9332ccb7c60141266d78a02a9eee8e7ae39c489 /source
parent989a2cf2d5c9028799e06a28ce07788a7263290a (diff)
parent1e285a6a5caefd56b9e774f88b6141abf341520f (diff)
downloadIronOS-dev.tar.gz
IronOS-dev.zip
Merge pull request #2032 from ia/tip-type-ts80HEADdev
Set tip type as auto by default in runtime
Diffstat (limited to 'source')
-rw-r--r--source/Core/Src/Settings.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/source/Core/Src/Settings.cpp b/source/Core/Src/Settings.cpp
index 59867d53..28198f78 100644
--- a/source/Core/Src/Settings.cpp
+++ b/source/Core/Src/Settings.cpp
@@ -304,11 +304,6 @@ const char *lookupTipName() {
tipType_t value = (tipType_t)getSettingValue(SettingsOptions::SolderingTipType);
switch (value) {
-#ifdef AUTO_TIP_SELECTION
- case tipType_t::TIP_TYPE_AUTO:
- return translatedString(Tr->TipTypeAuto);
- break;
-#endif
#ifdef TIPTYPE_T12
case tipType_t::T12_8_OHM:
return translatedString(Tr->TipTypeT12Long);
@@ -320,7 +315,7 @@ const char *lookupTipName() {
return translatedString(Tr->TipTypeT12PTS);
break;
#endif
-#ifdef TIPTYE_TS80
+#ifdef TIPTYPE_TS80
case tipType_t::TS80_4_5_OHM:
return translatedString(Tr->TipTypeTS80);
break;
@@ -330,8 +325,11 @@ const char *lookupTipName() {
return translatedString(Tr->TipTypeJBCC210);
break;
#endif
+#ifdef AUTO_TIP_SELECTION
+ case tipType_t::TIP_TYPE_AUTO:
+#endif
default:
- return nullptr;
+ return translatedString(Tr->TipTypeAuto);
break;
}
}