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

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

@@ -26,7 +26,7 @@ const char* SettingsLongNames[14] =
const char* TempCalStatus[3] = { "Cal Temp", "Cal OK ", "Cal Fail" }; //All fixed 8 chars 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* 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 SettingTrueChar = 'T';
const char SettingFalseChar = 'F'; const char SettingFalseChar = 'F';
const char SettingSleepChar = 'S'; 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* TempCalStatus[3] = {"CAL TEMP", "CAL OK ", "CAL FAIL"}; //All fixed 8 chars
const char* UVLOWarningString = "LOW VOLT";//Fixed width 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 SettingTrueChar = 'V';
const char SettingFalseChar = 'F'; const char SettingFalseChar = 'F';
const char SettingSleepChar = 'S'; const char SettingSleepChar = 'S';