sv/IronOS
1
0
Fork 0
forked from me/IronOS
Code Pull Requests Activity

Add more voltage settings

Browse Source
This commit is contained in:
PlayDay
2021-03-07 11:34:04 +01:00
parent 038542b2fb
commit def2aa89fd
35 changed files with 498 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Translations/make_translation.py
View File

@@ -100,6 +100,7 @@ def getConstants():
consants.append(("SymbolWatts", "W"))
consants.append(("SymbolVolts", "V"))
consants.append(("SymbolDC", "DC"))
consants.append(("SymbolNA", "N/A"))
consants.append(("SymbolCellCount", "S"))
consants.append(("SymbolVersionNumber", buildVersion))
return consants

14
Translations/translation_BG.json
View File

@@ -49,6 +49,13 @@
"SettingLockFullChar": "F"
},
"menuGroups": {
"PowerMenu": {
"text2": [
"Power",
"settings"
],
"desc": "Power settings"
},
"SolderingMenu": {
"text2": [
"Поялник",
@@ -274,6 +281,13 @@
"locking"
],
"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
},
"MinVolCell": {
"text2": [
"Maximum",
"voltage"
],
"desc": "Minimum allowed voltage per cell"
}
}
}

14
Translations/translation_CS.json
View File

@@ -49,6 +49,13 @@
"SettingLockFullChar": "F"
},
"menuGroups": {
"PowerMenu": {
"text2": [
"Power",
"settings"
],
"desc": "Power settings"
},
"SolderingMenu": {
"text2": [
"Pájecí",
@@ -274,6 +281,13 @@
"locking"
],
"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
},
"MinVolCell": {
"text2": [
"Maximum",
"voltage"
],
"desc": "Minimum allowed voltage per cell"
}
}
}

14
Translations/translation_DA.json
View File

@@ -49,6 +49,13 @@
"SettingLockFullChar": "F"
},
"menuGroups": {
"PowerMenu": {
"text2": [
"Power",
"settings"
],
"desc": "Power settings"
},
"SolderingMenu": {
"text2": [
"Soldering",
@@ -274,6 +281,13 @@
"locking"
],
"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
},
"MinVolCell": {
"text2": [
"Maximum",
"voltage"
],
"desc": "Minimum allowed voltage per cell"
}
}
}

14
Translations/translation_DE.json
View File

@@ -50,6 +50,13 @@
"SettingLockFullChar": "V"
},
"menuGroups": {
"PowerMenu": {
"text2": [
"Power",
"settings"
],
"desc": "Power settings"
},
"SolderingMenu": {
"text2": [
"Löt-",
@@ -275,6 +282,13 @@
"sperre"
],
"desc": "Langes drücken beider Tasten im Lötmodus sperrt diese <D=deaktiviert | B=nur Boost | V=vollständig>"
},
"MinVolCell": {
"text2": [
"Maximum",
"voltage"
],
"desc": "Minimum allowed voltage per cell"
}
}
}

14
Translations/translation_EN.json
View File

@@ -50,6 +50,13 @@
"SettingLockFullChar": "F"
},
"menuGroups": {
"PowerMenu": {
"text2": [
"Power",
"settings"
],
"desc": "Power settings"
},
"SolderingMenu": {
"text2": [
"Soldering",
@@ -275,6 +282,13 @@
"buttons"
],
"desc": "When soldering, long press both buttons, to lock them <D=disable | B=\"boost mode\" only | F=full locking>"
},
"MinVolCell": {
"text2": [
"Maximum",
"voltage"
],
"desc": "Minimum allowed voltage per cell"
}
}
}

14
Translations/translation_ES.json
View File

@@ -49,6 +49,13 @@
"SettingLockFullChar": "F"
},
"menuGroups": {
"PowerMenu": {
"text2": [
"Power",
"settings"
],
"desc": "Power settings"
},
"SolderingMenu": {
"text2": [
"Ajustes de",
@@ -274,6 +281,13 @@
"locking"
],
"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
},
"MinVolCell": {
"text2": [
"Maximum",
"voltage"
],
"desc": "Minimum allowed voltage per cell"
}
}
}

14
Translations/translation_FI.json
View File

