Merge branch 'master' of https://github.com/Ralim/ts100

Minor changes _IT

Translation Editor/translation_pt.json

@@ -3,9 +3,9 @@
 	"languageLocalName": "Português",
 	"cyrillicGlyphs": false,
 	"messages": {
-		"SettingsCalibrationDone": "Calibration done!",
-		"SettingsCalibrationWarning": "A ponta deve estar em temperatura ambiente antes de continuar!",
-		"SettingsResetWarning": "Resetar para ajustes de fábrica?",
+		"SettingsCalibrationDone": "Calibração terminada!",
+		"SettingsCalibrationWarning": "A ponta deve estar à temperatura ambiente antes de continuar!",
+		"SettingsResetWarning": "Definições de fábrica?",
 		"UVLOWarningString": "DC BAIXO",
 		"UndervoltageString": "Subtensão",
 		"InputVoltageString": "Tensão ",
@@ -48,9 +48,9 @@
 		"UIMenu": {
 			"text2": [
 				"Interface",
-				"Usuário"
+				"Utilizador"
 			],
-			"desc": "Configurações da interface do usuário"
+			"desc": "Configurações do interface do utilizador"
 		},
 		"AdvancedMenu": {
 			"text2": [
@@ -67,7 +67,7 @@
 				"Fonte",
 				"alimentação"
 			],
-			"desc": "nte de alimentação. Define a tensão de corte. <DC=10V> <S=3.3V/célula>"
+			"desc": "Fonte de alimentação. Define a tensão de corte. <DC=10V> <S=3.3V/célula>"
 		},
 		"SleepTemperature": {
 			"text": "TMPE",
@@ -110,12 +110,12 @@
 			"desc": "Unidade de temperatura <C=Celsius F=Fahrenheit>"
 		},
 		"AdvancedIdle": {
-			"text": "OCIOSO",
+			"text": "EM ESPERA",
 			"text2": [
 				"Tela repouso",
 				"avançada"
 			],
-			"desc": "Exibe informações avançadas quando ocioso"
+			"desc": "Exibe informações avançadas quando em espera"
 		},
 		"DisplayRotation": {
 			"text": "ORIENT",
@@ -129,9 +129,9 @@
 			"text": "TURBO",
 			"text2": [
 				"Modo turbo",
-				"ativado"
+				"activado"
 			],
-			"desc": "Tecla frontal ativa modo \"turbo\""
+			"desc": "Tecla frontal activa modo \"turbo\""
 		},
 		"BoostTemperature": {
 			"text": "TTMP",
@@ -153,9 +153,9 @@
 			"text": "RESFRI",
 			"text2": [
 				"Piscar ao",
-				"resfriar"
+				"arrefecer"
 			],
-			"desc": "Faz o valor da temperatura piscar durante o resfriamento"
+			"desc": "Faz o valor da temperatura piscar durante o arrefecimento"
 		},
 		"TemperatureCalibration": {
 			"text": "CAL.TEMP",
@@ -166,7 +166,7 @@
 			"desc": "Calibra a temperatura"
 		},
 		"SettingsReset": {
-			"text": "RESETAR",
+			"text": "RESET",
 			"text2": [
 				"Reset de",
 				"fábrica?"
@@ -179,7 +179,7 @@
 				"Calibrar",
 				"tensão"
 			],
-			"desc": "Calibra a tensão de alimentação. Use os botões para ajustar o valor. Mantenha presionado para sair"
+			"desc": "Calibra a tensão de alimentação. Use os botões para ajustar o valor. Mantenha pressionado para sair"
 		},
 		"AdvancedSoldering": {
 			"text": "AVNCAD",
@@ -195,39 +195,39 @@
 				"Velocidade",
 				"texto ajuda"
 			],
-			"desc": "Velocidade que esse texto é exibido"
+			"desc": "Velocidade a que o texto é exibido"
 		},
 		"TipModel": {
-			"text": "TIPMO",
+			"text": "MODPNT",
 			"text2": [
-				"Tip",
-				"Model"
+				"Ponta",
+				"Modelo"
 			],
-			"desc": "Tip Model selection"
+			"desc": "Selecção de modelo de ponta"
 		},
 		"SimpleCalibrationMode": {
 			"text": "SMPCAL",
 			"text2": [
-				"Simple",
-				"Calibration"
+				"Calibração",
+				"Simples"
 			],
-			"desc": "Simple Calibration using Hot water"
+			"desc": "Calibração simples com água quente"
 		},
 		"AdvancedCalibrationMode": {
 			"text": "ADVCAL",
 			"text2": [
-				"Advanced",
-				"Calibration"
+				"Calibração",
+				"Avançada"
 			],
-			"desc": "Advanced calibration using thermocouple on the tip"
+			"desc": "Calibração avançada com um termopar na ponta"
 		},
 		"PowerInput": {
 			"text": "PWRW",
 			"text2": [
-				"Power",
-				"Wattage"
+				"Potência",
+				"Fonte"
 			],
-			"desc": "Power Wattage of the power adapter used"
+			"desc": "Potência da fonte usada (Watt)"
 		}
 	}
 }

