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

Fix screen blink

Browse Source 
Fixes #56
This commit is contained in:
Ben V. Brown
2017-08-10 17:34:01 +10:00
parent 6c56f98928
commit f0e1498e92
3 changed files with 15 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
workspace/ts100/src/Main.c
View File

@@ -76,6 +76,7 @@ void setup() {
resetSettings(); resetSettings();
} }
} }
Start_Watchdog(5000); //start the system watch dog as 5 second timeout Start_Watchdog(5000); //start the system watch dog as 5 second timeout
} }

42
workspace/ts100/src/Modes.c
View File

@@ -297,18 +297,7 @@ void ProcessUI() {
//Either button was pushed //Either button was pushed
operatingMode = STARTUP; operatingMode = STARTUP;
} }
if (systemSettings.sensitivity) {
if (millis() - getLastMovement()
> (systemSettings.ShutdownTime * 60000)) {
if ((millis() - getLastButtonPress()
> systemSettings.ShutdownTime * 60000)) {
Oled_DisplayOff();
}
} else {
Oled_DisplayOn();
}
} else
Oled_DisplayOn();
} }
break; break;
case UVLOWARN: case UVLOWARN:
@@ -430,25 +419,22 @@ void DrawUI() {
static uint16_t lastSolderingDrawnTemp2 = 0; static uint16_t lastSolderingDrawnTemp2 = 0;
static uint8_t settingsLongTestScrollPos = 0; static uint8_t settingsLongTestScrollPos = 0;
uint16_t temp = readIronTemp(0, 0, 0xFFFF); uint16_t temp = readIronTemp(0, 0, 0xFFFF);
if (millis() - getLastMovement() > (5 * 60 * 1000) if (systemSettings.sensitivity) {
&& (millis() - getLastButtonPress() > (5 * 60 * 1000))) {
//OLED off
Oled_DisplayOff();
} else {
Oled_DisplayOn();
}
switch (operatingMode) {
case STARTUP:
//We are chilling in the idle mode
//Check if movement in the last 5 minutes , if not sleep OLED
if (millis() - getLastMovement() > (5 * 60 * 1000) if (millis() - getLastMovement() > (5 * 60 * 1000)
&& (millis() - getLastButtonPress() > (5 * 60 * 1000))) { && (millis() - getLastButtonPress() > (5 * 60 * 1000))) {
//OLED off //OLED off
Oled_DisplayOff(); Oled_DisplayOff();
} else { } else {
Oled_DisplayOn(); Oled_DisplayOn();
OLED_DrawIDLELogo(); //Draw the icons for prompting the user
} }
}
switch (operatingMode) {
case STARTUP:
//We are chilling in the idle mode
//Check if movement in the last 5 minutes , if not sleep OLED
OLED_DrawIDLELogo(); //Draw the icons for prompting the user
break; break;
case SOLDERING: case SOLDERING:
//The user is soldering //The user is soldering
@@ -737,14 +723,6 @@ void DrawUI() {
OLED_DrawString("SLP ", 4); OLED_DrawString("SLP ", 4);
drawTemp(temp, 4, systemSettings.temperatureRounding); drawTemp(temp, 4, systemSettings.temperatureRounding);
if (millis() - getLastMovement() > (10 * 60 * 1000)
&& (millis() - getLastButtonPress() > (10 * 60 * 1000))) {
//OLED off
Oled_DisplayOff();
} else {
Oled_DisplayOn();
}
break; break;
case COOLING: case COOLING:
//We are warning the user the tip is cooling //We are warning the user the tip is cooling

6
workspace/ts100/src/Strings.c
View File

@@ -46,10 +46,12 @@ const char* SettingsLongNames[14] =
/*These are all the help text for all the settings.*/ /*These are all the help text for all the settings.*/
/*All must start with 6 spaces so they come on screen nicely.*/ /*All must start with 6 spaces so they come on screen nicely.*/
" Fuente de energ<72>a. Ajusta el l<>mite inferior de voltaje. <DC 10V> <S 3.3V por celda>", " Fuente de energ<72>a. Ajusta el l<>mite inferior de voltaje. <DC 10V> <S 3.3V por celda>",
" Temperatura en reposo. <C>", " Tiempo hasta activar reposo. <Minutos>", " Temperatura en reposo. <C>",
" Tiempo hasta activar reposo. <Minutos>",
" Tiempo hasta apagado. <Minutos>", " Tiempo hasta apagado. <Minutos>",
" Sensibilidad del movimiento. <0. Apagado, 1. El menos sensible, 9. El m<>s sensible>", " Sensibilidad del movimiento. <0. Apagado, 1. El menos sensible, 9. El m<>s sensible>",
" Unidad de temperatura.", " Redondeo de la temperatura.", " Unidad de temperatura.",
" Redondeo de la temperatura.",
" Tasa de actualizaci<63>n de la temperatura.", " Tasa de actualizaci<63>n de la temperatura.",
" Orientaci<63>n de la pantalla <A. Autom<6F>tico, I. Mano izquierda, D. Mano derecha>", " Orientaci<63>n de la pantalla <A. Autom<6F>tico, I. Mano izquierda, D. Mano derecha>",
" Activar el bot<6F>n \"Boost\" en modo soldadura.", " Activar el bot<6F>n \"Boost\" en modo soldadura.",