me/IronOS
1
0
Fork 1
mirror of https://github.com/Ralim/IronOS.git synced 2025-02-26 07:53:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #558 from Ralim/fix/acting-as-red-light

Browse Source 
Fix Acting as red light + translations around the auto start
This commit is contained in:
Ben V. Brown
2020-01-18 20:35:32 +11:00
committed by GitHub
parent 08a1e0c7c7 e2067971a5
commit e725e63b3f
33 changed files with 1758 additions and 1596 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Translation Editor/make_translation.py
View File

@@ -95,9 +95,6 @@ def getConstants():
consants.append(('SymbolDC', 'DC'))
consants.append(('SymbolCellCount', 'S'))
consants.append(('SymbolVersionNumber', 'V2.08'))
consants.append(('SymbolManual', 'M'))
consants.append(('SymbolAuto', 'A'))
consants.append(('SymbolSleep', 'S'))
return consants

43
Translation Editor/translation_bg.json
View File

@@ -21,14 +21,17 @@
"TipDisconnectedString": "ВРЪХ ЛОША ВРЪЗКА",
"SolderingAdvancedPowerPrompt": "Захранване: ",
"OffString": "Off",
"ResetOKMessage":"Reset OK"
"ResetOKMessage": "Reset OK"
},
"characters": {
"SettingRightChar": "R",
"SettingLeftChar": "L",
"SettingAutoChar": "A",
"SettingFastChar": "F",
"SettingSlowChar": "S"
"SettingSlowChar": "S",
"SettingStartSolderingChar": "T",
"SettingStartSleepChar": "S",
"SettingStartNoneChar": "F"
},
"menuDouble": true,
"menuGroups": {
@@ -229,22 +232,22 @@
"Wattage"
],
"desc": "Power Wattage of the power adapter used"
},
"PowerLimitEnable": {
"text": "PLIMEN",
"text2": [
"P Limit",
"Enable"
],
"desc": "Enable power limit"
},
"PowerLimit": {
"text": "PLIM",
"text2": [
"Power",
"Limit"
],
"desc": "Maximum power the iron can use <Watts>"
}
}
},
"PowerLimitEnable": {
"text": "PLIMEN",
"text2": [
"P Limit",
"Enable"
],
"desc": "Enable power limit"
},
"PowerLimit": {
"text": "PLIM",
"text2": [
"Power",
"Limit"
],
"desc": "Maximum power the iron can use <Watts>"
}
}
}

5
Translation Editor/translation_cs.json
View File

