diff --git a/workspace/TS100/inc/Font.h b/workspace/TS100/inc/Font.h index c22cc8fb..4a6fb48e 100644 --- a/workspace/TS100/inc/Font.h +++ b/workspace/TS100/inc/Font.h @@ -488,8 +488,10 @@ const uint8_t ExtraFontChars[] = { 0x00,0x00,0x38,0xC4,0x00,0x38,0xC4,0x00,0x38,0xC4,0x00,0x00,0x00,0x38,0x3A,0x39,0x38,0x3A,0x39,0x38,0x3A,0x39,0x10,0x10, // heating 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x38,0x38,0x38,0x38,0x38,0x38,0x38,0x38,0x10,0x10, // cooling - 0x00,0x60,0xE0,0xFE,0xE0,0xE0,0xE0,0xE0,0xFE,0xE0,0x60,0x00,0x00,0x00,0x00,0x01,0x03,0xFF,0xFF,0x03,0x01,0x00,0x00,0x00 + 0x00,0x60,0xE0,0xFE,0xE0,0xE0,0xE0,0xE0,0xFE,0xE0,0x60,0x00,0x00,0x00,0x00,0x01,0x03,0xFF,0xFF,0x03,0x01,0x00,0x00,0x00, // AC + 0xE0,0xF0,0x98,0x18,0x18,0x18,0x18,0xD8,0x78,0x38,0xFC,0xE6,0x1F,0x3F,0x61,0x63,0x66,0x6C,0x67,0x61,0x60,0x60,0x3F,0x1F, // checkbox on + 0xE0,0xF0,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0xF0,0xE0,0x1F,0x3F,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x3F,0x1F // checkbox off /* 0x00,0x00,0x00,0x80,0x80,0xFE,0xFF,0x83,0x87,0x06,0x00,0x00,0x00,0x00,0x30,0x70,0x60,0x7F,0x3F,0x00,0x00,0x00,0x00,0x00, // Function? diff --git a/workspace/TS100/inc/OLED.hpp b/workspace/TS100/inc/OLED.hpp index 71a736e3..c1f6ee95 100644 --- a/workspace/TS100/inc/OLED.hpp +++ b/workspace/TS100/inc/OLED.hpp @@ -41,6 +41,7 @@ public: // Draws a number at the current cursor location void clearScreen(); // Clears the buffer void drawBattery(uint8_t state); // Draws the battery level symbol + void drawCheckbox(bool state); // Draws a checkbox void drawSymbol(uint8_t symbolID);//Used for drawing symbols of a predictable width void drawArea(int16_t x, int8_t y, uint8_t wide, uint8_t height, const uint8_t* ptr); diff --git a/workspace/TS100/src/OLED.cpp b/workspace/TS100/src/OLED.cpp index 8aa34268..fd5bb322 100644 --- a/workspace/TS100/src/OLED.cpp +++ b/workspace/TS100/src/OLED.cpp @@ -272,6 +272,9 @@ void OLED::drawBattery(uint8_t state) { state = 10; drawSymbol(3 + state); } +void OLED::drawCheckbox(bool state) { + drawSymbol((state) ? 17 : 18); +} void OLED::drawSymbol(uint8_t symbolID) { //draw a symbol to the current cursor location setFont(2); diff --git a/workspace/TS100/src/Translation.c b/workspace/TS100/src/Translation.c index a6525d2b..38a47c23 100644 --- a/workspace/TS100/src/Translation.c +++ b/workspace/TS100/src/Translation.c @@ -79,8 +79,6 @@ const char* SleepingAdvancedString = "Sleeping..."; // <=17 chars const char* WarningSimpleString = "HOT!"; // Must be <= 4 chars const char* WarningAdvancedString = "WARNING! TIP HOT!"; -const char SettingTrueChar = 'T'; -const char SettingFalseChar = 'F'; const char SettingRightChar = 'R'; const char SettingLeftChar = 'L'; const char SettingAutoChar = 'A'; @@ -136,8 +134,6 @@ const char* SleepingAdvancedString = "Ожидание..."; // <=17 chars const char* WarningSimpleString = " АЙ!"; // Must be <= 4 chars const char* WarningAdvancedString = "ОСТОРОЖНО! ГОРЯЧО"; -const char SettingTrueChar = '+'; -const char SettingFalseChar = '-'; /* * #TODO change support for multibyte constants here const char SettingRightChar = 'П'; @@ -199,8 +195,6 @@ const char* SleepingAdvancedString = "Sleeping..."; // <=17 chars const char* WarningSimpleString = "HOT!"; // Must be <= 4 chars const char* WarningAdvancedString = "WARNING! TIP HOT!"; -const char SettingTrueChar = 'T'; -const char SettingFalseChar = 'F'; const char SettingRightChar = 'R'; const char SettingLeftChar = 'L'; const char SettingAutoChar = 'A'; @@ -256,8 +250,6 @@ const char* SleepingAdvancedString = "Sleeping..."; // <=17 chars const char* WarningSimpleString = "HOT!"; // Must be <= 4 chars const char* WarningAdvancedString = "WARNING! TIP HOT!"; -const char SettingTrueChar = 'T'; -const char SettingFalseChar = 'F'; const char SettingRightChar = 'R'; const char SettingLeftChar = 'L'; const char SettingAutoChar = 'A'; @@ -313,8 +305,6 @@ const char* SleepingAdvancedString = "Standby"; // <=17 chars const char* WarningSimpleString = "HOT!"; // Must be <= 4 chars const char* WarningAdvancedString = "ATTENZIONE! PUNTA CALDA!"; -const char SettingTrueChar = 'A'; -const char SettingFalseChar = 'D'; const char SettingRightChar = 'D'; const char SettingLeftChar = 'S'; const char SettingAutoChar = 'A'; @@ -370,8 +360,6 @@ const char* SleepingAdvancedString = "En veille..."; // <=17 chars const char* WarningSimpleString = "HOT!"; // Must be <= 4 chars const char* WarningAdvancedString = "ATTENTION! PANNE CHAUDE!"; -const char SettingTrueChar = 'V'; -const char SettingFalseChar = 'F'; const char SettingRightChar = 'D'; const char SettingLeftChar = 'G'; const char SettingAutoChar = 'A'; @@ -427,8 +415,6 @@ const char* SleepingAdvancedString = "Ruhemodus..."; // <=17 chars const char* WarningSimpleString = "HEIß"; // Must be <= 4 chars const char* WarningAdvancedString = "Achtung! Spitze Heiß!"; -const char SettingTrueChar = 'J'; -const char SettingFalseChar = 'N'; const char SettingRightChar = 'R'; const char SettingLeftChar = 'L'; const char SettingAutoChar = 'A'; @@ -484,8 +470,6 @@ const char* SleepingAdvancedString = "Kludovy rezim..."; // <=17 chars const char* WarningSimpleString = "HOT!"; // Must be <= 4 chars const char* WarningAdvancedString = "Pozor! Hrot je horuci!"; -const char SettingTrueChar = 'T'; -const char SettingFalseChar = 'F'; const char SettingRightChar = 'R'; const char SettingLeftChar = 'L'; const char SettingAutoChar = 'A'; @@ -541,8 +525,6 @@ const char* SleepingAdvancedString = "Uyuyor..."; // <=17 chars const char* WarningSimpleString = "HOT!"; // Must be <= 4 chars const char* WarningAdvancedString = "UYARI! UÇ SICAK!"; -const char SettingTrueChar = 'T'; -const char SettingFalseChar = 'F'; const char SettingRightChar = 'R'; const char SettingLeftChar = 'L'; const char SettingAutoChar = 'A'; @@ -598,8 +580,6 @@ const char* SleepingAdvancedString = "Spavanje..."; // <=17 chars const char* WarningSimpleString = "VRUĆ"; // Must be <= 4 chars const char* WarningAdvancedString = "OPREZ! Vršak je vruć!"; -const char SettingTrueChar = '+'; -const char SettingFalseChar = '-'; const char SettingRightChar = 'D'; const char SettingLeftChar = 'L'; const char SettingAutoChar = 'A'; @@ -655,8 +635,6 @@ const char* SleepingAdvancedString = "Rezim spanku..."; // <=17 chars const char* WarningSimpleString = "HOT!"; // Must be <= 4 chars const char* WarningAdvancedString = "!! HORKY HROT !!"; // <= 16 chars -const char SettingTrueChar = 'Z'; -const char SettingFalseChar = 'V'; const char SettingRightChar = 'P'; const char SettingLeftChar = 'L'; const char SettingAutoChar = 'A'; @@ -712,8 +690,6 @@ const char* SleepingAdvancedString = "Alvás..."; // <=17 chars const char* WarningSimpleString = "HOT!"; // Must be <= 4 chars const char* WarningAdvancedString = "FIGYELEM! FORRÓ HEGY!"; -const char SettingTrueChar = 'T'; -const char SettingFalseChar = 'F'; const char SettingRightChar = 'R'; const char SettingLeftChar = 'L'; const char SettingAutoChar = 'A'; @@ -769,8 +745,6 @@ const char* SleepingAdvancedString = "Dvale..."; // <=17 chars const char* WarningSimpleString = "Varm"; // Must be <= 4 chars const char* WarningAdvancedString = "ADVARSEL! VARM LODDESPIDS!"; -const char SettingTrueChar = 'j'; -const char SettingFalseChar = 'N'; const char SettingRightChar = 'H'; const char SettingLeftChar = 'V'; const char SettingAutoChar = 'A'; @@ -826,8 +800,6 @@ const char* SleepingAdvancedString = "Uspienie..."; // <=17 chars const char* WarningSimpleString = "HOT!"; // Must be <= 4 chars const char* WarningAdvancedString = "UWAGA! GORĄCA KOŃCÓWKA!"; -const char SettingTrueChar = 'T'; -const char SettingFalseChar = 'N'; const char SettingRightChar = 'P'; const char SettingLeftChar = 'L'; const char SettingAutoChar = 'A'; diff --git a/workspace/TS100/src/gui.cpp b/workspace/TS100/src/gui.cpp index 960cb088..c275039e 100644 --- a/workspace/TS100/src/gui.cpp +++ b/workspace/TS100/src/gui.cpp @@ -258,8 +258,7 @@ static void settings_setAdvancedSolderingScreens(void) { static void settings_displayAdvancedSolderingScreens(void) { printShortDescription(15, 7); - lcd.drawChar((systemSettings.detailedSoldering) ? SettingTrueChar - : SettingFalseChar); + lcd.drawCheckbox(systemSettings.detailedSoldering); } @@ -270,8 +269,7 @@ static void settings_setAdvancedIDLEScreens(void) { static void settings_displayAdvancedIDLEScreens(void) { printShortDescription(6, 7); - lcd.drawChar((systemSettings.detailedIDLE) ? SettingTrueChar - : SettingFalseChar); + lcd.drawCheckbox(systemSettings.detailedIDLE); } @@ -307,8 +305,7 @@ static void settings_setBoostModeEnabled(void) { static void settings_displayBoostModeEnabled(void) { printShortDescription(8, 7); - lcd.drawChar((systemSettings.boostModeEnabled) ? SettingTrueChar - : SettingFalseChar); + lcd.drawCheckbox(systemSettings.boostModeEnabled); } @@ -339,8 +336,7 @@ static void settings_setAutomaticStartMode(void) { static void settings_displayAutomaticStartMode(void) { printShortDescription(10, 7); - lcd.drawChar((systemSettings.autoStartMode) ? SettingTrueChar - : SettingFalseChar); + lcd.drawCheckbox(systemSettings.autoStartMode); } @@ -351,8 +347,7 @@ static void settings_setCoolingBlinkEnabled(void) { static void settings_displayCoolingBlinkEnabled(void) { printShortDescription(11, 7); - lcd.drawChar((systemSettings.coolingTempBlink) ? SettingTrueChar - : SettingFalseChar); + lcd.drawCheckbox(systemSettings.coolingTempBlink); }