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

Move watchdog resets to only be in PID

Browse Source
This commit is contained in:
Ben V. Brown
2018-01-26 12:30:09 +11:00
parent 93869b979e
commit 715be0b0b6
4 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
workspace/TS100/src/main.cpp
View File

@@ -166,13 +166,11 @@ static void waitForButtonPress() {
while (buttons) {
buttons = getButtonState();
GUIDelay();
HAL_IWDG_Refresh(&hiwdg);
lcd.refresh();
lcd.refresh();
}
while (!buttons) {
buttons = getButtonState();
GUIDelay();
HAL_IWDG_Refresh(&hiwdg);
lcd.refresh();
}
}
@@ -185,7 +183,6 @@ void waitForButtonPressOrTimeout(uint32_t timeout) {
if (buttons) return;
if (HAL_GetTick() > timeout) return;
GUIDelay();
HAL_IWDG_Refresh(&hiwdg);
}
}
@@ -372,7 +369,6 @@ static void gui_settingsMenu() {
lcd.refresh(); // update the LCD
osDelay(20);
HAL_IWDG_Refresh(&hiwdg);
}
saveSettings();
@@ -410,7 +406,7 @@ static int gui_showTipTempWarning() {
lcd.drawSymbol(1);
}
}
if (systemSettings.coolingTempBlink && tipTemp > 50) {
if (systemSettings.coolingTempBlink && tipTemp > 70) {
if (HAL_GetTick() % 500 < 250) lcd.clearScreen();
}
lcd.refresh();
@@ -420,9 +416,8 @@ static int gui_showTipTempWarning() {
else if (buttons == BUTTON_B_SHORT || buttons == BUTTON_BOTH)
return 0;
if (tipTemp < 30) return 0;
if (tipTemp < 50) return 0;//Exit the warning screen
HAL_IWDG_Refresh(&hiwdg);
GUIDelay();
}
}
@@ -493,7 +488,6 @@ static int gui_SolderingSleepingMode() {
}
lcd.refresh();
GUIDelay();
HAL_IWDG_Refresh(&hiwdg);
}
}
static void gui_solderingMode() {
@@ -643,7 +637,6 @@ static void gui_solderingMode() {
}
}
GUIDelay();
HAL_IWDG_Refresh(&hiwdg);
}
}
#define ACCELDEBUG 0
@@ -798,7 +791,6 @@ void startGUITask(void const *argument) {
lcd.refresh();
animationStep++;
HAL_IWDG_Refresh(&hiwdg);
GUIDelay();
}
}