Patch to handle UTF slightly better.

Not perfect but working for now
Update strings to be more uniform
2025-02-26 07:53:55 +00:00 · 2017-09-17 12:21:25 +10:00 · 2017-09-17 11:50:44 +10:00 · 2017-09-09 23:13:21 +10:00
4 changed files with 228 additions and 150 deletions
--- a/workspace/ts100/inc/Oled.h
+++ b/workspace/ts100/inc/Oled.h
@@ -24,7 +24,7 @@ const u8* Data_Command(u8 len, const u8* ptr);
 void Clear_Screen(void); //Clear the screen
 /*Functions for writing to the screen*/
 void OLED_DrawString(const char* string, const uint8_t length);
-void OLED_DrawChar(char c, uint8_t x);
+void OLED_DrawChar(char c, uint8_t x,char preCursor);
 void OLED_DrawExtraFontChars(uint8_t id, uint8_t x);
 void OLED_DrawSymbolChar(uint8_t id, uint8_t x);
 void OLED_DrawWideChar(uint8_t id, uint8_t x);
--- a/workspace/ts100/src/Modes.c
+++ b/workspace/ts100/src/Modes.c
@@ -466,7 +466,7 @@ void DrawUI() {
 		if (StatusFlags == 8)
 			OLED_DrawExtraFontChars(2, 4);
 		else {
-			OLED_DrawChar(' ', 4);
+			OLED_DrawChar(' ', 4, 0);
 		}
 		//Draw in battery symbol if desired
 		if (systemSettings.cutoutSetting) {
@@ -521,12 +521,12 @@ void DrawUI() {
 	case TEMP_ADJ:
 		//We are prompting the user to change the temp so we draw the current setpoint temp
 		//With the nifty arrows
-		OLED_DrawChar(' ', 0);
-		OLED_DrawChar('<', 1);
+		OLED_DrawChar(' ', 0,0);
+		OLED_DrawChar('<', 1,0);
 		drawTemp(systemSettings.SolderingTemp, 2, 0);
-		OLED_DrawChar(' ', 5);
-		OLED_DrawChar(' ', 7);
-		OLED_DrawChar('>', 6);
+		OLED_DrawChar(' ', 5,0);
+		OLED_DrawChar(' ', 7,0);
+		OLED_DrawChar('>', 6,0);
 		break;
 	case SETTINGS:
 		//We are prompting the user the setting name
@@ -546,7 +546,7 @@ void DrawUI() {
 							+ settingsLongTestScrollPos, lengthLeft);
 			if (lengthLeft < 8)
 				for (uint8_t i = lengthLeft; i < 8; i++)
-					OLED_DrawChar(' ', i);
+					OLED_DrawChar(' ', i, 0);
 			if (millis() - lastOLEDDrawTime > 120) {
 				settingsLongTestScrollPos++;
 				lastOLEDDrawTime = millis();
@@ -558,12 +558,12 @@ void DrawUI() {
 				OLED_DrawString(SettingsShortNames[UVCO], 6);
 				if (systemSettings.cutoutSetting == 0) {
 					//DC
-					OLED_DrawChar('D', 6);
-					OLED_DrawChar('C', 7);
+					OLED_DrawChar('D', 6, 0);
+					OLED_DrawChar('C', 7, 0);
 				} else {
 					//S count
-					OLED_DrawChar('2' + systemSettings.cutoutSetting, 6);
-					OLED_DrawChar('S', 7);
+					OLED_DrawChar('2' + systemSettings.cutoutSetting, 6, 0);
+					OLED_DrawChar('S', 7, 0);
 				}
 				break;
 			case SLEEP_TEMP:
@@ -575,11 +575,11 @@ void DrawUI() {
 				OLED_DrawString(SettingsShortNames[SLEEP_TIME], 5);
 				//Draw in the timescale
 				if (systemSettings.SleepTime < 6) {
-					OLED_DrawChar('S', 7);
+					OLED_DrawChar('S', 7, 0);
 					OLED_DrawTwoNumber(systemSettings.SleepTime * 10, 5);

 				} else {
-					OLED_DrawChar('M', 7);
+					OLED_DrawChar('M', 7, 0);
 					OLED_DrawTwoNumber(systemSettings.SleepTime - 5, 5);
 				}
 				break;
@@ -590,29 +590,29 @@ void DrawUI() {
 			case TEMPDISPLAY:/*Are we showing in C or F ?*/
 				OLED_DrawString(SettingsShortNames[TEMPDISPLAY], 7);
 				if (systemSettings.displayTempInF)
-					OLED_DrawChar(SettingTempFChar, 7);
+					OLED_DrawChar(SettingTempFChar, 7, 0);
 				else
-					OLED_DrawChar(SettingTempCChar, 7);
+					OLED_DrawChar(SettingTempCChar, 7, 0);
 				break;
 			case SCREENROTATION:
 				OLED_DrawString(SettingsShortNames[SCREENROTATION], 7);

 				switch (systemSettings.OrientationMode) {
 				case 0:
-					OLED_DrawChar(SettingRightChar, 7);
+					OLED_DrawChar(SettingRightChar, 7, 0);
 					break;
 				case 1:
-					OLED_DrawChar(SettingLeftChar, 7);
+					OLED_DrawChar(SettingLeftChar, 7, 0);
 					break;
 				case 2:
-					OLED_DrawChar(SettingAutoChar, 7);
+					OLED_DrawChar(SettingAutoChar, 7, 0);
 					break;
 				}
 				break;
 			case MOTIONSENSITIVITY:
 				OLED_DrawString(SettingsShortNames[MOTIONSENSITIVITY], 7);

-				OLED_DrawChar('0' + systemSettings.sensitivity, 7);
+				OLED_DrawChar('0' + systemSettings.sensitivity, 7,0);
 				break;
 			case TEMPROUNDING:
 				//We are prompting the user about their display mode preferences
@@ -621,13 +621,13 @@ void DrawUI() {

 				switch (systemSettings.temperatureRounding) {
 				case ROUNDING_NONE:
-					OLED_DrawChar('1', 7);
+					OLED_DrawChar('1', 7,0);
 					break;
 				case ROUNDING_FIVE:
-					OLED_DrawChar('5', 7);
+					OLED_DrawChar('5', 7,0);
 					break;
 				case ROUNDING_TEN:
-					OLED_DrawChar('X', 7);
+					OLED_DrawChar('X', 7,0);
 					break;
 				}
 			}
@@ -638,13 +638,13 @@ void DrawUI() {
 				OLED_DrawString(SettingsShortNames[DISPUPDATERATE], 7);
 				switch (systemSettings.displayUpdateSpeed) {
 				case DISPLAYMODE_FAST:
-					OLED_DrawChar(SettingFastChar, 7);
+					OLED_DrawChar(SettingFastChar, 7,0);
 					break;
 				case DISPLAYMODE_SLOW:
-					OLED_DrawChar(SettingSlowChar, 7);
+					OLED_DrawChar(SettingSlowChar, 7,0);
 					break;
 				case DISPLAYMODE_MEDIUM:
-					OLED_DrawChar(SettingMediumChar, 7);
+					OLED_DrawChar(SettingMediumChar, 7,0);
 					break;

 				}
@@ -655,10 +655,10 @@ void DrawUI() {

 				switch (systemSettings.boostModeEnabled) {
 				case 1:
-					OLED_DrawChar(SettingTrueChar, 7);
+					OLED_DrawChar(SettingTrueChar, 7,0);
 					break;
 				case 0:
-					OLED_DrawChar(SettingFalseChar, 7);
+					OLED_DrawChar(SettingFalseChar, 7,0);
 					break;
 				}
 				break;
@@ -670,10 +670,10 @@ void DrawUI() {
 				OLED_DrawString(SettingsShortNames[POWERDISPLAY], 7);
 				switch (systemSettings.powerDisplay) {
 				case 1:
-					OLED_DrawChar(SettingTrueChar, 7);
+					OLED_DrawChar(SettingTrueChar, 7,0);
 					break;
 				case 0:
-					OLED_DrawChar(SettingFalseChar, 7);
+					OLED_DrawChar(SettingFalseChar, 7,0);
 					break;

 				}
@@ -682,13 +682,13 @@ void DrawUI() {
 				OLED_DrawString(SettingsShortNames[AUTOSTART], 7);
 				switch (systemSettings.autoStart) {
 				case 1:
-					OLED_DrawChar(SettingTrueChar, 7);
+					OLED_DrawChar(SettingTrueChar, 7,0);
 					break;
 				case 0:
-					OLED_DrawChar(SettingFalseChar, 7);
+					OLED_DrawChar(SettingFalseChar, 7,0);
 					break;
 				case 2:
-					OLED_DrawChar(SettingSleepChar, 7);
+					OLED_DrawChar(SettingSleepChar, 7,0);
 					break;
 				}
 				break;
@@ -696,10 +696,10 @@ void DrawUI() {
 				OLED_DrawString(SettingsShortNames[COOLINGBLINK], 7);
 				switch (systemSettings.coolingTempBlink) {
 				case 1:
-					OLED_DrawChar(SettingTrueChar, 7);
+					OLED_DrawChar(SettingTrueChar, 7,0);
 					break;
 				case 0:
-					OLED_DrawChar(SettingFalseChar, 7);
+					OLED_DrawChar(SettingFalseChar, 7,0);
 					break;
 				}
 				break;
@@ -759,14 +759,14 @@ void DrawUI() {
 		if (StatusFlags == 0 || ((millis() % 1000) > 500)) {

 			OLED_DrawString("IN", 2);
-			OLED_DrawChar(48 + ((voltage / 100) % 10), 2);
+			OLED_DrawChar(48 + ((voltage / 100) % 10), 2,0);
 			voltage -= (voltage / 100) * 100;
-			OLED_DrawChar(48 + ((voltage / 10) % 10), 3);
+			OLED_DrawChar(48 + ((voltage / 10) % 10), 3,0);
 			voltage -= (voltage / 10) * 10;
-			OLED_DrawChar('.', 4);
-			OLED_DrawChar(48 + (voltage % 10), 5);
-			OLED_DrawChar('V', 6);
-			OLED_DrawChar(' ', 7);
+			OLED_DrawChar('.', 4,0);
+			OLED_DrawChar(48 + (voltage % 10), 5,0);
+			OLED_DrawChar('V', 6,0);
+			OLED_DrawChar(' ', 7,0);
 		} else {
 			OLED_DrawString("IN      ", 8);
 		}
--- a/workspace/ts100/src/Oled.c
+++ b/workspace/ts100/src/Oled.c
@@ -192,13 +192,19 @@ void Clear_Screen(void) {
 */
 void OLED_DrawString(const char* string, const uint8_t length) {
 	for (uint8_t i = 0; i < length; i++) {
-		OLED_DrawChar(string[i], i);
+		if (string[i] >= 0x80) {
+			OLED_DrawChar(string[i + 1], i, string[i]);
+			i++;
+			OLED_DrawChar(' ', i,0);
+		} else
+			OLED_DrawChar(string[i], i, '\0');
+
 	}
 }
 /*
 * Draw a char onscreen at letter index x
 */
-void OLED_DrawChar(char c, uint8_t x) {
+void OLED_DrawChar(char c, uint8_t x, char preCursor) {
 	if (x > 7)
 		return; //clipping

@@ -208,9 +214,9 @@ void OLED_DrawChar(char c, uint8_t x) {
 	if (c < 0x80) {
 		ptr = (u8*) FONT;
 		offset = c - ' ';
-	} else if (c >= 0xA0) {
+	} else if (preCursor>0) {
 		ptr = (u8*) FontLatin2;
-		offset = c - 0xA0; //this table starts at 0xA0
+		offset = c - 0xA0+0x40; //this table starts at 0xA0
 	} else
 		return; //not in font

@@ -252,27 +258,27 @@ void OLED_BlankSlot(uint8_t xStart, uint8_t width) {
 */
 void OLED_DrawTwoNumber(uint8_t in, uint8_t x) {

-	OLED_DrawChar(48 + (in / 10) % 10, x);
-	OLED_DrawChar(48 + in % 10, x + 1);
+	OLED_DrawChar(48 + (in / 10) % 10, x,0);
+	OLED_DrawChar(48 + in % 10, x + 1,0);
 }
 /*
 * Draw a 3 digit number to the display at letter slot x
 */
 void OLED_DrawThreeNumber(uint16_t in, uint8_t x) {

-	OLED_DrawChar(48 + (in / 100) % 10, x);
-	OLED_DrawChar(48 + (in / 10) % 10, x + 1);
-	OLED_DrawChar(48 + in % 10, x + 2);
+	OLED_DrawChar(48 + (in / 100) % 10, x,0);
+	OLED_DrawChar(48 + (in / 10) % 10, x + 1,0);
+	OLED_DrawChar(48 + in % 10, x + 2,0);
 }
 /*
 * Draw a 4 digit number to the display at letter slot x
 */
 void OLED_DrawFourNumber(uint16_t in, uint8_t x) {

-	OLED_DrawChar(48 + (in / 1000) % 10, x);
-	OLED_DrawChar(48 + (in / 100) % 10, x + 1);
-	OLED_DrawChar(48 + (in / 10) % 10, x + 2);
-	OLED_DrawChar(48 + (in % 10), x + 3);
+	OLED_DrawChar(48 + (in / 1000) % 10, x,0);
+	OLED_DrawChar(48 + (in / 100) % 10, x + 1,0);
+	OLED_DrawChar(48 + (in / 10) % 10, x + 2,0);
+	OLED_DrawChar(48 + (in % 10), x + 3,0);
 }

 void OLED_DrawIDLELogo() {
--- a/workspace/ts100/src/Strings.c
+++ b/workspace/ts100/src/Strings.c
@@ -5,109 +5,181 @@
 *      Author: Ben V. Brown
 */
 #include "Strings.h"
-#define LANG_EN
+#define LANG_IT
 #ifdef LANG_EN
-const char* SettingsLongNames[14] =
-		{
-		/*These are all the help text for all the settings.*/
-		/*All must start with 6 spaces so they come on screen nicely.*/
-		"      Power source. Sets cutoff voltage. <DC 10V> <S 3.3V per cell>",
-				"      Sleep Temperature <C>", "      Sleep Timeout <Minutes>",
-				"      Shutdown Timeout <Minutes>",
-				"      Motion Sensitivity <0.Off 1.least sensitive 9.most sensitive>",
-				"      Temperature Unit", "      Temperature Rounding Amount",
-				"      Temperature Display Update Rate",
-				"      Display Orientation <A. Automatic L. Left Handed R. Right Handed>",
-				"      Enable front key enters boost mode 450C mode when soldering",
-				"      Temperature when in \"boost\" mode",
-				"      Changes the arrows to a power display when soldering",
-				"      Automatically starts the iron into soldering on power up. T=Soldering, S= Sleep mode,F=Off",
-				"      Blink the temperature on the cooling screen while the tip is still hot." };
-
-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* CoolingPromptString = "Off  "; //Fixed width 5 chars
-const char SettingTrueChar = 'T';
-const char SettingFalseChar = 'F';
-const char SettingSleepChar = 'S';
-const char SettingFastChar = 'F';
-const char SettingMediumChar = 'M';
-const char SettingSlowChar = 'S';
-const char SettingRightChar = 'R';
-const char SettingLeftChar = 'L';
-const char SettingAutoChar = 'A';
-const char SettingTempCChar = 'C';
-const char SettingTempFChar = 'F';
-
+  const char* SettingsLongNames[14] = {
+    /*These are all the help text for all the settings.*/
+    /*All must start with 6 spaces so they come on screen nicely.*/
+    "      Power source. Sets cutoff voltage. <DC=10V S=3.3V per cell>",
+    "      Sleep Temperature <C>",
+    "      Sleep Timeout <Minutes>",
+    "      Shutdown Timeout <Minutes>",
+    "      Motion Sensitivity <0=Off 1=Least sensitive 9=Most sensitive>",
+    "      Temperature Unit <C=Celsius F=Farnheit>",
+    "      Temperature Rounding Amount <Units>",
+    "      Temperature Display Update Rate <S=Slow M=Medium F=Fast>",
+    "      Display Orientation <A=Automatic L=Left Handed R=Right Handed>",
+    "      Enable front key enters boost mode 450C mode when soldering <T=True F=False>",
+    "      Temperature when in \"boost\" mode <C>",
+    "      Changes the arrows to a power display when soldering <T=True F=False>",
+    "      Automatically starts the iron into soldering on power up. <T=Soldering S=Sleep mode F=Off>",
+    "      Blink the temperature on the cooling screen while the tip is still hot. <T=True F=False>"
+  };
+  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* CoolingPromptString = "Off  "; //Fixed width 5 chars
+  const char SettingTrueChar = 'T';
+  const char SettingFalseChar = 'F';
+  const char SettingSleepChar = 'S';
+  const char SettingFastChar = 'F';
+  const char SettingMediumChar = 'M';
+  const char SettingSlowChar = 'S';
+  const char SettingRightChar = 'R';
+  const char SettingLeftChar = 'L';
+  const char SettingAutoChar = 'A';
+  const char SettingTempCChar = 'C';
+  const char SettingTempFChar = 'F';
 #endif
+
 #ifdef LANG_ES
-const char* SettingsLongNames[14] =
-{
-	/*These are all the help text for all the settings.*/
-	/*All must start with 6 spaces so they come on screen nicely.*/
-	"      Fuente de energ<72>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.",
-	"      Redondeo de la temperatura.",
-	"      Tasa de actualizaci<EFBFBD>n de la temperatura.",
-	"      Orientaci<EFBFBD>n de la pantalla <A. Autom<6F>tico, I. Mano izquierda, D. Mano derecha>",
-	"      Activar el bot<6F>n \"Boost\" en modo soldadura.",
-	"      Temperatura en modo \"Boost\".",
-	"      Cambiar las flechas en pantalla por indicador de potencia en modo soldadura.",
-	"      Iniciar modo soldadura en el encendido. <V. S<>, S. Modo reposo, F. No ",
-	"      Parpadea la temperatura en el enfriamiento si la punta sigue caliente."};
-
-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* CoolingPromptString = "Cool ";//Fixed width 5 chars
-const char SettingTrueChar = 'V';
-const char SettingFalseChar = 'F';
-const char SettingSleepChar = 'S';
-const char SettingFastChar = 'R';
-const char SettingMediumChar = 'M';
-const char SettingSlowChar = 'L';
-const char SettingRightChar = 'D';
-const char SettingLeftChar = 'I';
-const char SettingAutoChar = 'A';
-const char SettingTempCChar = 'C';
-const char SettingTempFChar = 'F';
+  const char* SettingsLongNames[14] = {
+    /*These are all the help text for all the settings.*/
+    /*All must start with 6 spaces so they come on screen nicely.*/
+    "      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.",
+    "      Redondeo de la temperatura.",
+    "      Tasa de actualización de la temperatura.",
+    "      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>",
+    "      Cambiar las flechas en pantalla por indicador de potencia en modo soldadura.",
+    "      Iniciar modo soldadura en el encendido. <V=Sí S=Modo reposo F=No>",
+    "      Parpadea la temperatura en el enfriamiento si la punta sigue caliente."
+  };
+  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* CoolingPromptString = "Cool "; //Fixed width 5 chars
+  const char SettingTrueChar = 'V';
+  const char SettingFalseChar = 'F';
+  const char SettingSleepChar = 'S';
+  const char SettingFastChar = 'R';
+  const char SettingMediumChar = 'M';
+  const char SettingSlowChar = 'L';
+  const char SettingRightChar = 'D';
+  const char SettingLeftChar = 'I';
+  const char SettingAutoChar = 'A';
+  const char SettingTempCChar = 'C';
+  const char SettingTempFChar = 'F';
 #endif
+
 #ifdef LANG_DE
-const char* SettingsLongNames[14] =
-		{
-		/*These are all the help text for all the settings.*/
-		/*All must start with 6 spaces so they come on screen nicely.*/
-		"      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", "      Temperatur Runden",
-				"      Temperaturanzeige Updaterate",
-				"      Anzeigerichtung <A. Auto L. Linksh<73>ndig R. Rechtsh<73>ndig>",
-				"      Fronttaste f<>r Temperaturboost einschalten",
-				"      Temperatur im \"boost\"-Modus",
-				"      <EFBFBD>ndert \"Temperaturpfeile\" in Leistungsbalken",
-				"      Automatischer Start beim Einschalten. J=L<>ttemp., R=Ruhemodus,N=Aus",
-				"      Temperatur blinkt beim Abk<62>hlen, solange noch hei<65>." };
+  const char* SettingsLongNames[14] = {
+    /*These are all the help text for all the settings.*/
+    /*All must start with 6 spaces so they come on screen nicely.*/
+    "      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",
+    "      Temperatur Runden",
+    "      Temperaturanzeige Updaterate",
+    "      Anzeigerichtung <A=Auto L=Linkshändig R=Rechtshändig>",
+    "      Fronttaste für Temperaturboost einschalten",
+    "      Temperatur im \"boost\"-Modus <C>",
+    "      Ändert \"Temperaturpfeile\" in Leistungsbalken",
+    "      Automatischer Start beim Einschalten. <J=Löttemp R=Ruhemodus N=Aus>",
+    "      Temperatur blinkt beim Abkühlen, solange noch heiß."
+  };
+  const char* TempCalStatus[3] = { "Cal Temp", "Cal OK  ", "Cal Fehl" }; //All fixed 8 chars
+  const char* UVLOWarningString = "V gering"; //Fixed width 8 chars
+  const char* CoolingPromptString = "Kalt "; //Fixed width 5 chars
+  const char SettingTrueChar = 'J';
+  const char SettingFalseChar = 'N';
+  const char SettingSleepChar = 'R';
+  const char SettingFastChar = 'S';
+  const char SettingMediumChar = 'M';
+  const char SettingSlowChar = 'L';
+  const char SettingRightChar = 'R';
+  const char SettingLeftChar = 'L';
+  const char SettingAutoChar = 'A';
+  const char SettingTempCChar = 'C';
+  const char SettingTempFChar = 'F';
+#endif

-const char* TempCalStatus[3] = { "Cal Temp", "Cal OK  ", "Cal Fehl" }; //All fixed 8 chars
-const char* UVLOWarningString = "V gering"; //Fixed width 8 chars
-const char* CoolingPromptString = "Kalt "; //Fixed width 5 chars
-const char SettingTrueChar = 'J';
-const char SettingFalseChar = 'N';
-const char SettingSleepChar = 'R';
-const char SettingFastChar = 'S';
-const char SettingMediumChar = 'M';
-const char SettingSlowChar = 'L';
-const char SettingRightChar = 'R';
-const char SettingLeftChar = 'L';
-const char SettingAutoChar = 'A';
-const char SettingTempCChar = 'C';
-const char SettingTempFChar = 'F';
+#ifdef LANG_FR
+  const char* SettingsLongNames[14] = {
+    /*These are all the help text for all the settings.*/
+    /*All must start with 6 spaces so they come on screen nicely.*/
+    "      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.",
+    "      Arrondissement de la temperature.",
+    "      Taux de raffraichissement de la temperature.",
+    "      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>",
+    "      Change les fleches en affichage de la tension pendant la soudure.",
+    "      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."
+  };
+  const char* TempCalStatus[3] = { "Cal Temp", "Cal OK  ", "Cal Err " }; //All fixed 8 chars
+  const char* UVLOWarningString = "Batt Bas"; //Fixed width 8 chars
+  const char* CoolingPromptString = "Etein"; //Fixed width 5 chars
+  const char SettingTrueChar = 'A';
+  const char SettingFalseChar = 'D';
+  const char SettingSleepChar = 'V';
+  const char SettingFastChar = 'R';
+  const char SettingMediumChar = 'M';
+  const char SettingSlowChar = 'L';
+  const char SettingRightChar = 'D';
+  const char SettingLeftChar = 'G';
+  const char SettingAutoChar = 'A';
+  const char SettingTempCChar = 'C';
+  const char SettingTempFChar = 'F';
+#endif

+#ifdef LANG_IT
+  const char* SettingsLongNames[14] = {
+    /*These are all the help text for all the settings.*/
+    /*All must start with 6 spaces so they come on screen nicely.*/
+    "      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",
+    "      Arrotondamento temperatura",
+    "      Velocità di aggiornamento temperatura",
+    "      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>",
+    "      Visualizza il grafico della potenza assorbita al posto delle frecce",
+    "      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."
+  };
+
+  const char* TempCalStatus[3] = { "Cal Temp", "Cal OK  ", "Cal Err " }; //All fixed 8 chars
+  const char* UVLOWarningString = "LOW VOLT"; //Fixed width 8 chars
+  const char* CoolingPromptString = "Cool"; //Fixed width 5 chars
+  const char SettingTrueChar = 'S';
+  const char SettingFalseChar = 'N';
+  const char SettingSleepChar = 'R';
+  const char SettingFastChar = 'V';
+  const char SettingMediumChar = 'M';
+  const char SettingSlowChar = 'L';
+  const char SettingRightChar = 'D';
+  const char SettingLeftChar = 'S';
+  const char SettingAutoChar = 'A';
+  const char SettingTempCChar = 'C';
+  const char SettingTempFChar = 'F';
 #endif
 const char* SettingsShortNames[14] = { "PWRSC ", "STMP ", "STME ", "SHTME ",
 		"MSENSE ", "TMPUNT ", "TMPRND ", "TMPSPD ", "DSPROT ", "BOOST  ",
Author	SHA1	Message	Date
Ben V. Brown	0e7e304f4e	Patch to handle UTF slightly better. Not perfect but working for now	2017-09-17 12:21:25 +10:00
Ben V. Brown	0aae546dc9	Update strings to be more uniform closes #89 Also includes the new Italian translation closes #88	2017-09-17 11:50:44 +10:00
Maelremrem	2bf06caa09	Added french language (#84 ) * Added french language Add the french translation for all the strings <maelremrem>	2017-09-09 23:13:21 +10:00