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

Add in C/F in more places #94

Browse Source
This commit is contained in:
Ben V. Brown
2017-10-03 09:28:01 +11:00
parent bb75817e83
commit 8b8e2a1f10
3 changed files with 38 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
workspace/TS100/inc/Translation.h
View File

@@ -12,6 +12,11 @@ extern const char* SettingsLongNames[14];
extern const char* SettingsShortNames[14]; extern const char* SettingsShortNames[14];
extern const char* SettingsCalibrationWarning; extern const char* SettingsCalibrationWarning;
extern const char* UVLOWarningString; extern const char* UVLOWarningString;
extern const char* SleepingSimpleString;
extern const char* SleepingAdvancedString;
extern const char* WarningSimpleString;
extern const char* WarningAdvancedString;
extern const char SettingTrueChar; extern const char SettingTrueChar;
extern const char SettingFalseChar; extern const char SettingFalseChar;
extern const char SettingSleepChar; extern const char SettingSleepChar;

5
workspace/TS100/src/Translation.c
View File

@@ -38,6 +38,11 @@ const char* SettingsLongNames[14] = {
const char* SettingsCalibrationWarning = "Please ensure the tip is at room temperature before continuing!"; const char* SettingsCalibrationWarning = "Please ensure the tip is at room temperature before continuing!";
const char* UVLOWarningString = "LOW VOLT"; //Fixed width 8 chars const char* UVLOWarningString = "LOW VOLT"; //Fixed width 8 chars
const char* SleepingSimpleString = "ZZzz"; // Must be <= 4 chars
const char* SleepingAdvancedString = "Sleeping..."; // <=17 chars
const char* WarningSimpleString = "WARN"; //Must be <= 4 chars
const char* WarningAdvancedString = "WARNING! TIP HOT!";
const char SettingTrueChar = 'V'; const char SettingTrueChar = 'V';
const char SettingFalseChar = 'F'; const char SettingFalseChar = 'F';
const char SettingSleepChar = 'S'; const char SettingSleepChar = 'S';

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

@@ -361,16 +361,22 @@ static void gui_showTipTempWarning() {
lcd.setCursor(0, 0); lcd.setCursor(0, 0);
if (systemSettings.advancedScreens) { if (systemSettings.advancedScreens) {
lcd.setFont(1); lcd.setFont(1);
lcd.print("WARNING! TIP HOT!"); lcd.print(WarningAdvancedString);
lcd.setCursor(0, 8); lcd.setCursor(0, 8);
lcd.print("Tip Temp: "); lcd.print("Tip Temp: ");
lcd.printNumber(tipTemp, 3); lcd.printNumber(tipTemp, 3);
lcd.print("C"); if (systemSettings.temperatureInF)
lcd.print("F");
else
lcd.print("C");
} else { } else {
lcd.setFont(0); lcd.setFont(0);
lcd.print(WarningSimpleString);
lcd.print("WARN!");
lcd.printNumber(tipTemp, 3); lcd.printNumber(tipTemp, 3);
if (systemSettings.temperatureInF)
lcd.drawSymbol(0);
else
lcd.drawSymbol(1);
} }
if (systemSettings.coolingTempBlink) { if (systemSettings.coolingTempBlink) {
if (HAL_GetTick() % 500 < 250) if (HAL_GetTick() % 500 < 250)
@@ -380,8 +386,13 @@ static void gui_showTipTempWarning() {
ButtonState buttons = getButtonState(); ButtonState buttons = getButtonState();
if (buttons == BUTTON_B_SHORT || buttons == BUTTON_F_SHORT || buttons == BUTTON_BOTH) if (buttons == BUTTON_B_SHORT || buttons == BUTTON_F_SHORT || buttons == BUTTON_BOTH)
return; return;
if (tipTemp < 30) if (systemSettings.temperatureInF) {
return; if (tipTemp < 86)
return;
} else {
if (tipTemp < 30)
return;
}
HAL_IWDG_Refresh(&hiwdg); HAL_IWDG_Refresh(&hiwdg);
osDelay(200); osDelay(200);
} }
@@ -414,19 +425,27 @@ static int gui_SolderingSleepingMode() {
lcd.setCursor(0, 0); lcd.setCursor(0, 0);
if (systemSettings.advancedScreens) { if (systemSettings.advancedScreens) {
lcd.setFont(1); lcd.setFont(1);
lcd.print("Sleeping..."); lcd.print(SleepingAdvancedString);
lcd.setCursor(0, 8); lcd.setCursor(0, 8);
lcd.print("Tip:"); lcd.print("Tip:");
lcd.printNumber(tipTemp, 3); lcd.printNumber(tipTemp, 3);
if (systemSettings.temperatureInF)
lcd.print("F");
else
lcd.print("C");
lcd.print(" VIN:"); lcd.print(" VIN:");
lcd.printNumber(getInputVoltageX10() / 10, 2); lcd.printNumber(getInputVoltageX10() / 10, 2);
lcd.drawChar('.'); lcd.drawChar('.');
lcd.printNumber(getInputVoltageX10() % 10, 1); lcd.printNumber(getInputVoltageX10() % 10, 1);
lcd.print("V");
} else { } else {
lcd.setFont(0); lcd.setFont(0);
lcd.print("SLEEP"); lcd.print(SleepingSimpleString);
lcd.printNumber(tipTemp, 3); lcd.printNumber(tipTemp, 3);
if (systemSettings.temperatureInF)
lcd.drawSymbol(0);
else
lcd.drawSymbol(1);
} }
if (lastMovementTime) if (lastMovementTime)
if (((uint32_t) (HAL_GetTick() - lastMovementTime)) if (((uint32_t) (HAL_GetTick() - lastMovementTime))