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

Fix #62

Browse Source
This commit is contained in:
Ben V. Brown
2017-08-13 22:47:01 +10:00
parent 1d602bd9a1
commit bb174c7639
2 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -421,7 +421,8 @@ void DrawUI() {
uint16_t temp = readIronTemp(0, 0, 0xFFFF);
if (systemSettings.sensitivity) {
if (millis() - getLastMovement() > (5 * 60 * 1000)
&& (millis() - getLastButtonPress() > (5 * 60 * 1000))) {
&& (millis() - getLastButtonPress() > (5 * 60 * 1000))
&& (temp < 400)) {
//OLED off
Oled_DisplayOff();
} else {
@@ -434,7 +435,7 @@ void DrawUI() {
//Check if movement in the last 5 minutes , if not sleep OLED
OLED_DrawIDLELogo(); //Draw the icons for prompting the user
temp = readIronTemp(0, 1, 0xFFFF);//to update the internal filter buffer
break;
case SOLDERING:
//The user is soldering
@@ -733,10 +734,8 @@ void DrawUI() {
temp = readIronTemp(0, 1, 0xFFFF); //force temp re-reading
drawTemp(temp, 5, systemSettings.temperatureRounding);
if (temp > 300)
Oled_DisplayOn();
if (temp > 500 && systemSettings.coolingTempBlink
&& (millis() % 600) > 300)
&& (millis() % 1000) > 500)
OLED_InvertBuffer();
break;
case UVLOWARN:

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

@@ -21,12 +21,12 @@ const char* SettingsLongNames[14] =
" Enable front key enters boost mode 450C mode when soldering",
" Temperature when in \"boost\" mode",
" Changes the arrows to a power display when soldering",
" Automatically starts the iron into soldering on power up.T=Soldering, S= Sleep mode,F=Off",
" Automatically starts the iron into soldering on power up. T=Soldering, S= Sleep mode,F=Off",
" Blink the temperature on the cooling screen while the tip is still hot." };
const char* TempCalStatus[3] = { "Cal Temp", "Cal OK ", "Cal Fail" }; //All fixed 8 chars
const char* UVLOWarningString = "Low Volt"; //Fixed width 8 chars
const char* CoolingPromptString = "Cool "; //Fixed width 5 chars
const char* CoolingPromptString = "Off "; //Fixed width 5 chars
const char SettingTrueChar = 'T';
const char SettingFalseChar = 'F';
const char SettingSleepChar = 'S';
@@ -62,7 +62,7 @@ const char* SettingsLongNames[14] =
const char* TempCalStatus[3] = {"CAL TEMP", "CAL OK ", "CAL FAIL"}; //All fixed 8 chars
const char* UVLOWarningString = "LOW VOLT";//Fixed width 8 chars
const char* CoolingPromptString = "COOL ";//Fixed width 5 chars
const char* CoolingPromptString = "Cool ";//Fixed width 5 chars
const char SettingTrueChar = 'V';
const char SettingFalseChar = 'F';
const char SettingSleepChar = 'S';
@@ -77,25 +77,25 @@ const char SettingTempFChar = 'F';
#endif
#ifdef LANG_DE
const char* SettingsLongNames[14] =
{
/*These are all the help text for all the settings.*/
/*All must start with 6 spaces so they come on screen nicely.*/
" Stromversorgung. Setzt Abschaltspannung <DC 10V> <S 3.3V per cell>",
" Ruhetemperatur <C>", " Ruhemodus nach <Minuten>",
" Abschaltzeit <Minuten>",
" Bewegungsempfindlichkeit <0.Aus 1.Minimal 9.Maximal>",
" Temperatur Einheit", " Temperatur Runden",
" Temperaturanzeige Updaterate",
" Anzeigerichtung <A. Automatisch L. Linksh<73>ndig R. Rechtsh<73>ndig>",
" Fronttaste f<>r Temperaturboost einschalten",
" Temperatur im \"boost\"-Modus",
" <20>ndert \"Temperaturpfeile\" in Leistungsbalken",
" Automatischer Start beim Einschalten. J=L<>ttemp., R=Ruhemodus,N=Aus",
" Temperatur blinkt beim Abk<62>hlen, solange noch hei<65>." };
{
/*These are all the help text for all the settings.*/
/*All must start with 6 spaces so they come on screen nicely.*/
" Stromversorgung. Setzt Abschaltspannung <DC 10V> <S 3.3V per cell>",
" Ruhetemperatur <C>", " Ruhemodus nach <Minuten>",
" Abschaltzeit <Minuten>",
" Bewegungsempfindlichkeit <0.Aus 1.Minimal 9.Maximal>",
" Temperatur Einheit", " Temperatur Runden",
" Temperaturanzeige Updaterate",
" Anzeigerichtung <A. Automatisch L. Linksh<73>ndig R. Rechtsh<73>ndig>",
" Fronttaste f<>r Temperaturboost einschalten",
" Temperatur im \"boost\"-Modus",
" <20>ndert \"Temperaturpfeile\" in Leistungsbalken",
" Automatischer Start beim Einschalten. J=L<>ttemp., R=Ruhemodus,N=Aus",
" Temperatur blinkt beim Abk<62>hlen, solange noch hei<65>."};
const char* TempCalStatus[3] = { "Cal Temp", "Cal OK ", "Cal Fehl" }; //All fixed 8 chars
const char* UVLOWarningString = "V gering"; //Fixed width 8 chars
const char* CoolingPromptString = "Kalt "; //Fixed width 5 chars
const char* TempCalStatus[3] = {"Cal Temp", "Cal OK ", "Cal Fehl"}; //All fixed 8 chars
const char* UVLOWarningString = "V gering";//Fixed width 8 chars
const char* CoolingPromptString = "Kalt ";//Fixed width 5 chars
const char SettingTrueChar = 'J';
const char SettingFalseChar = 'N';
const char SettingSleepChar = 'R';