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 14cca01f78 into ebdff59293

Browse Source
This commit is contained in:
nonokirby
2025-02-09 00:41:25 +08:00
committed by GitHub
parent ebdff59293 14cca01f78
commit cbf2b5a69d
41 changed files with 90 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Translations/translation_BE.json
View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "Ч",
"SettingStartSleepOffChar": "К",
"SettingLockBoostChar": "Т",
"SettingLockFullChar": "П"
"SettingLockFullChar": "П",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

3
Translations/translation_BG.json
View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "С",
"SettingStartSleepOffChar": "П",
"SettingLockBoostChar": "Т",
"SettingLockFullChar": "П"
"SettingLockFullChar": "П",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

3
Translations/translation_CS.json
View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "S",
"SettingStartSleepOffChar": "M",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "U"
"SettingLockFullChar": "U",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

3
Translations/translation_DA.json
View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "D",
"SettingStartSleepOffChar": "R",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
"SettingLockFullChar": "F",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

3
Translations/translation_DE.json
View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "R",
"SettingStartSleepOffChar": "K",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "V"
"SettingLockFullChar": "V",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

3
Translations/translation_EL.json
View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "Ζ",
"SettingStartSleepOffChar": "Υ",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "Π"
"SettingLockFullChar": "Π",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

3
Translations/translation_EN.json
View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "Z",
"SettingStartSleepOffChar": "R",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
"SettingLockFullChar": "F",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

3
Translations/translation_ES.json
View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "R",
"SettingStartSleepOffChar": "F",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
"SettingLockFullChar": "F",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

3
Translations/translation_ET.json
View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "Z",
"SettingStartSleepOffChar": "P",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "T"
"SettingLockFullChar": "T",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

3
Translations/translation_FI.json
View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "L",
"SettingStartSleepOffChar": "H",
"SettingLockBoostChar": "V",
"SettingLockFullChar": "K"
"SettingLockFullChar": "K",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

3
Translations/translation_FR.json
View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "V",
"SettingStartSleepOffChar": "O",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "V"
"SettingLockFullChar": "V",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

3
Translations/translation_HR.json
View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "T",
"SettingStartSleepOffChar": "H",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "Z"
"SettingLockFullChar": "Z",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

3
Translations/translation_HU.json
View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "A",
"SettingStartSleepOffChar": "Sz",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "T"
"SettingLockFullChar": "T",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

3
Translations/translation_IT.json
View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "R",
"SettingStartSleepOffChar": "A",
"SettingLockBoostChar": "T",
"SettingLockFullChar": "C"
"SettingLockFullChar": "C",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

3
Translations/translation_JA_JP.json
View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "待",
"SettingStartSleepOffChar": "室",
"SettingLockBoostChar": "ブ",
"SettingLockFullChar": "全"
"SettingLockFullChar": "全",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

3
Translations/translation_LT.json
View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "M",
"SettingStartSleepOffChar": "K",
"SettingLockBoostChar": "T",
"SettingLockFullChar": "V"
"SettingLockFullChar": "V",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

3
Translations/translation_NB.json
View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "D",
"SettingStartSleepOffChar": "R",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
"SettingLockFullChar": "F",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

3
Translations/translation_NL.json
View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "S",
"SettingStartSleepOffChar": "Z",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "V"
"SettingLockFullChar": "V",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

3
Translations/translation_NL_BE.json
View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "S",
"SettingStartSleepOffChar": "K",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
"SettingLockFullChar": "F",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

3
Translations/translation_PL.json
View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "Z",
"SettingStartSleepOffChar": "O",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "P"
"SettingLockFullChar": "P",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

3
Translations/translation_PT.json
View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "H",
"SettingStartSleepOffChar": "A",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
"SettingLockFullChar": "F",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

3
Translations/translation_RO.json
View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "Z",
"SettingStartSleepOffChar": "R",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
"SettingLockFullChar": "F",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

3
Translations/translation_RU.json
View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "С",
"SettingStartSleepOffChar": "К",
"SettingLockBoostChar": "Т",
"SettingLockFullChar": "П"
"SettingLockFullChar": "П",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

3
Translations/translation_SK.json
View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "S",
"SettingStartSleepOffChar": "I",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "P"
"SettingLockFullChar": "P",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

3
Translations/translation_SL.json
View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "Z",
"SettingStartSleepOffChar": "V",
"SettingLockBoostChar": "L",
"SettingLockFullChar": "P"
"SettingLockFullChar": "P",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

3
Translations/translation_SR_CYRL.json
View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "С",
"SettingStartSleepOffChar": "X",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
"SettingLockFullChar": "F",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

3
Translations/translation_SR_LATN.json
View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "S",
"SettingStartSleepOffChar": "X",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
"SettingLockFullChar": "F",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

3
Translations/translation_SV.json
View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "V",
"SettingStartSleepOffChar": "R",
"SettingLockBoostChar": "T",
"SettingLockFullChar": "F"
"SettingLockFullChar": "F",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

3
Translations/translation_TR.json
View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "U",
"SettingStartSleepOffChar": "S",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
"SettingLockFullChar": "F",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