@@ -49,6 +49,13 @@
"SettingLockFullChar": "F"
},
"menuGroups": {
"PowerMenu": {
"text2": [
"Power",
"settings"
],
"desc": "Power settings"
},
"SolderingMenu": {
"text2": [
"Juotos-",
@@ -274,6 +281,13 @@
"locking"
],
"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
},
"MinVolCell": {
"text2": [
"Maximum",
"voltage"
],
"desc": "Minimum allowed voltage per cell"
}
}
}

14
Translations/translation_FR.json
View File

@@ -49,6 +49,13 @@
"SettingLockFullChar": "V"
},
"menuGroups": {
"PowerMenu": {
"text2": [
"Power",
"settings"
],
"desc": "Power settings"
},
"SolderingMenu": {
"text2": [
"Paramètres",
@@ -274,6 +281,13 @@
"capteur effet hall"
],
"desc": "Sensibilité du capteur à effet Hall lors de la détection de mise en veille <D=désactivé | B=basse | M=moyenne | H=haute>"
},
"MinVolCell": {
"text2": [
"Maximum",
"voltage"
],
"desc": "Minimum allowed voltage per cell"
}
}
}

14
Translations/translation_HR.json
View File

@@ -49,6 +49,13 @@
"SettingLockFullChar": "F"
},
"menuGroups": {
"PowerMenu": {
"text2": [
"Power",
"settings"
],
"desc": "Power settings"
},
"SolderingMenu": {
"text2": [
"Postavke",
@@ -274,6 +281,13 @@
"locking"
],
"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
},
"MinVolCell": {
"text2": [
"Maximum",
"voltage"
],
"desc": "Minimum allowed voltage per cell"
}
}
}

14
Translations/translation_HU.json
View File

@@ -49,6 +49,13 @@
"SettingLockFullChar": "T"
},
"menuGroups": {
"PowerMenu": {
"text2": [
"Power",
"settings"
],
"desc": "Power settings"
},
"SolderingMenu": {
"text2": [
"Forrasztási",
@@ -274,6 +281,13 @@
"enged."
],
"desc": "Forrasztás közben mindkét gombot hosszan lenyomva rögzíti a hőmérsékletet (K=ki B=csak \"boost\" mód T=teljes lezárás)"
},
"MinVolCell": {
"text2": [
"Maximum",
"voltage"
],
"desc": "Minimum allowed voltage per cell"
}
}
}

14
Translations/translation_IT.json
View File

@@ -49,6 +49,13 @@
"SettingLockFullChar": "C"
},
"menuGroups": {
"PowerMenu": {
"text2": [
"Power",
"settings"
],
"desc": "Power settings"
},
"SolderingMenu": {
"text2": [
"Opzioni",
@@ -274,6 +281,13 @@
"tasti"
],
"desc": "Blocca i tasti durante la modalità Saldatura; tieni premuto entrambi per bloccare/sbloccare <D: disattiva; T: blocca «Turbo»; C: blocco completo>"
},
"MinVolCell": {
"text2": [
"Maximum",
"voltage"
],
"desc": "Minimum allowed voltage per cell"
}
}
}

14
Translations/translation_LT.json
View File

@@ -49,6 +49,13 @@
"SettingLockFullChar": "V"
},
"menuGroups": {
"PowerMenu": {
"text2": [
"Power",
"settings"
],
"desc": "Power settings"
},
"SolderingMenu": {
"text2": [
"Litavimo",
@@ -274,6 +281,13 @@
"užraktas"
],
"desc": "Lituodami, ilgai paspauskite abu mygtukus, kad juos užrakintumėte <I=Išjungta, T=Tik turbo režimas, V=Visiškas užrakinimas>"
},
"MinVolCell": {
"text2": [
"Maximum",
"voltage"
],
"desc": "Minimum allowed voltage per cell"
}
}
}

14
Translations/translation_NL.json
View File

@@ -49,6 +49,13 @@
"SettingSensitivityHigh": "H"
},
"menuGroups": {
"PowerMenu": {
"text2": [
"Power",
"settings"
],
"desc": "Power settings"
},
"SolderingMenu": {
"text2": [
"Soldeer",
@@ -274,6 +281,13 @@
"knoppen"
],
"desc": "Tijdens solderen lang op beide knoppen drukken, blokkeert ze. <U=Uit, B=Alleen boost, V=Volledig blokkeren>"
},
"MinVolCell": {
"text2": [
"Maximum",
"voltage"
],
"desc": "Minimum allowed voltage per cell"
}
}
}

