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

Merge pull request #993 from Ralim/ralim/const-temp-catch

Browse Source 
Thermal Runaway alert
This commit is contained in:
Ben V. Brown
2021-06-24 21:15:55 +10:00
committed by GitHub
parent 6a19bfbf47 0400da7c88
commit 758379a7e6
34 changed files with 112 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Translations/translation_BG.json
View File

@@ -42,7 +42,8 @@
],
"LockingKeysString": " LOCKED",
"UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!"
"WarningKeysLockedString": "!LOCKED!",
"WarningThermalRunaway":["Thermal","Runaway"]
},
"characters": {
"SettingRightChar": "R",

3
Translations/translation_CS.json
View File

@@ -42,7 +42,8 @@
],
"LockingKeysString": " LOCKED",
"UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!"
"WarningKeysLockedString": "!LOCKED!",
"WarningThermalRunaway":["Thermal","Runaway"]
},
"characters": {
"SettingRightChar": "P",

3
Translations/translation_DA.json
View File

@@ -42,7 +42,8 @@
],
"LockingKeysString": " LOCKED",
"UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!"
"WarningKeysLockedString": "!LOCKED!",
"WarningThermalRunaway":["Thermal","Runaway"]
},
"characters": {
"SettingRightChar": "H",

3
Translations/translation_DE.json
View File

@@ -43,7 +43,8 @@
],
"LockingKeysString": "GESPERRT",
"UnlockingKeysString": "ENTSPERRT",
"WarningKeysLockedString": "!GESPERRT!"
"WarningKeysLockedString": "!GESPERRT!",
"WarningThermalRunaway":["Thermal","Runaway"]
},
"characters": {
"SettingRightChar": "R",

3
Translations/translation_EN.json
View File

@@ -42,7 +42,8 @@
],
"LockingKeysString": "LOCKED",
"UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!"
"WarningKeysLockedString": "!LOCKED!",
"WarningThermalRunaway":["Thermal","Runaway"]
},
"characters": {
"SettingRightChar": "R",

3
Translations/translation_ES.json
View File

@@ -43,7 +43,8 @@
],
"LockingKeysString": " BLOQUEADO",
"UnlockingKeysString": "DESBLOQUEADO",
"WarningKeysLockedString": "¡BLOQUEADO!"
"WarningKeysLockedString": "¡BLOQUEADO!",
"WarningThermalRunaway":["Thermal","Runaway"]
},
"characters": {
"SettingRightChar": "D",

3
Translations/translation_FI.json
View File

@@ -41,7 +41,8 @@
],
"LockingKeysString": " LUKITTU",
"UnlockingKeysString": "AUKI",
"WarningKeysLockedString": "!LUKKO!"
"WarningKeysLockedString": "!LUKKO!",
"WarningThermalRunaway":["Thermal","Runaway"]
},
"characters": {
"SettingRightChar": "O",

3
Translations/translation_FR.json
View File

@@ -42,7 +42,8 @@
],
"LockingKeysString": "VERROUIL",
"UnlockingKeysString": "DEVERROU",
"WarningKeysLockedString": "! VERR. !"
"WarningKeysLockedString": "! VERR. !",
"WarningThermalRunaway":["Thermal","Runaway"]
},
"characters": {
"SettingRightChar": "D",

3
Translations/translation_HR.json
View File

@@ -42,7 +42,8 @@
],
"LockingKeysString": " LOCKED",
"UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!"
"WarningKeysLockedString": "!LOCKED!",
"WarningThermalRunaway":["Thermal","Runaway"]
},
"characters": {
"SettingRightChar": "D",

3
Translations/translation_HU.json
View File

@@ -45,7 +45,8 @@
],
"LockingKeysString": "LEZÁRVA",
"UnlockingKeysString": "FELOLDVA",
"WarningKeysLockedString": "!LEZÁRVA!"
"WarningKeysLockedString": "!LEZÁRVA!",
"WarningThermalRunaway":["Thermal","Runaway"]
},
"characters": {
"SettingRightChar": "J",

3
Translations/translation_IT.json
View File

@@ -42,7 +42,8 @@
],
"LockingKeysString": "Blocc.",
"UnlockingKeysString": "Sblocc.",
"WarningKeysLockedString": "BLOCCATO"
"WarningKeysLockedString": "BLOCCATO",
"WarningThermalRunaway":["Thermal","Runaway"]
},
"characters": {
"SettingRightChar": "D",

3
Translations/translation_JA_JP.json
View File

@@ -40,7 +40,8 @@
],
"LockingKeysString": "ボタンロック",
"UnlockingKeysString": "ロックを解除",
"WarningKeysLockedString": "!入力ロック中!"
"WarningKeysLockedString": "!入力ロック中!",
"WarningThermalRunaway":["Thermal","Runaway"]
},
"characters": {
"SettingRightChar": "右",

3
Translations/translation_LT.json
View File

@@ -42,7 +42,8 @@
],
"LockingKeysString": " UŽRAKIN",
"UnlockingKeysString": "ATRAKIN",
"WarningKeysLockedString": "!UŽRAK!"
"WarningKeysLockedString": "!UŽRAK!",
"WarningThermalRunaway":["Thermal","Runaway"]
},
"characters": {
"SettingRightChar": "D",

3
Translations/translation_NL.json
View File

@@ -42,7 +42,8 @@
],
"LockingKeysString": " GEBLOKKEERD",
"UnlockingKeysString": "GEDEBLOKKEERD",
"WarningKeysLockedString": "!GEBLOKKEERD!"
"WarningKeysLockedString": "!GEBLOKKEERD!",
"WarningThermalRunaway":["Thermal","Runaway"]
},
"characters": {
"SettingRightChar": "R",

3
Translations/translation_NL_BE.json
View File

@@ -42,7 +42,8 @@
],
"LockingKeysString": " LOCKED",
"UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!"
"WarningKeysLockedString": "!LOCKED!",
"WarningThermalRunaway":["Thermal","Runaway"]
},
"characters": {
"SettingRightChar": "R",

3
Translations/translation_NO.json
View File

@@ -42,7 +42,8 @@
],
"LockingKeysString": " LOCKED",
"UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!"
"WarningKeysLockedString": "!LOCKED!",
"WarningThermalRunaway":["Thermal","Runaway"]
},
"characters": {
"SettingRightChar": "H",

3
Translations/translation_PL.json
View File

@@ -43,7 +43,8 @@
],
"LockingKeysString": " ZABLOK.",
"UnlockingKeysString": "ODBLOK.",
"WarningKeysLockedString": "!ZABLOK!"
"WarningKeysLockedString": "!ZABLOK!",
"WarningThermalRunaway":["Thermal","Runaway"]
},
"characters": {
"SettingRightChar": "P",

3
Translations/translation_PT.json
View File

@@ -42,7 +42,8 @@
],
"LockingKeysString": "LOCKED",
"UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!"
"WarningKeysLockedString": "!LOCKED!",
"WarningThermalRunaway":["Thermal","Runaway"]
},
"characters": {
"SettingRightChar": "D",

3
Translations/translation_RU.json
View File

@@ -43,7 +43,8 @@
],
"LockingKeysString": "LOCKED",
"UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!"
"WarningKeysLockedString": "!LOCKED!",
"WarningThermalRunaway":["Thermal","Runaway"]
},
"characters": {
"SettingRightChar": "П",

3
Translations/translation_SK.json
View File

@@ -42,7 +42,8 @@
],
"LockingKeysString": "ZABLOK.",
"UnlockingKeysString": "ODBLOK.",
"WarningKeysLockedString": "!ZABLOK!"
"WarningKeysLockedString": "!ZABLOK!",
"WarningThermalRunaway":["Thermal","Runaway"]
},
"characters": {
"SettingRightChar": "P",

3
Translations/translation_SL.json
View File

@@ -42,7 +42,8 @@
],
"LockingKeysString": "ZAKLENJ.",
"UnlockingKeysString": "ODKLENJ.",
"WarningKeysLockedString": "ZAKLENJ."
"WarningKeysLockedString": "ZAKLENJ.",
"WarningThermalRunaway":["Thermal","Runaway"]
},
"characters": {
"SettingRightChar": "D",

3
Translations/translation_SR_CYRL.json
View File

@@ -42,7 +42,8 @@
],
"LockingKeysString": "LOCKED",
"UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!"
"WarningKeysLockedString": "!LOCKED!",
"WarningThermalRunaway":["Thermal","Runaway"]
},
"characters": {
"SettingRightChar": "Д",

3
Translations/translation_SR_LATN.json
View File

@@ -42,7 +42,8 @@
],
"LockingKeysString": "LOCKED",
"UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!"
"WarningKeysLockedString": "!LOCKED!",
"WarningThermalRunaway":["Thermal","Runaway"]
},
"characters": {
"SettingRightChar": "D",

3
Translations/translation_SV.json
View File

@@ -36,7 +36,8 @@
],
"LockingKeysString": "LÅST",
"UnlockingKeysString": "UPPLÅST",
"WarningKeysLockedString": "!LÅST!"
"WarningKeysLockedString": "!LÅST!",
"WarningThermalRunaway":["Thermal","Runaway"]
},
"characters": {
"SettingRightChar": "H",

3
Translations/translation_TR.json
View File

@@ -45,7 +45,8 @@
],
"LockingKeysString": "LOCKED",
"UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!"
"WarningKeysLockedString": "!LOCKED!",
"WarningThermalRunaway":["Thermal","Runaway"]
},
"characters": {
"SettingRightChar": "R",

3
Translations/translation_UK.json
View File

@@ -43,7 +43,8 @@
],
"LockingKeysString": "ЗАБЛОК.",
"UnlockingKeysString": "РОЗБЛОК.",
"WarningKeysLockedString": "!ЗАБЛОК!"
"WarningKeysLockedString": "!ЗАБЛОК!",
"WarningThermalRunaway":["Thermal","Runaway"]
},
"characters": {
"SettingRightChar": "П",

3
Translations/translation_YUE_HK.json
View File

@@ -40,7 +40,8 @@
],
"LockingKeysString": "已鎖定",
"UnlockingKeysString": "已解除鎖定",
"WarningKeysLockedString": "!撳掣鎖定!"
"WarningKeysLockedString": "!撳掣鎖定!",
"WarningThermalRunaway":["Thermal","Runaway"]
},
"characters": {
"SettingRightChar": "右",

3
Translations/translation_ZH_CN.json
View File

@@ -40,7 +40,8 @@
],
"LockingKeysString": "已锁定",
"UnlockingKeysString": "已解除锁定",
"WarningKeysLockedString": "!按键锁定!"
"WarningKeysLockedString": "!按键锁定!",
"WarningThermalRunaway":["Thermal","Runaway"]
},
"characters": {
"SettingRightChar": "右",

4
Translations/translation_ZH_TW.json
View File

@@ -40,7 +40,9 @@
],
"LockingKeysString": "已鎖定",
"UnlockingKeysString": "已解除鎖定",
"WarningKeysLockedString": "!按鍵鎖定!"
"WarningKeysLockedString": "!按鍵鎖定!",
"WarningThermalRunaway":["Thermal","Runaway"],
"WarningThermalRunaway":["Thermal","Runaway"]
},
"characters": {
"SettingRightChar": "右",

3
Translations/translations_def.js
View File

@@ -83,6 +83,9 @@ var def =
},
{
"id": "WarningKeysLockedString"
},
{
"id": "WarningThermalRunaway"
}
],
"characters": [

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

@@ -85,6 +85,7 @@ struct TranslationIndexTable {
uint16_t LockingKeysString;
uint16_t UnlockingKeysString;
uint16_t WarningKeysLockedString;
uint16_t WarningThermalRunaway;
uint16_t SettingRightChar;
uint16_t SettingLeftChar;

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

@@ -94,6 +94,9 @@
#define DETAILED_SOLDERING 0 // 0: Disable 1: Enable - Default 0
#define DETAILED_IDLE 0 // 0: Disable 1: Enable - Default 0
#define THERMAL_RUNAWAY_TIME_SEC 20
#define THERMAL_RUNAWAY_TEMP_C 20
#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

13
source/Core/Threads/GUIThread.cpp
View File

@@ -28,6 +28,7 @@ extern "C" {
// File local variables
extern uint32_t currentTempTargetDegC;
extern TickType_t lastMovementTime;
extern bool heaterThermalRunaway;
extern osThreadId GUITaskHandle;
extern osThreadId MOVTaskHandle;
extern osThreadId PIDTaskHandle;
@@ -62,7 +63,7 @@ void GUIDelay() {
// This limits the re-draw rate to the LCD and also lets the DMA run
// As the gui task can very easily fill this bus with transactions, which will
// prevent the movement detection from running
osDelay(50);
vTaskDelay(5 * TICKS_10MS);
}
void gui_drawTipTemp(bool symbol, const FontStyle font) {
// Draw tip temp handling unit conversion & tolerance near setpoint
@@ -608,7 +609,6 @@ static void gui_solderingMode(uint8_t jumpToSleep) {
}
}
OLED::refresh();
// Update the setpoints for the temperature
if (boostModeOn) {
if (systemSettings.temperatureInF)
@@ -645,6 +645,15 @@ static void gui_solderingMode(uint8_t jumpToSleep) {
} else {
setStatusLED(LED_HEATING);
}
// If we have tripped thermal runaway, turn off header and show warning
if (heaterThermalRunaway) {
currentTempTargetDegC = 0; // heaater control off
// TODO WARNING
warnUser(translatedString(Tr->WarningThermalRunaway), 10 * TICKS_SECOND);
heaterThermalRunaway = false;
return;
}
// slow down ui update rate
GUIDelay();
}

37
source/Core/Threads/PIDThread.cpp
View File

@@ -19,6 +19,7 @@ static TickType_t powerPulseDurationUnit = (5 * TICKS_100MS) / 2; // 250 ms
TaskHandle_t pidTaskNotification = NULL;
uint32_t currentTempTargetDegC = 0; // Current temperature target in C
int32_t powerSupplyWattageLimit = 0;
bool heaterThermalRunaway = false;
/* StartPIDTask function */
void startPIDTask(void const *argument __unused) {
/*
@@ -32,8 +33,10 @@ void startPIDTask(void const *argument __unused) {
history<int32_t, PID_TIM_HZ> tempError = {{0}, 0, 0};
currentTempTargetDegC = 0; // Force start with no output (off). If in sleep / soldering this will
// be over-ridden rapidly
pidTaskNotification = xTaskGetCurrentTaskHandle();
uint32_t PIDTempTarget = 0;
pidTaskNotification = xTaskGetCurrentTaskHandle();
uint32_t PIDTempTarget = 0;
uint16_t tipTempCRunawayTemp = 0;
TickType_t runawaylastChangeTime = 0;
#ifdef SLEW_LIMIT
int32_t x10WattsOutLast = 0;
#endif
@@ -91,6 +94,33 @@ void startPIDTask(void const *argument __unused) {
// and counters extra power if the iron is no longer losing temp.
// basically: temp - lastTemp
// Unfortunately, our temp signal is too noisy to really help.
// Check for thermal runaway, where it has been x seconds with negligible (y) temp rise
// While trying to actively heat
if ((tError > THERMAL_RUNAWAY_TEMP_C)) {
// Temp error is high
int16_t delta = (int16_t)currentTipTempInC - (int16_t)tipTempCRunawayTemp;
if (delta < 0) {
delta = -delta;
}
if (delta > THERMAL_RUNAWAY_TEMP_C) {
// We have heated up more than the threshold, reset the timer
tipTempCRunawayTemp = currentTipTempInC;
runawaylastChangeTime = xTaskGetTickCount();
} else {
if ((xTaskGetTickCount() - runawaylastChangeTime) > (THERMAL_RUNAWAY_TIME_SEC * TICKS_SECOND)) {
// It has taken too long to rise
heaterThermalRunaway = true;
}
}
} else {
tipTempCRunawayTemp = currentTipTempInC;
runawaylastChangeTime = xTaskGetTickCount();
}
} else {
tipTempCRunawayTemp = currentTipTempInC;
runawaylastChangeTime = xTaskGetTickCount();
}
// If the user turns on the option of using an occasional pulse to keep the power bank on
if (systemSettings.KeepAwakePulse) {
@@ -111,6 +141,9 @@ void startPIDTask(void const *argument __unused) {
if (getTipRawTemp(0) > (0x7FFF - 32)) {
x10WattsOut = 0;
}
if (heaterThermalRunaway) {
x10WattsOut = 0;
}
if (systemSettings.powerLimit && x10WattsOut > (systemSettings.powerLimit * 10)) {
x10WattsOut = systemSettings.powerLimit * 10;
}