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

Merge pull request #2032 from ia/tip-type-ts80
Some checks failed
CI / tests (push) Has been cancelled
Details
CI / check_c-cpp (push) Has been cancelled
Details
CI / check_python (push) Has been cancelled
Details
CI / check_shell (push) Has been cancelled
Details
CI / check_docs (push) Has been cancelled
Details
Docs / deploy-docs (push) Has been cancelled
Details
CI / build (MHP30) (push) Has been cancelled
Details
CI / build (Pinecil) (push) Has been cancelled
Details
CI / build (Pinecilv2) (push) Has been cancelled
Details
CI / build (S60) (push) Has been cancelled
Details
CI / build (S60P) (push) Has been cancelled
Details
CI / build (T55) (push) Has been cancelled
Details
CI / build (TS100) (push) Has been cancelled
Details
CI / build (TS101) (push) Has been cancelled
Details
CI / build (TS80) (push) Has been cancelled
Details
CI / build (TS80P) (push) Has been cancelled
Details
CI / build_multi-lang (Pinecil) (push) Has been cancelled
Details
CI / build_multi-lang (Pinecilv2) (push) Has been cancelled
Details
CI / upload_metadata (push) Has been cancelled
Details

Browse Source 
Set tip type as auto by default in runtime
This commit is contained in:
Ivan Zorin
2024-12-24 05:30:39 +03:00
committed by GitHub
parent 989a2cf2d5 1e285a6a5c
commit 5347385b28
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;
@@ -329,9 +324,12 @@ const char *lookupTipName() {
case tipType_t::JBC_210_2_5_OHM:
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;
}
}