3
Translations/translation_UK.json
View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "С",
"SettingStartSleepOffChar": "К",
"SettingLockBoostChar": "Т",
"SettingLockFullChar": "П"
"SettingLockFullChar": "П",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

3
Translations/translation_UZ.json
View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "U",
"SettingStartSleepOffChar": "X",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "T"
"SettingLockFullChar": "T",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

3
Translations/translation_VI.json
View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "Z",
"SettingStartSleepOffChar": "R",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
"SettingLockFullChar": "F",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

3
Translations/translation_YUE_HK.json
View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "待",
"SettingStartSleepOffChar": "室",
"SettingLockBoostChar": "增",
"SettingLockFullChar": "全"
"SettingLockFullChar": "全",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

3
Translations/translation_ZH_CN.json
View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "待",
"SettingStartSleepOffChar": "室",
"SettingLockBoostChar": "增",
"SettingLockFullChar": "全"
"SettingLockFullChar": "全",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

3
Translations/translation_ZH_TW.json
View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "待",
"SettingStartSleepOffChar": "室",
"SettingLockBoostChar": "增",
"SettingLockFullChar": "全"
"SettingLockFullChar": "全",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

6
Translations/translations_definitions.json
View File

@@ -165,6 +165,12 @@
"len": 1,
"default": "F",
"description": "Shown when the locking mode is set to lock all buttons."
},
{
"id": "SettingLockTempChar",
"len": 1,
"default": "T",
"description": "Shown when the locking mode is set to lock all buttons except for -/B to change the temperature."
}
],
"menuGroups": [

7
source/Core/Inc/Settings.h
View File

@@ -114,9 +114,10 @@ typedef enum {
} usbpdMode_t;
typedef enum {
DISABLED = 0, // Locking buttons is disabled
BOOST = 1, // Locking buttons for Boost mode only
FULL = 2, // Locking buttons for Boost mode AND for Soldering mode
DISABLED = 0, // All buttons are unlocked
BOOST = 1, // All buttons are locked except boost
FULL = 2, // All buttons are locked
TEMP = 3, // All buttons are locked except -/B to change the temperature
} lockingMode_t;
/* Selection of the soldering tip

1
source/Core/Inc/Translation.h
View File

@@ -147,6 +147,7 @@ struct TranslationIndexTable {
uint16_t SettingStartSleepOffChar;
uint16_t SettingLockBoostChar;
uint16_t SettingLockFullChar;
uint16_t SettingLockTempChar;
uint16_t USBPDModeDefault;
uint16_t USBPDModeNoDynamic;
uint16_t USBPDModeSafe;

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

@@ -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
@@ -72,7 +72,7 @@ static const SettingConstants settingsConstants[(int)SettingsOptions::SettingsOp
{ 0, 1, 1, DETAILED_SOLDERING}, // DetailedSoldering
{ 0, (uint16_t)(HasFahrenheit ? 1 : 0), 1, TEMPERATURE_INF}, // TemperatureInF
{ 0, 1, 1, DESCRIPTION_SCROLL_SPEED}, // DescriptionScrollSpeed
{ 0, 2, 1, LOCKING_MODE}, // LockingMode
{ 0, 3, 1, LOCKING_MODE}, // LockingMode
{ 0, 99, 1, POWER_PULSE_DEFAULT}, // KeepAwakePulse
{ 1, POWER_PULSE_WAIT_MAX, 1, POWER_PULSE_WAIT_DEFAULT}, // KeepAwakePulseWait
{ 1, POWER_PULSE_DURATION_MAX, 1, POWER_PULSE_DURATION_DEFAULT}, // KeepAwakePulseDuration

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

@@ -635,6 +635,9 @@ static void displayLockingMode(void) {
case lockingMode_t::FULL:
OLED::print(translatedString(Tr->SettingLockFullChar), FontStyle::LARGE);
break;
case lockingMode_t::TEMP:
OLED::print(translatedString(Tr->SettingLockTempChar), FontStyle::LARGE);
break;
default:
OLED::drawUnavailableIcon();
break;

5
source/Core/Threads/UI/logic/Soldering.cpp
View File

@@ -35,7 +35,7 @@ OperatingMode handleSolderingButtons(const ButtonState buttons, guiContext *cxt)
cxt->scratch_state.state1 = 3;
break;
case BUTTON_F_LONG:
if (getSettingValue(SettingsOptions::BoostTemp) && (getSettingValue(SettingsOptions::LockingMode) == lockingMode_t::BOOST)) {
if (getSettingValue(SettingsOptions::BoostTemp) && (getSettingValue(SettingsOptions::LockingMode) >= lockingMode_t::BOOST ||)) {
cxt->scratch_state.state2 = 1;
break;
}
@@ -65,6 +65,9 @@ OperatingMode handleSolderingButtons(const ButtonState buttons, guiContext *cxt)
}
break;
case BUTTON_F_SHORT:
if (getSettingValue(SettingsOptions::LockingMode) == lockingMode_t::TEMP) {
break;
}
case BUTTON_B_SHORT:
cxt->transitionMode = TransitionAnimation::Left;
return OperatingMode::TemperatureAdjust;