Skip to content

Commit

Permalink
Bring in translations for the final 2.0 prep
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ralim
Ralim committed Nov 4, 2017
1 parent afa8257 commit 7cc0fd7
Show file tree
Hide file tree
Showing 3 changed files with 236 additions and 41 deletions.
7 changes: 6 additions & 1 deletion workspace/TS100/inc/Translation.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ extern const char SettingLeftChar;
extern const char SettingAutoChar;

#define LANG_EN

//#define LANG_RU
//#define LANG_ES
//#define LANG_SE
//#define LANG_IT
//#define LANG_FR
//#define LANG_DE

#endif /* TRANSLATION_H_ */
243 changes: 209 additions & 34 deletions workspace/TS100/src/Translation.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,56 @@
#include "Translation.h"

#ifdef LANG_EN
const char* SettingsLongNames[16] = {
/*These are all the help text for all the settings.*/
/*No requirements on spacing or length*/
"Power source. Sets cutoff voltage. <DC 10V> <S 3.3V per cell>", //Power Source
"Sleep Temperature <C>", //Sleep Temp
"Sleep Timeout <Minutes/Seconds>", //Sleep Timeout
"Shutdown Timeout <Minutes>", //Shutdown Time
"Motion Sensitivity <0.Off 1.least sensitive 9.most sensitive>", //Motion Sensitivity
"Temperature Unit <C=Celsius F=Fahrenheit>", //Temp Unit
"Display detailed information in a smaller font on the idle screen.", //Detailed Information
"Display Orientation <A. Automatic L. Left Handed R. Right Handed>", //Orientation
"Enable front key enters boost mode 450C mode when soldering", //Boost enable
"Temperature when in \"boost\" mode", //Boost Temp
"Automatically starts the iron into soldering on power up. T=Soldering, S= Sleep mode,F=Off", //Auto start
"Blink the temperature on the cooling screen while the tip is still hot.", //Cooling Blink
"Calibrate tip offset.", //Calibrate Tip
"Reset all settings", //Reset Settings
"VIN Calibration. Buttons adjust, long press to exit", //VIN Cal
"Display detailed information while soldering", //ADV SLD
};