workspace/TS100/inc/Font.h

@@ -10,7 +10,11 @@
 #ifndef FONT_H_
 #define FONT_H_
 #include "Translation.h"
-
+#ifdef LANG_RU
+#ifndef CYRILLIC_GLYPHS
+#define CYRILLIC_GLYPHS
+#endif
+#endif
 #define FONT_12_WIDTH   12
 
 /*

workspace/TS100/inc/LIS2DH12.hpp

@@ -19,15 +19,15 @@ public:
 	static Orientation getOrientation() {
 #ifdef MODEL_TS80
 		uint8_t val = (FRToSI2C::I2C_RegisterRead(LIS2DH_I2C_ADDRESS,
-				LIS_INT2_SRC) >> 2);
+		LIS_INT2_SRC) >> 2);
 		if (val == 8)
 			val = 3;
-		else if (val==1)
-			val=0;
-		else if(val==2)
-			val=1;
+		else if (val == 1)
+			val = 1;
+		else if (val == 2)
+			val = 0;
 		else
-			val=3;
+			val = 3;
 		return static_cast<Orientation>(val);
 #endif
 #ifdef MODEL_TS100

workspace/TS100/inc/Settings.h

@@ -11,8 +11,8 @@
 #define SETTINGS_H_
 #include <stdint.h>
 #include "stm32f1xx_hal.h"
-#define SETTINGSVERSION                                                       \
-  0x18 /*Change this if you change the struct below to prevent people getting \
+#define SETTINGSVERSION   ( 0x19 )
+/*Change this if you change the struct below to prevent people getting \
           out of sync*/
 
 /*
@@ -23,7 +23,7 @@ typedef struct {
 	uint16_t SolderingTemp;  // current set point for the iron
 	uint16_t SleepTemp;      // temp to drop to in sleep
 	uint8_t SleepTime;       // minutes timeout to sleep
-	uint8_t cutoutSetting;   // The voltage we cut out at for under voltage OR Power level for TS80
+	uint8_t cutoutSetting; // The voltage we cut out at for under voltage OR Power level for TS80
 	uint8_t OrientationMode :2; // If true we want to invert the display for lefties
 	uint8_t sensitivity :4;  // Sensitivity of accelerometer (5 bits)
 	uint8_t autoStartMode :2;  // Should the unit automatically jump straight

workspace/TS100/src/OLED.cpp

@@ -144,6 +144,9 @@ void OLED::drawChar(char c, char PrecursorCommand) {
 }
 
 void OLED::setRotation(bool leftHanded) {
+#ifdef MODEL_TS80
+	leftHanded=!leftHanded;
+#endif
   if (inLeftHandedMode == leftHanded) {
     return;
   }

workspace/TS100/src/Translation.cpp

@@ -947,9 +947,9 @@ const char* SettingsDescriptions[] = {
   /* ShutdownTimeout           */ "Imposta il timer per lo spegnimento <minuti>",
   /* MotionSensitivity         */ "Imposta la sensibilità al movimento per uscire dalla modalità Standby <0: nessuna; 1: minima; 9: massima>",
   /* TemperatureUnit           */ "Scegli l'unità di misura per la temperatura <C: grado Celsius; F: grado Farenheit>",
-  /* AdvancedIdle              */ "Mostra informazioni dettagliate con un carattere più piccolo all'interno della schermata principale",
+  /* AdvancedIdle              */ "Mostra informazioni dettagliate all'interno della schermata principale",
   /* DisplayRotation           */ "Imposta l'orientamento del display <A: automatico; S: mano sinistra; D: mano destra>",
-  /* BoostEnabled              */ "Il tasto superiore attiva la funzione «Turbo» durante la modalità Saldatura",
+  /* BoostEnabled              */ "Attiva la funzione «Turbo», durante la modalità Saldatura, tenendo premuto il tasto superiore",
   /* BoostTemperature          */ "Imposta la temperatura della funzione «Turbo»",
   /* AutoStart                 */ "Attiva automaticamente il saldatore quando viene alimentato <A: saldatura; S: standby; D: disattiva>",
   /* CooldownBlink             */ "Mostra, lampeggiante, la temperatura durante il raffreddamento se la punta è ancora calda",