14
Translations/translation_NL_BE.json
View File

@@ -49,6 +49,13 @@
"SettingLockFullChar": "F"
},
"menuGroups": {
"PowerMenu": {
"text2": [
"Power",
"settings"
],
"desc": "Power settings"
},
"SolderingMenu": {
"text2": [
"Soldeer",
@@ -274,6 +281,13 @@
"locking"
],
"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
},
"MinVolCell": {
"text2": [
"Maximum",
"voltage"
],
"desc": "Minimum allowed voltage per cell"
}
}
}

14
Translations/translation_NO.json
View File

@@ -49,6 +49,13 @@
"SettingLockFullChar": "F"
},
"menuGroups": {
"PowerMenu": {
"text2": [
"Power",
"settings"
],
"desc": "Power settings"
},
"SolderingMenu": {
"text2": [
"Lodde-",
@@ -274,6 +281,13 @@
"locking"
],
"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
},
"MinVolCell": {
"text2": [
"Maximum",
"voltage"
],
"desc": "Minimum allowed voltage per cell"
}
}
}

14
Translations/translation_PL.json
View File

@@ -50,6 +50,13 @@
"SettingLockFullChar": "P"
},
"menuGroups": {
"PowerMenu": {
"text2": [
"Power",
"settings"
],
"desc": "Power settings"
},
"SolderingMenu": {
"text2": [
"Lutowanie",
@@ -275,6 +282,13 @@
"przycisków"
],
"desc": "W trybie lutowania, wciśnij oba przyciski aby je zablokować <O-Wyłączona, B-tylko Boost, P-pełna blokada>"
},
"MinVolCell": {
"text2": [
"Maximum",
"voltage"
],
"desc": "Minimum allowed voltage per cell"
}
}
}

14
Translations/translation_PT.json
View File

@@ -49,6 +49,13 @@
"SettingLockFullChar": "F"
},
"menuGroups": {
"PowerMenu": {
"text2": [
"Power",
"settings"
],
"desc": "Power settings"
},
"SolderingMenu": {
"text2": [
"Configurações",
@@ -274,6 +281,13 @@
"locking"
],
"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
},
"MinVolCell": {
"text2": [
"Maximum",
"voltage"
],
"desc": "Minimum allowed voltage per cell"
}
}
}

14
Translations/translation_RU.json
View File

@@ -49,6 +49,13 @@
"SettingLockFullChar": "П"
},
"menuGroups": {
"PowerMenu": {
"text2": [
"Power",
"settings"
],
"desc": "Power settings"
},
"SolderingMenu": {
"text2": [
"Параметры",
@@ -274,6 +281,13 @@
"блок. кнопок"
],
"desc": "При работе длинное нажатие обеих кнопок блокирует их <О=Отключено, Т=Только турбо, П=Полная блокировка>"
},
"MinVolCell": {
"text2": [
"Maximum",
"voltage"
],
"desc": "Minimum allowed voltage per cell"
}
}
}

14
Translations/translation_SK.json
View File

@@ -49,6 +49,13 @@
"SettingLockFullChar": "P"
},
"menuGroups": {
"PowerMenu": {
"text2": [
"Power",
"settings"
],
"desc": "Power settings"
},
"SolderingMenu": {
"text2": [
"Nastavenie",
@@ -274,6 +281,13 @@
"tlačidiel"
],
"desc": "Zamknutie tlačidiel - dlhé stlačenie oboch naraz počas spájkovania <Z=Zakázať, B=Okrem boost, P=Plné zamknutie>"
},
"MinVolCell": {
"text2": [
"Maximum",
"voltage"
],
"desc": "Minimum allowed voltage per cell"
}
}
}

14
Translations/translation_SL.json
View File

