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

Fix Menu not handling some languages

Browse Source 
Should close #125
This commit is contained in:
Ben V. Brown
2017-12-12 11:31:22 +11:00
parent b0e20b9e2f
commit 17e7d92463
3 changed files with 127 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,12 +23,12 @@ extern const char SettingRightChar;
extern const char SettingLeftChar; extern const char SettingLeftChar;
extern const char SettingAutoChar; extern const char SettingAutoChar;
#define LANG_EN //#define LANG_EN
//#define LANG_RU //#define LANG_RU
//#define LANG_ES //#define LANG_ES
//#define LANG_SE //#define LANG_SE
//#define LANG_IT //#define LANG_IT
//#define LANG_FR #define LANG_FR
//#define LANG_DE //#define LANG_DE
//#define LANG_CS_CZ //#define LANG_CS_CZ

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

@@ -7,7 +7,8 @@
#include "Translation.h" #include "Translation.h"
#ifdef LANG_EN #ifdef LANG_EN
const char* SettingsLongNames[16] = { const char* SettingsLongNames[16] =
{
/*These are all the help text for all the settings.*/ /*These are all the help text for all the settings.*/
/*No requirements on spacing or length*/ /*No requirements on spacing or length*/
"Power source. Sets cutoff voltage. <DC 10V> <S 3.3V per cell>", //Power Source "Power source. Sets cutoff voltage. <DC 10V> <S 3.3V per cell>", //Power Source
@@ -28,7 +29,8 @@ const char* SettingsLongNames[16] = {
"Display detailed information while soldering", //ADV SLD "Display detailed information while soldering", //ADV SLD
}; };
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* SleepingSimpleString = "Zzzz"; // Must be <= 4 chars
const char* SleepingAdvancedString = "Sleeping..."; // <=17 chars const char* SleepingAdvancedString = "Sleeping..."; // <=17 chars

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

@@ -314,8 +314,7 @@ static void gui_settingsMenu() {
settingsResetRequest = false; settingsResetRequest = false;
bool earlyExit = false; bool earlyExit = false;
uint32_t descriptionStart = 0; uint32_t descriptionStart = 0;
while ((settingsMenu[currentScreen].description != NULL) while ((settingsMenu[currentScreen].incrementHandler.func != NULL) && earlyExit == false) {
&& earlyExit == false) {
lcd.setFont(0); lcd.setFont(0);
lcd.clearScreen(); lcd.clearScreen();
lcd.setCursor(0, 0); lcd.setCursor(0, 0);