@@ -29,7 +29,10 @@
"SettingLeftChar": "L",
"SettingAutoChar": "A",
"SettingFastChar": "R",
"SettingSlowChar": "P"
"SettingSlowChar": "P",
"SettingStartSolderingChar": "T",
"SettingStartSleepChar": "S",
"SettingStartNoneChar": "F"
},
"menuDouble": true,
"menuGroups": {

7
Translation Editor/translation_da.json
View File

@@ -21,14 +21,17 @@
"TipDisconnectedString": "TIP DISCONNECTED",
"SolderingAdvancedPowerPrompt": "Power: ",
"OffString": "Off",
"ResetOKMessage":"Reset OK"
"ResetOKMessage": "Reset OK"
},
"characters": {
"SettingRightChar": "H",
"SettingLeftChar": "V",
"SettingAutoChar": "A",
"SettingFastChar": "F",
"SettingSlowChar": "S"
"SettingSlowChar": "S",
"SettingStartSolderingChar": "L",
"SettingStartSleepChar": "D",
"SettingStartNoneChar": "S"
},
"menuDouble": false,
"menuGroups": {

7
Translation Editor/translation_de.json
View File

@@ -21,14 +21,17 @@
"TipDisconnectedString": "Spitze fehlt",
"SolderingAdvancedPowerPrompt": "Leistung: ",
"OffString": "Aus",
"ResetOKMessage":"Reset OK"
"ResetOKMessage": "Reset OK"
},
"characters": {
"SettingRightChar": "R",
"SettingLeftChar": "L",
"SettingAutoChar": "A",
"SettingFastChar": "F",
"SettingSlowChar": "S"
"SettingSlowChar": "S",
"SettingStartSolderingChar": "J",
"SettingStartSleepChar": "S",
"SettingStartNoneChar": "F"
},
"menuDouble": true,
"menuGroups": {

7
Translation Editor/translation_en.json
View File

@@ -30,7 +30,10 @@
"SettingLeftChar": "L",
"SettingAutoChar": "A",
"SettingFastChar": "F",
"SettingSlowChar": "S"
"SettingSlowChar": "S",
"SettingStartSolderingChar": "T",
"SettingStartSleepChar": "S",
"SettingStartNoneChar": "F"
},
"menuDouble": true,
"menuGroups": {
@@ -150,7 +153,7 @@
"Auto",
"start"
],
"desc": "Automatically starts the iron into soldering on power up. T=Soldering, S= Sleep mode,F=Off"
"desc": "Automatically starts the iron into soldering on power up. A=Soldering, S= Sleep mode, M=Off"
},
"CooldownBlink": {
"text": "CLBLNK",

7
Translation Editor/translation_es.json
View File

@@ -21,14 +21,17 @@
"TipDisconnectedString": "SIN PUNTA",
"SolderingAdvancedPowerPrompt": "POTENCIA: ",
"OffString": "Off",
"ResetOKMessage":"Reset OK"
"ResetOKMessage": "Reset OK"
},
"characters": {
"SettingRightChar": "D",
"SettingLeftChar": "I",
"SettingAutoChar": "A",
"SettingFastChar": "R",
"SettingSlowChar": "L"
"SettingSlowChar": "L",
"SettingStartSolderingChar": "V",
"SettingStartSleepChar": "S",
"SettingStartNoneChar": "F"
},
"menuDouble": true,
"menuGroups": {

7
Translation Editor/translation_fi.json
View File

@@ -21,14 +21,17 @@
"TipDisconnectedString": "KÄRKI ON IRTI",
"SolderingAdvancedPowerPrompt": "Teho: ",
"OffString": "OFF",
"ResetOKMessage":"Reset OK"
"ResetOKMessage": "Reset OK"
},
"characters": {
"SettingRightChar": "O",
"SettingLeftChar": "V",
"SettingAutoChar": "A",
"SettingFastChar": "N",
"SettingSlowChar": "H"
"SettingSlowChar": "H",
"SettingStartSolderingChar": "T",
"SettingStartSleepChar": "S",
"SettingStartNoneChar": "F"
},
"menuDouble": true,
"menuGroups": {

7
Translation Editor/translation_fr.json
View File

@@ -21,14 +21,17 @@
"TipDisconnectedString": "PANNE DÉBRANCHÉE",
"SolderingAdvancedPowerPrompt": "Puissance: ",
"OffString": "Off",
"ResetOKMessage":"Reset OK"
"ResetOKMessage": "Reset OK"
},
"characters": {
"SettingRightChar": "D",
"SettingLeftChar": "G",
"SettingAutoChar": "A",
"SettingFastChar": "R",
"SettingSlowChar": "L"
"SettingSlowChar": "L",
"SettingStartSolderingChar": "A",
"SettingStartSleepChar": "V",
"SettingStartNoneChar": "D"
},
"menuDouble": true,
"menuGroups": {

7
Translation Editor/translation_hr.json
View File

@@ -21,14 +21,17 @@
"TipDisconnectedString": "VRH NIJE SPOJEN!",
"SolderingAdvancedPowerPrompt": "Snaga: ",
"OffString": "Off",
"ResetOKMessage":"Reset OK"
"ResetOKMessage": "Reset OK"
},
"characters": {
"SettingRightChar": "D",
"SettingLeftChar": "L",
"SettingAutoChar": "A",
"SettingFastChar": "B",
"SettingSlowChar": "S"
"SettingSlowChar": "S",
"SettingStartSolderingChar": "T",
"SettingStartSleepChar": "S",
"SettingStartNoneChar": "F"
},
"menuDouble": true,
"menuGroups": {

7
Translation Editor/translation_hu.json
View File

@@ -21,14 +21,17 @@
"TipDisconnectedString": "HEGY LEVÉVE",
"SolderingAdvancedPowerPrompt": "Telj: ",
"OffString": "Ki",
"ResetOKMessage":"Reset OK"
"ResetOKMessage": "Reset OK"
},
"characters": {
"SettingRightChar": "J",
"SettingLeftChar": "B",
"SettingAutoChar": "A",
"SettingFastChar": "G",
"SettingSlowChar": "L"
"SettingSlowChar": "L",
"SettingStartSolderingChar": "T",
"SettingStartSleepChar": "S",
"SettingStartNoneChar": "F"
},
"menuDouble": false,
"menuGroups": {

7
Translation Editor/translation_it.json
View File

@@ -21,14 +21,17 @@
"TipDisconnectedString": "PUNTA ASSENTE",
"SolderingAdvancedPowerPrompt": "Potenz:",
"OffString": "OFF",
"ResetOKMessage":"Reset OK"
"ResetOKMessage": "Reset OK"
},
"characters": {
"SettingRightChar": "D",
"SettingLeftChar": "S",
"SettingAutoChar": "A",
"SettingFastChar": "V",
"SettingSlowChar": "L"
"SettingSlowChar": "L",
"SettingStartSolderingChar": "A",
"SettingStartSleepChar": "S",
"SettingStartNoneChar": "D"
},
"menuDouble": true,
"menuGroups": {

7
Translation Editor/translation_lt.json
View File

@@ -21,14 +21,17 @@
"TipDisconnectedString": "ANTGAL ATJUNGTAS",
"SolderingAdvancedPowerPrompt": "Maitinimas: ",
"OffString": "Išj",
"ResetOKMessage":"Reset OK"
"ResetOKMessage": "Reset OK"
},
"characters": {
"SettingRightChar": "D",
"SettingLeftChar": "K",
"SettingAutoChar": "A",
"SettingFastChar": "T",
"SettingSlowChar": "N"
"SettingSlowChar": "N",
"SettingStartSolderingChar": "T",
"SettingStartSleepChar": "S",
"SettingStartNoneChar": "F"
},
"menuDouble": true,
"menuGroups": {

7
Translation Editor/translation_nl.json
View File

@@ -21,14 +21,17 @@
"TipDisconnectedString": "TIP LOSGEKOPPELD",
"SolderingAdvancedPowerPrompt": "vermogen: ",
"OffString": "Off",
"ResetOKMessage":"Reset OK"
"ResetOKMessage": "Reset OK"
},
"characters": {
"SettingRightChar": "R",
"SettingLeftChar": "L",
"SettingAutoChar": "A",
"SettingFastChar": "F",
"SettingSlowChar": "S"
"SettingSlowChar": "S",
"SettingStartSolderingChar": "T",
"SettingStartSleepChar": "S",
"SettingStartNoneChar": "F"
},
"menuDouble": true,
"menuGroups": {

7
Translation Editor/translation_nl_be.json
View File

@@ -21,14 +21,17 @@
"TipDisconnectedString": "Punt ONTKOPPELD",
"SolderingAdvancedPowerPrompt": "Vermogen: ",
"OffString": "Uit",
"ResetOKMessage":"Reset OK"
"ResetOKMessage": "Reset OK"
},
"characters": {
"SettingRightChar": "R",
"SettingLeftChar": "L",
"SettingAutoChar": "A",
"SettingFastChar": "S",
"SettingSlowChar": "T"
"SettingSlowChar": "T",
"SettingStartSolderingChar": "T",
"SettingStartSleepChar": "S",
"SettingStartNoneChar": "F"
},
"menuDouble": true,
"menuGroups": {

7
Translation Editor/translation_no.json
View File

@@ -21,14 +21,17 @@
"TipDisconnectedString": "SPISS FRAKOBLET",
"SolderingAdvancedPowerPrompt": "Effekt: ",
"OffString": "Av",
"ResetOKMessage":"Reset OK"
"ResetOKMessage": "Reset OK"
},
"characters": {
"SettingRightChar": "H",
"SettingLeftChar": "V",
"SettingAutoChar": "A",
"SettingFastChar": "H",
"SettingSlowChar": "L"
"SettingSlowChar": "L",
"SettingStartSolderingChar": "L",
"SettingStartSleepChar": "D",
"SettingStartNoneChar": "I"
},
"menuDouble": false,
"menuGroups": {

7
Translation Editor/translation_pl.json
View File

@@ -21,14 +21,17 @@
"TipDisconnectedString": "GROT ODŁĄCZONY",
"SolderingAdvancedPowerPrompt": "Power: ",
"OffString": "Wyłącz",
"ResetOKMessage":"Reset OK"
"ResetOKMessage": "Reset OK"
},
"characters": {
"SettingRightChar": "P",
"SettingLeftChar": "L",
"SettingAutoChar": "A",
"SettingFastChar": "F",
"SettingSlowChar": "S"
"SettingSlowChar": "S",
"SettingStartSolderingChar": "T",
"SettingStartSleepChar": "S",
"SettingStartNoneChar": "N"
},
"menuDouble": false,
"menuGroups": {

7
Translation Editor/translation_pt.json
View File

@@ -21,14 +21,17 @@
"TipDisconnectedString": "SEM PONTA",
"SolderingAdvancedPowerPrompt": "Power: ",
"OffString": "Off",
"ResetOKMessage":"Reset OK"
"ResetOKMessage": "Reset OK"
},
"characters": {
"SettingRightChar": "D",
"SettingLeftChar": "C",
"SettingAutoChar": "A",
"SettingFastChar": "R",
"SettingSlowChar": "L"
"SettingSlowChar": "L",
"SettingStartSolderingChar": "T",
"SettingStartSleepChar": "S",
"SettingStartNoneChar": "F"
},
"menuDouble": true,
"menuGroups": {

7
Translation Editor/translation_ru.json
View File

@@ -21,14 +21,17 @@
"TipDisconnectedString": "Жало отключено",
"SolderingAdvancedPowerPrompt": "Питание: ",
"OffString": "Off",
"ResetOKMessage":"Reset OK"
"ResetOKMessage": "Reset OK"
},
"characters": {
"SettingRightChar": "П",
"SettingLeftChar": "Л",
"SettingAutoChar": "A",
"SettingFastChar": "+",
"SettingSlowChar": "-"
"SettingSlowChar": "-",
"SettingStartSolderingChar": "T",
"SettingStartSleepChar": "S",
"SettingStartNoneChar": "F"
},
"menuDouble": true,
"menuGroups": {

7
Translation Editor/translation_sk.json
View File

@@ -21,14 +21,17 @@
"TipDisconnectedString": "TIP DISCONNECTED",
"SolderingAdvancedPowerPrompt": "Power: ",
"OffString": "Off",
"ResetOKMessage":"Reset OK"
"ResetOKMessage": "Reset OK"
},
"characters": {
"SettingRightChar": "R",
"SettingLeftChar": "L",
"SettingAutoChar": "A",
"SettingFastChar": "F",
"SettingSlowChar": "S"
"SettingSlowChar": "S",
"SettingStartSolderingChar": "T",
"SettingStartSleepChar": "S",
"SettingStartNoneChar": "F"
},
"menuDouble": false,
"menuGroups": {

5
Translation Editor/translation_sl.json
View File

@@ -29,7 +29,10 @@
"SettingLeftChar": "L",
"SettingAutoChar": "S",
"SettingFastChar": "H",
"SettingSlowChar": "P"
"SettingSlowChar": "P",
"SettingStartSolderingChar": "T",
"SettingStartSleepChar": "S",
"SettingStartNoneChar": "F"
},
"menuDouble": true,
"menuGroups": {

7
Translation Editor/translation_sr_cyrl.json
View File

@@ -21,14 +21,17 @@
"TipDisconnectedString": "ВРХ НИЈЕ СПОЈЕН",
"SolderingAdvancedPowerPrompt": "Снага: ",
"OffString": "Иск",
"ResetOKMessage":"Reset OK"
"ResetOKMessage": "Reset OK"
},
"characters": {
"SettingRightChar": "Д",
"SettingLeftChar": "Л",
"SettingAutoChar": "А",
"SettingFastChar": "Б",
"SettingSlowChar": "С"
"SettingSlowChar": "С",
"SettingStartSolderingChar": "T",
"SettingStartSleepChar": "S",
"SettingStartNoneChar": "F"
},
"menuDouble": true,
"menuGroups": {

7
Translation Editor/translation_sr_latn.json
View File

@@ -21,14 +21,17 @@
"TipDisconnectedString": "VRH NIJE SPOJEN",
"SolderingAdvancedPowerPrompt": "Snaga: ",
"OffString": "Isk",
"ResetOKMessage":"Reset OK"
"ResetOKMessage": "Reset OK"
},
"characters": {
"SettingRightChar": "D",
"SettingLeftChar": "L",
"SettingAutoChar": "A",
"SettingFastChar": "B",
"SettingSlowChar": "S"
"SettingSlowChar": "S",
"SettingStartSolderingChar": "T",
"SettingStartSleepChar": "S",
"SettingStartNoneChar": "F"
},
"menuDouble": true,
"menuGroups": {

7
Translation Editor/translation_sv.json
View File

@@ -21,14 +21,17 @@
"TipDisconnectedString": "SPETS URTAGEN",
"SolderingAdvancedPowerPrompt": "Ström: ",
"OffString": "Av",
"ResetOKMessage":"Reset OK"
"ResetOKMessage": "Reset OK"
},
"characters": {
"SettingRightChar": "H",
"SettingLeftChar": "V",
"SettingAutoChar": "A",
"SettingFastChar": "S",
"SettingSlowChar": "L"
"SettingSlowChar": "L",
"SettingStartSolderingChar": "T",
"SettingStartSleepChar": "S",
"SettingStartNoneChar": "F"
},
"menuDouble": true,
"menuGroups": {

7
Translation Editor/translation_tr.json
View File

@@ -21,14 +21,17 @@
"TipDisconnectedString": "UÇ ÇIKARILDI",
"SolderingAdvancedPowerPrompt": "Güç: ",
"OffString": "Kapalı",
"ResetOKMessage":"Reset Tamam"
"ResetOKMessage": "Reset Tamam"
},
"characters": {
"SettingRightChar": "R",
"SettingLeftChar": "L",
"SettingAutoChar": "A",
"SettingFastChar": "F",
"SettingSlowChar": "S"
"SettingSlowChar": "S",
"SettingStartSolderingChar": "T",
"SettingStartSleepChar": "S",
"SettingStartNoneChar": "F"
},
"menuDouble": false,
"menuGroups": {

7
Translation Editor/translation_uk.json
View File

@@ -21,14 +21,17 @@
"TipDisconnectedString": "Жало вимкнено!",
"SolderingAdvancedPowerPrompt": "Живлення: ",
"OffString": "Вимк",
"ResetOKMessage":"Reset OK"
"ResetOKMessage": "Reset OK"
},
"characters": {
"SettingRightChar": "П",
"SettingLeftChar": "Л",
"SettingAutoChar": "A",
"SettingFastChar": "+",
"SettingSlowChar": "-"
"SettingSlowChar": "-",
"SettingStartSolderingChar": "T",
"SettingStartSleepChar": "S",
"SettingStartNoneChar": "F"
},
"menuDouble": true,
"menuGroups": {

12
Translation Editor/translations_def.js
View File

@@ -116,6 +116,18 @@ var def =
{
"id": "SettingSlowChar",
"len": 1
},
{
"id": "SettingStartSolderingChar",
"len": 1
},
{
"id": "SettingStartSleepChar",
"len": 1
},
{
"id": "SettingStartNoneChar",
"len": 1
}
],
"menuGroups": [

100
workspace/TS100/Core/Inc/Translation.h
View File

@@ -18,59 +18,59 @@ extern const uint8_t USER_FONT_6x8[];
* use SettingsShortNames as SettingsShortNames[16][1].. second column undefined
*/
extern const enum ShortNameType SettingsShortNameType;
extern const char* SettingsShortNames[23][2];
extern const char* SettingsDescriptions[23];
extern const char* SettingsMenuEntries[4];
extern const char *SettingsShortNames[23][2];
extern const char *SettingsDescriptions[23];
extern const char *SettingsMenuEntries[4];
extern const char* SettingsCalibrationDone;
extern const char* SettingsCalibrationWarning;
extern const char* SettingsResetWarning;
extern const char* UVLOWarningString;
extern const char* UndervoltageString;
extern const char* InputVoltageString;
extern const char* WarningTipTempString;
extern const char* BadTipString;
extern const char *SettingsCalibrationDone;
extern const char *SettingsCalibrationWarning;
extern const char *SettingsResetWarning;
extern const char *UVLOWarningString;
extern const char *UndervoltageString;
extern const char *InputVoltageString;
extern const char *WarningTipTempString;
extern const char *BadTipString;
extern const char* SleepingSimpleString;
extern const char* SleepingAdvancedString;
extern const char* WarningSimpleString;
extern const char* WarningAdvancedString;
extern const char* SleepingTipAdvancedString;
extern const char* IdleTipString;
extern const char* IdleSetString;
extern const char* TipDisconnectedString;
extern const char* SolderingAdvancedPowerPrompt;
extern const char* OffString;
extern const char* ResetOKMessage;
extern const char* YourGainMessage;
extern const char* SettingsResetMessage;
extern const char *SleepingSimpleString;
extern const char *SleepingAdvancedString;
extern const char *WarningSimpleString;
extern const char *WarningAdvancedString;
extern const char *SleepingTipAdvancedString;
extern const char *IdleTipString;
extern const char *IdleSetString;
extern const char *TipDisconnectedString;
extern const char *SolderingAdvancedPowerPrompt;
extern const char *OffString;
extern const char *ResetOKMessage;
extern const char *YourGainMessage;
extern const char *SettingsResetMessage;
extern const char* SettingTrueChar;
extern const char* SettingFalseChar;
extern const char* SettingRightChar;
extern const char* SettingLeftChar;
extern const char* SettingAutoChar;
extern const char *SettingTrueChar;
extern const char *SettingFalseChar;
extern const char *SettingRightChar;
extern const char *SettingLeftChar;
extern const char *SettingAutoChar;
extern const char *SettingStartSolderingChar;
extern const char *SettingStartSleepChar;
extern const char *SettingStartNoneChar;
extern const char* SettingFastChar;
extern const char* SettingSlowChar;
extern const char* TipModelStrings[];
extern const char* DebugMenu[];
extern const char* SymbolPlus;
extern const char* SymbolMinus;
extern const char* SymbolSpace;
extern const char* SymbolDot;
extern const char* SymbolDegC;
extern const char* SymbolDegF;
extern const char* SymbolMinutes;
extern const char* SymbolSeconds;
extern const char* SymbolWatts;
extern const char* SymbolVolts;
extern const char* SymbolDC;
extern const char* SymbolCellCount;
extern const char* SymbolManual;
extern const char* SymbolAuto;
extern const char* SymbolSleep;
extern const char* SymbolVersionNumber;
extern const char *SettingFastChar;
extern const char *SettingSlowChar;
extern const char *TipModelStrings[];
extern const char *DebugMenu[];
extern const char *SymbolPlus;
extern const char *SymbolMinus;
extern const char *SymbolSpace;
extern const char *SymbolDot;
extern const char *SymbolDegC;
extern const char *SymbolDegF;
extern const char *SymbolMinutes;
extern const char *SymbolSeconds;
extern const char *SymbolWatts;
extern const char *SymbolVolts;
extern const char *SymbolDC;
extern const char *SymbolCellCount;
extern const char *SymbolVersionNumber;
extern const char* DebugMenu[];
extern const char *DebugMenu[];
#endif /* TRANSLATION_H_ */

1
workspace/TS100/Core/Src/GUIThread.cpp
View File

@@ -501,7 +501,6 @@ static void gui_solderingMode(uint8_t jumpToSleep) {
OLED::setCursor(0, 0);
OLED::clearScreen();
OLED::setFont(0);
uint16_t tipTemp = getTipRawTemp(0);
//Draw in the screen details
if (systemSettings.detailedSoldering) {
OLED::setFont(1);

4
workspace/TS100/Core/Src/TipThermoModel.cpp
View File

@@ -122,7 +122,7 @@ uint32_t TipThermoModel::getTipInF(bool sampleNow) {
uint32_t TipThermoModel::getTipMaxInC() {
uint32_t maximumTipTemp = TipThermoModel::convertTipRawADCToDegC(
0x7FFF - 10);
0x7FFF - (80 * 5)); //back off approx 5 deg c from ADC max
maximumTipTemp += getHandleTemperature() / 10; //Add handle offset
return maximumTipTemp;
return maximumTipTemp - 1;
}

2989
workspace/TS100/Core/Src/Translation.cpp
View File

File diff suppressed because it is too large Load Diff

8
workspace/TS100/Core/Src/gui.cpp
View File

@@ -572,16 +572,16 @@ static void settings_displayAutomaticStartMode(void) {
switch (systemSettings.autoStartMode) {
case 0:
OLED::print(SymbolManual);
OLED::print(SettingStartNoneChar);
break;
case 1:
OLED::print(SymbolAuto);
OLED::print(SettingStartSolderingChar);
break;
case 2:
OLED::print(SymbolSleep);
OLED::print(SettingStartSleepChar);
break;
default:
OLED::print(SymbolManual);
OLED::print(SettingStartNoneChar);
break;
}
}

30
workspace/TS100/Core/Src/main.cpp
View File

@@ -124,6 +124,7 @@ void startPIDTask(void const *argument __unused) {
currentTempTargetDegC = 0; // Force start with no output (off). If in sleep / soldering this will
// be over-ridden rapidly
pidTaskNotification = xTaskGetCurrentTaskHandle();
uint32_t PIDTempTarget = 0;
for (;;) {
if (ulTaskNotifyTake(pdTRUE, 2000)) {
@@ -131,15 +132,16 @@ void startPIDTask(void const *argument __unused) {
int32_t x10WattsOut = 0;
// Do the reading here to keep the temp calculations churning along
uint32_t currentTipTempInC = TipThermoModel::getTipInC(true);
if (currentTempTargetDegC) {
PIDTempTarget = currentTempTargetDegC;
if (PIDTempTarget) {
// Cap the max set point to 450C
if (currentTempTargetDegC > (450)) {
if (PIDTempTarget > (450)) {
//Maximum allowed output
currentTempTargetDegC = (450);
PIDTempTarget = (450);
}
if (currentTempTargetDegC > TipThermoModel::getTipMaxInC()) {
currentTempTargetDegC = TipThermoModel::getTipMaxInC();
//Safety check that not aiming higher than current tip can measure
if (PIDTempTarget > TipThermoModel::getTipMaxInC()) {
PIDTempTarget = TipThermoModel::getTipMaxInC();
}
// Convert the current tip to degree's C
@@ -147,7 +149,7 @@ void startPIDTask(void const *argument __unused) {
// to be unstable. Use a rolling average to dampen it.
// We overshoot by roughly 1 degree C.
// This helps stabilize the display.
int32_t tError = currentTempTargetDegC - currentTipTempInC + 1;
int32_t tError = PIDTempTarget - currentTipTempInC + 1;
tError = tError > INT16_MAX ? INT16_MAX : tError;
tError = tError < INT16_MIN ? INT16_MIN : tError;
tempError.update(tError);
@@ -192,18 +194,20 @@ void startPIDTask(void const *argument __unused) {
lastPowerPulse = xTaskGetTickCount();
}
#endif
//Secondary safety check to forcefully disable header when within ADC noise of top of ADC
if (getTipRawTemp(0) > (0x7FFF - 150)) {
x10WattsOut = 0;
}
if (systemSettings.powerLimitEnable
&& x10WattsOut > (systemSettings.powerLimit * 10))
&& x10WattsOut > (systemSettings.powerLimit * 10)) {
setTipX10Watts(systemSettings.powerLimit * 10);
else
} else {
setTipX10Watts(x10WattsOut);
}
HAL_IWDG_Refresh(&hiwdg);
} else {
asm("bkpt");
//ADC interrupt timeout
//ADC interrupt timeout
setTipPWM(0);
}
}