@@ -961,7 +961,7 @@ const char* SettingsDescriptions[] = {
   /* TipModel                  */ "Seleziona il modello della punta in uso",
   /* SimpleCalibrationMode     */ "Calibra le rilevazioni di temperatura tramite l'utilizzo di acqua calda",
   /* AdvancedCalibrationMode   */ "Calibra le rilevazioni di temperatura attraverso la termocoppia presente nella punta",
-  /* PowerInput                */ "Imposta la potenza dell'alimentatore in uso",
+  /* PowerInput                */ "Imposta la potenza massima erogabile dall'alimentatore in uso",
 };
 
 const char* SettingsCalibrationDone = "Calibrazione effettuata";
@@ -977,10 +977,10 @@ const char* SleepingAdvancedString = "Standby";
 const char* WarningSimpleString = "HOT!";
 const char* WarningAdvancedString = "PUNTA CALDA!";
 const char* SleepingTipAdvancedString = "Punta:";
-const char* IdleTipString = "Punta:";
+const char* IdleTipString = "T punta:";
 const char* IdleSetString = "/";
 const char* TipDisconnectedString = "PUNTA ASSENTE";
-const char* SolderingAdvancedPowerPrompt = "Potenza:";
+const char* SolderingAdvancedPowerPrompt = "Potenz:";
 const char* OffString = "OFF";
 
 const char SettingRightChar = 'D';