const char* SettingsCalibrationWarning = "Please ensure the tip is at room temperature before continuing!";
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 = "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';
#endif
#ifdef LANG_RU
const char* SettingsLongNames[16] = {
/*These are all the help text for all the settings.*/
/*No requirements on spacing or length*/
"Power source. Sets cutoff voltage. <DC 10V> <S 3.3V per cell>", //Power Source
"Sleep Temperature <C>",//Sleep Temp
"Sleep Timeout <Minutes/Seconds>",//Sleep Timeout
"Shutdown Timeout <Minutes>",//Shutdown Time
"Motion Sensitivity <0.Off 1.least sensitive 9.most sensitive>",//Motion Sensitivity
"Temperature Unit <C=Celsius F=Fahrenheit>",//Temp Unit
"Источник питания. Установка напряжения отключения. <DC 10V> <S 3.3 V на батарею>", //Cell count
"Температура Сна <С>",//Sleep Temp
"Переход в режим Сна <Минуты>",//Sleep timeout
"Переходит в режим ожидания <Минуты>",//Shutdown timeout
"Акселерометр <0. Выкл. 1. мин. чувствительный 9. макс. чувствительный>",//Sensitivity
"В чем измерять температуру",//Temp Unit
"Display detailed information in a smaller font on the idle screen.",//Detailed Information
"Display Orientation <A. Automatic L. Left Handed R. Right Handed>",//Orientation
"Enable front key enters boost mode 450C mode when soldering",//Boost enable
"Temperature when in \"boost\" mode",//Boost Temp
"Automatically starts the iron into soldering on power up. T=Soldering, S= Sleep mode,F=Off",//Auto start
"Blink the temperature on the cooling screen while the tip is still hot.",//Cooling Blink
"Ориентация Дисплея <A. Автоматический L. Левая Рука R. Правая Рука>",//Orientation
"Активация кнопки A для Турбо режима до 450С при пайке ",//Boost enable
"Установка температуры для Турбо режима",//Boost temp
"Автоматический запуск паяльника при включении питания. T=Нагрев, S= Режим Сна,F=Выкл.",//Auto start
"Мигает температура на экране охлаждения, пока жало остается горячим."//Cooling blink
"Calibrate tip offset.",//Calibrate Tip
"Reset all settings",//Reset Settings
"VIN Calibration. Buttons adjust, long press to exit",//VIN Cal
Expand All @@ -41,33 +76,173 @@ const char SettingRightChar = 'R';
const char SettingLeftChar = 'L';
const char SettingAutoChar = 'A';
#endif
#ifdef LANG_RU
#ifdef LANG_ES
const char* SettingsLongNames[16] = {
/*These are all the help text for all the settings.*/
/*No requirements on spacing or length*/
"Источник питания. Установка напряжения отключения. <DC 10V> <S 3.3 V на батарею>", //Cell count
"Температура Сна <С>", //Sleep Temp
"Переход в режим Сна <Минуты>", //Sleep timeout
"Переходит в режим ожидания <Минуты>", //Shutdown timeout
"Акселерометр <0. Выкл. 1. мин. чувствительный 9. макс. чувствительный>", //Sensitivity
"В чем измерять температуру", //Temp Unit
"Display detailed information in a smaller font on the idle screen.", //Detailed Information
"Ориентация Дисплея <A. Автоматический L. Левая Рука R. Правая Рука>", //Orientation
"Активация кнопки A для Турбо режима до 450С при пайке ", //Boost enable
"Установка температуры для Турбо режима", //Boost temp
"Автоматический запуск паяльника при включении питания. T=Нагрев, S= Режим Сна,F=Выкл.", //Auto start
"Мигает температура на экране охлаждения, пока жало остается горячим." //Cooling blink
"Calibrate tip offset.",//Calibrate Tip
"Reset all settings", //Reset Settings
"VIN Calibration. Buttons adjust, long press to exit", //VIN Cal
"Display detailed information while soldering", //ADV SLD
};
/*These are all the help text for all the settings.*/
/*No requirements on spacing or length*/
"Fuente de energía. Ajusta el límite inferior de voltaje. <DC=10V S=3.3V por celda>",
"Temperatura en reposo. <C>",
"Tiempo hasta activar reposo. <Minutos>",
"Tiempo hasta apagado. <Minutos>",
"Sensibilidad del movimiento. <0=Apagado 1=El menos sensible 9=El más sensible>",
"Unidad de temperatura.",
"Display detailed information in a smaller font on the idle screen.", //Detailed Information
"Orientación de la pantalla <A=Automático I=Mano izquierda D=Mano derecha>",
"Activar el botón \"Boost\" en modo soldadura.",
"Temperatura en modo \"Boost\". <C>",
"Iniciar modo soldadura en el encendido. <V=Sí S=Modo reposo F=No>",
"Parpadea la temperatura en el enfriamiento si la punta sigue caliente."
"Calibrate tip offset.",//Calibrate Tip
"Reset all settings",//Reset Settings
"VIN Calibration. Buttons adjust, long press to exit",//VIN Cal
"Display detailed information while soldering",//ADV SLD
};

const char* SettingsCalibrationWarning = "Please ensure the tip is at room temperature before continuing!";
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 = "HOT!"; //Must be <= 4 chars
const char* SleepingSimpleString = "Zzzz";// Must be <= 4 chars
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';
#endif
#ifdef LANG_SE
const char* SettingsLongNames[16] = {
/*These are all the help text for all the settings.*/
/*No requirements on spacing or length*/
"Источник питания. Установка напряжения отключения. <DC 10V> <S 3.3 V на батарею>", //Cell count
"Температура Сна <С>",//Sleep Temp
"Переход в режим Сна <Минуты>",//Sleep timeout
"Переходит в режим ожидания <Минуты>",//Shutdown timeout
"Акселерометр <0. Выкл. 1. мин. чувствительный 9. макс. чувствительный>",//Sensitivity
"В чем измерять температуру",//Temp Unit
"Display detailed information in a smaller font on the idle screen.",//Detailed Information
"Ориентация Дисплея <A. Автоматический L. Левая Рука R. Правая Рука>",//Orientation
"Активация кнопки A для Турбо режима до 450С при пайке ",//Boost enable
"Установка температуры для Турбо режима",//Boost temp
"Автоматический запуск паяльника при включении питания. T=Нагрев, S= Режим Сна,F=Выкл.",//Auto start
"Мигает температура на экране охлаждения, пока жало остается горячим."//Cooling blink
"Calibrate tip offset.",//Calibrate Tip
"Reset all settings",//Reset Settings
"VIN Calibration. Buttons adjust, long press to exit",//VIN Cal
"Display detailed information while soldering",//ADV SLD
};

