mirror of
https://github.com/Ralim/IronOS.git
synced 2025-02-26 07:53:55 +00:00
Compare commits
64 Commits
update
...
cbf2b5a69d
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cbf2b5a69d | ||
|
|
14cca01f78 | ||
|
|
6a549b6acc | ||
|
|
911ef59da4 | ||
|
|
7e1dfc05a3 | ||
|
|
7bf9620eb7 | ||
|
|
a712e8d478 | ||
|
|
d6c04a090b | ||
|
|
7869b28736 | ||
|
|
06629c6d87 | ||
|
|
98755f06a1 | ||
|
|
82a032819a | ||
|
|
daca0e66f8 | ||
|
|
e1340adf13 | ||
|
|
1b45b363f2 | ||
|
|
78686a8e51 | ||
|
|
4286358d1d | ||
|
|
60e3f1d5af | ||
|
|
d9d421fe8f | ||
|
|
30c9ac805a | ||
|
|
52c4087d3f | ||
|
|
a5259448b9 | ||
|
|
7c2664797e | ||
|
|
6e30c78c9d | ||
|
|
d7a58e50d4 | ||
|
|
050fa824c0 | ||
|
|
509e6a8ef4 | ||
|
|
1e756b4b4a | ||
|
|
ea14714b36 | ||
|
|
67ecb2d766 | ||
|
|
32d9577e48 | ||
|
|
0fa48ed345 | ||
|
|
211c172103 | ||
|
|
058f04f0cd | ||
|
|
84c61aa62a | ||
|
|
5a67f060d4 | ||
|
|
9d26f8b1b5 | ||
|
|
72a7cf3de2 | ||
|
|
0fdc05257a | ||
|
|
8c538a2ab0 | ||
|
|
f6c864d3b6 | ||
|
|
c2c1cab283 | ||
|
|
522822b268 | ||
|
|
b37c4209af | ||
|
|
eca4a230bc | ||
|
|
ff213aa06f | ||
|
|
4a1e946e25 | ||
|
|
b005870033 | ||
|
|
07457af576 | ||
|
|
7fc12dafbf | ||
|
|
cb667874b6 | ||
|
|
f759195339 | ||
|
|
5e8cd339ed | ||
|
|
ab5f5b23a6 | ||
|
|
5b5200a8d8 | ||
|
|
9e8bd8e790 | ||
|
|
6632065ade | ||
|
|
fc7aaf2b56 | ||
|
|
95493b48e7 | ||
|
|
27de7f5db1 | ||
|
|
450d129d15 | ||
|
|
9b3effeaa6 | ||
|
|
2bd7b81589 | ||
|
|
933e2ccd7f |
@@ -81,7 +81,8 @@
|
||||
"SettingStartSleepChar": "Ч",
|
||||
"SettingStartSleepOffChar": "К",
|
||||
"SettingLockBoostChar": "Т",
|
||||
"SettingLockFullChar": "П"
|
||||
"SettingLockFullChar": "П",
|
||||
"SettingLockTempChar": "T"
|
||||
},
|
||||
"menuGroups": {
|
||||
"PowerMenu": {
|
||||
|
||||
@@ -81,7 +81,8 @@
|
||||
"SettingStartSleepChar": "С",
|
||||
"SettingStartSleepOffChar": "П",
|
||||
"SettingLockBoostChar": "Т",
|
||||
"SettingLockFullChar": "П"
|
||||
"SettingLockFullChar": "П",
|
||||
"SettingLockTempChar": "T"
|
||||
},
|
||||
"menuGroups": {
|
||||
"PowerMenu": {
|
||||
|
||||
@@ -81,7 +81,8 @@
|
||||
"SettingStartSleepChar": "S",
|
||||
"SettingStartSleepOffChar": "M",
|
||||
"SettingLockBoostChar": "B",
|
||||
"SettingLockFullChar": "U"
|
||||
"SettingLockFullChar": "U",
|
||||
"SettingLockTempChar": "T"
|
||||
},
|
||||
"menuGroups": {
|
||||
"PowerMenu": {
|
||||
|
||||
@@ -81,7 +81,8 @@
|
||||
"SettingStartSleepChar": "D",
|
||||
"SettingStartSleepOffChar": "R",
|
||||
"SettingLockBoostChar": "B",
|
||||
"SettingLockFullChar": "F"
|
||||
"SettingLockFullChar": "F",
|
||||
"SettingLockTempChar": "T"
|
||||
},
|
||||
"menuGroups": {
|
||||
"PowerMenu": {
|
||||
|
||||
@@ -81,7 +81,8 @@
|
||||
"SettingStartSleepChar": "R",
|
||||
"SettingStartSleepOffChar": "K",
|
||||
"SettingLockBoostChar": "B",
|
||||
"SettingLockFullChar": "V"
|
||||
"SettingLockFullChar": "V",
|
||||
"SettingLockTempChar": "T"
|
||||
},
|
||||
"menuGroups": {
|
||||
"PowerMenu": {
|
||||
|
||||
@@ -81,7 +81,8 @@
|
||||
"SettingStartSleepChar": "Ζ",
|
||||
"SettingStartSleepOffChar": "Υ",
|
||||
"SettingLockBoostChar": "B",
|
||||
"SettingLockFullChar": "Π"
|
||||
"SettingLockFullChar": "Π",
|
||||
"SettingLockTempChar": "T"
|
||||
},
|
||||
"menuGroups": {
|
||||
"PowerMenu": {
|
||||
|
||||
@@ -81,7 +81,8 @@
|
||||
"SettingStartSleepChar": "Z",
|
||||
"SettingStartSleepOffChar": "R",
|
||||
"SettingLockBoostChar": "B",
|
||||
"SettingLockFullChar": "F"
|
||||
"SettingLockFullChar": "F",
|
||||
"SettingLockTempChar": "T"
|
||||
},
|
||||
"menuGroups": {
|
||||
"PowerMenu": {
|
||||
|
||||
@@ -81,7 +81,8 @@
|
||||
"SettingStartSleepChar": "R",
|
||||
"SettingStartSleepOffChar": "F",
|
||||
"SettingLockBoostChar": "B",
|
||||
"SettingLockFullChar": "F"
|
||||
"SettingLockFullChar": "F",
|
||||
"SettingLockTempChar": "T"
|
||||
},
|
||||
"menuGroups": {
|
||||
"PowerMenu": {
|
||||
|
||||
@@ -81,7 +81,8 @@
|
||||
"SettingStartSleepChar": "Z",
|
||||
"SettingStartSleepOffChar": "P",
|
||||
"SettingLockBoostChar": "B",
|
||||
"SettingLockFullChar": "T"
|
||||
"SettingLockFullChar": "T",
|
||||
"SettingLockTempChar": "T"
|
||||
},
|
||||
"menuGroups": {
|
||||
"PowerMenu": {
|
||||
|
||||
@@ -81,7 +81,8 @@
|
||||
"SettingStartSleepChar": "L",
|
||||
"SettingStartSleepOffChar": "H",
|
||||
"SettingLockBoostChar": "V",
|
||||
"SettingLockFullChar": "K"
|
||||
"SettingLockFullChar": "K",
|
||||
"SettingLockTempChar": "T"
|
||||
},
|
||||
"menuGroups": {
|
||||
"PowerMenu": {
|
||||
|
||||
@@ -81,7 +81,8 @@
|
||||
"SettingStartSleepChar": "V",
|
||||
"SettingStartSleepOffChar": "O",
|
||||
"SettingLockBoostChar": "B",
|
||||
"SettingLockFullChar": "V"
|
||||
"SettingLockFullChar": "V",
|
||||
"SettingLockTempChar": "T"
|
||||
},
|
||||
"menuGroups": {
|
||||
"PowerMenu": {
|
||||
|
||||
@@ -81,7 +81,8 @@
|
||||
"SettingStartSleepChar": "T",
|
||||
"SettingStartSleepOffChar": "H",
|
||||
"SettingLockBoostChar": "B",
|
||||
"SettingLockFullChar": "Z"
|
||||
"SettingLockFullChar": "Z",
|
||||
"SettingLockTempChar": "T"
|
||||
},
|
||||
"menuGroups": {
|
||||
"PowerMenu": {
|
||||
|
||||
@@ -81,7 +81,8 @@
|
||||
"SettingStartSleepChar": "A",
|
||||
"SettingStartSleepOffChar": "Sz",
|
||||
"SettingLockBoostChar": "B",
|
||||
"SettingLockFullChar": "T"
|
||||
"SettingLockFullChar": "T",
|
||||
"SettingLockTempChar": "T"
|
||||
},
|
||||
"menuGroups": {
|
||||
"PowerMenu": {
|
||||
|
||||
@@ -81,7 +81,8 @@
|
||||
"SettingStartSleepChar": "R",
|
||||
"SettingStartSleepOffChar": "A",
|
||||
"SettingLockBoostChar": "T",
|
||||
"SettingLockFullChar": "C"
|
||||
"SettingLockFullChar": "C",
|
||||
"SettingLockTempChar": "T"
|
||||
},
|
||||
"menuGroups": {
|
||||
"PowerMenu": {
|
||||
|
||||
@@ -81,7 +81,8 @@
|
||||
"SettingStartSleepChar": "待",
|
||||
"SettingStartSleepOffChar": "室",
|
||||
"SettingLockBoostChar": "ブ",
|
||||
"SettingLockFullChar": "全"
|
||||
"SettingLockFullChar": "全",
|
||||
"SettingLockTempChar": "T"
|
||||
},
|
||||
"menuGroups": {
|
||||
"PowerMenu": {
|
||||
|
||||
@@ -81,7 +81,8 @@
|
||||
"SettingStartSleepChar": "M",
|
||||
"SettingStartSleepOffChar": "K",
|
||||
"SettingLockBoostChar": "T",
|
||||
"SettingLockFullChar": "V"
|
||||
"SettingLockFullChar": "V",
|
||||
"SettingLockTempChar": "T"
|
||||
},
|
||||
"menuGroups": {
|
||||
"PowerMenu": {
|
||||
|
||||
@@ -81,7 +81,8 @@
|
||||
"SettingStartSleepChar": "D",
|
||||
"SettingStartSleepOffChar": "R",
|
||||
"SettingLockBoostChar": "B",
|
||||
"SettingLockFullChar": "F"
|
||||
"SettingLockFullChar": "F",
|
||||
"SettingLockTempChar": "T"
|
||||
},
|
||||
"menuGroups": {
|
||||
"PowerMenu": {
|
||||
|
||||
@@ -81,7 +81,8 @@
|
||||
"SettingStartSleepChar": "S",
|
||||
"SettingStartSleepOffChar": "Z",
|
||||
"SettingLockBoostChar": "B",
|
||||
"SettingLockFullChar": "V"
|
||||
"SettingLockFullChar": "V",
|
||||
"SettingLockTempChar": "T"
|
||||
},
|
||||
"menuGroups": {
|
||||
"PowerMenu": {
|
||||
|
||||
@@ -81,7 +81,8 @@
|
||||
"SettingStartSleepChar": "S",
|
||||
"SettingStartSleepOffChar": "K",
|
||||
"SettingLockBoostChar": "B",
|
||||
"SettingLockFullChar": "F"
|
||||
"SettingLockFullChar": "F",
|
||||
"SettingLockTempChar": "T"
|
||||
},
|
||||
"menuGroups": {
|
||||
"PowerMenu": {
|
||||
|
||||
@@ -81,7 +81,8 @@
|
||||
"SettingStartSleepChar": "Z",
|
||||
"SettingStartSleepOffChar": "O",
|
||||
"SettingLockBoostChar": "B",
|
||||
"SettingLockFullChar": "P"
|
||||
"SettingLockFullChar": "P",
|
||||
"SettingLockTempChar": "T"
|
||||
},
|
||||
"menuGroups": {
|
||||
"PowerMenu": {
|
||||
|
||||
@@ -81,7 +81,8 @@
|
||||
"SettingStartSleepChar": "H",
|
||||
"SettingStartSleepOffChar": "A",
|
||||
"SettingLockBoostChar": "B",
|
||||
"SettingLockFullChar": "F"
|
||||
"SettingLockFullChar": "F",
|
||||
"SettingLockTempChar": "T"
|
||||
},
|
||||
"menuGroups": {
|
||||
"PowerMenu": {
|
||||
|
||||
@@ -81,7 +81,8 @@
|
||||
"SettingStartSleepChar": "Z",
|
||||
"SettingStartSleepOffChar": "R",
|
||||
"SettingLockBoostChar": "B",
|
||||
"SettingLockFullChar": "F"
|
||||
"SettingLockFullChar": "F",
|
||||
"SettingLockTempChar": "T"
|
||||
},
|
||||
"menuGroups": {
|
||||
"PowerMenu": {
|
||||
|
||||
@@ -81,7 +81,8 @@
|
||||
"SettingStartSleepChar": "С",
|
||||
"SettingStartSleepOffChar": "К",
|
||||
"SettingLockBoostChar": "Т",
|
||||
"SettingLockFullChar": "П"
|
||||
"SettingLockFullChar": "П",
|
||||
"SettingLockTempChar": "T"
|
||||
},
|
||||
"menuGroups": {
|
||||
"PowerMenu": {
|
||||
|
||||
@@ -81,7 +81,8 @@
|
||||
"SettingStartSleepChar": "S",
|
||||
"SettingStartSleepOffChar": "I",
|
||||
"SettingLockBoostChar": "B",
|
||||
"SettingLockFullChar": "P"
|
||||
"SettingLockFullChar": "P",
|
||||
"SettingLockTempChar": "T"
|
||||
},
|
||||
"menuGroups": {
|
||||
"PowerMenu": {
|
||||
|
||||
@@ -81,7 +81,8 @@
|
||||
"SettingStartSleepChar": "Z",
|
||||
"SettingStartSleepOffChar": "V",
|
||||
"SettingLockBoostChar": "L",
|
||||
"SettingLockFullChar": "P"
|
||||
"SettingLockFullChar": "P",
|
||||
"SettingLockTempChar": "T"
|
||||
},
|
||||
"menuGroups": {
|
||||
"PowerMenu": {
|
||||
|
||||
@@ -81,7 +81,8 @@
|
||||
"SettingStartSleepChar": "С",
|
||||
"SettingStartSleepOffChar": "X",
|
||||
"SettingLockBoostChar": "B",
|
||||
"SettingLockFullChar": "F"
|
||||
"SettingLockFullChar": "F",
|
||||
"SettingLockTempChar": "T"
|
||||
},
|
||||
"menuGroups": {
|
||||
"PowerMenu": {
|
||||
|
||||
@@ -81,7 +81,8 @@
|
||||
"SettingStartSleepChar": "S",
|
||||
"SettingStartSleepOffChar": "X",
|
||||
"SettingLockBoostChar": "B",
|
||||
"SettingLockFullChar": "F"
|
||||
"SettingLockFullChar": "F",
|
||||
"SettingLockTempChar": "T"
|
||||
},
|
||||
"menuGroups": {
|
||||
"PowerMenu": {
|
||||
|
||||
@@ -81,7 +81,8 @@
|
||||
"SettingStartSleepChar": "V",
|
||||
"SettingStartSleepOffChar": "R",
|
||||
"SettingLockBoostChar": "T",
|
||||
"SettingLockFullChar": "F"
|
||||
"SettingLockFullChar": "F",
|
||||
"SettingLockTempChar": "T"
|
||||
},
|
||||
"menuGroups": {
|
||||
"PowerMenu": {
|
||||
|
||||
@@ -81,7 +81,8 @@
|
||||
"SettingStartSleepChar": "U",
|
||||
"SettingStartSleepOffChar": "S",
|
||||
"SettingLockBoostChar": "B",
|
||||
"SettingLockFullChar": "F"
|
||||
"SettingLockFullChar": "F",
|
||||
"SettingLockTempChar": "T"
|
||||
},
|
||||
"menuGroups": {
|
||||
"PowerMenu": {
|
||||
|
||||
@@ -81,7 +81,8 @@
|
||||
"SettingStartSleepChar": "С",
|
||||
"SettingStartSleepOffChar": "К",
|
||||
"SettingLockBoostChar": "Т",
|
||||
"SettingLockFullChar": "П"
|
||||
"SettingLockFullChar": "П",
|
||||
"SettingLockTempChar": "T"
|
||||
},
|
||||
"menuGroups": {
|
||||
"PowerMenu": {
|
||||
|
||||
@@ -81,7 +81,8 @@
|
||||
"SettingStartSleepChar": "U",
|
||||
"SettingStartSleepOffChar": "X",
|
||||
"SettingLockBoostChar": "B",
|
||||
"SettingLockFullChar": "T"
|
||||
"SettingLockFullChar": "T",
|
||||
"SettingLockTempChar": "T"
|
||||
},
|
||||
"menuGroups": {
|
||||
"PowerMenu": {
|
||||
|
||||
@@ -81,7 +81,8 @@
|
||||
"SettingStartSleepChar": "Z",
|
||||
"SettingStartSleepOffChar": "R",
|
||||
"SettingLockBoostChar": "B",
|
||||
"SettingLockFullChar": "F"
|
||||
"SettingLockFullChar": "F",
|
||||
"SettingLockTempChar": "T"
|
||||
},
|
||||
"menuGroups": {
|
||||
"PowerMenu": {
|
||||
|
||||
@@ -81,7 +81,8 @@
|
||||
"SettingStartSleepChar": "待",
|
||||
"SettingStartSleepOffChar": "室",
|
||||
"SettingLockBoostChar": "增",
|
||||
"SettingLockFullChar": "全"
|
||||
"SettingLockFullChar": "全",
|
||||
"SettingLockTempChar": "T"
|
||||
},
|
||||
"menuGroups": {
|
||||
"PowerMenu": {
|
||||
|
||||
@@ -81,7 +81,8 @@
|
||||
"SettingStartSleepChar": "待",
|
||||
"SettingStartSleepOffChar": "室",
|
||||
"SettingLockBoostChar": "增",
|
||||
"SettingLockFullChar": "全"
|
||||
"SettingLockFullChar": "全",
|
||||
"SettingLockTempChar": "T"
|
||||
},
|
||||
"menuGroups": {
|
||||
"PowerMenu": {
|
||||
|
||||
@@ -81,7 +81,8 @@
|
||||
"SettingStartSleepChar": "待",
|
||||
"SettingStartSleepOffChar": "室",
|
||||
"SettingLockBoostChar": "增",
|
||||
"SettingLockFullChar": "全"
|
||||
"SettingLockFullChar": "全",
|
||||
"SettingLockTempChar": "T"
|
||||
},
|
||||
"menuGroups": {
|
||||
"PowerMenu": {
|
||||
|
||||
@@ -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": [
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user