@@ -997,7 +997,7 @@ const char* SettingsShortNames[][2] = {
   /* ShutdownTimeout           */ { "Timer", "spegnimento" },
   /* MotionSensitivity         */ { "Sensibilità", "al movimento" },
   /* TemperatureUnit           */ { "Unità di", "temperatura" },
-  /* AdvancedIdle              */ { "Mostra", "dettagli" },
+  /* AdvancedIdle              */ { "Interfaccia", "testuale" },
   /* DisplayRotation           */ { "Orientamento", "display" },
   /* BoostEnabled              */ { "Funzione", "«Turbo»" },
   /* BoostTemperature          */ { "Temp", "«Turbo»" },
@@ -1008,7 +1008,7 @@ const char* SettingsShortNames[][2] = {
   /* VoltageCalibration        */ { "Calibrazione", "tensione" },
   /* AdvancedSoldering         */ { "Dettagli", "saldatura" },
   /* ScrollingSpeed            */ { "Velocità", "testo" },
-  /* TipModel                  */ { "Modello", "della punta" },
+  /* TipModel                  */ { "Modello", "punta" },
   /* SimpleCalibrationMode     */ { "Calibrazione", "semplice" },
   /* AdvancedCalibrationMode   */ { "Calibrazione", "avanzata" },
   /* PowerInput                */ { "Potenza", "alimentaz" },

workspace/TS100/src/gui.cpp

@@ -472,10 +472,10 @@ static void settings_setDisplayRotation(void) {
 	systemSettings.OrientationMode = systemSettings.OrientationMode % 3;
 	switch (systemSettings.OrientationMode) {
 	case 0:
-		OLED::setRotation(true);
+		OLED::setRotation(false);
 		break;
 	case 1:
-		OLED::setRotation(false);
+		OLED::setRotation(true);
 		break;
 	case 2:
 		// do nothing on auto
@@ -652,22 +652,28 @@ static void setTipOffset() {
 
 	uint32_t offset = 0;
 	for (uint8_t i = 0; i < 15; i++) {
-		offset += getTipRawTemp(1);
+		offset += getTipRawTemp(0);
 		// cycle through the filter a fair bit to ensure we're stable.
 		OLED::clearScreen();
 		OLED::setCursor(0, 0);
+		OLED::print(".");
 		for (uint8_t x = 0; x < i / 4; x++)
 			OLED::print(".");
 		OLED::refresh();
-		osDelay(333);
+		osDelay(100);
 	}
 	systemSettings.CalibrationOffset = offset / 15;
 	// Need to remove from this the ambient temperature offset
-	uint32_t ambientoffset = getHandleTemperature(); // Handle temp in C
-	ambientoffset *=1000;
+	uint32_t ambientoffset = getHandleTemperature(); // Handle temp in C x10
+	ambientoffset *= 100;
 	ambientoffset /= tipGainCalValue;
+	systemSettings.CalibrationOffset -= ambientoffset;
 	setCalibrationOffset(systemSettings.CalibrationOffset);  // store the error
-	osDelay(100);
+	OLED::clearScreen();
+	OLED::setCursor(0, 0);
+	OLED::print("OK");
+	OLED::refresh();
+	osDelay(1000);
 }
 static void calibration_enterSimpleCal(void) {
 	// User has entered into the simple cal routine
@@ -816,10 +822,10 @@ static void settings_setCalibrateVIN(void) {
 
 	for (;;) {
 		OLED::setCursor(0, 0);
-		OLED::printNumber(getInputVoltageX10(systemSettings.voltageDiv,0) / 10,
+		OLED::printNumber(getInputVoltageX10(systemSettings.voltageDiv, 0) / 10,
 				2);
 		OLED::print(".");
-		OLED::printNumber(getInputVoltageX10(systemSettings.voltageDiv,0) % 10,
+		OLED::printNumber(getInputVoltageX10(systemSettings.voltageDiv, 0) % 10,
 				1);
 		OLED::print("V");
 

workspace/TS100/src/hardware.c

@@ -34,7 +34,7 @@ uint16_t getHandleTemperature() {
 	result -= 4965;  // remove 0.5V offset
 	// 10mV per C
 	// 99.29 counts per Deg C above 0C
-	result *= 10;
+	result *= 100;
 	result /= 993;
 	return result;
 }

workspace/TS100/src/main.cpp

@@ -770,7 +770,7 @@ void startGUITask(void const *argument __unused) {
 	bool buttonLockout = false;
 	bool tempOnDisplay = false;
 	getTipRawTemp(1);  // reset filter
-	OLED::setRotation(!(systemSettings.OrientationMode & 1));
+	OLED::setRotation(systemSettings.OrientationMode & 1);
 	uint32_t ticks = xTaskGetTickCount();
 	ticks += 400;  // 4 seconds from now
 	while (xTaskGetTickCount() < ticks) {
@@ -939,7 +939,7 @@ void startPIDTask(void const *argument __unused) {
 #ifdef MODEL_TS80
 			//Set power management code to the tip resistance in ohms * 10
 			setupPower(calculateTipR() / 100);
-			size_t lastPowerPulse = 0;
+			//size_t lastPowerPulse = 0;
 #else
 	setupPower(85);
 
@@ -1056,7 +1056,7 @@ void startMOVTask(void const *argument __unused) {
 	osDelay(250);  // wait for accelerometer to stabilize
 #endif
 
-	OLED::setRotation(!(systemSettings.OrientationMode & 1));
+	OLED::setRotation(systemSettings.OrientationMode & 1);
 	lastMovementTime = 0;
 	int16_t datax[MOVFilter] = { 0 };
 	int16_t datay[MOVFilter] = { 0 };

workspace/TS100A/.cproject

@@ -485,6 +485,7 @@
 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
 	<storageModule moduleId="refreshScope" versionNumber="2">
 		<configuration configurationName="TS100"/>
+		<configuration configurationName="TS100_LOCAL"/>
 		<configuration configurationName="Release">
 			<resource resourceType="PROJECT" workspacePath="/TS100A"/>
 		</configuration>

workspace/TS100A/.settings/language.settings.xml

@@ -4,7 +4,7 @@
 		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="com.atollic.truestudio.mbs.GCCSpecsDetectorAtollicArm" console="false" env-hash="1636694427566673783" id="com.atollic.truestudio.mbs.provider" keep-relative-paths="false" name="Atollic ARM Tools Language Settings" parameter="${COMMAND} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.atollic.truestudio.mbs.GCCSpecsDetectorAtollicArm" console="false" env-hash="-167355215276254258" id="com.atollic.truestudio.mbs.provider" keep-relative-paths="false" name="Atollic ARM Tools Language Settings" parameter="${COMMAND} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
@@ -14,7 +14,7 @@
 		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="com.atollic.truestudio.mbs.GCCSpecsDetectorAtollicArm" console="false" env-hash="1636694427566673783" id="com.atollic.truestudio.mbs.provider" keep-relative-paths="false" name="Atollic ARM Tools Language Settings" parameter="${COMMAND} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.atollic.truestudio.mbs.GCCSpecsDetectorAtollicArm" console="false" env-hash="-167355215276254258" id="com.atollic.truestudio.mbs.provider" keep-relative-paths="false" name="Atollic ARM Tools Language Settings" parameter="${COMMAND} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
@@ -24,7 +24,7 @@
 		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="com.atollic.truestudio.mbs.GCCSpecsDetectorAtollicArm" console="false" env-hash="1636694427566673783" id="com.atollic.truestudio.mbs.provider" keep-relative-paths="false" name="Atollic ARM Tools Language Settings" parameter="${COMMAND} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.atollic.truestudio.mbs.GCCSpecsDetectorAtollicArm" console="false" env-hash="-167355215276254258" id="com.atollic.truestudio.mbs.provider" keep-relative-paths="false" name="Atollic ARM Tools Language Settings" parameter="${COMMAND} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

workspace/TS100A/.settings/org.eclipse.core.resources.prefs

@@ -1,2 +1,3 @@
 eclipse.preferences.version=1
+encoding//inc/Font.h=UTF-8
 encoding//src/Translation.cpp=UTF-8