Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disable short press of + button to change temperature to prevent accidentally changing temp only when using boost mode. #2054

Open
wants to merge 63 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
933e2cc
Disable change temp with B/+ in soldering mode
nonokirby Jan 20, 2025
2bd7b81
Soldering Control Changes
nonokirby Jan 20, 2025
9b3effe
Update Soldering.cpp with call to setting BoostButtonTempChange
nonokirby Jan 21, 2025
450d129
Update Settings.cpp
nonokirby Jan 21, 2025
27de7f5
Update Settings.cpp
nonokirby Jan 21, 2025
95493b4
Update Soldering.cpp to disable + activating temp only while boost mo…
nonokirby Jan 21, 2025
fc7aaf2
Update Settings.cpp add BoostButtonTe
nonokirby Jan 21, 2025
6632065
Update Settings.h to change locking mode
nonokirby Jan 21, 2025
9e8bd8e
Update Settings.h to add better descriptions
nonokirby Jan 21, 2025
5b5200a
Update Settings.cpp to revert addition of new setting
nonokirby Jan 21, 2025
ab5f5b2
Update settingsGUI.cpp to change display for locking mode
nonokirby Jan 22, 2025
5e8cd33
Update Translation.h
nonokirby Jan 22, 2025
f759195
Update translation_EN.json
nonokirby Jan 22, 2025
cb66787
Update Settings.cpp
nonokirby Jan 22, 2025
7fc12da
Update Soldering.cpp to fix broken logic
nonokirby Jan 22, 2025
07457af
Update Soldering.cpp because i used the wrong symbol
nonokirby Jan 22, 2025
b005870
Update Soldering.cpp to fix build complaining
nonokirby Jan 22, 2025
4a1e946
Update translations_definitions.json
nonokirby Jan 22, 2025
ff213aa
Update translation_BE.json
nonokirby Jan 22, 2025
eca4a23
Update translation_BG.json
nonokirby Jan 22, 2025
b37c420
Update translation_CS.json
nonokirby Jan 22, 2025
522822b
Update translation_DA.json
nonokirby Jan 22, 2025
c2c1cab
Update translation_DE.json
nonokirby Jan 22, 2025
f6c864d
Update translation_EL.json
nonokirby Jan 22, 2025
8c538a2
Update translation_EN.json
nonokirby Jan 22, 2025
0fdc052
Update translation_EN.json
nonokirby Jan 22, 2025
72a7cf3
Update translation_ES.json
nonokirby Jan 22, 2025
9d26f8b
Update translation_ET.json
nonokirby Jan 22, 2025
5a67f06
Update translation_FI.json
nonokirby Jan 22, 2025
84c61aa
Update translation_FR.json
nonokirby Jan 22, 2025
058f04f
Update translation_HR.json
nonokirby Jan 22, 2025
211c172
Update translation_HU.json
nonokirby Jan 22, 2025
0fa48ed
Update translation_IT.json
nonokirby Jan 22, 2025
32d9577
Update translation_JA_JP.json
nonokirby Jan 22, 2025
67ecb2d
Update translation_LT.json
nonokirby Jan 22, 2025
ea14714
Update translation_NB.json
nonokirby Jan 22, 2025
1e756b4
Update translation_NL.json
nonokirby Jan 22, 2025
509e6a8
Update translation_NL_BE.json
nonokirby Jan 22, 2025
050fa82
Update translation_PL.json
nonokirby Jan 22, 2025
d7a58e5
Update translation_PT.json
nonokirby Jan 22, 2025
6e30c78
Update translation_RO.json
nonokirby Jan 22, 2025
7c26647
Update translation_RU.json
nonokirby Jan 22, 2025
a525944
Update translation_SK.json
nonokirby Jan 22, 2025
52c4087
Update translation_SL.json
nonokirby Jan 22, 2025
30c9ac8
Update translation_SR_CYRL.json
nonokirby Jan 22, 2025
d9d421f
Update translation_SR_LATN.json
nonokirby Jan 22, 2025
60e3f1d
Update translation_SV.json
nonokirby Jan 22, 2025
4286358
Update translation_TR.json
nonokirby Jan 22, 2025
78686a8
Update translation_UK.json
nonokirby Jan 22, 2025
1b45b36
Update translation_UZ.json
nonokirby Jan 22, 2025
e1340ad
Update translation_VI.json
nonokirby Jan 22, 2025
daca0e6
Update translation_YUE_HK.json
nonokirby Jan 22, 2025
82a0328
Update translation_ZH_CN.json
nonokirby Jan 22, 2025
98755f0
Update translation_ZH_TW.json
nonokirby Jan 22, 2025
06629c6
Update Soldering.cpp
nonokirby Jan 22, 2025
7869b28
Update Soldering.cpp Fix formatting
nonokirby Jan 22, 2025
d6c04a0
Update Soldering.cpp to fix formatting (again.....)
nonokirby Jan 22, 2025
a712e8d
Apply suggestions from code review to clean up wording and typos
nonokirby Jan 24, 2025
7bf9620
Help to Unify descriptions for new locking mode in definitions.json a…
ia Jan 24, 2025
7e1dfc0
Sync
ia Jan 25, 2025
911ef59
Enable TEMP locking as option
ia Jan 26, 2025
6a549b6
Sync
ia Jan 28, 2025
14cca01
Update Soldering.cpp to enable standard locking for testing
nonokirby Jan 29, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Translations/translation_BE.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@
"SettingStartSleepChar": "Ч",
"SettingStartSleepOffChar": "К",
"SettingLockBoostChar": "Т",
"SettingLockFullChar": "П"
"SettingLockFullChar": "П",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {
Expand Down
3 changes: 2 additions & 1 deletion Translations/translation_BG.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@
"SettingStartSleepChar": "С",
"SettingStartSleepOffChar": "П",
"SettingLockBoostChar": "Т",
"SettingLockFullChar": "П"
"SettingLockFullChar": "П",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {
Expand Down
3 changes: 2 additions & 1 deletion Translations/translation_CS.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@
"SettingStartSleepChar": "S",
"SettingStartSleepOffChar": "M",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "U"
"SettingLockFullChar": "U",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {
Expand Down
3 changes: 2 additions & 1 deletion Translations/translation_DA.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@
"SettingStartSleepChar": "D",
"SettingStartSleepOffChar": "R",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
"SettingLockFullChar": "F",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {
Expand Down
3 changes: 2 additions & 1 deletion Translations/translation_DE.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@
"SettingStartSleepChar": "R",
"SettingStartSleepOffChar": "K",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "V"
"SettingLockFullChar": "V",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {
Expand Down
3 changes: 2 additions & 1 deletion Translations/translation_EL.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@
"SettingStartSleepChar": "Ζ",
"SettingStartSleepOffChar": "Υ",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "Π"
"SettingLockFullChar": "Π",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {
Expand Down
3 changes: 2 additions & 1 deletion Translations/translation_EN.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@
"SettingStartSleepChar": "Z",
"SettingStartSleepOffChar": "R",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
"SettingLockFullChar": "F",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {
Expand Down
3 changes: 2 additions & 1 deletion Translations/translation_ES.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@
"SettingStartSleepChar": "R",
"SettingStartSleepOffChar": "F",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
"SettingLockFullChar": "F",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {
Expand Down
3 changes: 2 additions & 1 deletion Translations/translation_ET.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@
"SettingStartSleepChar": "Z",
"SettingStartSleepOffChar": "P",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "T"
"SettingLockFullChar": "T",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {
Expand Down
3 changes: 2 additions & 1 deletion Translations/translation_FI.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@
"SettingStartSleepChar": "L",
"SettingStartSleepOffChar": "H",
"SettingLockBoostChar": "V",
"SettingLockFullChar": "K"
"SettingLockFullChar": "K",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {
Expand Down
3 changes: 2 additions & 1 deletion Translations/translation_FR.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@
"SettingStartSleepChar": "V",
"SettingStartSleepOffChar": "O",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "V"
"SettingLockFullChar": "V",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {
Expand Down
3 changes: 2 additions & 1 deletion Translations/translation_HR.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@
"SettingStartSleepChar": "T",
"SettingStartSleepOffChar": "H",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "Z"
"SettingLockFullChar": "Z",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {
Expand Down
3 changes: 2 additions & 1 deletion Translations/translation_HU.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@
"SettingStartSleepChar": "A",
"SettingStartSleepOffChar": "Sz",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "T"
"SettingLockFullChar": "T",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {
Expand Down
3 changes: 2 additions & 1 deletion Translations/translation_IT.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@
"SettingStartSleepChar": "R",
"SettingStartSleepOffChar": "A",
"SettingLockBoostChar": "T",
"SettingLockFullChar": "C"
"SettingLockFullChar": "C",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {
Expand Down
3 changes: 2 additions & 1 deletion Translations/translation_JA_JP.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@
"SettingStartSleepChar": "待",
"SettingStartSleepOffChar": "室",
"SettingLockBoostChar": "ブ",
"SettingLockFullChar": "全"
"SettingLockFullChar": "全",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {
Expand Down
3 changes: 2 additions & 1 deletion Translations/translation_LT.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@
"SettingStartSleepChar": "M",
"SettingStartSleepOffChar": "K",
"SettingLockBoostChar": "T",
"SettingLockFullChar": "V"
"SettingLockFullChar": "V",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {
Expand Down
3 changes: 2 additions & 1 deletion Translations/translation_NB.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@
"SettingStartSleepChar": "D",
"SettingStartSleepOffChar": "R",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
"SettingLockFullChar": "F",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {
Expand Down
3 changes: 2 additions & 1 deletion Translations/translation_NL.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@
"SettingStartSleepChar": "S",
"SettingStartSleepOffChar": "Z",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "V"
"SettingLockFullChar": "V",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {
Expand Down
3 changes: 2 additions & 1 deletion Translations/translation_NL_BE.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@
"SettingStartSleepChar": "S",
"SettingStartSleepOffChar": "K",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
"SettingLockFullChar": "F",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {
Expand Down
3 changes: 2 additions & 1 deletion Translations/translation_PL.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@
"SettingStartSleepChar": "Z",
"SettingStartSleepOffChar": "O",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "P"
"SettingLockFullChar": "P",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {
Expand Down
3 changes: 2 additions & 1 deletion Translations/translation_PT.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@
"SettingStartSleepChar": "H",
"SettingStartSleepOffChar": "A",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
"SettingLockFullChar": "F",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {
Expand Down
3 changes: 2 additions & 1 deletion Translations/translation_RO.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@
"SettingStartSleepChar": "Z",
"SettingStartSleepOffChar": "R",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
"SettingLockFullChar": "F",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {
Expand Down
3 changes: 2 additions & 1 deletion Translations/translation_RU.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@
"SettingStartSleepChar": "С",
"SettingStartSleepOffChar": "К",
"SettingLockBoostChar": "Т",
"SettingLockFullChar": "П"
"SettingLockFullChar": "П",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {
Expand Down
3 changes: 2 additions & 1 deletion Translations/translation_SK.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@
"SettingStartSleepChar": "S",
"SettingStartSleepOffChar": "I",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "P"
"SettingLockFullChar": "P",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {
Expand Down
3 changes: 2 additions & 1 deletion Translations/translation_SL.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@
"SettingStartSleepChar": "Z",
"SettingStartSleepOffChar": "V",
"SettingLockBoostChar": "L",
"SettingLockFullChar": "P"
"SettingLockFullChar": "P",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {
Expand Down
3 changes: 2 additions & 1 deletion Translations/translation_SR_CYRL.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@
"SettingStartSleepChar": "С",
"SettingStartSleepOffChar": "X",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
"SettingLockFullChar": "F",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {
Expand Down
3 changes: 2 additions & 1 deletion Translations/translation_SR_LATN.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@
"SettingStartSleepChar": "S",
"SettingStartSleepOffChar": "X",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
"SettingLockFullChar": "F",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {
Expand Down
3 changes: 2 additions & 1 deletion Translations/translation_SV.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@
"SettingStartSleepChar": "V",
"SettingStartSleepOffChar": "R",
"SettingLockBoostChar": "T",
"SettingLockFullChar": "F"
"SettingLockFullChar": "F",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {
Expand Down
3 changes: 2 additions & 1 deletion Translations/translation_TR.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@
"SettingStartSleepChar": "U",
"SettingStartSleepOffChar": "S",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
"SettingLockFullChar": "F",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {
Expand Down
3 changes: 2 additions & 1 deletion Translations/translation_UK.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@
"SettingStartSleepChar": "С",
"SettingStartSleepOffChar": "К",
"SettingLockBoostChar": "Т",
"SettingLockFullChar": "П"
"SettingLockFullChar": "П",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {
Expand Down
3 changes: 2 additions & 1 deletion Translations/translation_UZ.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@
"SettingStartSleepChar": "U",
"SettingStartSleepOffChar": "X",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "T"
"SettingLockFullChar": "T",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {
Expand Down
3 changes: 2 additions & 1 deletion Translations/translation_VI.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@
"SettingStartSleepChar": "Z",
"SettingStartSleepOffChar": "R",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
"SettingLockFullChar": "F",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {
Expand Down
3 changes: 2 additions & 1 deletion Translations/translation_YUE_HK.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@
"SettingStartSleepChar": "待",
"SettingStartSleepOffChar": "室",
"SettingLockBoostChar": "增",
"SettingLockFullChar": "全"
"SettingLockFullChar": "全",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {
Expand Down
3 changes: 2 additions & 1 deletion Translations/translation_ZH_CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@
"SettingStartSleepChar": "待",
"SettingStartSleepOffChar": "室",
"SettingLockBoostChar": "增",
"SettingLockFullChar": "全"
"SettingLockFullChar": "全",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {
Expand Down
3 changes: 2 additions & 1 deletion Translations/translation_ZH_TW.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@
"SettingStartSleepChar": "待",
"SettingStartSleepOffChar": "室",
"SettingLockBoostChar": "增",
"SettingLockFullChar": "全"
"SettingLockFullChar": "全",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {
Expand Down
6 changes: 6 additions & 0 deletions Translations/translations_definitions.json
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shown when the locking mode is disabled, but the +/A button can no longer change temperature.

}
],
"menuGroups": [
Expand Down
7 changes: 4 additions & 3 deletions source/Core/Inc/Settings.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The TEMP state is worded backwards, all the buttons are unlocked, and the locking mode's trigger (dual press and hold) is disabled, the +/B button is prevented from changing the temperature.
All buttons are unlocked. +/A no longer changes temp
Would this be a better wording than the original?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Locking Mode is responsible to lock the buttons in the soldering menu. lockingMode_t has constant values: two of them, DISABLED and FULL should be read as off (locking mode is off) and on (locking mode is on and all the buttons are locked). While for the rest of the "intermediate" values, like BOOST or TEMP, they should be read as: lock buttons except. Therefore, there is a mode to lock buttons except BOOST, lock buttons except TEMP, etc. This is not ideal, but it is what it is, that's how constant for BOOST exception is named and its option is documented. And it's always better to stick to the same/similar style, whether it's code style or options' description style to avoid users' or developers' suffering every time something changes.

} lockingMode_t;

/* Selection of the soldering tip
Expand Down
1 change: 1 addition & 0 deletions source/Core/Inc/Translation.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading
Loading