const char* SettingsCalibrationWarning = "Please ensure the tip is at room temperature before continuing!";
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 = "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';
#endif
#ifdef LANG_IT
const char* SettingsLongNames[16] = {
/*These are all the help text for all the settings.*/
/*No requirements on spacing or length*/
"Sorgente di alimentazione. Imposta il limite inferiore di tensione. <DC=10V S=3.3V per cella>",
"Temperatura modalità riposo <C>",
"Timeout per passaggio a modalità riposo <Minuti>",
"Timeout spegnimento <Minuti>",
"Sensibilità al movimento <0=Spento 1=Sensibilità minima 9=Sensibilità massima>",
"Unità di temperatura",
"Display detailed information in a smaller font on the idle screen.", //Detailed Information
"Orientamento del display <A=Automatico S=Sinistrorso D=Destrorso>",
"Il tasto anteriore abilita modalità \"boost\" fino a 450C durante la saldatura",
"Temperatura in modalità \"boost\" <C>",
"Avvia automaticamente il saldatore quando viene alimentato. <S=Modalità saldatura R=Modalità riposo N=Spento>",
"Durante lo spegnimento la temperatura lampeggia sul display finché la punta è calda."
"Calibrate tip offset.",//Calibrate Tip
"Reset all settings",//Reset Settings
"VIN Calibration. Buttons adjust, long press to exit",//VIN Cal
"Display detailed information while soldering",//ADV SLD
};

const char* SettingsCalibrationWarning = "Please ensure the tip is at room temperature before continuing!";
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 = "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';
#endif
#ifdef LANG_FR
const char* SettingsLongNames[16] = {
/*These are all the help text for all the settings.*/
/*No requirements on spacing or length*/
"Type d\'alimentation. Regle la tension de coupure. <DC=10V S=3.3V par cellules>",
"Temperature en veille. <C>",
"Temps avant mise en veille. <Minutes>",
"Temps avant extinction. <Minutes>",
"Sensibilitee du capteur de mouvement. <0=Inactif 1=Peu sensible 9=Tres sensible>",
"Unitee de temperature.",
"Display detailed information in a smaller font on the idle screen.", //Detailed Information
"Orientation de l\'affichage. <A=Automatique G=Gaucher D=Droitier>",
"Active le mode \"Boost\" 450C sur le bouton de devant pendant la soudure.",
"Temperature du mode \"Boost\". <C>",
"Demarre automatiquement la soudure a l\'allumage. <A=Active, V=Mode Veille, D=Desactive>",
"Fait clignotter la temperature pendant la phase de refroidissement quand la panne est chaude."
"Calibrate tip offset.",//Calibrate Tip
"Reset all settings",//Reset Settings
"VIN Calibration. Buttons adjust, long press to exit",//VIN Cal
"Display detailed information while soldering",//ADV SLD
};

