Merge pull request #558 from Ralim/fix/acting-as-red-light

Fix Acting as red light + translations around the auto start

Translation Editor/make_translation.py

@@ -95,9 +95,6 @@ def getConstants():
     consants.append(('SymbolDC', 'DC'))
     consants.append(('SymbolCellCount', 'S'))
     consants.append(('SymbolVersionNumber', 'V2.08'))
-    consants.append(('SymbolManual', 'M'))
-    consants.append(('SymbolAuto', 'A'))
-    consants.append(('SymbolSleep', 'S'))
     return consants
 
 

Translation Editor/translation_bg.json

@@ -28,7 +28,10 @@
 		"SettingLeftChar": "L",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "F",
-		"SettingSlowChar": "S"
+		"SettingSlowChar": "S",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": true,
 	"menuGroups": {

Translation Editor/translation_cs.json

@@ -29,7 +29,10 @@
 		"SettingLeftChar": "L",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "R",
-		"SettingSlowChar": "P"
+		"SettingSlowChar": "P",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": true,
 	"menuGroups": {

Translation Editor/translation_da.json

@@ -28,7 +28,10 @@
 		"SettingLeftChar": "V",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "F",
-		"SettingSlowChar": "S"
+		"SettingSlowChar": "S",
+		"SettingStartSolderingChar": "L",
+		"SettingStartSleepChar": "D",
+		"SettingStartNoneChar": "S"
 	},
 	"menuDouble": false,
 	"menuGroups": {

Translation Editor/translation_de.json

@@ -28,7 +28,10 @@
 		"SettingLeftChar": "L",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "F",
-		"SettingSlowChar": "S"
+		"SettingSlowChar": "S",
+		"SettingStartSolderingChar": "J",
+		"SettingStartSleepChar": "S",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": true,
 	"menuGroups": {

Translation Editor/translation_en.json

@@ -30,7 +30,10 @@
 		"SettingLeftChar": "L",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "F",
-		"SettingSlowChar": "S"
+		"SettingSlowChar": "S",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": true,
 	"menuGroups": {
@@ -150,7 +153,7 @@
 				"Auto",
 				"start"
 			],
-			"desc": "Automatically starts the iron into soldering on power up. T=Soldering, S= Sleep mode,F=Off"
+			"desc": "Automatically starts the iron into soldering on power up. A=Soldering, S= Sleep mode, M=Off"
 		},
 		"CooldownBlink": {
 			"text": "CLBLNK",

Translation Editor/translation_es.json

@@ -28,7 +28,10 @@
 		"SettingLeftChar": "I",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "R",
-		"SettingSlowChar": "L"
+		"SettingSlowChar": "L",
+		"SettingStartSolderingChar": "V",
+		"SettingStartSleepChar": "S",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": true,
 	"menuGroups": {

Translation Editor/translation_fi.json

@@ -28,7 +28,10 @@
 		"SettingLeftChar": "V",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "N",
-		"SettingSlowChar": "H"
+		"SettingSlowChar": "H",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": true,
 	"menuGroups": {

Translation Editor/translation_fr.json

@@ -28,7 +28,10 @@
 		"SettingLeftChar": "G",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "R",
-		"SettingSlowChar": "L"
+		"SettingSlowChar": "L",
+		"SettingStartSolderingChar": "A",
+		"SettingStartSleepChar": "V",
+		"SettingStartNoneChar": "D"
 	},
 	"menuDouble": true,
 	"menuGroups": {

Translation Editor/translation_hr.json

@@ -28,7 +28,10 @@
 		"SettingLeftChar": "L",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "B",
-		"SettingSlowChar": "S"
+		"SettingSlowChar": "S",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": true,
 	"menuGroups": {

Translation Editor/translation_hu.json

@@ -28,7 +28,10 @@
 		"SettingLeftChar": "B",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "G",
-		"SettingSlowChar": "L"
+		"SettingSlowChar": "L",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": false,
 	"menuGroups": {

Translation Editor/translation_it.json

@@ -28,7 +28,10 @@
 		"SettingLeftChar": "S",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "V",
-		"SettingSlowChar": "L"
+		"SettingSlowChar": "L",
+		"SettingStartSolderingChar": "A",
+		"SettingStartSleepChar": "S",
+		"SettingStartNoneChar": "D"
 	},
 	"menuDouble": true,
 	"menuGroups": {

Translation Editor/translation_lt.json

@@ -28,7 +28,10 @@
 		"SettingLeftChar": "K",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "T",
-		"SettingSlowChar": "N"
+		"SettingSlowChar": "N",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": true,
 	"menuGroups": {

Translation Editor/translation_nl.json

@@ -28,7 +28,10 @@
 		"SettingLeftChar": "L",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "F",
-		"SettingSlowChar": "S"
+		"SettingSlowChar": "S",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": true,
 	"menuGroups": {

Translation Editor/translation_nl_be.json

@@ -28,7 +28,10 @@
 		"SettingLeftChar": "L",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "S",
-		"SettingSlowChar": "T"
+		"SettingSlowChar": "T",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": true,
 	"menuGroups": {

Translation Editor/translation_no.json

@@ -28,7 +28,10 @@
 		"SettingLeftChar": "V",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "H",
-		"SettingSlowChar": "L"
+		"SettingSlowChar": "L",
+		"SettingStartSolderingChar": "L",
+		"SettingStartSleepChar": "D",
+		"SettingStartNoneChar": "I"
 	},
 	"menuDouble": false,
 	"menuGroups": {

Translation Editor/translation_pl.json

@@ -28,7 +28,10 @@
 		"SettingLeftChar": "L",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "F",
-		"SettingSlowChar": "S"
+		"SettingSlowChar": "S",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartNoneChar": "N"
 	},
 	"menuDouble": false,
 	"menuGroups": {

Translation Editor/translation_pt.json

@@ -28,7 +28,10 @@
 		"SettingLeftChar": "C",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "R",
-		"SettingSlowChar": "L"
+		"SettingSlowChar": "L",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": true,
 	"menuGroups": {

Translation Editor/translation_ru.json

@@ -28,7 +28,10 @@
 		"SettingLeftChar": "Л",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "+",
-		"SettingSlowChar": "-"
+		"SettingSlowChar": "-",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": true,
 	"menuGroups": {

Translation Editor/translation_sk.json

@@ -28,7 +28,10 @@
 		"SettingLeftChar": "L",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "F",
-		"SettingSlowChar": "S"
+		"SettingSlowChar": "S",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": false,
 	"menuGroups": {

Translation Editor/translation_sl.json

@@ -29,7 +29,10 @@
 		"SettingLeftChar": "L",
 		"SettingAutoChar": "S",
 		"SettingFastChar": "H",
-		"SettingSlowChar": "P"
+		"SettingSlowChar": "P",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": true,
 	"menuGroups": {

Translation Editor/translation_sr_cyrl.json

@@ -28,7 +28,10 @@
 		"SettingLeftChar": "Л",
 		"SettingAutoChar": "А",
 		"SettingFastChar": "Б",
-		"SettingSlowChar": "С"
+		"SettingSlowChar": "С",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": true,
 	"menuGroups": {

Translation Editor/translation_sr_latn.json

@@ -28,7 +28,10 @@
 		"SettingLeftChar": "L",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "B",
-		"SettingSlowChar": "S"
+		"SettingSlowChar": "S",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": true,
 	"menuGroups": {

Translation Editor/translation_sv.json

@@ -28,7 +28,10 @@
 		"SettingLeftChar": "V",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "S",
-		"SettingSlowChar": "L"
+		"SettingSlowChar": "L",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": true,
 	"menuGroups": {

Translation Editor/translation_tr.json

@@ -28,7 +28,10 @@
 		"SettingLeftChar": "L",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "F",
-		"SettingSlowChar": "S"
+		"SettingSlowChar": "S",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": false,
 	"menuGroups": {

Translation Editor/translation_uk.json

@@ -28,7 +28,10 @@
 		"SettingLeftChar": "Л",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "+",
-		"SettingSlowChar": "-"
+		"SettingSlowChar": "-",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": true,
 	"menuGroups": {

Translation Editor/translations_def.js

@@ -116,6 +116,18 @@ var def =
 		{
 			"id": "SettingSlowChar",
 			"len": 1
+		},
+		{
+			"id": "SettingStartSolderingChar",
+			"len": 1
+		},
+		{
+			"id": "SettingStartSleepChar",
+			"len": 1
+		},
+		{
+			"id": "SettingStartNoneChar",
+			"len": 1
 		}
 	],
 	"menuGroups": [

workspace/TS100/Core/Inc/Translation.h

@@ -50,6 +50,9 @@ extern const char* SettingFalseChar;
 extern const char *SettingRightChar;
 extern const char *SettingLeftChar;
 extern const char *SettingAutoChar;
+extern const char *SettingStartSolderingChar;
+extern const char *SettingStartSleepChar;
+extern const char *SettingStartNoneChar;
 
 extern const char *SettingFastChar;
 extern const char *SettingSlowChar;
@@ -67,9 +70,6 @@ extern const char* SymbolWatts;
 extern const char *SymbolVolts;
 extern const char *SymbolDC;
 extern const char *SymbolCellCount;
-extern const char* SymbolManual;
-extern const char* SymbolAuto;
-extern const char* SymbolSleep;
 extern const char *SymbolVersionNumber;
 
 extern const char *DebugMenu[];

workspace/TS100/Core/Src/GUIThread.cpp

@@ -501,7 +501,6 @@ static void gui_solderingMode(uint8_t jumpToSleep) {
 		OLED::setCursor(0, 0);
 		OLED::clearScreen();
 		OLED::setFont(0);
-		uint16_t tipTemp = getTipRawTemp(0);
 		//Draw in the screen details
 		if (systemSettings.detailedSoldering) {
 			OLED::setFont(1);

workspace/TS100/Core/Src/TipThermoModel.cpp

@@ -122,7 +122,7 @@ uint32_t TipThermoModel::getTipInF(bool sampleNow) {
 
 uint32_t TipThermoModel::getTipMaxInC() {
 	uint32_t maximumTipTemp = TipThermoModel::convertTipRawADCToDegC(
-			0x7FFF - 10);
+			0x7FFF - (80 * 5)); //back off approx 5 deg c from ADC max
 	maximumTipTemp += getHandleTemperature() / 10; //Add handle offset
-	return maximumTipTemp;
+	return maximumTipTemp - 1;
 }

workspace/TS100/Core/Src/gui.cpp

@@ -572,16 +572,16 @@ static void settings_displayAutomaticStartMode(void) {
 
 	switch (systemSettings.autoStartMode) {
 	case 0:
-		OLED::print(SymbolManual);
+		OLED::print(SettingStartNoneChar);
 		break;
 	case 1:
-		OLED::print(SymbolAuto);
+		OLED::print(SettingStartSolderingChar);
 		break;
 	case 2:
-		OLED::print(SymbolSleep);
+		OLED::print(SettingStartSleepChar);
 		break;
 	default:
-		OLED::print(SymbolManual);
+		OLED::print(SettingStartNoneChar);
 		break;
 	}
 }

workspace/TS100/Core/Src/main.cpp

@@ -124,6 +124,7 @@ void startPIDTask(void const *argument __unused) {
 	currentTempTargetDegC = 0; // Force start with no output (off). If in sleep / soldering this will
 							   // be over-ridden rapidly
 	pidTaskNotification = xTaskGetCurrentTaskHandle();
+	uint32_t PIDTempTarget = 0;
 	for (;;) {
 
 		if (ulTaskNotifyTake(pdTRUE, 2000)) {
@@ -131,15 +132,16 @@ void startPIDTask(void const *argument __unused) {
 			int32_t x10WattsOut = 0;
 			// Do the reading here to keep the temp calculations churning along
 			uint32_t currentTipTempInC = TipThermoModel::getTipInC(true);
-
-			if (currentTempTargetDegC) {
+			PIDTempTarget = currentTempTargetDegC;
+			if (PIDTempTarget) {
 				// Cap the max set point to 450C
-				if (currentTempTargetDegC > (450)) {
+				if (PIDTempTarget > (450)) {
 					//Maximum allowed output
-					currentTempTargetDegC = (450);
+					PIDTempTarget = (450);
 				}
-				if (currentTempTargetDegC > TipThermoModel::getTipMaxInC()) {
-					currentTempTargetDegC = TipThermoModel::getTipMaxInC();
+				//Safety check that not aiming higher than current tip can measure
+				if (PIDTempTarget > TipThermoModel::getTipMaxInC()) {
+					PIDTempTarget = TipThermoModel::getTipMaxInC();
 				}
 				// Convert the current tip to degree's C
 
@@ -147,7 +149,7 @@ void startPIDTask(void const *argument __unused) {
 				//  to be unstable. Use a rolling average to dampen it.
 				// We overshoot by roughly 1 degree C.
 				//  This helps stabilize the display.
-				int32_t tError = currentTempTargetDegC - currentTipTempInC + 1;
+				int32_t tError = PIDTempTarget - currentTipTempInC + 1;
 				tError = tError > INT16_MAX ? INT16_MAX : tError;
 				tError = tError < INT16_MIN ? INT16_MIN : tError;
 				tempError.update(tError);
@@ -192,17 +194,19 @@ void startPIDTask(void const *argument __unused) {
 				lastPowerPulse = xTaskGetTickCount();
 			}
 #endif
-
+			//Secondary safety check to forcefully disable header when within ADC noise of top of ADC
+			if (getTipRawTemp(0) > (0x7FFF - 150)) {
+				x10WattsOut = 0;
+			}
 			if (systemSettings.powerLimitEnable
-					&& x10WattsOut > (systemSettings.powerLimit * 10))
+					&& x10WattsOut > (systemSettings.powerLimit * 10)) {
 				setTipX10Watts(systemSettings.powerLimit * 10);
-			else
+			} else {
 				setTipX10Watts(x10WattsOut);
+			}
 
 			HAL_IWDG_Refresh(&hiwdg);
 		} else {
-			asm("bkpt");
-
 			//ADC interrupt timeout
 			setTipPWM(0);
 		}