From 933e2ccd7f2a097ddd02427235f3ce79e8543f69 Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Mon, 20 Jan 2025 17:56:49 -0500 Subject: [PATCH 01/61] Disable change temp with B/+ in soldering mode Disabled the change temp menu appearing when + is pressed in soldering mode to prevent accidental changes of temperature while using boost mode. --- source/Core/Threads/UI/logic/Soldering.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/source/Core/Threads/UI/logic/Soldering.cpp b/source/Core/Threads/UI/logic/Soldering.cpp index 45483d154..b3eaf92cc 100644 --- a/source/Core/Threads/UI/logic/Soldering.cpp +++ b/source/Core/Threads/UI/logic/Soldering.cpp @@ -65,6 +65,7 @@ OperatingMode handleSolderingButtons(const ButtonState buttons, guiContext *cxt) } break; case BUTTON_F_SHORT: + break; case BUTTON_B_SHORT: cxt->transitionMode = TransitionAnimation::Left; return OperatingMode::TemperatureAdjust; From 2bd7b8158967c2dd10e011de53e96293acd04c97 Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Mon, 20 Jan 2025 18:30:50 -0500 Subject: [PATCH 02/61] Soldering Control Changes Updated the readme file to reflect the changes to A/+ in soldering mode. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6d4fee8d4..62bb762f2 100644 --- a/README.md +++ b/README.md @@ -127,7 +127,7 @@ After powering on the device for the first time with _IronOS_ installed and havi - pressing the `+/A` button enters the _soldering mode_; - pressing the `-/B` button enters the _settings menu_; - in _soldering mode_: - - short press of `+/A` / `-/B` buttons changes the soldering temperature; + - short press of the `-/B` button changes the soldering temperature; - long press of the `+/A` button enables _boost mode_ (increasing soldering temperature to the adjustable setting as long as the button is pressed); - long press of the `-/B` button enters _standby mode_ and stops heating; - in _standby mode_: From 9b3effeaa60115e8e97ae709075961015da7007c Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Mon, 20 Jan 2025 23:43:32 -0500 Subject: [PATCH 03/61] Update Soldering.cpp with call to setting BoostButtonTempChange --- source/Core/Threads/UI/logic/Soldering.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/source/Core/Threads/UI/logic/Soldering.cpp b/source/Core/Threads/UI/logic/Soldering.cpp index b3eaf92cc..3db0bc62a 100644 --- a/source/Core/Threads/UI/logic/Soldering.cpp +++ b/source/Core/Threads/UI/logic/Soldering.cpp @@ -39,7 +39,7 @@ OperatingMode handleSolderingButtons(const ButtonState buttons, guiContext *cxt) cxt->scratch_state.state2 = 1; break; } - /*Fall through*/ + /*Fall throuhg*/ default: // Set timer for and display a lock warning cxt->scratch_state.state7 = xTaskGetTickCount() + TICKS_SECOND; warnUser(translatedString(Tr->WarningKeysLockedString), buttons); @@ -65,8 +65,9 @@ OperatingMode handleSolderingButtons(const ButtonState buttons, guiContext *cxt) } break; case BUTTON_F_SHORT: - break; - case BUTTON_B_SHORT: + if (getSettingValue(SettingsOptions::BoostButtonTempChange)) { + break;} + case BUTTON_B_SHORT: cxt->transitionMode = TransitionAnimation::Left; return OperatingMode::TemperatureAdjust; case BUTTON_BOTH_LONG: From 450d129d15ad71d72be97c846f1e5a979b0ecffd Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 00:01:08 -0500 Subject: [PATCH 04/61] Update Settings.cpp --- source/Core/Src/Settings.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/source/Core/Src/Settings.cpp b/source/Core/Src/Settings.cpp index 28198f78b..abb3f178a 100644 --- a/source/Core/Src/Settings.cpp +++ b/source/Core/Src/Settings.cpp @@ -110,6 +110,7 @@ static const SettingConstants settingsConstants[(int)SettingsOptions::SettingsOp { 1, 10, 1, 2}, // ProfileCooldownSpeed { 0, 12, 1, 0}, // HallEffectSleepTime { 0, (tipType_t::TIP_TYPE_MAX - 1) > 0 ? (tipType_t::TIP_TYPE_MAX - 1) : 0, 1, 0}, // SolderingTipType + { 0, 1, 1, BOOST_BUTTON_TEMP_CHANGE}, //BoostButtonTempChange }; static_assert((sizeof(settingsConstants) / sizeof(SettingConstants)) == ((int)SettingsOptions::SettingsOptionsLength)); From 27de7f5db11f88fdff41f9a33b28d0f4f24da465 Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 00:03:46 -0500 Subject: [PATCH 05/61] Update Settings.cpp --- source/Core/Src/Settings.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/source/Core/Src/Settings.cpp b/source/Core/Src/Settings.cpp index abb3f178a..28198f78b 100644 --- a/source/Core/Src/Settings.cpp +++ b/source/Core/Src/Settings.cpp @@ -110,7 +110,6 @@ static const SettingConstants settingsConstants[(int)SettingsOptions::SettingsOp { 1, 10, 1, 2}, // ProfileCooldownSpeed { 0, 12, 1, 0}, // HallEffectSleepTime { 0, (tipType_t::TIP_TYPE_MAX - 1) > 0 ? (tipType_t::TIP_TYPE_MAX - 1) : 0, 1, 0}, // SolderingTipType - { 0, 1, 1, BOOST_BUTTON_TEMP_CHANGE}, //BoostButtonTempChange }; static_assert((sizeof(settingsConstants) / sizeof(SettingConstants)) == ((int)SettingsOptions::SettingsOptionsLength)); From 95493b48e7095c7620a52d82645069ef1a5f2a67 Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 00:04:48 -0500 Subject: [PATCH 06/61] Update Soldering.cpp to disable + activating temp only while boost mode setting is on --- source/Core/Threads/UI/logic/Soldering.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/Core/Threads/UI/logic/Soldering.cpp b/source/Core/Threads/UI/logic/Soldering.cpp index 3db0bc62a..5e6fbafc7 100644 --- a/source/Core/Threads/UI/logic/Soldering.cpp +++ b/source/Core/Threads/UI/logic/Soldering.cpp @@ -65,7 +65,7 @@ OperatingMode handleSolderingButtons(const ButtonState buttons, guiContext *cxt) } break; case BUTTON_F_SHORT: - if (getSettingValue(SettingsOptions::BoostButtonTempChange)) { + if (getSettingValue(SettingsOptions::BoostTemp)) { break;} case BUTTON_B_SHORT: cxt->transitionMode = TransitionAnimation::Left; From fc7aaf2b568b553473e20eaad9bf7f5cbd79b392 Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 17:51:32 -0500 Subject: [PATCH 07/61] Update Settings.cpp add BoostButtonTe --- source/Core/Src/Settings.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/Core/Src/Settings.cpp b/source/Core/Src/Settings.cpp index 28198f78b..5c8067b93 100644 --- a/source/Core/Src/Settings.cpp +++ b/source/Core/Src/Settings.cpp @@ -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 @@ -110,6 +110,7 @@ static const SettingConstants settingsConstants[(int)SettingsOptions::SettingsOp { 1, 10, 1, 2}, // ProfileCooldownSpeed { 0, 12, 1, 0}, // HallEffectSleepTime { 0, (tipType_t::TIP_TYPE_MAX - 1) > 0 ? (tipType_t::TIP_TYPE_MAX - 1) : 0, 1, 0}, // SolderingTipType + { 0, 1, 1, 0}, // BoostButtonTempChange }; static_assert((sizeof(settingsConstants) / sizeof(SettingConstants)) == ((int)SettingsOptions::SettingsOptionsLength)); From 6632065adeaf5f3ca309a633d7489563c9e60612 Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 18:21:31 -0500 Subject: [PATCH 08/61] Update Settings.h to change locking mode --- source/Core/Inc/Settings.h | 1 + 1 file changed, 1 insertion(+) diff --git a/source/Core/Inc/Settings.h b/source/Core/Inc/Settings.h index fd41e271f..5f40335a5 100644 --- a/source/Core/Inc/Settings.h +++ b/source/Core/Inc/Settings.h @@ -117,6 +117,7 @@ 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 + TEMP = 3, // Locking buttons for Boost mode Temp change } lockingMode_t; /* Selection of the soldering tip From 9e8bd8e790ad3e6b868af93f7f6be455c664a85c Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 18:40:14 -0500 Subject: [PATCH 09/61] Update Settings.h to add better descriptions --- source/Core/Inc/Settings.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/Core/Inc/Settings.h b/source/Core/Inc/Settings.h index 5f40335a5..2a01e4600 100644 --- a/source/Core/Inc/Settings.h +++ b/source/Core/Inc/Settings.h @@ -114,10 +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 - TEMP = 3, // Locking buttons for Boost mode Temp change + DISABLED = 0, // All buttons are unlocked + BOOST = 1, // All buttons except boost are locked + FULL = 2, // All buttons are locked + TEMP = 3, // All butons are unlocked except the boost button's temp change function. } lockingMode_t; /* Selection of the soldering tip From 5b5200a8d810c19a5020e7aaea1b5b078ab7f699 Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 18:41:39 -0500 Subject: [PATCH 10/61] Update Settings.cpp to revert addition of new setting --- source/Core/Src/Settings.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/source/Core/Src/Settings.cpp b/source/Core/Src/Settings.cpp index 5c8067b93..b3081f390 100644 --- a/source/Core/Src/Settings.cpp +++ b/source/Core/Src/Settings.cpp @@ -110,7 +110,6 @@ static const SettingConstants settingsConstants[(int)SettingsOptions::SettingsOp { 1, 10, 1, 2}, // ProfileCooldownSpeed { 0, 12, 1, 0}, // HallEffectSleepTime { 0, (tipType_t::TIP_TYPE_MAX - 1) > 0 ? (tipType_t::TIP_TYPE_MAX - 1) : 0, 1, 0}, // SolderingTipType - { 0, 1, 1, 0}, // BoostButtonTempChange }; static_assert((sizeof(settingsConstants) / sizeof(SettingConstants)) == ((int)SettingsOptions::SettingsOptionsLength)); From ab5f5b23a69e80e501c2497a7a6f011778e37da7 Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 19:17:30 -0500 Subject: [PATCH 11/61] Update settingsGUI.cpp to change display for locking mode --- source/Core/Src/settingsGUI.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/source/Core/Src/settingsGUI.cpp b/source/Core/Src/settingsGUI.cpp index d26b26bb1..d552925f0 100644 --- a/source/Core/Src/settingsGUI.cpp +++ b/source/Core/Src/settingsGUI.cpp @@ -636,6 +636,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; From 5e8cd339edc65eb79754c2253e49b3078baf2550 Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 19:25:44 -0500 Subject: [PATCH 12/61] Update Translation.h --- source/Core/Inc/Translation.h | 1 + 1 file changed, 1 insertion(+) diff --git a/source/Core/Inc/Translation.h b/source/Core/Inc/Translation.h index c8ad90198..bee252321 100644 --- a/source/Core/Inc/Translation.h +++ b/source/Core/Inc/Translation.h @@ -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; From f759195339f9f1cd185f993a4939ff1b604829bb Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 19:30:40 -0500 Subject: [PATCH 13/61] Update translation_EN.json --- Translations/translation_EN.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Translations/translation_EN.json b/Translations/translation_EN.json index 9ef29e1ef..a9ecbde8a 100644 --- a/Translations/translation_EN.json +++ b/Translations/translation_EN.json @@ -81,7 +81,8 @@ "SettingStartSleepChar": "Z", "SettingStartSleepOffChar": "R", "SettingLockBoostChar": "B", - "SettingLockFullChar": "F" + "SettingLockFullChar": "F", + "SettingLockTempChar": "T" }, "menuGroups": { "PowerMenu": { From cb667874b6de1d450f2bd4d5b7cb1ebc57467a04 Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 20:05:41 -0500 Subject: [PATCH 14/61] Update Settings.cpp --- source/Core/Src/Settings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/Core/Src/Settings.cpp b/source/Core/Src/Settings.cpp index b3081f390..16a96166d 100644 --- a/source/Core/Src/Settings.cpp +++ b/source/Core/Src/Settings.cpp @@ -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 From 7fc12dafbff916ba504bb1840bdc13f731ab9a31 Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 20:19:12 -0500 Subject: [PATCH 15/61] Update Soldering.cpp to fix broken logic --- source/Core/Threads/UI/logic/Soldering.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/Core/Threads/UI/logic/Soldering.cpp b/source/Core/Threads/UI/logic/Soldering.cpp index 5e6fbafc7..802638019 100644 --- a/source/Core/Threads/UI/logic/Soldering.cpp +++ b/source/Core/Threads/UI/logic/Soldering.cpp @@ -65,13 +65,13 @@ OperatingMode handleSolderingButtons(const ButtonState buttons, guiContext *cxt) } break; case BUTTON_F_SHORT: - if (getSettingValue(SettingsOptions::BoostTemp)) { + if (getSettingValue(SettingsOptions::LockingMode) == lockingMode_t::TEMP) { break;} case BUTTON_B_SHORT: cxt->transitionMode = TransitionAnimation::Left; return OperatingMode::TemperatureAdjust; case BUTTON_BOTH_LONG: - if (getSettingValue(SettingsOptions::LockingMode)) { + if (getSettingValue(SettingsOptions::LockingMode) != lockingMode_t::TEMP || lockingMode_t::OFF) { // Lock buttons if (cxt->scratch_state.state1 == 0) { if (warnUser(translatedString(Tr->LockingKeysString), buttons)) { From 07457af57601e0229fe848a7b19a6ca7695affb9 Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 20:21:38 -0500 Subject: [PATCH 16/61] Update Soldering.cpp because i used the wrong symbol --- source/Core/Threads/UI/logic/Soldering.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/Core/Threads/UI/logic/Soldering.cpp b/source/Core/Threads/UI/logic/Soldering.cpp index 802638019..8bd6a63fe 100644 --- a/source/Core/Threads/UI/logic/Soldering.cpp +++ b/source/Core/Threads/UI/logic/Soldering.cpp @@ -71,7 +71,7 @@ OperatingMode handleSolderingButtons(const ButtonState buttons, guiContext *cxt) cxt->transitionMode = TransitionAnimation::Left; return OperatingMode::TemperatureAdjust; case BUTTON_BOTH_LONG: - if (getSettingValue(SettingsOptions::LockingMode) != lockingMode_t::TEMP || lockingMode_t::OFF) { + if (getSettingValue(SettingsOptions::LockingMode) != (lockingMode_t::TEMP || lockingMode_t::DISABLED)) { // Lock buttons if (cxt->scratch_state.state1 == 0) { if (warnUser(translatedString(Tr->LockingKeysString), buttons)) { From b005870033a6261844389d2a83edb4cd8c08705d Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 20:48:30 -0500 Subject: [PATCH 17/61] Update Soldering.cpp to fix build complaining --- source/Core/Threads/UI/logic/Soldering.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/Core/Threads/UI/logic/Soldering.cpp b/source/Core/Threads/UI/logic/Soldering.cpp index 8bd6a63fe..b94ebbae3 100644 --- a/source/Core/Threads/UI/logic/Soldering.cpp +++ b/source/Core/Threads/UI/logic/Soldering.cpp @@ -66,7 +66,8 @@ OperatingMode handleSolderingButtons(const ButtonState buttons, guiContext *cxt) break; case BUTTON_F_SHORT: if (getSettingValue(SettingsOptions::LockingMode) == lockingMode_t::TEMP) { - break;} + break; + } case BUTTON_B_SHORT: cxt->transitionMode = TransitionAnimation::Left; return OperatingMode::TemperatureAdjust; From 4a1e946e25981959f83fb0548961d9aa0bb01f9c Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 20:55:41 -0500 Subject: [PATCH 18/61] Update translations_definitions.json --- Translations/translations_definitions.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Translations/translations_definitions.json b/Translations/translations_definitions.json index e473ca346..4907fe3b5 100644 --- a/Translations/translations_definitions.json +++ b/Translations/translations_definitions.json @@ -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 only the boost button's temperature change function" } ], "menuGroups": [ From ff213aa06f87a18f76ec33bc391dcc0e70825475 Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 21:36:07 -0500 Subject: [PATCH 19/61] Update translation_BE.json --- Translations/translation_BE.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Translations/translation_BE.json b/Translations/translation_BE.json index 42b16c025..e0552d7ca 100644 --- a/Translations/translation_BE.json +++ b/Translations/translation_BE.json @@ -81,7 +81,8 @@ "SettingStartSleepChar": "Ч", "SettingStartSleepOffChar": "К", "SettingLockBoostChar": "Т", - "SettingLockFullChar": "П" + "SettingLockFullChar": "П", + "SettingLockTempChar": "T" }, "menuGroups": { "PowerMenu": { From eca4a230bc4e00e500269da1af5ec14558309e33 Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 21:36:27 -0500 Subject: [PATCH 20/61] Update translation_BG.json --- Translations/translation_BG.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Translations/translation_BG.json b/Translations/translation_BG.json index bfe61bc61..15239037d 100644 --- a/Translations/translation_BG.json +++ b/Translations/translation_BG.json @@ -81,7 +81,8 @@ "SettingStartSleepChar": "С", "SettingStartSleepOffChar": "П", "SettingLockBoostChar": "Т", - "SettingLockFullChar": "П" + "SettingLockFullChar": "П", + "SettingLockTempChar": "T" }, "menuGroups": { "PowerMenu": { From b37c4209afc3c4ed50cd88724c9fdc05d65a47d0 Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 21:36:50 -0500 Subject: [PATCH 21/61] Update translation_CS.json --- Translations/translation_CS.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Translations/translation_CS.json b/Translations/translation_CS.json index a6ea50e55..1fd90a928 100644 --- a/Translations/translation_CS.json +++ b/Translations/translation_CS.json @@ -81,7 +81,8 @@ "SettingStartSleepChar": "S", "SettingStartSleepOffChar": "M", "SettingLockBoostChar": "B", - "SettingLockFullChar": "U" + "SettingLockFullChar": "U", + "SettingLockTempChar": "T" }, "menuGroups": { "PowerMenu": { From 522822b268180ee00a05080e45470ada95ab1367 Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 21:37:00 -0500 Subject: [PATCH 22/61] Update translation_DA.json --- Translations/translation_DA.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Translations/translation_DA.json b/Translations/translation_DA.json index c80e7c6fd..29231d71d 100644 --- a/Translations/translation_DA.json +++ b/Translations/translation_DA.json @@ -81,7 +81,8 @@ "SettingStartSleepChar": "D", "SettingStartSleepOffChar": "R", "SettingLockBoostChar": "B", - "SettingLockFullChar": "F" + "SettingLockFullChar": "F", + "SettingLockTempChar": "T" }, "menuGroups": { "PowerMenu": { From c2c1cab283bce3f5a3dc1135fa19942ae0598fd8 Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 21:37:12 -0500 Subject: [PATCH 23/61] Update translation_DE.json --- Translations/translation_DE.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Translations/translation_DE.json b/Translations/translation_DE.json index 0208a8482..240ffb46c 100644 --- a/Translations/translation_DE.json +++ b/Translations/translation_DE.json @@ -81,7 +81,8 @@ "SettingStartSleepChar": "R", "SettingStartSleepOffChar": "K", "SettingLockBoostChar": "B", - "SettingLockFullChar": "V" + "SettingLockFullChar": "V", + "SettingLockTempChar": "T" }, "menuGroups": { "PowerMenu": { From f6c864d3b6199c401594dde725400851c5af4e25 Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 21:37:27 -0500 Subject: [PATCH 24/61] Update translation_EL.json --- Translations/translation_EL.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Translations/translation_EL.json b/Translations/translation_EL.json index 8a8a99eae..50b28789f 100644 --- a/Translations/translation_EL.json +++ b/Translations/translation_EL.json @@ -81,7 +81,8 @@ "SettingStartSleepChar": "Ζ", "SettingStartSleepOffChar": "Υ", "SettingLockBoostChar": "B", - "SettingLockFullChar": "Π" + "SettingLockFullChar": "Π", + "SettingLockTempChar": "T" }, "menuGroups": { "PowerMenu": { From 8c538a2ab0189652289f47a9cd9c4275cb842890 Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 21:37:37 -0500 Subject: [PATCH 25/61] Update translation_EN.json --- Translations/translation_EN.json | 1 + 1 file changed, 1 insertion(+) diff --git a/Translations/translation_EN.json b/Translations/translation_EN.json index a9ecbde8a..42023d137 100644 --- a/Translations/translation_EN.json +++ b/Translations/translation_EN.json @@ -82,6 +82,7 @@ "SettingStartSleepOffChar": "R", "SettingLockBoostChar": "B", "SettingLockFullChar": "F", + "SettingLockTempChar": "T", "SettingLockTempChar": "T" }, "menuGroups": { From 0fdc05257ad3e6b1849ab72ed15feba691d0ecc7 Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 21:37:51 -0500 Subject: [PATCH 26/61] Update translation_EN.json --- Translations/translation_EN.json | 1 - 1 file changed, 1 deletion(-) diff --git a/Translations/translation_EN.json b/Translations/translation_EN.json index 42023d137..a9ecbde8a 100644 --- a/Translations/translation_EN.json +++ b/Translations/translation_EN.json @@ -82,7 +82,6 @@ "SettingStartSleepOffChar": "R", "SettingLockBoostChar": "B", "SettingLockFullChar": "F", - "SettingLockTempChar": "T", "SettingLockTempChar": "T" }, "menuGroups": { From 72a7cf3de2d312e18f0384700feb2a2a10e77544 Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 21:38:03 -0500 Subject: [PATCH 27/61] Update translation_ES.json --- Translations/translation_ES.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Translations/translation_ES.json b/Translations/translation_ES.json index 76d8fd4d7..b5df22ef7 100644 --- a/Translations/translation_ES.json +++ b/Translations/translation_ES.json @@ -81,7 +81,8 @@ "SettingStartSleepChar": "R", "SettingStartSleepOffChar": "F", "SettingLockBoostChar": "B", - "SettingLockFullChar": "F" + "SettingLockFullChar": "F", + "SettingLockTempChar": "T" }, "menuGroups": { "PowerMenu": { From 9d26f8b1b5f2330caec62e2cee23f534cd90707d Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 21:38:13 -0500 Subject: [PATCH 28/61] Update translation_ET.json --- Translations/translation_ET.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Translations/translation_ET.json b/Translations/translation_ET.json index 75dcccf3a..2ccbc0e60 100644 --- a/Translations/translation_ET.json +++ b/Translations/translation_ET.json @@ -81,7 +81,8 @@ "SettingStartSleepChar": "Z", "SettingStartSleepOffChar": "P", "SettingLockBoostChar": "B", - "SettingLockFullChar": "T" + "SettingLockFullChar": "T", + "SettingLockTempChar": "T" }, "menuGroups": { "PowerMenu": { From 5a67f060d42d47fbb36730814aa5cde765231703 Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 21:38:31 -0500 Subject: [PATCH 29/61] Update translation_FI.json --- Translations/translation_FI.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Translations/translation_FI.json b/Translations/translation_FI.json index b9c04eadc..e076fa47a 100644 --- a/Translations/translation_FI.json +++ b/Translations/translation_FI.json @@ -81,7 +81,8 @@ "SettingStartSleepChar": "L", "SettingStartSleepOffChar": "H", "SettingLockBoostChar": "V", - "SettingLockFullChar": "K" + "SettingLockFullChar": "K", + "SettingLockTempChar": "T" }, "menuGroups": { "PowerMenu": { From 84c61aa62a89ef063032c7bdd1fc8cbc0838f17e Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 21:38:50 -0500 Subject: [PATCH 30/61] Update translation_FR.json --- Translations/translation_FR.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Translations/translation_FR.json b/Translations/translation_FR.json index 07f404f81..ac26437c7 100644 --- a/Translations/translation_FR.json +++ b/Translations/translation_FR.json @@ -81,7 +81,8 @@ "SettingStartSleepChar": "V", "SettingStartSleepOffChar": "O", "SettingLockBoostChar": "B", - "SettingLockFullChar": "V" + "SettingLockFullChar": "V", + "SettingLockTempChar": "T" }, "menuGroups": { "PowerMenu": { From 058f04f0cd0e36cbbce926a9220f1b50f27ac1fb Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 21:39:03 -0500 Subject: [PATCH 31/61] Update translation_HR.json --- Translations/translation_HR.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Translations/translation_HR.json b/Translations/translation_HR.json index 53455e5f3..9df38e3e2 100644 --- a/Translations/translation_HR.json +++ b/Translations/translation_HR.json @@ -81,7 +81,8 @@ "SettingStartSleepChar": "T", "SettingStartSleepOffChar": "H", "SettingLockBoostChar": "B", - "SettingLockFullChar": "Z" + "SettingLockFullChar": "Z", + "SettingLockTempChar": "T" }, "menuGroups": { "PowerMenu": { From 211c172103a745771fa02dc3dfcb7cf667794656 Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 21:39:13 -0500 Subject: [PATCH 32/61] Update translation_HU.json --- Translations/translation_HU.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Translations/translation_HU.json b/Translations/translation_HU.json index db817202c..0a8ce6d36 100644 --- a/Translations/translation_HU.json +++ b/Translations/translation_HU.json @@ -81,7 +81,8 @@ "SettingStartSleepChar": "A", "SettingStartSleepOffChar": "Sz", "SettingLockBoostChar": "B", - "SettingLockFullChar": "T" + "SettingLockFullChar": "T", + "SettingLockTempChar": "T" }, "menuGroups": { "PowerMenu": { From 0fa48ed345fd06cf0d06711eb970839691714e15 Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 21:39:19 -0500 Subject: [PATCH 33/61] Update translation_IT.json --- Translations/translation_IT.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Translations/translation_IT.json b/Translations/translation_IT.json index 643a9f53f..26f0d4c9a 100644 --- a/Translations/translation_IT.json +++ b/Translations/translation_IT.json @@ -81,7 +81,8 @@ "SettingStartSleepChar": "R", "SettingStartSleepOffChar": "A", "SettingLockBoostChar": "T", - "SettingLockFullChar": "C" + "SettingLockFullChar": "C", + "SettingLockTempChar": "T" }, "menuGroups": { "PowerMenu": { From 32d9577e48bcf8cdd7b9d5593f76e3a709094681 Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 21:39:31 -0500 Subject: [PATCH 34/61] Update translation_JA_JP.json --- Translations/translation_JA_JP.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Translations/translation_JA_JP.json b/Translations/translation_JA_JP.json index 58fe176b0..d6922bb80 100644 --- a/Translations/translation_JA_JP.json +++ b/Translations/translation_JA_JP.json @@ -81,7 +81,8 @@ "SettingStartSleepChar": "待", "SettingStartSleepOffChar": "室", "SettingLockBoostChar": "ブ", - "SettingLockFullChar": "全" + "SettingLockFullChar": "全", + "SettingLockTempChar": "T" }, "menuGroups": { "PowerMenu": { From 67ecb2d7665205f047900f30b6951ad57e2d867f Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 21:39:38 -0500 Subject: [PATCH 35/61] Update translation_LT.json --- Translations/translation_LT.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Translations/translation_LT.json b/Translations/translation_LT.json index 2d77dec8d..c5843e4b7 100644 --- a/Translations/translation_LT.json +++ b/Translations/translation_LT.json @@ -81,7 +81,8 @@ "SettingStartSleepChar": "M", "SettingStartSleepOffChar": "K", "SettingLockBoostChar": "T", - "SettingLockFullChar": "V" + "SettingLockFullChar": "V", + "SettingLockTempChar": "T" }, "menuGroups": { "PowerMenu": { From ea14714b3634ddabcd2ffe30d966d1f3f39f543c Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 21:39:47 -0500 Subject: [PATCH 36/61] Update translation_NB.json --- Translations/translation_NB.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Translations/translation_NB.json b/Translations/translation_NB.json index cac1f3079..3aa27763d 100644 --- a/Translations/translation_NB.json +++ b/Translations/translation_NB.json @@ -81,7 +81,8 @@ "SettingStartSleepChar": "D", "SettingStartSleepOffChar": "R", "SettingLockBoostChar": "B", - "SettingLockFullChar": "F" + "SettingLockFullChar": "F", + "SettingLockTempChar": "T" }, "menuGroups": { "PowerMenu": { From 1e756b4b4a3c2dda9fc84455351e9611f9db8c81 Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 21:39:59 -0500 Subject: [PATCH 37/61] Update translation_NL.json --- Translations/translation_NL.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Translations/translation_NL.json b/Translations/translation_NL.json index 7b3a68d8d..c495b5e2d 100644 --- a/Translations/translation_NL.json +++ b/Translations/translation_NL.json @@ -81,7 +81,8 @@ "SettingStartSleepChar": "S", "SettingStartSleepOffChar": "Z", "SettingLockBoostChar": "B", - "SettingLockFullChar": "V" + "SettingLockFullChar": "V", + "SettingLockTempChar": "T" }, "menuGroups": { "PowerMenu": { From 509e6a8ef4cb952ced3bdfd0c9673d4479890033 Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 21:40:11 -0500 Subject: [PATCH 38/61] Update translation_NL_BE.json --- Translations/translation_NL_BE.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Translations/translation_NL_BE.json b/Translations/translation_NL_BE.json index 989359df1..9ab4541f4 100644 --- a/Translations/translation_NL_BE.json +++ b/Translations/translation_NL_BE.json @@ -81,7 +81,8 @@ "SettingStartSleepChar": "S", "SettingStartSleepOffChar": "K", "SettingLockBoostChar": "B", - "SettingLockFullChar": "F" + "SettingLockFullChar": "F", + "SettingLockTempChar": "T" }, "menuGroups": { "PowerMenu": { From 050fa824c06ff6c92d951bab1e600c1f9905485f Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 21:40:19 -0500 Subject: [PATCH 39/61] Update translation_PL.json --- Translations/translation_PL.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Translations/translation_PL.json b/Translations/translation_PL.json index 8e5160766..e87f3cc1c 100644 --- a/Translations/translation_PL.json +++ b/Translations/translation_PL.json @@ -81,7 +81,8 @@ "SettingStartSleepChar": "Z", "SettingStartSleepOffChar": "O", "SettingLockBoostChar": "B", - "SettingLockFullChar": "P" + "SettingLockFullChar": "P", + "SettingLockTempChar": "T" }, "menuGroups": { "PowerMenu": { From d7a58e50d465dbbef77a10599e45c751b65c8a00 Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 21:40:28 -0500 Subject: [PATCH 40/61] Update translation_PT.json --- Translations/translation_PT.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Translations/translation_PT.json b/Translations/translation_PT.json index 5f4ab9993..34130da31 100644 --- a/Translations/translation_PT.json +++ b/Translations/translation_PT.json @@ -81,7 +81,8 @@ "SettingStartSleepChar": "H", "SettingStartSleepOffChar": "A", "SettingLockBoostChar": "B", - "SettingLockFullChar": "F" + "SettingLockFullChar": "F", + "SettingLockTempChar": "T" }, "menuGroups": { "PowerMenu": { From 6e30c78c9d6cdf89906e770123f3c4e276baa557 Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 21:40:36 -0500 Subject: [PATCH 41/61] Update translation_RO.json --- Translations/translation_RO.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Translations/translation_RO.json b/Translations/translation_RO.json index 2e5105fac..cbaf7448f 100644 --- a/Translations/translation_RO.json +++ b/Translations/translation_RO.json @@ -81,7 +81,8 @@ "SettingStartSleepChar": "Z", "SettingStartSleepOffChar": "R", "SettingLockBoostChar": "B", - "SettingLockFullChar": "F" + "SettingLockFullChar": "F", + "SettingLockTempChar": "T" }, "menuGroups": { "PowerMenu": { From 7c2664797e73c7a7e8c969bc714492ddcbd06740 Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 21:40:46 -0500 Subject: [PATCH 42/61] Update translation_RU.json --- Translations/translation_RU.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Translations/translation_RU.json b/Translations/translation_RU.json index 81dac2ef3..c18e5f82d 100644 --- a/Translations/translation_RU.json +++ b/Translations/translation_RU.json @@ -81,7 +81,8 @@ "SettingStartSleepChar": "С", "SettingStartSleepOffChar": "К", "SettingLockBoostChar": "Т", - "SettingLockFullChar": "П" + "SettingLockFullChar": "П", + "SettingLockTempChar": "T" }, "menuGroups": { "PowerMenu": { From a5259448b92985a044ac82137b4a65e35e81b1fc Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 21:40:57 -0500 Subject: [PATCH 43/61] Update translation_SK.json --- Translations/translation_SK.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Translations/translation_SK.json b/Translations/translation_SK.json index 476b8288b..dd713b639 100644 --- a/Translations/translation_SK.json +++ b/Translations/translation_SK.json @@ -81,7 +81,8 @@ "SettingStartSleepChar": "S", "SettingStartSleepOffChar": "I", "SettingLockBoostChar": "B", - "SettingLockFullChar": "P" + "SettingLockFullChar": "P", + "SettingLockTempChar": "T" }, "menuGroups": { "PowerMenu": { From 52c4087d3f8a3c3d9350d73a2b40715949c8f5ae Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 21:41:07 -0500 Subject: [PATCH 44/61] Update translation_SL.json --- Translations/translation_SL.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Translations/translation_SL.json b/Translations/translation_SL.json index 358f91173..e61f0ac8b 100644 --- a/Translations/translation_SL.json +++ b/Translations/translation_SL.json @@ -81,7 +81,8 @@ "SettingStartSleepChar": "Z", "SettingStartSleepOffChar": "V", "SettingLockBoostChar": "L", - "SettingLockFullChar": "P" + "SettingLockFullChar": "P", + "SettingLockTempChar": "T" }, "menuGroups": { "PowerMenu": { From 30c9ac805a4afb93c9ba86fe16bb571c0dd5b1cd Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 21:41:19 -0500 Subject: [PATCH 45/61] Update translation_SR_CYRL.json --- Translations/translation_SR_CYRL.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Translations/translation_SR_CYRL.json b/Translations/translation_SR_CYRL.json index 70ddae54e..9faa36090 100644 --- a/Translations/translation_SR_CYRL.json +++ b/Translations/translation_SR_CYRL.json @@ -81,7 +81,8 @@ "SettingStartSleepChar": "С", "SettingStartSleepOffChar": "X", "SettingLockBoostChar": "B", - "SettingLockFullChar": "F" + "SettingLockFullChar": "F", + "SettingLockTempChar": "T" }, "menuGroups": { "PowerMenu": { From d9d421fe8fec42b1f5a02a42fc675279c969ac5a Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 21:41:27 -0500 Subject: [PATCH 46/61] Update translation_SR_LATN.json --- Translations/translation_SR_LATN.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Translations/translation_SR_LATN.json b/Translations/translation_SR_LATN.json index eaa70d808..7068a44ba 100644 --- a/Translations/translation_SR_LATN.json +++ b/Translations/translation_SR_LATN.json @@ -81,7 +81,8 @@ "SettingStartSleepChar": "S", "SettingStartSleepOffChar": "X", "SettingLockBoostChar": "B", - "SettingLockFullChar": "F" + "SettingLockFullChar": "F", + "SettingLockTempChar": "T" }, "menuGroups": { "PowerMenu": { From 60e3f1d5af6ba300b32df9368f9ee6e9eefe0cb5 Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 21:41:36 -0500 Subject: [PATCH 47/61] Update translation_SV.json --- Translations/translation_SV.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Translations/translation_SV.json b/Translations/translation_SV.json index 3cdaf6917..8905f2bc2 100644 --- a/Translations/translation_SV.json +++ b/Translations/translation_SV.json @@ -81,7 +81,8 @@ "SettingStartSleepChar": "V", "SettingStartSleepOffChar": "R", "SettingLockBoostChar": "T", - "SettingLockFullChar": "F" + "SettingLockFullChar": "F", + "SettingLockTempChar": "T" }, "menuGroups": { "PowerMenu": { From 4286358d1d59bf2b4de92eeae165bac015b0195f Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 21:41:46 -0500 Subject: [PATCH 48/61] Update translation_TR.json --- Translations/translation_TR.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Translations/translation_TR.json b/Translations/translation_TR.json index 539ffa441..dbd7277f3 100644 --- a/Translations/translation_TR.json +++ b/Translations/translation_TR.json @@ -81,7 +81,8 @@ "SettingStartSleepChar": "U", "SettingStartSleepOffChar": "S", "SettingLockBoostChar": "B", - "SettingLockFullChar": "F" + "SettingLockFullChar": "F", + "SettingLockTempChar": "T" }, "menuGroups": { "PowerMenu": { From 78686a8e51ccace07e6506d3c3ec26bfdc9804fc Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 21:41:54 -0500 Subject: [PATCH 49/61] Update translation_UK.json --- Translations/translation_UK.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Translations/translation_UK.json b/Translations/translation_UK.json index 02fa7df9b..84f2bc3c3 100644 --- a/Translations/translation_UK.json +++ b/Translations/translation_UK.json @@ -81,7 +81,8 @@ "SettingStartSleepChar": "О", "SettingStartSleepOffChar": "К", "SettingLockBoostChar": "Т", - "SettingLockFullChar": "П" + "SettingLockFullChar": "П", + "SettingLockTempChar": "T" }, "menuGroups": { "PowerMenu": { From 1b45b363f296ba7ac3fdf4daebc53486542d29bd Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 21:42:07 -0500 Subject: [PATCH 50/61] Update translation_UZ.json --- Translations/translation_UZ.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Translations/translation_UZ.json b/Translations/translation_UZ.json index 97f8b9d62..c0c10875f 100644 --- a/Translations/translation_UZ.json +++ b/Translations/translation_UZ.json @@ -81,7 +81,8 @@ "SettingStartSleepChar": "U", "SettingStartSleepOffChar": "X", "SettingLockBoostChar": "B", - "SettingLockFullChar": "T" + "SettingLockFullChar": "T", + "SettingLockTempChar": "T" }, "menuGroups": { "PowerMenu": { From e1340adf130bbf1278aee429caff1990c56c9040 Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 21:42:14 -0500 Subject: [PATCH 51/61] Update translation_VI.json --- Translations/translation_VI.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Translations/translation_VI.json b/Translations/translation_VI.json index dae1a6535..a74eb24b8 100644 --- a/Translations/translation_VI.json +++ b/Translations/translation_VI.json @@ -81,7 +81,8 @@ "SettingStartSleepChar": "Z", "SettingStartSleepOffChar": "R", "SettingLockBoostChar": "B", - "SettingLockFullChar": "F" + "SettingLockFullChar": "F", + "SettingLockTempChar": "T" }, "menuGroups": { "PowerMenu": { From daca0e66f82ea15819b399837694de020fd1dd04 Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 21:42:22 -0500 Subject: [PATCH 52/61] Update translation_YUE_HK.json --- Translations/translation_YUE_HK.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Translations/translation_YUE_HK.json b/Translations/translation_YUE_HK.json index e7737b2ba..1ecde699a 100644 --- a/Translations/translation_YUE_HK.json +++ b/Translations/translation_YUE_HK.json @@ -81,7 +81,8 @@ "SettingStartSleepChar": "待", "SettingStartSleepOffChar": "室", "SettingLockBoostChar": "增", - "SettingLockFullChar": "全" + "SettingLockFullChar": "全", + "SettingLockTempChar": "T" }, "menuGroups": { "PowerMenu": { From 82a032819a8f3cd6e28f2339cdb1a5eb11782c52 Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 21:42:29 -0500 Subject: [PATCH 53/61] Update translation_ZH_CN.json --- Translations/translation_ZH_CN.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Translations/translation_ZH_CN.json b/Translations/translation_ZH_CN.json index 685612810..1961a6bee 100644 --- a/Translations/translation_ZH_CN.json +++ b/Translations/translation_ZH_CN.json @@ -81,7 +81,8 @@ "SettingStartSleepChar": "待", "SettingStartSleepOffChar": "室", "SettingLockBoostChar": "增", - "SettingLockFullChar": "全" + "SettingLockFullChar": "全", + "SettingLockTempChar": "T" }, "menuGroups": { "PowerMenu": { From 98755f06a1fb3fc2c2a78666cede49d65ac3f71b Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 21:42:36 -0500 Subject: [PATCH 54/61] Update translation_ZH_TW.json --- Translations/translation_ZH_TW.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Translations/translation_ZH_TW.json b/Translations/translation_ZH_TW.json index 222180519..1f220c711 100644 --- a/Translations/translation_ZH_TW.json +++ b/Translations/translation_ZH_TW.json @@ -81,7 +81,8 @@ "SettingStartSleepChar": "待", "SettingStartSleepOffChar": "室", "SettingLockBoostChar": "增", - "SettingLockFullChar": "全" + "SettingLockFullChar": "全", + "SettingLockTempChar": "T" }, "menuGroups": { "PowerMenu": { From 06629c6d870afa7c6890bbbaed1ebbf978fb4c41 Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 21:58:21 -0500 Subject: [PATCH 55/61] Update Soldering.cpp --- source/Core/Threads/UI/logic/Soldering.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/Core/Threads/UI/logic/Soldering.cpp b/source/Core/Threads/UI/logic/Soldering.cpp index b94ebbae3..59115a582 100644 --- a/source/Core/Threads/UI/logic/Soldering.cpp +++ b/source/Core/Threads/UI/logic/Soldering.cpp @@ -72,7 +72,7 @@ OperatingMode handleSolderingButtons(const ButtonState buttons, guiContext *cxt) cxt->transitionMode = TransitionAnimation::Left; return OperatingMode::TemperatureAdjust; case BUTTON_BOTH_LONG: - if (getSettingValue(SettingsOptions::LockingMode) != (lockingMode_t::TEMP || lockingMode_t::DISABLED)) { + if (getSettingValue(SettingsOptions::LockingMode) && (getSettingValue(SettingsOptions::LockingMode) != lockingMode_t::TEMP)) { // Lock buttons if (cxt->scratch_state.state1 == 0) { if (warnUser(translatedString(Tr->LockingKeysString), buttons)) { From 7869b28736d83b4d145f68b789bc2c2761d31600 Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 22:09:23 -0500 Subject: [PATCH 56/61] Update Soldering.cpp Fix formatting --- source/Core/Threads/UI/logic/Soldering.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/Core/Threads/UI/logic/Soldering.cpp b/source/Core/Threads/UI/logic/Soldering.cpp index 59115a582..4346d00f4 100644 --- a/source/Core/Threads/UI/logic/Soldering.cpp +++ b/source/Core/Threads/UI/logic/Soldering.cpp @@ -66,9 +66,9 @@ OperatingMode handleSolderingButtons(const ButtonState buttons, guiContext *cxt) break; case BUTTON_F_SHORT: if (getSettingValue(SettingsOptions::LockingMode) == lockingMode_t::TEMP) { - break; + break; } - case BUTTON_B_SHORT: + case BUTTON_B_SHORT: cxt->transitionMode = TransitionAnimation::Left; return OperatingMode::TemperatureAdjust; case BUTTON_BOTH_LONG: From d6c04a090b3a4a484743a8cc737c96235c9ac654 Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Tue, 21 Jan 2025 22:10:51 -0500 Subject: [PATCH 57/61] Update Soldering.cpp to fix formatting (again.....) --- source/Core/Threads/UI/logic/Soldering.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/Core/Threads/UI/logic/Soldering.cpp b/source/Core/Threads/UI/logic/Soldering.cpp index 4346d00f4..181e4ce27 100644 --- a/source/Core/Threads/UI/logic/Soldering.cpp +++ b/source/Core/Threads/UI/logic/Soldering.cpp @@ -66,7 +66,7 @@ OperatingMode handleSolderingButtons(const ButtonState buttons, guiContext *cxt) break; case BUTTON_F_SHORT: if (getSettingValue(SettingsOptions::LockingMode) == lockingMode_t::TEMP) { - break; + break; } case BUTTON_B_SHORT: cxt->transitionMode = TransitionAnimation::Left; From a712e8d478d487fd7d400b963254bfba878d95b6 Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Thu, 23 Jan 2025 21:21:08 -0500 Subject: [PATCH 58/61] Apply suggestions from code review to clean up wording and typos --- README.md | 2 +- source/Core/Inc/Settings.h | 2 +- source/Core/Src/Settings.cpp | 2 +- source/Core/Threads/UI/logic/Soldering.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 62bb762f2..6d4fee8d4 100644 --- a/README.md +++ b/README.md @@ -127,7 +127,7 @@ After powering on the device for the first time with _IronOS_ installed and havi - pressing the `+/A` button enters the _soldering mode_; - pressing the `-/B` button enters the _settings menu_; - in _soldering mode_: - - short press of the `-/B` button changes the soldering temperature; + - short press of `+/A` / `-/B` buttons changes the soldering temperature; - long press of the `+/A` button enables _boost mode_ (increasing soldering temperature to the adjustable setting as long as the button is pressed); - long press of the `-/B` button enters _standby mode_ and stops heating; - in _standby mode_: diff --git a/source/Core/Inc/Settings.h b/source/Core/Inc/Settings.h index 2a01e4600..963c97568 100644 --- a/source/Core/Inc/Settings.h +++ b/source/Core/Inc/Settings.h @@ -117,7 +117,7 @@ typedef enum { DISABLED = 0, // All buttons are unlocked BOOST = 1, // All buttons except boost are locked FULL = 2, // All buttons are locked - TEMP = 3, // All butons are unlocked except the boost button's temp change function. + TEMP = 3, // All buttons are unlocked except the A/+ button's temp change function. } lockingMode_t; /* Selection of the soldering tip diff --git a/source/Core/Src/Settings.cpp b/source/Core/Src/Settings.cpp index 16a96166d..b3081f390 100644 --- a/source/Core/Src/Settings.cpp +++ b/source/Core/Src/Settings.cpp @@ -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, 3, 1, LOCKING_MODE}, // LockingMode + { 0, 2, 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 diff --git a/source/Core/Threads/UI/logic/Soldering.cpp b/source/Core/Threads/UI/logic/Soldering.cpp index 181e4ce27..5ee712c1d 100644 --- a/source/Core/Threads/UI/logic/Soldering.cpp +++ b/source/Core/Threads/UI/logic/Soldering.cpp @@ -39,7 +39,7 @@ OperatingMode handleSolderingButtons(const ButtonState buttons, guiContext *cxt) cxt->scratch_state.state2 = 1; break; } - /*Fall throuhg*/ + /*Fall through*/ default: // Set timer for and display a lock warning cxt->scratch_state.state7 = xTaskGetTickCount() + TICKS_SECOND; warnUser(translatedString(Tr->WarningKeysLockedString), buttons); From 7bf9620eb77786a41ebdf8e9f9978d13cb4ec921 Mon Sep 17 00:00:00 2001 From: Ivan Zorin Date: Fri, 24 Jan 2025 23:42:43 +0300 Subject: [PATCH 59/61] Help to Unify descriptions for new locking mode in definitions.json and in Settings.h --- Translations/translations_definitions.json | 2 +- source/Core/Inc/Settings.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Translations/translations_definitions.json b/Translations/translations_definitions.json index 4907fe3b5..f6a357392 100644 --- a/Translations/translations_definitions.json +++ b/Translations/translations_definitions.json @@ -170,7 +170,7 @@ "id": "SettingLockTempChar", "len": 1, "default": "T", - "description": "Shown when the locking mode is set to lock only the boost button's temperature change function" + "description": "Shown when the locking mode is set to lock all buttons except for -/B to change the temperature." } ], "menuGroups": [ diff --git a/source/Core/Inc/Settings.h b/source/Core/Inc/Settings.h index 963c97568..632016758 100644 --- a/source/Core/Inc/Settings.h +++ b/source/Core/Inc/Settings.h @@ -115,9 +115,9 @@ typedef enum { typedef enum { DISABLED = 0, // All buttons are unlocked - BOOST = 1, // All buttons except boost are locked + BOOST = 1, // All buttons are locked except boost FULL = 2, // All buttons are locked - TEMP = 3, // All buttons are unlocked except the A/+ button's temp change function. + TEMP = 3, // All buttons are locked except -/B to change the temperature } lockingMode_t; /* Selection of the soldering tip From 911ef59da45203b79f0276a63ee850bf172ff01f Mon Sep 17 00:00:00 2001 From: Ivan Zorin Date: Sun, 26 Jan 2025 03:35:15 +0300 Subject: [PATCH 60/61] Enable TEMP locking as option --- source/Core/Src/Settings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/Core/Src/Settings.cpp b/source/Core/Src/Settings.cpp index b3081f390..16a96166d 100644 --- a/source/Core/Src/Settings.cpp +++ b/source/Core/Src/Settings.cpp @@ -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 From 14cca01f781df93744c66e1d1fce70f911953ce9 Mon Sep 17 00:00:00 2001 From: nonokirby <82886780+nonokirby@users.noreply.github.com> Date: Wed, 29 Jan 2025 11:21:17 -0500 Subject: [PATCH 61/61] Update Soldering.cpp to enable standard locking for testing --- source/Core/Threads/UI/logic/Soldering.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/Core/Threads/UI/logic/Soldering.cpp b/source/Core/Threads/UI/logic/Soldering.cpp index 5ee712c1d..fa5ad4047 100644 --- a/source/Core/Threads/UI/logic/Soldering.cpp +++ b/source/Core/Threads/UI/logic/Soldering.cpp @@ -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; } @@ -72,7 +72,7 @@ OperatingMode handleSolderingButtons(const ButtonState buttons, guiContext *cxt) cxt->transitionMode = TransitionAnimation::Left; return OperatingMode::TemperatureAdjust; case BUTTON_BOTH_LONG: - if (getSettingValue(SettingsOptions::LockingMode) && (getSettingValue(SettingsOptions::LockingMode) != lockingMode_t::TEMP)) { + if (getSettingValue(SettingsOptions::LockingMode)) { // Lock buttons if (cxt->scratch_state.state1 == 0) { if (warnUser(translatedString(Tr->LockingKeysString), buttons)) {