const char* SettingsCalibrationWarning = "Please ensure the tip is at room temperature before continuing!";
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 = "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';
#endif
#ifdef LANG_DE
const char* SettingsLongNames[16] = {
/*These are all the help text for all the settings.*/
/*No requirements on spacing or length*/
"Stromversorgung. Setzt Abschaltspannung <DC=10V S=3.3V pro Zelle>",
"Ruhetemperatur <C>",
"Ruhemodus nach <Minuten>",
"Abschaltzeit <Minuten>",
"Bewegungsempfindlichkeit <0=Aus 1=Minimal 9=Maximal>",
"Temperatur Einheit",
"Display detailed information in a smaller font on the idle screen.", //Detailed Information
"Anzeigerichtung <A=Auto L=Linkshändig R=Rechtshändig>",
"Fronttaste für Temperaturboost einschalten",
"Temperatur im \"boost\"-Modus <C>",
"Automatischer Start beim Einschalten. <J=Löttemp R=Ruhemodus N=Aus>",
"Temperatur blinkt beim Abkühlen, solange noch heiß."
"Calibrate tip offset.",//Calibrate Tip
"Reset all settings",//Reset Settings
"VIN Calibration. Buttons adjust, long press to exit",//VIN Cal
"Display detailed information while soldering",//ADV SLD
};

const char* SettingsCalibrationWarning = "Please ensure the tip is at room temperature before continuing!";
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 = "HOT!";//Must be <= 4 chars
const char* WarningAdvancedString = "WARNING! TIP HOT!";

const char SettingTrueChar = 'T';
Expand Down
27 changes: 21 additions & 6 deletions workspace/TS100/src/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,21 @@ int main(void) {
void GUIDelay() {
osDelay(50); //20Hz
}
void gui_drawTipTemp() {
//Draw tip temp handling unit conversion & tolerance near setpoint
uint16_t Temp = getTipRawTemp(0);

if (systemSettings.temperatureInF)
Temp = tipMeasurementToF(Temp);
else
Temp = tipMeasurementToC(Temp);
//Round if nearby
if (abs(Temp - systemSettings.SolderingTemp) < 3)
Temp = systemSettings.SolderingTemp;

lcd.printNumber(Temp, 3); //Draw the tip temp out finally

}
ButtonState getButtonState() {
/*
* Read in the buttons and then determine if a state change needs to occur
Expand Down Expand Up @@ -551,10 +566,10 @@ static void gui_solderingMode() {

lcd.drawChar(' '); // Space out gap between battery <-> temp
if (systemSettings.temperatureInF) {
lcd.printNumber(tipMeasurementToF(tipTemp), 3); //Draw current tip temp
gui_drawTipTemp(); //Draw current tip temp
lcd.drawSymbol(0); //deg F
} else {
lcd.printNumber(tipMeasurementToC(tipTemp), 3); //Draw current tip temp
gui_drawTipTemp(); //Draw current tip temp
lcd.drawSymbol(1); //deg C
}

Expand Down Expand Up @@ -585,10 +600,10 @@ static void gui_solderingMode() {
lcd.drawChar(' ');

if (systemSettings.temperatureInF) {
lcd.printNumber(tipMeasurementToF(tipTemp), 3); //Draw current tip temp
gui_drawTipTemp(); //Draw current tip temp
lcd.drawSymbol(0); //deg F
} else {
lcd.printNumber(tipMeasurementToC(tipTemp), 3); //Draw current tip temp
gui_drawTipTemp(); //Draw current tip temp
lcd.drawSymbol(1); //deg C
}

Expand Down Expand Up @@ -689,7 +704,7 @@ void startGUITask(void const * argument) {
lcd.clearScreen(); //Ensure the buffer starts clean
lcd.setCursor(0, 0); //Position the cursor at the 0,0 (top left)
lcd.setFont(1); //small font
lcd.print((char*) "V2.00a6"); //Print version number
lcd.print((char*) "V2.00"); //Print version number
lcd.setCursor(0, 8); //second line
lcd.print(__DATE__); //print the compile date
lcd.refresh();
Expand Down Expand Up @@ -870,7 +885,7 @@ void startMOVTask(void const * argument) {
#endif

for (;;) {
int32_t threshold = 800 + (9 * 200);
int32_t threshold = 1200 + (9 * 200);
threshold -= systemSettings.sensitivity * 200; // 200 is the step size
accel.getAxisReadings(&tx, &ty, &tz);

Expand Down

0 comments on commit 7cc0fd7

Please sign in to comment.