@@ -49,6 +49,13 @@
"SettingLockFullChar": "P"
},
"menuGroups": {
"PowerMenu": {
"text2": [
"Power",
"settings"
],
"desc": "Power settings"
},
"SolderingMenu": {
"text2": [
"Nastavitve",
@@ -274,6 +281,13 @@
"zaklep gumbov"
],
"desc": "Za zaklep med spajkanjem drži oba gumba <O=onemogoči | L=le pospešeno | P=polno>"
},
"MinVolCell": {
"text2": [
"Maximum",
"voltage"
],
"desc": "Minimum allowed voltage per cell"
}
}
}

14
Translations/translation_SR_CYRL.json
View File

@@ -49,6 +49,13 @@
"SettingLockFullChar": "F"
},
"menuGroups": {
"PowerMenu": {
"text2": [
"Power",
"settings"
],
"desc": "Power settings"
},
"SolderingMenu": {
"text2": [
"Поставке",
@@ -274,6 +281,13 @@
"locking"
],
"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
},
"MinVolCell": {
"text2": [
"Maximum",
"voltage"
],
"desc": "Minimum allowed voltage per cell"
}
}
}

14
Translations/translation_SR_LATN.json
View File

@@ -49,6 +49,13 @@
"SettingLockFullChar": "F"
},
"menuGroups": {
"PowerMenu": {
"text2": [
"Power",
"settings"
],
"desc": "Power settings"
},
"SolderingMenu": {
"text2": [
"Postavke",
@@ -274,6 +281,13 @@
"locking"
],
"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
},
"MinVolCell": {
"text2": [
"Maximum",
"voltage"
],
"desc": "Minimum allowed voltage per cell"
}
}
}

14
Translations/translation_SV.json
View File

@@ -49,6 +49,13 @@
"SettingLockFullChar": "F"
},
"menuGroups": {
"PowerMenu": {
"text2": [
"Power",
"settings"
],
"desc": "Power settings"
},
"SolderingMenu": {
"text2": [
"Lödnings-",
@@ -274,6 +281,13 @@
"locking"
],
"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
},
"MinVolCell": {
"text2": [
"Maximum",
"voltage"
],
"desc": "Minimum allowed voltage per cell"
}
}
}

14
Translations/translation_TR.json
View File

@@ -46,6 +46,13 @@
"SettingLockFullChar": "F"
},
"menuGroups": {
"PowerMenu": {
"text2": [
"Power",
"settings"
],
"desc": "Power settings"
},
"SolderingMenu": {
"text2": [
"Lehimleme",
@@ -292,6 +299,13 @@
"locking"
],
"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
},
"MinVolCell": {
"text2": [
"Maximum",
"voltage"
],
"desc": "Minimum allowed voltage per cell"
}
}
}

14
Translations/translation_UK.json
View File

@@ -49,6 +49,13 @@
"SettingLockFullChar": "П"
},
"menuGroups": {
"PowerMenu": {
"text2": [
"Power",
"settings"
],
"desc": "Power settings"
},
"SolderingMenu": {
"text2": [
"Параметри",
@@ -274,6 +281,13 @@
"блок. кнопок"
],
"desc": "Під час пайки тривале натискання обох кнопок заблокує їх <В=Вимк, Т=Тільки турбо, П=Повне>"
},
"MinVolCell": {
"text2": [
"Maximum",
"voltage"
],
"desc": "Minimum allowed voltage per cell"
}
}
}

14
Translations/translation_YUE_HK.json
View File

@@ -50,6 +50,13 @@
"SettingLockFullChar": "全"
},
"menuGroups": {
"PowerMenu": {
"text2": [
"Power",
"settings"
],
"desc": "Power settings"
},
"SolderingMenu": {
"text2": [
"",
@@ -275,6 +282,13 @@
"撳掣鎖定"
],
"desc": "喺焊接模式時，同時長撳兩粒掣啓用撳掣鎖定 <無=停用 | 增=只鎖定增熱模式 | 全=鎖定全部>"
},
"MinVolCell": {
"text2": [
"Maximum",
"voltage"
],
"desc": "Minimum allowed voltage per cell"
}
}
}

14
Translations/translation_ZH_TW.json
View File

@@ -50,6 +50,13 @@
"SettingLockFullChar": "全"
},
"menuGroups": {
"PowerMenu": {
"text2": [
"Power",
"settings"
],
"desc": "Power settings"
},
"SolderingMenu": {
"text2": [
"",
@@ -275,6 +282,13 @@
"按鍵鎖定"
],
"desc": "於焊接模式時，同時長按兩個按鍵啟用按鍵鎖定 <無=停用 | 增=只鎖定增熱模式 | 全=鎖定全部>"
},
"MinVolCell": {
"text2": [
"Maximum",
"voltage"
],
"desc": "Minimum allowed voltage per cell"
}
}
}

15
Translations/translations_def.js
View File

@@ -173,7 +173,8 @@ var def =
{
"id": "SettingSensitivityHigh",
"len": 1
}, {
},
{
"id": "SettingLockDisableChar",
"len": 1,
"default": "D"
@@ -190,6 +191,10 @@ var def =
}
],
"menuGroups": [
{
"id": "PowerMenu",
"maxLen": 11
},
{
"id": "SolderingMenu",
"maxLen": 11
@@ -342,10 +347,16 @@ var def =
"id": "HallEffSensitivity",
"maxLen": 6,
"maxLen2": 8
}, {
},
{
"id": "LockingMode",
"maxLen": 6,
"maxLen2": 13
},
{
"id": "MinVolCell",
"maxLen": 4,
"maxLen2": 9
}
]
}

36
source/Core/Drivers/Font.h
View File

@@ -150,6 +150,42 @@ const uint8_t disconnectedTipIcon[] = {
* */
const uint8_t SettingsMenuIcons[] = {
// Power
// width = 16
// height = 16
0xC0,
0xB0,
0x8C,
0x83,
0x01,
0x01,
0x21,
0x31,
0xA9,
0x65,
0x03,
0x42,
0x62,
0x52,
0xCA,
0x06,
0x60,
0x58,
0x26,
0x11,
0x08,
0xC4,
0xB2,
0x4D,
0x23,
0x10,
0x08,
0x04,
0x02,
0x01,
0x00,
0x00,
// Soldering
// width = 16
// height = 16

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

@@ -25,6 +25,7 @@ typedef struct {
uint16_t SleepTemp; // temp to drop to in sleep
uint8_t SleepTime; // minutes timeout to sleep
uint8_t minDCVoltageCells; // The voltage we cut out at for under voltage when powered by DC jack
uint8_t minVoltageCells; // Minimum allowed voltage per cell <3S - 3.0V (30)> <4S - 2.4V (24)> <...> (Minimum recommended 2.7V)
uint8_t QCIdealVoltage; // Desired QC3.0 voltage (9,12,20V)
uint8_t OrientationMode : 2; // Selects between Auto,Right and left handed layouts
uint8_t sensitivity : 4; // Sensitivity of accelerometer (5 bits)

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

@@ -14,7 +14,7 @@ extern const bool HasFahrenheit;
extern const char *SettingsShortNames[29][2];
extern const char *SettingsDescriptions[29];
extern const char *SettingsMenuEntries[4];
extern const char *SettingsMenuEntries[5];
extern const char *SettingsCalibrationDone;
extern const char *SettingsCalibrationWarning;
@@ -76,6 +76,7 @@ extern const char *SymbolSeconds;
extern const char *SymbolWatts;
extern const char *SymbolVolts;
extern const char *SymbolDC;
extern const char *SymbolNA;
extern const char *SymbolCellCount;
extern const char *SymbolVersionNumber;

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

@@ -46,7 +46,7 @@ uint8_t lookupVoltageLevel() {
if (systemSettings.minDCVoltageCells == 0)
return 90; // 9V since iron does not function effectively below this
else
return (systemSettings.minDCVoltageCells * 33) + (33 * 2);
return (systemSettings.minDCVoltageCells * systemSettings.minVoltageCells) + (systemSettings.minVoltageCells * 2);
}
void resetSettings() {
memset((void *)&systemSettings, 0, sizeof(systemSettingsType));
@@ -55,6 +55,7 @@ void resetSettings() {
// to sleep - default 1 min
systemSettings.SolderingTemp = SOLDERING_TEMP; // Default soldering temp is 320.0 C
systemSettings.minDCVoltageCells = CUT_OUT_SETTING; // default to no cut-off voltage
systemSettings.minVoltageCells = RECOM_VOL_CELL; // Minimum voltage per cell (Recommended 3.3V (33))
systemSettings.QCIdealVoltage = 0; // Default to 9V for QC3.0 Voltage
systemSettings.version = SETTINGSVERSION; // Store the version number to allow for easier upgrades
systemSettings.detailedSoldering = DETAILED_SOLDERING; // Detailed soldering screen

80
source/Core/Src/gui.cpp
View File

@@ -19,6 +19,8 @@ void gui_Menu(const menuitem *menu);
#ifdef POW_DC
static bool settings_setInputVRange(void);
static void settings_displayInputVRange(void);
static bool settings_setInputMinVRange(void);
static void settings_displayInputMinVRange(void);
#endif
#ifdef POW_QC
static bool settings_setQCInputV(void);
@@ -73,10 +75,12 @@ static void settings_displayHallEffect(void);
static bool settings_setHallEffect(void);
#endif
// Menu functions
static void settings_displaySolderingMenu(void);
static bool settings_enterSolderingMenu(void);
static void settings_displayPowerMenu(void);
static bool settings_enterPowerMenu(void);
static void settings_displaySolderingMenu(void);
static bool settings_enterSolderingMenu(void);
static void settings_displayPowerSavingMenu(void);
static bool settings_enterPowerSavingMenu(void);
static void settings_displayUIMenu(void);
static bool settings_enterUIMenu(void);
static void settings_displayAdvancedMenu(void);
@@ -84,7 +88,9 @@ static bool settings_enterAdvancedMenu(void);
/*
* Root Settings Menu
*
* Power Source
* Power Menu
* Power Source
*
* Soldering
* Boost Mode Enabled
* Boost Mode Temp
@@ -121,26 +127,34 @@ static bool settings_enterAdvancedMenu(void);
*/
const menuitem rootSettingsMenu[]{
/*
* Power Source
* Power Menu
* Soldering Menu
* Power Saving Menu
* UI Menu
* Advanced Menu
* Exit
*/
#ifdef POW_DC
{(const char *)SettingsDescriptions[0], settings_setInputVRange, settings_displayInputVRange}, /*Voltage input*/
#endif
#ifdef POW_QC
{(const char *)SettingsDescriptions[19], settings_setQCInputV, settings_displayQCInputV}, /*Voltage input*/
#endif
{(const char *)NULL, settings_enterPowerMenu, settings_displayPowerMenu}, /*Power*/
{(const char *)NULL, settings_enterSolderingMenu, settings_displaySolderingMenu}, /*Soldering*/
{(const char *)NULL, settings_enterPowerMenu, settings_displayPowerMenu}, /*Sleep Options Menu*/
{(const char *)NULL, settings_enterPowerSavingMenu, settings_displayPowerSavingMenu}, /*Sleep Options Menu*/
{(const char *)NULL, settings_enterUIMenu, settings_displayUIMenu}, /*UI Menu*/
{(const char *)NULL, settings_enterAdvancedMenu, settings_displayAdvancedMenu}, /*Advanced Menu*/
{NULL, NULL, NULL} // end of menu marker. DO NOT REMOVE
};
const menuitem powerMenu[] = {
/*
* Power Source
*/
#ifdef POW_DC
{(const char *)SettingsDescriptions[0], settings_setInputVRange, settings_displayInputVRange}, /*Voltage input*/
{(const char *)SettingsDescriptions[28], settings_setInputMinVRange, settings_displayInputMinVRange}, /*Minimum voltage input*/
#endif
#ifdef POW_QC
{(const char *)SettingsDescriptions[19], settings_setQCInputV, settings_displayQCInputV}, /*Voltage input*/
#endif
{NULL, NULL, NULL} // end of menu marker. DO NOT REMOVE
};
const menuitem solderingMenu[] = {
/*
* Boost Mode Enabled
@@ -173,7 +187,7 @@ const menuitem UIMenu[] = {
{(const char *)SettingsDescriptions[21], settings_setReverseButtonTempChangeEnabled, settings_displayReverseButtonTempChangeEnabled}, /* Reverse Temp change buttons + - */
{NULL, NULL, NULL} // end of menu marker. DO NOT REMOVE
};
const menuitem PowerMenu[] = {
const menuitem PowerSavingMenu[] = {
/*
* Sleep Temp
* Sleep Time
@@ -294,7 +308,9 @@ static int userConfirmation(const char *message) {
#ifdef POW_DC
static bool settings_setInputVRange(void) {
systemSettings.minDCVoltageCells = (systemSettings.minDCVoltageCells + 1) % 5;
return systemSettings.minDCVoltageCells == 4;
if (systemSettings.minDCVoltageCells == 1 && systemSettings.minVoltageCells < 30)
systemSettings.minVoltageCells = 30;
return systemSettings.minDCVoltageCells == 5;
}
static void settings_displayInputVRange(void) {
@@ -307,6 +323,27 @@ static void settings_displayInputVRange(void) {
OLED::print(SymbolDC);
}
}
static bool settings_setInputMinVRange(void) {
systemSettings.minVoltageCells = (systemSettings.minVoltageCells + 1) % 38;
if (systemSettings.minDCVoltageCells == 1 && systemSettings.minVoltageCells < 30)
systemSettings.minVoltageCells = 30;
else if(systemSettings.minVoltageCells < 24)
systemSettings.minVoltageCells = 24;
return systemSettings.minVoltageCells == 38;
}
static void settings_displayInputMinVRange(void) {
if (systemSettings.minDCVoltageCells) {
printShortDescription(28, 4);
OLED::printNumber(systemSettings.minVoltageCells / 10, 2);
OLED::print(SymbolDot);
OLED::printNumber(systemSettings.minVoltageCells % 10, 1);
} else {
printShortDescription(28, 5);
OLED::print(SymbolNA);
}
}
#endif
#ifdef POW_QC
static bool settings_setQCInputV(void) {
@@ -904,22 +941,27 @@ static void displayMenu(size_t index) {
}
static void settings_displayCalibrateVIN(void) { printShortDescription(13, 5); }
static void settings_displaySolderingMenu(void) { displayMenu(0); }
static void settings_displayPowerMenu(void) { displayMenu(0); }
static bool settings_enterPowerMenu(void) {
gui_Menu(powerMenu);
return false;
}
static void settings_displaySolderingMenu(void) { displayMenu(1); }
static bool settings_enterSolderingMenu(void) {
gui_Menu(solderingMenu);
return false;
}
static void settings_displayPowerMenu(void) { displayMenu(1); }
static bool settings_enterPowerMenu(void) {
gui_Menu(PowerMenu);
static void settings_displayPowerSavingMenu(void) { displayMenu(2); }
static bool settings_enterPowerSavingMenu(void) {
gui_Menu(PowerSavingMenu);
return false;
}
static void settings_displayUIMenu(void) { displayMenu(2); }
static void settings_displayUIMenu(void) { displayMenu(3); }
static bool settings_enterUIMenu(void) {
gui_Menu(HasFahrenheit ? UIMenu : UIMenu + 1);
return false;
}
static void settings_displayAdvancedMenu(void) { displayMenu(3); }
static void settings_displayAdvancedMenu(void) { displayMenu(4); }
static bool settings_enterAdvancedMenu(void) {
gui_Menu(advancedMenu);
return false;

7
source/configuration.h
View File

@@ -88,9 +88,10 @@
#define DETAILED_SOLDERING 0 // 0: Disable 1: Enable - Default 0
#define DETAILED_IDLE 0 // 0: Disable 1: Enable - Default 0
#define CUT_OUT_SETTING 0 // default to no cut-off voltage
#define TEMPERATURE_INF 0 // default to 0
#define DESCRIPTION_SCROLL_SPEED 0 // 0: Slow 1: Fast - default to slow
#define CUT_OUT_SETTING 0 // default to no cut-off voltage
#define RECOM_VOL_CELL 33 // Minimum voltage per cell (Recommended 3.3V (33))
#define TEMPERATURE_INF 0 // default to 0
#define DESCRIPTION_SCROLL_SPEED 0 // 0: Slow 1: Fast - default to slow
#define OP_AMP_Rf_TS100 750 * 1000 // 750 Kilo-ohms -> From schematic, R1
#define OP_AMP_Rin_TS100 2370 // 2.37 Kilo-ohms -> From schematic, R2