Update version for release

Update to newest compiler from ARM

Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:rolling
+FROM ubuntu:20.04
 LABEL maintainer="Ben V. Brown <ralim@ralimtek.com>"
 
 WORKDIR /build
@@ -12,10 +12,10 @@ RUN apt-get update && \
   bzip2 \
   python3 \
   wget && \
-  apt-get clean && \
+  apt-get clean
-  wget -qO- https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2019q4/RC2.1/gcc-arm-none-eabi-9-2019-q4-major-x86_64-linux.tar.bz2 | tar -xj
+RUN wget -qO- https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm/9-2020q2/gcc-arm-none-eabi-9-2020-q2-update-x86_64-linux.tar.bz2 | tar -xj
 
 # Add compiler to the path
-ENV PATH "/build/gcc-arm-none-eabi-9-2019-q4-major/bin:$PATH"
+ENV PATH "/build/gcc-arm-none-eabi-9-2020-q2-update/bin:$PATH"
 COPY . /build/source
 COPY ./ci /build/ci

Translation Editor/translation_bg.json

@@ -273,6 +273,22 @@
 				"long?"
 			],
 			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
-}
+}

Translation Editor/translation_cs.json

@@ -274,6 +274,22 @@
 				"long?"
 			],
 			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
-}
+}

Translation Editor/translation_da.json

@@ -273,6 +273,22 @@
 				"long?"
 			],
 			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
-}
+}

Translation Editor/translation_de.json

@@ -277,6 +277,22 @@
 				"Taste Lang?"
 			],
 			"desc": "Temperaturwechselschritte bei langem Tastendruck!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
-}
+}

Translation Editor/translation_en.json

@@ -5,12 +5,12 @@
 	"tempUnitFahrenheit": true,
 	"messages": {
 		"SettingsCalibrationDone": "Calibration done!",
-		"SettingsCalibrationWarning": "Please ensure the tip is at room temperature before continuing!",
+		"SettingsCalibrationWarning": "Please ensure the tip is at room temperature, before continuing!",
 		"SettingsResetWarning": "Are you sure you want to reset settings to default values?",
 		"UVLOWarningString": "DC LOW",
 		"UndervoltageString": "Undervoltage",
 		"InputVoltageString": "Input V: ",
-		"WarningTipTempString": "Tip Temp: ",
+		"WarningTipTempString": "Tip temp: ",
 		"BadTipString": "BAD TIP",
 		"SleepingSimpleString": "Zzzz",
 		"SleepingAdvancedString": "Sleeping...",
@@ -23,7 +23,7 @@
 		"SolderingAdvancedPowerPrompt": "Power: ",
 		"OffString": "Off",
 		"ResetOKMessage": "Reset OK",
-		"YourGainMessage": "Your Gain:",
+		"YourGainMessage": "Your gain:",
 		"SettingsResetMessage": "Settings were\nreset!"
 	},
 	"characters": {
@@ -42,28 +42,28 @@
 		"SolderingMenu": {
 			"text2": [
 				"Soldering",
-				"Settings"
+				"settings"
 			],
 			"desc": "Soldering settings"
 		},
 		"PowerSavingMenu": {
 			"text2": [
 				"Sleep",
-				"Modes"
+				"modes"
 			],
 			"desc": "Power saving settings"
 		},
 		"UIMenu": {
 			"text2": [
 				"User",
-				"Interface"
+				"interface"
 			],
 			"desc": "User interface settings"
 		},
 		"AdvancedMenu": {
 			"text2": [
 				"Advanced",
-				"Options"
+				"options"
 			],
 			"desc": "Advanced options"
 		}
@@ -83,7 +83,7 @@
 				"Sleep",
 				"temp"
 			],
-			"desc": "Sleep Temperature"
+			"desc": "Sleep temperature"
 		},
 		"SleepTimeout": {
 			"text": "STME",
@@ -91,7 +91,7 @@
 				"Sleep",
 				"timeout"
 			],
-			"desc": "Sleep Timeout <Minutes/Seconds>"
+			"desc": "Sleep timeout <Minutes/Seconds>"
 		},
 		"ShutdownTimeout": {
 			"text": "SHTME",
@@ -99,7 +99,7 @@
 				"Shutdown",
 				"timeout"
 			],
-			"desc": "Shutdown Timeout <Minutes>"
+			"desc": "Shutdown timeout <Minutes>"
 		},
 		"MotionSensitivity": {
 			"text": "MSENSE",
@@ -107,15 +107,15 @@
 				"Motion",
 				"sensitivity"
 			],
-			"desc": "Motion Sensitivity <0=Off 1=Least Sensitive 9=Most Sensitive>"
+			"desc": "Motion sensitivity <0=Off 1=Least sensitive 9=Most sensitive>"
 		},
 		"TemperatureUnit": {
 			"text": "TMPUNT",
 			"text2": [
 				"Temperature",
-				"units"
+				"unit"
 			],
-			"desc": "Temperature Unit <C=Celsius F=Fahrenheit>"
+			"desc": "Temperature unit <C=Celsius F=Fahrenheit>"
 		},
 		"AdvancedIdle": {
 			"text": "ADVIDL",
@@ -123,7 +123,7 @@
 				"Detailed",
 				"idle screen"
 			],
-			"desc": "Display detailed information in a smaller font on the idle screen."
+			"desc": "Display detailed information in a smaller font on the idle screen"
 		},
 		"DisplayRotation": {
 			"text": "DSPROT",
@@ -131,15 +131,15 @@
 				"Display",
 				"orientation"
 			],
-			"desc": "Display Orientation <A=Automatic L=Left Handed R=Right Handed>"
+			"desc": "Display orientation <A=Automatic L=Left-handed R=Right-handed>"
 		},
 		"BoostEnabled": {
 			"text": "BOOST",
 			"text2": [
-				"Boost mode",
+				"Boost",
-				"enabled"
+				"mode"
 			],
-			"desc": "Enable front key long press \"Boost\" mode when soldering"
+			"desc": "Enable front key long press \"boost mode\" when soldering"
 		},
 		"BoostTemperature": {
 			"text": "BTMP",
@@ -147,7 +147,7 @@
 				"Boost",
 				"temp"
 			],
-			"desc": "Temperature when in \"Boost\" mode"
+			"desc": "Temperature when in \"boost mode\""
 		},
 		"AutoStart": {
 			"text": "ASTART",
@@ -155,7 +155,7 @@
 				"Auto",
 				"start"
 			],
-			"desc": "Automatically starts the iron into soldering on power up <T=Soldering S=Sleep F=Off>"
+			"desc": "Automatically starts the iron into soldering on power up <F=Off T=Soldering S=Sleep O=Sleep at room temperature>"
 		},
 		"CooldownBlink": {
 			"text": "CLBLNK",
@@ -163,7 +163,7 @@
 				"Cooldown",
 				"blink"
 			],
-			"desc": "Blink the temperature on the cooling screen while the tip is still hot."
+			"desc": "Blink the temperature on the cooling screen while the tip is still hot"
 		},
 		"TemperatureCalibration": {
 			"text": "TMP CAL?",
@@ -171,7 +171,7 @@
 				"Calibrate",
 				"temperature?"
 			],
-			"desc": "Calibrate tip offset."
+			"desc": "Calibrate tip offset?"
 		},
 		"SettingsReset": {
 			"text": "RESET?",
@@ -179,7 +179,7 @@
 				"Factory",
 				"Reset?"
 			],
-			"desc": "Reset all settings"
+			"desc": "Reset all settings!"
 		},
 		"VoltageCalibration": {
 			"text": "CAL VIN?",
@@ -187,7 +187,7 @@
 				"Calibrate",
 				"input voltage?"
 			],
-			"desc": "VIN Calibration. Buttons adjust, long press to exit"
+			"desc": "VIN Calibration <long press to exit>"
 		},
 		"AdvancedSoldering": {
 			"text": "ADVSLD",
@@ -201,7 +201,7 @@
 			"text": "DESCSP",
 			"text2": [
 				"Scrolling",
-				"Speed"
+				"speed"
 			],
 			"desc": "Speed this text scrolls past at <S=Slow F=Fast>"
 		},
@@ -209,23 +209,23 @@
 			"text": "TIPMO",
 			"text2": [
 				"Tip",
-				"Model"
+				"model"
 			],
-			"desc": "Tip Model selection"
+			"desc": "Tip model selection"
 		},
 		"SimpleCalibrationMode": {
 			"text": "SMPCAL",
 			"text2": [
 				"Simple",
-				"Calibration"
+				"calibration"
 			],
-			"desc": "Simple Calibration using Hot water"
+			"desc": "Simple calibration using hot water"
 		},
 		"AdvancedCalibrationMode": {
 			"text": "ADVCAL",
 			"text2": [
 				"Advanced",
-				"Calibration"
+				"calibration"
 			],
 			"desc": "Advanced calibration using thermocouple on the tip"
 		},
@@ -233,15 +233,15 @@
 			"text": "PWRW",
 			"text2": [
 				"Power",
-				"Wattage"
+				"wattage"
 			],
-			"desc": "Power Wattage of the power adapter used"
+			"desc": "Power wattage of the power adapter used"
 		},
 		"PowerLimitEnable": {
 			"text": "PLIMEN",
 			"text2": [
-				"P Limit",
+				"Enable power",
-				"Enable"
+				"limit"
 			],
 			"desc": "Enable power limit"
 		},
@@ -249,33 +249,49 @@
 			"text": "PLIM",
 			"text2": [
 				"Power",
-				"Limit"
+				"limit"
 			],
 			"desc": "Maximum power the iron can use <Watts>"
 		},
 		"ReverseButtonTempChange": {
 			"text": "RVTCHG",
 			"text2": [
-				"Key +-",
+				"Reverse",
-				"reverse?"
+				"+ - keys"
 			],
-			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+			"desc": "Reverse assignment of temperature adjustment buttons"
 		},
 		"TempChangeShortStep": {
 			"text": "TCHGST",
 			"text2": [
 				"Temp change",
-				"short?"
+				"short"
 			],
-			"desc": "Temperature change steps on short button press!"
+			"desc": "Temperature change steps on short button press"
 		},
 		"TempChangeLongStep": {
 			"text": "TCHGLT",
 			"text2": [
 				"Temp change",
-				"long?"
+				"long"
 			],
-			"desc": "Temperature change steps on long button press!"
+			"desc": "Temperature change steps on long button press"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
 }

Translation Editor/translation_es.json

@@ -275,6 +275,22 @@
 				"long?"
 			],
 			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
-}
+}

Translation Editor/translation_fi.json

@@ -273,6 +273,22 @@
 				"long?"
 			],
 			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
-}
+}

Translation Editor/translation_fr.json

@@ -13,8 +13,8 @@
 		"BadTipString": "PANNE HS",
 		"SleepingSimpleString": "Zzzz",
 		"SleepingAdvancedString": "En veille...",
-		"WarningSimpleString": "HOT!",
+		"WarningSimpleString": "CHAUD!",
-		"WarningAdvancedString": "ATTENTION! CHAUD",
+		"WarningAdvancedString": "ATTENTION! CHAUD!",
 		"SleepingTipAdvancedString": "Panne:",
 		"IdleTipString": "Tip:",
 		"IdleSetString": " Set:",
@@ -238,41 +238,57 @@
 			"text": "PLIMEN",
 			"text2": [
 				"P Limit",
-				"Enable"
+				"Activer?"
 			],
-			"desc": "Enable power limit"
+			"desc": "Activer la limite de puissance"
 		},
 		"PowerLimit": {
 			"text": "PLIM",
 			"text2": [
-				"Power",
+				"Puissance",
-				"Limit"
+				"Limite"
 			],
-			"desc": "Maximum power the iron can use <Watts>"
+			"desc": "Puissance maximale utilisable <Watts>"
 		},
 		"ReverseButtonTempChange": {
 			"text": "RVTCHG",
 			"text2": [
 				"Key +-",
-				"reverse?"
+				"Inverser?"
 			],
-			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+			"desc": "Inversez l'assignation +/- du bouton de changement de température de la pointe."
 		},
 		"TempChangeShortStep": {
 			"text": "TCHGST",
 			"text2": [
 				"Temp change",
-				"short?"
+				"Court?"
 			],
-			"desc": "Temperature change steps on short button press!"
+			"desc": "Incrément de changement de température sur appui court."
 		},
 		"TempChangeLongStep": {
 			"text": "TCHGLT",
 			"text2": [
 				"Temp change",
-				"long?"
+				"Long?"
 			],
-			"desc": "Temperature change steps on long button press!"
+			"desc": "Incrément de changement de température sur appui long."
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
-}
+}

Translation Editor/translation_hr.json

@@ -273,6 +273,22 @@
 				"long?"
 			],
 			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
-}
+}

Translation Editor/translation_hu.json

@@ -235,44 +235,60 @@
 			"desc": "A tápegység által leadott teljesítmény"
 		},
 		"PowerLimitEnable": {
-			"text": "PLIMEN",
+			"text": "TELJH",
 			"text2": [
-				"P Limit",
+				"Telj H",
-				"Enable"
+				"Bekapcsolva"
 			],
-			"desc": "Enable power limit"
+			"desc": "Bemeneti teljesitmény korlátozása"
 		},
 		"PowerLimit": {
-			"text": "PLIM",
+			"text": "TELJM",
 			"text2": [
-				"Power",
+				"Telj",
-				"Limit"
+				"maximum"
 			],
-			"desc": "Maximum power the iron can use <Watts>"
+			"desc": "Maximális teljesitmény beállitása <Watts>"
 		},
 		"ReverseButtonTempChange": {
-			"text": "RVTCHG",
+			"text": "HÖVÁLT",
 			"text2": [
-				"Key +-",
+				"GOMB +-",
-				"reverse?"
+				"Felcseréled?"
 			],
-			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+			"desc": "A páka hömérséklet növelés csökkentési gombok felcserélése."
 		},
 		"TempChangeShortStep": {
-			"text": "TCHGST",
+			"text": "HÖRÖV",
 			"text2": [
-				"Temp change",
+				"Hömérséklet",
-				"short?"
+				"váltás rövid?"
 			],
-			"desc": "Temperature change steps on short button press!"
+			"desc": "Hömérséklet váltás rövid gombnyomásrs bekapcsolva!"
 		},
 		"TempChangeLongStep": {
-			"text": "TCHGLT",
+			"text": "HÖHOS",
 			"text2": [
-				"Temp change",
+				"Hömérséklet",
-				"long?"
+				"váltás hosszú?"
 			],
-			"desc": "Temperature change steps on long button press!"
+			"desc": "Hömérséklet váltás hosszú gombnyomásrs bekapcsolva!"
+		},
+		"PowerPulsePower":{
+			"text": "TELJP",
+			"text2": [
+				"Telj power",
+				"bank üzem W"
+			],
+			"desc": "Powerbank üzemnél nem engedi a powerbankot kikapcsolni idönkénti áram felvételt generál. "
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
-}
+}

Translation Editor/translation_it.json

@@ -21,7 +21,9 @@
 		"TipDisconnectedString": "PUNTA ASSENTE",
 		"SolderingAdvancedPowerPrompt": "Potenz:",
 		"OffString": "OFF",
-		"ResetOKMessage": "Reset OK"
+		"ResetOKMessage": "Reset OK",
+		"YourGainMessage": "Guad.: ",
+		"SettingsResetMessage": "Reset effettuato"
 	},
 	"characters": {
 		"SettingRightChar": "D",
@@ -160,7 +162,7 @@
 				"Avviso",
 				"punta calda"
 			],
-			"desc": "Mostra, lampeggiante, la temperatura durante il raffreddamento se la punta è ancora calda"
+			"desc": "Evidenzia il valore di temperatura durante il raffreddamento se la punta è ancora calda"
 		},
 		"TemperatureCalibration": {
 			"text": "",
@@ -237,42 +239,58 @@
 		"PowerLimitEnable": {
 			"text": "PLIMEN",
 			"text2": [
-				"P Limit",
+				"Limitatore",
-				"Enable"
+				"di potenza"
 			],
-			"desc": "Enable power limit"
+			"desc": "Abilita un limitatore per la potenza massima erogabile al saldatore"
 		},
 		"PowerLimit": {
 			"text": "PLIM",
 			"text2": [
-				"Power",
+				"Limite",
-				"Limit"
+				"di potenza"
 			],
-			"desc": "Maximum power the iron can use <Watts>"
+			"desc": "Imposta il valore di potenza massima erogabile al saldatore <watt>"
 		},
 		"ReverseButtonTempChange": {
 			"text": "RVTCHG",
 			"text2": [
-				"Key +-",
+				"Inversione",
-				"reverse?"
+				"tasti"
 			],
-			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+			"desc": "Inverti i tasti per impostare la temperatura della punta "
 		},
 		"TempChangeShortStep": {
 			"text": "TCHGST",
 			"text2": [
-				"Temp change",
+				"Cambio temp",
-				"short?"
+				"pressione breve"
 			],
-			"desc": "Temperature change steps on short button press!"
+			"desc": "Varia la temperatura della punta attraverso una breve pressione dei tasti"
 		},
 		"TempChangeLongStep": {
 			"text": "TCHGLT",
 			"text2": [
-				"Temp change",
+				"Cambio temp",
-				"long?"
+				"pressione lunga"
 			],
-			"desc": "Temperature change steps on long button press!"
+			"desc": "Varia la temperatura della punta attraverso una lunga pressione dei tasti"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
-}
+}

Translation Editor/translation_lt.json

@@ -273,6 +273,22 @@
 				"long?"
 			],
 			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
-}
+}

Translation Editor/translation_nl.json

@@ -273,6 +273,22 @@
 				"long?"
 			],
 			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
-}
+}

Translation Editor/translation_nl_be.json

@@ -273,6 +273,22 @@
 				"long?"
 			],
 			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
-}
+}

Translation Editor/translation_no.json

@@ -273,6 +273,22 @@
 				"long?"
 			],
 			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
-}
+}

Translation Editor/translation_pl.json

@@ -273,6 +273,22 @@
 				"long?"
 			],
 			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
-}
+}

Translation Editor/translation_pt.json

@@ -273,6 +273,22 @@
 				"long?"
 			],
 			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
-}
+}

Translation Editor/translation_ru.json

@@ -3,17 +3,17 @@
 	"languageLocalName": "Русский",
 	"cyrillicGlyphs": true,
 	"messages": {
-		"SettingsCalibrationDone": "Калибровка выполнена!",
+		"SettingsCalibrationDone": "Калибровка завершена!",
-		"SettingsCalibrationWarning": "Убедитесь, что жало остыло до комнатной температуры, прежде чем продолжать!",
+		"SettingsCalibrationWarning": "Прежде чем продолжить, пожалуйста, убедитесь что жало имеет комнатную температуру!",
-		"SettingsResetWarning": "Вы действительно хотите сбросить настройки до значений по умолчанию?",
+		"SettingsResetWarning": "Вы уверены, что хотите сбросить настройки к значениям по-умолчанию?",
 		"UVLOWarningString": "НАПРЯЖ--",
-		"UndervoltageString": "Под питанием",
+		"UndervoltageString": "Низк. напряжение",
-		"InputVoltageString": "Питание B: ",
+		"InputVoltageString": "Питание В: ",
-		"WarningTipTempString": "Жало t°: ",
+		"WarningTipTempString": "Темп. жала: ",
-		"BadTipString": "Жало--",
+		"BadTipString": "ЖАЛО--",
-		"SleepingSimpleString": "Сон ",
+		"SleepingSimpleString": "Zzzz",
 		"SleepingAdvancedString": "Ожидание...",
-		"WarningSimpleString": " ГОРЯЧО!",
+		"WarningSimpleString": "ГОРЯЧО!",
 		"WarningAdvancedString": "!!! ГОРЯЧЕЕ ЖАЛО !!!",
 		"SleepingTipAdvancedString": "Жало:",
 		"IdleTipString": "Жало:",
@@ -23,18 +23,18 @@
 		"OffString": "Выкл.",
 		"ResetOKMessage": "Сброс OK",
 		"YourGainMessage": "Прирост:",
-		"SettingsResetMessage": "Настройки \nсброшены!"
+		"SettingsResetMessage": "Настройки сброшены!"
 	},
 	"characters": {
 		"SettingRightChar": "П",
 		"SettingLeftChar": "Л",
-		"SettingAutoChar": "A",
+		"SettingAutoChar": "А",
-		"SettingFastChar": "+",
+		"SettingFastChar": "Б",
-		"SettingSlowChar": "-",
+		"SettingSlowChar": "М",
-		"SettingStartSolderingChar": "T",
+		"SettingStartSolderingChar": "П",
-		"SettingStartSleepChar": "S",
+		"SettingStartSleepChar": "О",
-		"SettingStartSleepOffChar": "O",
+		"SettingStartSleepOffChar": "К",
-		"SettingStartNoneChar": "F"
+		"SettingStartNoneChar": "В"
 	},
 	"menuDouble": true,
 	"menuGroups": {
@@ -47,234 +47,250 @@
 		},
 		"PowerSavingMenu": {
 			"text2": [
-				"Режим",
+				"Режимы",
 				"сна"
 			],
-			"desc": "Параметры экономии энергии"
+			"desc": "Найстроки режима ожидания"
 		},
 		"UIMenu": {
 			"text2": [
-				"Пользовател",
+				"Параметры",
-				"интерфейс"
+				"интерфейса"
 			],
-			"desc": "Параметры пользовательского интерфейса"
+			"desc": "Найстройки пользовательского интерфейса"
 		},
 		"AdvancedMenu": {
 			"text2": [
 				"Дополнител.",
-				"параметры"
+				"найстройки"
 			],
-			"desc": "Дополнительные параметры"
+			"desc": "Дополнительные настройки"
 		}
 	},
 	"menuOptions": {
 		"PowerSource": {
-			"text": "ИстП",
+			"text": "ИстчнПит",
 			"text2": [
 				"Источник",
 				"питания"
 			],
-			"desc": "Источник питания. Установка напряжения отключения. <DC = 10 В, S = 3.3 В на батарею, ограничение мощности выкл.>"
+			"desc": "Источник питания. Устанавливает напряжение отсечки. <DC 10В> <S 3.3В на ячейку, без лимита мощности>"
 		},
 		"SleepTemperature": {
-			"text": "Тожд",
+			"text": "ТмпОжд",
 			"text2": [
-				"Темпер.",
+				"Темп.",
-				"сна"
+				"ожидания"
 			],
-			"desc": "Температура режима ожидания <С>"
+			"desc": "Температура режима ожидания"
 		},
 		"SleepTimeout": {
-			"text": "Вожд",
+			"text": "ВрмОжид",
 			"text2": [
 				"Таймаут",
-				"сна"
+				"ожидания"
 			],
 			"desc": "Время до перехода в режим ожидания <Минуты/Секунды>"
 		},
 		"ShutdownTimeout": {
-			"text": "Тоткл",
+			"text": "ВрмОткл",
 			"text2": [
-				"Время до",
+				"Таймаут",
-				"отключения"
+				"выключения"
 			],
-			"desc": "Время до отключения <Минуты>"
+			"desc": "Время до отключения паяльника <Минуты>"
 		},
 		"MotionSensitivity": {
-			"text": "ЧувсДв",
+			"text": "ЧувсАксл",
 			"text2": [
-				"Чувст. сенсо-",
+				"Чувствительн.",
-				"ра движения"
+				"акселерометра"
 			],
-			"desc": "Акселерометр <0 = Выкл, 1 = Мин. чувствительный, 9 = Макс. чувствительный>"
+			"desc": "Чувствительность акселерометра <0=Выкл., 1=Мин., 9=Макс.>"
 		},
 		"TemperatureUnit": {
 			"text": "ЕдТемп",
 			"text2": [
-				"Формат темпе-",
+				"Единицы",
-				"ратуры(C°/F°)"
+				"температуры"
 			],
-			"desc": "Единица измерения температуры <C = Цельсия, F = Фаренгейт>"
+			"desc": "Единицы изменения температуры <C=Цельция, F=Фаренгейта>"
 		},
 		"AdvancedIdle": {
 			"text": "ИнфОжд",
 			"text2": [
-				"Подробный ре-",
+				"Подробный",
-				"жим ожидания"
+				"реж. ожидания"
 			],
-			"desc": "Показывать детальную информацию маленьким шрифтом на домашнем экране"
+			"desc": "Отображать детальную информацию уменьшенным шрифтом на домашнем экране"
 		},
 		"DisplayRotation": {
 			"text": "ПовЭкр",
 			"text2": [
-				"Автоповорот",
+				"Ориентация",
 				"экрана"
 			],
-			"desc": "Ориентация дисплея <A = Авто, Л = Левая рука, П = Правая рука>"
+			"desc": "Ориентация экрана <А=Авто, Л=Левая рука, П=Правая рука>"
 		},
 		"BoostEnabled": {
-			"text": "Турбо",
+			"text": "Турб",
 			"text2": [
-				"Режим",
+				"Турбо",
-				"Турбо"
+				"режим"
 			],
-			"desc": "Активирует \"Турбо-режим\" при удержании кнопки А во время пайки"
+			"desc": "Включить активацию турбо-режма, при удержании ближней к жалу кнопки во время пайки"
 		},
 		"BoostTemperature": {
-			"text": "Ттур",
+			"text": "ТемпТурб",
 			"text2": [
-				"Темпер.",
+				"t° турбо",
-				"Турбо"
+				"режима"
 			],
-			"desc": "Температура в \"Турбо-режиме\""
+			"desc": "Температура жала в турбо режиме"
 		},
 		"AutoStart": {
-			"text": "Астарт",
+			"text": "АвтоРеж",
 			"text2": [
-				"Горячий",
+				"Авто",
 				"старт"
 			],
-			"desc": "Автоматический запуск паяльника при включении питания <T = Нагрев, S = Режим ожидания, F = Выкл.>"
+			"desc": "Режим с которым запускается паяльник при подаче питания <П=Пайка, О=Ожидание, К=Ожидание при комн. темп., В=Выкл.>"
 		},
 		"CooldownBlink": {
-			"text": "Охлажд",
+			"text": "МигТемп",
 			"text2": [
-				"Показ t° при",
+				"Мигание t°",
-				"остывании"
+				"при остывании"
 			],
-			"desc": "Показывать температуру на экране охлаждения, пока жало остается горячим"
+			"desc": "Мигать температурой на экране охлаждения, пока жало еще горячее"
 		},
 		"TemperatureCalibration": {
-			"text": "КалибрТ",
+			"text": "КалТемп?",
 			"text2": [
 				"Калибровка",
 				"температуры"
 			],
-			"desc": "Калибровка термодатчика"
+			"desc": "Калибровка термодатчика жала"
 		},
 		"SettingsReset": {
-			"text": "СБРОС?",
+			"text": "Сброс?",
 			"text2": [
-				"Сбросить все",
+				"Сброс",
-				"настройки?"
+				"Настроек"
 			],
-			"desc": "Сброс всех настроек"
+			"desc": "Сброс настроек к значеням по-умолчанию"
 		},
 		"VoltageCalibration": {
-			"text": "КалибрU?",
+			"text": "КалНапр",
 			"text2": [
 				"Калибровка",
 				"напряжения"
 			],
-			"desc": "Калибровка входного напряжения. Настройка кнопками, нажать и удержать чтобы завершить"
+			"desc": "Калибровка входного напряжения <длинное нажатие для выхода>"
 		},
 		"AdvancedSoldering": {
-			"text": "ИнфПай",
+			"text": "ИнфПайк",
 			"text2": [
-				"Подробный ре-",
+				"Подробный",
-				"жим пайки"
+				"экран пайки"
 			],
-			"desc": "Показывать детальную информацию при пайке"
+			"desc": "Показывать детальную информацию на экране пайки"
 		},
 		"ScrollingSpeed": {
-			"text": "DESCSP",
+			"text": "СкорТекс",
 			"text2": [
 				"Скорость",
 				"текста"
 			],
-			"desc": "Скорость прокрутки текста"
+			"desc": "Скорость прокрутки текста <М=медленно, Б=быстро>"
 		},
 		"TipModel": {
-			"text": "TIPMO",
+			"text": "МодЖала",
 			"text2": [
 				"Модель",
-				"жало"
+				"жала"
 			],
-			"desc": "Выбор модели жало"
+			"desc": "Выбор модели жала"
 		},
 		"SimpleCalibrationMode": {
-			"text": "SMPCAL",
+			"text": "УпрКал",
 			"text2": [
-				"Простая",
+				"Упрощенная",
 				"калибровка"
 			],
-			"desc": "Простая калибровка с использованием горячей воды"
+			"desc": "Упрощенная калибровка с использованием горячей воды"
 		},
 		"AdvancedCalibrationMode": {
-			"text": "ADVCAL",
+			"text": "УлучшКал",
 			"text2": [
-				"Подробная",
+				"Улучшенная",
 				"калибровка"
 			],
-			"desc": "Калибровка с помощью термопары"
+			"desc": "Улучшенная калибровка с импользованием термопары жала"
 		},
 		"PowerInput": {
-			"text": "PWRW",
+			"text": "МощнИст",
 			"text2": [
 				"Мощность",
-				"адаптера"
+				"питания"
 			],
-			"desc": "Мощность используемого адаптера питания"
+			"desc": "Мощность используемого источника питания"
 		},
 		"PowerLimitEnable": {
-			"text": "PLIMEN",
+			"text": "ВклЛимW",
 			"text2": [
 				"Ограничение",
 				"мощности"
 			],
-			"desc": "Включает ограничение мощности потребления"
+			"desc": "Включить лимит потреблямой мощности"
 		},
 		"PowerLimit": {
-			"text": "PLIM",
+			"text": "ЗначЛимW",
 			"text2": [
 				"Максимальная",
 				"мощность"
 			],
-			"desc": "Макс. мощность, которую может использовать паяльник <Ватт>"
+			"desc": "Максимальная мощность которую может использовать паяльник <Ватт>"
 		},
 		"ReverseButtonTempChange": {
-			"text": "RVTCHG",
+			"text": "ИнвКноп",
 			"text2": [
-				"Key +-",
+				"Инвертировать",
-				"reverse?"
+				"кнопки"
 			],
-			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+			"desc": "Инвертировать кнопки изменения температуры"
 		},
 		"TempChangeShortStep": {
-			"text": "TCHGST",
+			"text": "ШагКорт",
 			"text2": [
-				"Temp change",
+				"Шаг темп.",
-				"short?"
+				"кор. наж."
 			],
-			"desc": "Temperature change steps on short button press!"
+			"desc": "Шаг изменения температуры при коротком нажатии кнопок"
 		},
 		"TempChangeLongStep": {
-			"text": "TCHGLT",
+			"text": "ШагДлин",
 			"text2": [
-				"Temp change",
+				"Шаг темп.",
-				"long?"
+				"длин. наж."
 			],
-			"desc": "Temperature change steps on long button press!"
+			"desc": "Шаг изменения температуры при длинном нажатии кнопок"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"			
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
 }

Translation Editor/translation_sk.json

@@ -273,6 +273,22 @@
 				"long?"
 			],
 			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
-}
+}

Translation Editor/translation_sl.json

@@ -274,6 +274,22 @@
 				"long?"
 			],
 			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
-}
+}

Translation Editor/translation_sr_cyrl.json

@@ -273,6 +273,22 @@
 				"long?"
 			],
 			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
-}
+}

Translation Editor/translation_sr_latn.json

@@ -273,6 +273,22 @@
 				"long?"
 			],
 			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
-}
+}

Translation Editor/translation_sv.json

@@ -273,6 +273,22 @@
 				"long?"
 			],
 			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
-}
+}

Translation Editor/translation_tr.json

@@ -273,6 +273,22 @@
 				"long?"
 			],
 			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
-}
+}

Translation Editor/translation_uk.json

@@ -253,26 +253,42 @@
 		"ReverseButtonTempChange": {
 			"text": "RVTCHG",
 			"text2": [
-				"Key +-",
+				"Інвертувати",
-				"reverse?"
+				"кнопки +-?"
 			],
-			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+			"desc": "Інвертувати кнопки зміни температури."
 		},
 		"TempChangeShortStep": {
 			"text": "TCHGST",
 			"text2": [
-				"Temp change",
+				"Зміна темп.",
-				"short?"
+				"коротко?"
 			],
-			"desc": "Temperature change steps on short button press!"
+			"desc": "Змінювати температуру при короткому натисканні!"
 		},
 		"TempChangeLongStep": {
 			"text": "TCHGLT",
 			"text2": [
-				"Temp change",
+				"Зміна темп.",
-				"long?"
+				"довго?"
 			],
-			"desc": "Temperature change steps on long button press!"
+			"desc": "Змінювати температуру при довгому натисканні!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
 }

Translation Editor/translations_def.js

@@ -282,6 +282,16 @@ var def =
 			"id": "TempChangeLongStep",
 			"maxLen": 6,
 			"maxLen2": 16
+		},
+		{
+			"id": "PowerPulsePower",
+			"maxLen": 6,
+			"maxLen2": 16
+		},
+		{
+			"id": "TipGain",
+			"maxLen": 6,
+			"maxLen2": 8
 		}
 	]
 }

docker-compose.yml

@@ -1,4 +1,4 @@
-version: '3'
+version: "3"
 services:
   builder:
     stdin_open: true

workspace/TS100/Core/BSP/BSP.h

@@ -0,0 +1,55 @@
+#include "BSP_Flash.h"
+#include "BSP_Power.h"
+#include "BSP_QC.h"
+#include "Defines.h"
+#include "UnitSettings.h"
+#include "stdint.h"
+/*
+ * BSP.h -- Board Support
+ *
+ * This exposes functions that are expected to be implemented to add support for different hardware
+ */
+
+#ifndef BSP_BSP_H_
+#define BSP_BSP_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Called first thing in main() to init the hardware
+void preRToSInit();
+// Called once the RToS has started for any extra work
+void postRToSInit();
+
+// Called to reset the hardware watchdog unit
+void resetWatchdog();
+// Accepts a output level of 0.. to use to control the tip output PWM
+void setTipPWM(uint8_t pulse);
+// Returns the Handle temp in C, X10
+uint16_t getHandleTemperature();
+// Returns the Tip temperature ADC reading in raw units
+uint16_t getTipRawTemp(uint8_t refresh);
+// Returns the main DC input voltage, using the adjustable divisor + sample flag
+uint16_t getInputVoltageX10(uint16_t divisor, uint8_t sample);
+
+// Readers for the two buttons
+// !! Returns 1 if held down, 0 if released
+uint8_t getButtonA();
+uint8_t getButtonB();
+
+// This is a work around that will be called if I2C starts to bug out
+// This should toggle the SCL line until SDA goes high to end the current transaction
+void unstick_I2C();
+
+// Reboot the IC when things go seriously wrong
+void reboot();
+
+// If the user has programmed in a bootup logo, draw it to the screen from flash
+// Returns 1 if the logo was printed so that the unit waits for the timeout or button
+uint8_t showBootLogoIfavailable();
+
+void delay_ms(uint16_t count);
+#ifdef __cplusplus
+}
+#endif
+#endif /* BSP_BSP_H_ */

workspace/TS100/Core/BSP/BSP_Flash.h

@@ -0,0 +1,26 @@
+/*
+ * BSP_Flash.h
+ *
+ *  Created on: 29 May 2020
+ *      Author: Ralim
+ */
+#include "stdint.h"
+#ifndef BSP_BSP_FLASH_H_
+#define BSP_BSP_FLASH_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Wrappers to allow read/writing to a sector of flash that we use to store all of the user settings
+ *
+ * Should allow reading and writing to the flash
+ */
+
+//Erase the flash, then save the buffer. Returns 1 if worked
+uint8_t flash_save_buffer(const uint8_t *buffer, const uint16_t length);
+
+void flash_read_buffer(uint8_t *buffer, const uint16_t length);
+#ifdef __cplusplus
+}
+#endif
+#endif /* BSP_BSP_FLASH_H_ */

workspace/TS100/Core/BSP/BSP_Power.h

@@ -0,0 +1,27 @@
+#include "stdint.h"
+/*
+ * BSP_Power.h -- Board Support for Power control
+ *
+ * These functions are hooks used to allow for power control
+ *
+ */
+
+#ifndef BSP_POWER_H_
+#define BSP_POWER_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Called once at startup, after RToS
+// This can handle negotiations for QC/PD etc
+void power_probe();
+
+// Called periodically in the movement handling thread
+// Can be used to check any details for the power system
+void power_check();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

workspace/TS100/Core/BSP/BSP_QC.h

@@ -0,0 +1,42 @@
+/*
+ * BSP_QC.h
+ *
+ *  Created on: 29 May 2020
+ *      Author: Ralim
+ */
+
+#ifndef BSP_BSP_QC_H_
+#define BSP_BSP_QC_H_
+#include "stdint.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Init GPIO for QC neg
+void QC_Init_GPIO();
+// Set the DP pin to 0.6V
+void QC_DPlusZero_Six();
+// Set the DM pin to 0.6V
+void QC_DNegZero_Six();
+// Set the DP pin to 3.3V
+void QC_DPlusThree_Three();
+// Set the DM pin to 3.3V
+void QC_DNegThree_Three();
+// Turn on weak pulldown on the DM pin
+// This is used as a helper for some power banks
+void QC_DM_PullDown();
+// Turn off the pulldown
+void QC_DM_No_PullDown();
+// Turn on output drivers that were initally disabled to prevent spike through QC disable mode
+void QC_Post_Probe_En();
+// Check if DM was pulled down
+// 1=Pulled down, 0 == pulled high
+uint8_t QC_DM_PulledDown();
+
+// Re-sync if required
+void QC_resync();
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* BSP_BSP_QC_H_ */

workspace/TS100/Core/BSP/Defines.h

@@ -0,0 +1,19 @@
+/*
+ * Defines.h
+ *
+ *  Created on: 29 May 2020
+ *      Author: Ralim
+ */
+
+#ifndef BSP_DEFINES_H_
+#define BSP_DEFINES_H_
+
+
+enum Orientation {
+	ORIENTATION_LEFT_HAND = 0, ORIENTATION_RIGHT_HAND = 1, ORIENTATION_FLAT = 3
+};
+
+//It is assumed that all hardware implements an 8Hz update period at this time
+#define PID_TIM_HZ (8)
+
+#endif /* BSP_DEFINES_H_ */

workspace/TS100/Core/BSP/Miniware/BSP.cpp

@@ -0,0 +1,256 @@
+//BSP mapping functions
+
+#include "BSP.h"
+#include "Setup.h"
+#include "history.hpp"
+#include "Pins.h"
+#include "main.hpp"
+#include "history.hpp"
+#include "I2C_Wrapper.hpp"
+volatile uint16_t PWMSafetyTimer = 0;
+volatile uint8_t pendingPWM = 0;
+
+//2 second filter (ADC is PID_TIM_HZ Hz)
+history<uint16_t, PID_TIM_HZ> rawTempFilter = { { 0 }, 0, 0 };
+void resetWatchdog() {
+	HAL_IWDG_Refresh(&hiwdg);
+}
+
+uint16_t getHandleTemperature() {
+	// We return the current handle temperature in X10 C
+	// TMP36 in handle, 0.5V offset and then 10mV per deg C (0.75V @ 25C for
+	// example) STM32 = 4096 count @ 3.3V input -> But We oversample by 32/(2^2) =
+	// 8 times oversampling Therefore 32768 is the 3.3V input, so 0.1007080078125
+	// mV per count So we need to subtract an offset of 0.5V to center on 0C
+	// (4964.8 counts)
+	//
+	int32_t result = getADC(0);
+	result -= 4965;  // remove 0.5V offset
+	// 10mV per C
+	// 99.29 counts per Deg C above 0C
+	result *= 100;
+	result /= 993;
+	return result;
+}
+
+uint16_t getTipInstantTemperature() {
+	uint16_t sum = 0;	// 12 bit readings * 8 -> 15 bits
+	uint16_t readings[8];
+	//Looking to reject the highest outlier readings.
+	//As on some hardware these samples can run into the op-amp recovery time
+	//Once this time is up the signal stabilises quickly, so no need to reject minimums
+	readings[0] = hadc1.Instance->JDR1;
+	readings[1] = hadc1.Instance->JDR2;
+	readings[2] = hadc1.Instance->JDR3;
+	readings[3] = hadc1.Instance->JDR4;
+	readings[4] = hadc2.Instance->JDR1;
+	readings[5] = hadc2.Instance->JDR2;
+	readings[6] = hadc2.Instance->JDR3;
+	readings[7] = hadc2.Instance->JDR4;
+
+	for (int i = 0; i < 8; i++) {
+		sum += readings[i];
+	}
+	return sum;  // 8x over sample
+}
+
+uint16_t getTipRawTemp(uint8_t refresh) {
+	if (refresh) {
+		uint16_t lastSample = getTipInstantTemperature();
+		rawTempFilter.update(lastSample);
+		return lastSample;
+	} else {
+		return rawTempFilter.average();
+	}
+}
+
+uint16_t getInputVoltageX10(uint16_t divisor, uint8_t sample) {
+	// ADC maximum is 32767 == 3.3V at input == 28.05V at VIN
+	// Therefore we can divide down from there
+	// Multiplying ADC max by 4 for additional calibration options,
+	// ideal term is 467
+#ifdef MODEL_TS100
+#define BATTFILTERDEPTH 32
+#else
+#define BATTFILTERDEPTH 8
+
+#endif
+	static uint8_t preFillneeded = 10;
+	static uint32_t samples[BATTFILTERDEPTH];
+	static uint8_t index = 0;
+	if (preFillneeded) {
+		for (uint8_t i = 0; i < BATTFILTERDEPTH; i++)
+			samples[i] = getADC(1);
+		preFillneeded--;
+	}
+	if (sample) {
+		samples[index] = getADC(1);
+		index = (index + 1) % BATTFILTERDEPTH;
+	}
+	uint32_t sum = 0;
+
+	for (uint8_t i = 0; i < BATTFILTERDEPTH; i++)
+		sum += samples[i];
+
+	sum /= BATTFILTERDEPTH;
+	return sum * 4 / divisor;
+}
+
+void setTipPWM(uint8_t pulse) {
+	PWMSafetyTimer = 10; // This is decremented in the handler for PWM so that the tip pwm is
+						 // disabled if the PID task is not scheduled often enough.
+
+	pendingPWM = pulse;
+}
+
+// These are called by the HAL after the corresponding events from the system
+// timers.
+
+void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim) {
+// Period has elapsed
+	if (htim->Instance == TIM2) {
+		// we want to turn on the output again
+		PWMSafetyTimer--;
+		// We decrement this safety value so that lockups in the
+		// scheduler will not cause the PWM to become locked in an
+		// active driving state.
+		// While we could assume this could never happen, its a small price for
+		// increased safety
+		htim2.Instance->CCR4 = pendingPWM;
+		if (htim2.Instance->CCR4 && PWMSafetyTimer) {
+			HAL_TIM_PWM_Start(&htim3, TIM_CHANNEL_1);
+		} else {
+			HAL_TIM_PWM_Stop(&htim3, TIM_CHANNEL_1);
+		}
+	} else if (htim->Instance == TIM1) {
+		// STM uses this for internal functions as a counter for timeouts
+		HAL_IncTick();
+	}
+}
+
+void HAL_TIM_PWM_PulseFinishedCallback(TIM_HandleTypeDef *htim) {
+// This was a when the PWM for the output has timed out
+	if (htim->Channel == HAL_TIM_ACTIVE_CHANNEL_4) {
+		HAL_TIM_PWM_Stop(&htim3, TIM_CHANNEL_1);
+	}
+}
+void unstick_I2C() {
+	GPIO_InitTypeDef GPIO_InitStruct;
+	int timeout = 100;
+	int timeout_cnt = 0;
+
+	// 1. Clear PE bit.
+	hi2c1.Instance->CR1 &= ~(0x0001);
+	/**I2C1 GPIO Configuration
+	 PB6     ------> I2C1_SCL
+	 PB7     ------> I2C1_SDA
+	 */
+	//  2. Configure the SCL and SDA I/Os as General Purpose Output Open-Drain, High level (Write 1 to GPIOx_ODR).
+	GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_OD;
+	GPIO_InitStruct.Pull = GPIO_PULLUP;
+	GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
+
+	GPIO_InitStruct.Pin = SCL_Pin;
+	HAL_GPIO_Init(SCL_GPIO_Port, &GPIO_InitStruct);
+	HAL_GPIO_WritePin(SCL_GPIO_Port, SCL_Pin, GPIO_PIN_SET);
+
+	GPIO_InitStruct.Pin = SDA_Pin;
+	HAL_GPIO_Init(SDA_GPIO_Port, &GPIO_InitStruct);
+	HAL_GPIO_WritePin(SDA_GPIO_Port, SDA_Pin, GPIO_PIN_SET);
+
+	while (GPIO_PIN_SET != HAL_GPIO_ReadPin(SDA_GPIO_Port, SDA_Pin)) {
+		//Move clock to release I2C
+		HAL_GPIO_WritePin(SCL_GPIO_Port, SCL_Pin, GPIO_PIN_RESET);
+		asm("nop");
+		asm("nop");
+		asm("nop");
+		asm("nop");
+		HAL_GPIO_WritePin(SCL_GPIO_Port, SCL_Pin, GPIO_PIN_SET);
+
+		timeout_cnt++;
+		if (timeout_cnt > timeout)
+			return;
+	}
+
+	// 12. Configure the SCL and SDA I/Os as Alternate function Open-Drain.
+	GPIO_InitStruct.Mode = GPIO_MODE_AF_OD;
+	GPIO_InitStruct.Pull = GPIO_PULLUP;
+	GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
+
+	GPIO_InitStruct.Pin = SCL_Pin;
+	HAL_GPIO_Init(SCL_GPIO_Port, &GPIO_InitStruct);
+
+	GPIO_InitStruct.Pin = SDA_Pin;
+	HAL_GPIO_Init(SDA_GPIO_Port, &GPIO_InitStruct);
+
+	HAL_GPIO_WritePin(SCL_GPIO_Port, SCL_Pin, GPIO_PIN_SET);
+	HAL_GPIO_WritePin(SDA_GPIO_Port, SDA_Pin, GPIO_PIN_SET);
+
+	// 13. Set SWRST bit in I2Cx_CR1 register.
+	hi2c1.Instance->CR1 |= 0x8000;
+
+	asm("nop");
+
+	// 14. Clear SWRST bit in I2Cx_CR1 register.
+	hi2c1.Instance->CR1 &= ~0x8000;
+
+	asm("nop");
+
+	// 15. Enable the I2C peripheral by setting the PE bit in I2Cx_CR1 register
+	hi2c1.Instance->CR1 |= 0x0001;
+
+	// Call initialization function.
+	HAL_I2C_Init(&hi2c1);
+}
+
+uint8_t getButtonA() {
+	return HAL_GPIO_ReadPin(KEY_A_GPIO_Port, KEY_A_Pin) == GPIO_PIN_RESET ?
+			1 : 0;
+}
+uint8_t getButtonB() {
+	return HAL_GPIO_ReadPin(KEY_B_GPIO_Port, KEY_B_Pin) == GPIO_PIN_RESET ?
+			1 : 0;
+}
+
+/*
+ * Catch the IRQ that says that the conversion is done on the temperature
+ * readings coming in Once these have come in we can unblock the PID so that it
+ * runs again
+ */
+void HAL_ADCEx_InjectedConvCpltCallback(ADC_HandleTypeDef *hadc) {
+	BaseType_t xHigherPriorityTaskWoken = pdFALSE;
+	if (hadc == &hadc1) {
+		if (pidTaskNotification) {
+			vTaskNotifyGiveFromISR(pidTaskNotification,
+					&xHigherPriorityTaskWoken);
+			portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
+		}
+	}
+}
+void HAL_I2C_MasterRxCpltCallback(I2C_HandleTypeDef *hi2c __unused) {
+	FRToSI2C::CpltCallback();
+}
+void HAL_I2C_MasterTxCpltCallback(I2C_HandleTypeDef *hi2c __unused) {
+	FRToSI2C::CpltCallback();
+}
+void HAL_I2C_MemTxCpltCallback(I2C_HandleTypeDef *hi2c __unused) {
+	FRToSI2C::CpltCallback();
+}
+void HAL_I2C_ErrorCallback(I2C_HandleTypeDef *hi2c __unused) {
+
+	FRToSI2C::CpltCallback();
+}
+void HAL_I2C_AbortCpltCallback(I2C_HandleTypeDef *hi2c __unused) {
+
+	FRToSI2C::CpltCallback();
+}
+void HAL_I2C_MemRxCpltCallback(I2C_HandleTypeDef *hi2c __unused) {
+	FRToSI2C::CpltCallback();
+}
+void reboot() {
+	NVIC_SystemReset();
+}
+
+void delay_ms(uint16_t count) {
+	HAL_Delay(count);
+}

workspace/TS100/Core/BSP/Miniware/I2C_Wrapper.cpp

@@ -0,0 +1,142 @@
+/*
+ * FRToSI2C.cpp
+ *
+ *  Created on: 14Apr.,2018
+ *      Author: Ralim
+ */
+#include <I2C_Wrapper.hpp>
+#include "BSP.h"
+#include "Setup.h"
+#define I2CUSESDMA
+SemaphoreHandle_t FRToSI2C::I2CSemaphore;
+StaticSemaphore_t FRToSI2C::xSemaphoreBuffer;
+
+void FRToSI2C::CpltCallback() {
+	hi2c1.State = HAL_I2C_STATE_READY;  // Force state reset (even if tx error)
+	if (I2CSemaphore) {
+		xSemaphoreGiveFromISR(I2CSemaphore, NULL);
+	}
+}
+
+bool FRToSI2C::Mem_Read(uint16_t DevAddress, uint16_t MemAddress,
+		uint8_t *pData, uint16_t Size) {
+
+	if (I2CSemaphore == NULL) {
+		// no RToS, run blocking code
+		HAL_I2C_Mem_Read(&hi2c1, DevAddress, MemAddress, I2C_MEMADD_SIZE_8BIT,
+				pData, Size, 5000);
+		return true;
+	} else {
+		// RToS is active, run threading
+		// Get the mutex so we can use the I2C port
+		// Wait up to 1 second for the mutex
+		if (xSemaphoreTake(I2CSemaphore, (TickType_t)50) == pdTRUE) {
+#ifdef I2CUSESDMA
+			if (HAL_I2C_Mem_Read(&hi2c1, DevAddress, MemAddress,
+					I2C_MEMADD_SIZE_8BIT, pData, Size, 500) != HAL_OK) {
+
+				I2C_Unstick();
+				xSemaphoreGive(I2CSemaphore);
+				return false;
+			} else {
+				xSemaphoreGive(I2CSemaphore);
+				return true;
+			}
+#else
+
+			if (HAL_I2C_Mem_Read(&hi2c1, DevAddress, MemAddress, I2C_MEMADD_SIZE_8BIT, pData, Size,
+					5000)==HAL_OK){
+				xSemaphoreGive(I2CSemaphore);
+				return true;
+			}
+			xSemaphoreGive(I2CSemaphore);
+			return false;
+#endif
+		} else {
+			return false;
+		}
+	}
+
+}
+void FRToSI2C::I2C_RegisterWrite(uint8_t address, uint8_t reg, uint8_t data) {
+	Mem_Write(address, reg, &data, 1);
+}
+
+uint8_t FRToSI2C::I2C_RegisterRead(uint8_t add, uint8_t reg) {
+	uint8_t tx_data[1];
+	Mem_Read(add, reg, tx_data, 1);
+	return tx_data[0];
+}
+void FRToSI2C::Mem_Write(uint16_t DevAddress, uint16_t MemAddress,
+		uint8_t *pData, uint16_t Size) {
+
+	if (I2CSemaphore == NULL) {
+		// no RToS, run blocking code
+		HAL_I2C_Mem_Write(&hi2c1, DevAddress, MemAddress, I2C_MEMADD_SIZE_8BIT,
+				pData, Size, 5000);
+	} else {
+		// RToS is active, run threading
+		// Get the mutex so we can use the I2C port
+		// Wait up to 1 second for the mutex
+		if (xSemaphoreTake(I2CSemaphore, (TickType_t)50) == pdTRUE) {
+#ifdef I2CUSESDMA
+			if (HAL_I2C_Mem_Write(&hi2c1, DevAddress, MemAddress,
+					I2C_MEMADD_SIZE_8BIT, pData, Size, 500) != HAL_OK) {
+
+				I2C_Unstick();
+				xSemaphoreGive(I2CSemaphore);
+			}
+			xSemaphoreGive(I2CSemaphore);
+#else
+			if (HAL_I2C_Mem_Write(&hi2c1, DevAddress, MemAddress, I2C_MEMADD_SIZE_8BIT, pData,
+							Size, 5000) != HAL_OK) {
+			}
+			xSemaphoreGive(I2CSemaphore);
+#endif
+		} else {
+		}
+	}
+
+}
+
+void FRToSI2C::Transmit(uint16_t DevAddress, uint8_t *pData, uint16_t Size) {
+	if (I2CSemaphore == NULL) {
+		// no RToS, run blocking code
+		HAL_I2C_Master_Transmit(&hi2c1, DevAddress, pData, Size, 5000);
+	} else {
+		// RToS is active, run threading
+		// Get the mutex so we can use the I2C port
+		// Wait up to 1 second for the mutex
+		if (xSemaphoreTake(I2CSemaphore, (TickType_t)50) == pdTRUE) {
+#ifdef I2CUSESDMA
+
+			if (HAL_I2C_Master_Transmit_DMA(&hi2c1, DevAddress, pData, Size)
+					!= HAL_OK) {
+
+				I2C_Unstick();
+				xSemaphoreGive(I2CSemaphore);
+
+			}
+#else
+			HAL_I2C_Master_Transmit(&hi2c1, DevAddress, pData, Size, 5000);
+			xSemaphoreGive(I2CSemaphore);
+#endif
+
+		} else {
+		}
+	}
+
+}
+
+bool FRToSI2C::probe(uint16_t DevAddress) {
+	uint8_t buffer[1];
+	if (Mem_Read(DevAddress, 0,  buffer, 1)) {
+		//ACK'd
+		return true;
+	}
+	return false;
+}
+
+void FRToSI2C::I2C_Unstick() {
+	unstick_I2C();
+}

workspace/TS100/Core/BSP/Miniware/Pins.h

@@ -1,148 +1,83 @@
-/*
+/*
- * Hardware.h
+ * Pins.h
- *
+ *
- *  Created on: 29Aug.,2017
+ *  Created on: 29 May 2020
- *      Author: Ben V. Brown
+ *      Author: Ralim
- */
+ */
-
+
-#ifndef HARDWARE_H_
+#ifndef BSP_MINIWARE_PINS_H_
-#define HARDWARE_H_
+#define BSP_MINIWARE_PINS_H_
-#include "Setup.h"
+
-#include "stm32f1xx_hal.h"
+#if defined(MODEL_TS100) + defined(MODEL_TS80) > 1
-#include "FreeRTOS.h"
+#error "Multiple models defined!"
-#include "stm32f1xx_hal.h"
+#elif defined(MODEL_TS100) + defined(MODEL_TS80) == 0
-#include "cmsis_os.h"
+#error "No model defined!"
-#include "unit.h"
+#endif
-
+
-#ifdef __cplusplus
+#ifdef MODEL_TS100
-extern "C" {
+
-#endif
+#define KEY_B_Pin GPIO_PIN_6
-
+#define KEY_B_GPIO_Port GPIOA
-enum Orientation {
+#define TMP36_INPUT_Pin GPIO_PIN_7
-	ORIENTATION_LEFT_HAND = 0, ORIENTATION_RIGHT_HAND = 1, ORIENTATION_FLAT = 3
+#define TMP36_INPUT_GPIO_Port GPIOA
-};
+#define TMP36_ADC1_CHANNEL ADC_CHANNEL_7
-#define PID_TIM_HZ (8)
+#define TIP_TEMP_Pin GPIO_PIN_0
-#if defined(MODEL_TS100) + defined(MODEL_TS80) > 1
+#define TIP_TEMP_GPIO_Port GPIOB
-#error "Multiple models defined!"
+#define TIP_TEMP_ADC1_CHANNEL ADC_CHANNEL_8
-#elif defined(MODEL_TS100) + defined(MODEL_TS80) == 0
+#define TIP_TEMP_ADC2_CHANNEL ADC_CHANNEL_8
-#error "No model defined!"
+#define VIN_Pin GPIO_PIN_1
-#endif
+#define VIN_GPIO_Port GPIOB
-
+#define VIN_ADC1_CHANNEL ADC_CHANNEL_9
-#ifdef MODEL_TS100
+#define VIN_ADC2_CHANNEL ADC_CHANNEL_9
-
+#define OLED_RESET_Pin GPIO_PIN_8
-#define KEY_B_Pin GPIO_PIN_6
+#define OLED_RESET_GPIO_Port GPIOA
-#define KEY_B_GPIO_Port GPIOA
+#define KEY_A_Pin GPIO_PIN_9
-#define TMP36_INPUT_Pin GPIO_PIN_7
+#define KEY_A_GPIO_Port GPIOA
-#define TMP36_INPUT_GPIO_Port GPIOA
+#define INT_Orientation_Pin GPIO_PIN_3
-#define TMP36_ADC1_CHANNEL ADC_CHANNEL_7
+#define INT_Orientation_GPIO_Port GPIOB
-#define TIP_TEMP_Pin GPIO_PIN_0
+#define PWM_Out_Pin GPIO_PIN_4
-#define TIP_TEMP_GPIO_Port GPIOB
+#define PWM_Out_GPIO_Port GPIOB
-#define TIP_TEMP_ADC1_CHANNEL ADC_CHANNEL_8
+#define PWM_Out_CHANNEL TIM_CHANNEL_1
-#define TIP_TEMP_ADC2_CHANNEL ADC_CHANNEL_8
+#define PWM_Out_CCR
-#define VIN_Pin GPIO_PIN_1
+#define INT_Movement_Pin GPIO_PIN_5
-#define VIN_GPIO_Port GPIOB
+#define INT_Movement_GPIO_Port GPIOB
-#define VIN_ADC1_CHANNEL ADC_CHANNEL_9
+#define SCL_Pin GPIO_PIN_6
-#define VIN_ADC2_CHANNEL ADC_CHANNEL_9
+#define SCL_GPIO_Port GPIOB
-#define OLED_RESET_Pin GPIO_PIN_8
+#define SDA_Pin GPIO_PIN_7
-#define OLED_RESET_GPIO_Port GPIOA
+#define SDA_GPIO_Port GPIOB
-#define KEY_A_Pin GPIO_PIN_9
+
-#define KEY_A_GPIO_Port GPIOA
+#else
-#define INT_Orientation_Pin GPIO_PIN_3
+// TS80 pin map
-#define INT_Orientation_GPIO_Port GPIOB
+#define KEY_B_Pin GPIO_PIN_0
-#define PWM_Out_Pin GPIO_PIN_4
+#define KEY_B_GPIO_Port GPIOB
-#define PWM_Out_GPIO_Port GPIOB
+#define TMP36_INPUT_Pin GPIO_PIN_4
-#define PWM_Out_CHANNEL TIM_CHANNEL_1
+#define TMP36_INPUT_GPIO_Port GPIOA
-#define PWM_Out_CCR
+#define TMP36_ADC1_CHANNEL ADC_CHANNEL_4
-#define INT_Movement_Pin GPIO_PIN_5
+#define TIP_TEMP_Pin GPIO_PIN_3
-#define INT_Movement_GPIO_Port GPIOB
+#define TIP_TEMP_GPIO_Port GPIOA
-#define SCL_Pin GPIO_PIN_6
+#define TIP_TEMP_ADC1_CHANNEL ADC_CHANNEL_3
-#define SCL_GPIO_Port GPIOB
+#define TIP_TEMP_ADC2_CHANNEL ADC_CHANNEL_3
-#define SDA_Pin GPIO_PIN_7
+
-#define SDA_GPIO_Port GPIOB
+#define VIN_Pin GPIO_PIN_2
-
+#define VIN_GPIO_Port GPIOA
-#else
+#define VIN_ADC1_CHANNEL ADC_CHANNEL_2
-// TS80 pin map
+#define VIN_ADC2_CHANNEL ADC_CHANNEL_2
-#define KEY_B_Pin GPIO_PIN_0
+#define OLED_RESET_Pin GPIO_PIN_15
-#define KEY_B_GPIO_Port GPIOB
+#define OLED_RESET_GPIO_Port GPIOA
-#define TMP36_INPUT_Pin GPIO_PIN_4
+#define KEY_A_Pin GPIO_PIN_1
-#define TMP36_INPUT_GPIO_Port GPIOA
+#define KEY_A_GPIO_Port GPIOB
-#define TMP36_ADC1_CHANNEL ADC_CHANNEL_4
+#define INT_Orientation_Pin GPIO_PIN_4
-#define TIP_TEMP_Pin GPIO_PIN_3
+#define INT_Orientation_GPIO_Port GPIOB
-#define TIP_TEMP_GPIO_Port GPIOA
+#define PWM_Out_Pin GPIO_PIN_6
-#define TIP_TEMP_ADC1_CHANNEL ADC_CHANNEL_3
+#define PWM_Out_GPIO_Port GPIOA
-#define TIP_TEMP_ADC2_CHANNEL ADC_CHANNEL_3
+#define PWM_Out_CHANNEL TIM_CHANNEL_1
-
+#define INT_Movement_Pin GPIO_PIN_5
-#define VIN_Pin GPIO_PIN_2
+#define INT_Movement_GPIO_Port GPIOB
-#define VIN_GPIO_Port GPIOA
+#define SCL_Pin GPIO_PIN_6
-#define VIN_ADC1_CHANNEL ADC_CHANNEL_2
+#define SCL_GPIO_Port GPIOB
-#define VIN_ADC2_CHANNEL ADC_CHANNEL_2
+#define SDA_Pin GPIO_PIN_7
-#define OLED_RESET_Pin GPIO_PIN_15
+#define SDA_GPIO_Port GPIOB
-#define OLED_RESET_GPIO_Port GPIOA
+
-#define KEY_A_Pin GPIO_PIN_1
+#endif
-#define KEY_A_GPIO_Port GPIOB
+
-#define INT_Orientation_Pin GPIO_PIN_4
+#endif /* BSP_MINIWARE_PINS_H_ */
-#define INT_Orientation_GPIO_Port GPIOB
-#define PWM_Out_Pin GPIO_PIN_6
-#define PWM_Out_GPIO_Port GPIOA
-#define PWM_Out_CHANNEL TIM_CHANNEL_1
-#define INT_Movement_Pin GPIO_PIN_5
-#define INT_Movement_GPIO_Port GPIOB
-#define SCL_Pin GPIO_PIN_6
-#define SCL_GPIO_Port GPIOB
-#define SDA_Pin GPIO_PIN_7
-#define SDA_GPIO_Port GPIOB
-
-#endif
-
-/*
- * Keep in a uint8_t range for the ID's
- */
-#ifdef MODEL_TS100
-enum TipType {
-	TS_B2 = 0,
-	TS_D24 = 1,
-	TS_BC2 = 2,
-	TS_C1 = 3,
-	Tip_MiniWare = 4,
-	HAKKO_BC2 = 4,
-	Tip_Hakko = 5,
-	Tip_Custom = 5,
-};
-#endif
-#ifdef MODEL_TS80
-enum TipType {
-	TS_B02 = 0, TS_D25 = 1, Tip_MiniWare = 2, Tip_Custom = 3,
-};
-#endif
-extern uint16_t tipGainCalValue ;
-
-uint16_t lookupTipDefaultCalValue(enum TipType tipID);
- uint16_t getHandleTemperature();
-uint16_t getTipRawTemp(uint8_t refresh);
-uint16_t getInputVoltageX10(uint16_t divisor,uint8_t sample);
-
-void setTipPWM(uint8_t pulse);
-uint16_t ctoTipMeasurement(uint16_t temp);
-uint16_t tipMeasurementToC(uint16_t raw);
-uint16_t ftoTipMeasurement(uint16_t temp);
-#ifdef ENABLED_FAHRENHEIT_SUPPORT
-uint16_t tipMeasurementToF(uint16_t raw);
-#endif
-void seekQC(int16_t Vx10, uint16_t divisor);
-void setCalibrationOffset(int16_t offSet);
-void setTipType(enum TipType tipType, uint8_t manualCalGain);
-uint32_t calculateTipR();
-int16_t calculateMaxVoltage(uint8_t useHP);
-void startQC(uint16_t divisor); // Tries to negotiate QC for highest voltage, must be run after
-// RToS
-// This will try for 12V, failing that 9V, failing that 5V
-// If input is over 12V returns -1
-// If the input is [5-12] Will return the value.
-void vApplicationGetIdleTaskMemory(StaticTask_t **ppxIdleTaskTCBBuffer,
-		StackType_t **ppxIdleTaskStackBuffer, uint32_t *pulIdleTaskStackSize) ;
-void vApplicationIdleHook(void);
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* HARDWARE_H_ */

workspace/TS100/Core/BSP/Miniware/Power.cpp

@@ -0,0 +1,21 @@
+#include "BSP.h"
+#include "BSP_Power.h"
+#include "QC3.h"
+#include "Settings.h"
+void power_probe() {
+// If TS80 probe for QC
+// If TS100 - noop
+#ifdef MODEL_TS80
+    startQC(systemSettings.voltageDiv);
+
+    seekQC((systemSettings.cutoutSetting) ? 120 : 90,
+           systemSettings.voltageDiv);  // this will move the QC output to the preferred voltage to start with
+
+#endif
+}
+
+void power_check() {
+#ifdef MODEL_TS80
+    QC_resync();
+#endif
+}

workspace/TS100/Core/BSP/Miniware/QC_GPIO.cpp

@@ -0,0 +1,74 @@
+/*
+ * QC.c
+ *
+ *  Created on: 29 May 2020
+ *      Author: Ralim
+ */
+#include "BSP.h"
+#include "Pins.h"
+#include "QC3.h"
+#include "Settings.h"
+#include "stm32f1xx_hal.h"
+void QC_DPlusZero_Six() {
+    HAL_GPIO_WritePin(GPIOB, GPIO_PIN_3, GPIO_PIN_RESET);  // pull down D+
+}
+void QC_DNegZero_Six() {
+    HAL_GPIO_WritePin(GPIOA, GPIO_PIN_10, GPIO_PIN_SET);
+    HAL_GPIO_WritePin(GPIOA, GPIO_PIN_8, GPIO_PIN_RESET);
+}
+void QC_DPlusThree_Three() {
+    HAL_GPIO_WritePin(GPIOB, GPIO_PIN_3, GPIO_PIN_SET);  // pull up D+
+}
+void QC_DNegThree_Three() {
+    HAL_GPIO_WritePin(GPIOA, GPIO_PIN_10, GPIO_PIN_SET);
+    HAL_GPIO_WritePin(GPIOA, GPIO_PIN_8, GPIO_PIN_SET);
+}
+void QC_DM_PullDown() {
+    GPIO_InitTypeDef GPIO_InitStruct;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
+    GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
+    GPIO_InitStruct.Pull = GPIO_PULLDOWN;
+    GPIO_InitStruct.Pin = GPIO_PIN_11;
+    HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+}
+void QC_DM_No_PullDown() {
+    GPIO_InitTypeDef GPIO_InitStruct;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
+    GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Pin = GPIO_PIN_11;
+    HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+}
+void QC_Init_GPIO() {
+    // Setup any GPIO into the right states for QC
+    GPIO_InitTypeDef GPIO_InitStruct;
+    GPIO_InitStruct.Pin = GPIO_PIN_3;
+    GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
+    HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
+    GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Pin = GPIO_PIN_8 | GPIO_PIN_10;
+    HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
+    // Turn off output mode on pins that we can
+    GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Pin = GPIO_PIN_11 | GPIO_PIN_12 | GPIO_PIN_14 | GPIO_PIN_13;
+    HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+}
+void QC_Post_Probe_En() {
+    GPIO_InitTypeDef GPIO_InitStruct;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
+    GPIO_InitStruct.Pin = GPIO_PIN_8 | GPIO_PIN_10;
+    GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
+    HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+}
+
+uint8_t QC_DM_PulledDown() { return HAL_GPIO_ReadPin(GPIOA, GPIO_PIN_11) == GPIO_PIN_RESET ? 1 : 0; }
+
+void QC_resync() {
+#ifdef MODEL_TS80
+    seekQC((systemSettings.cutoutSetting) ? 120 : 90,
+           systemSettings.voltageDiv);  // Run the QC seek again if we have drifted too much
+#endif
+}

workspace/TS100/Core/BSP/Miniware/README.md

@@ -0,0 +1,12 @@
+# BSP section for STM32F103 based Miniware products
+
+This folder contains the hardware abstractions required for the TS100, TS80 and probably TS80P soldering irons.
+
+## Main abstractions
+
+* Hardware Init
+* -> Should contain all bootstrap to bring the hardware up to an operating point
+* -> Two functions are required, a pre and post FreeRToS call
+* I2C read/write
+* Set PWM for the tip
+* Links between IRQ's on the system and the calls in the rest of the firmware

workspace/TS100/Core/BSP/Miniware/Setup.c

@@ -5,6 +5,7 @@
  *      Author: Ben V. Brown
  */
 #include "Setup.h"
+#include "Pins.h"
 ADC_HandleTypeDef hadc1;
 ADC_HandleTypeDef hadc2;
 DMA_HandleTypeDef hdma_adc1;
@@ -32,12 +33,8 @@ static void MX_ADC2_Init(void);
 
 void Setup_HAL() {
 	SystemClock_Config();
-#ifndef LOCAL_BUILD
 	__HAL_AFIO_REMAP_SWJ_DISABLE()
 	;
-#else
-	__HAL_AFIO_REMAP_SWJ_NOJTAG();
-#endif
 
 	MX_GPIO_Init();
 	MX_DMA_Init();
@@ -49,8 +46,8 @@ void Setup_HAL() {
 	MX_IWDG_Init();
 	HAL_ADC_Start(&hadc2);
 	HAL_ADCEx_MultiModeStart_DMA(&hadc1, (uint32_t*) ADCReadings, 64); // start DMA of normal readings
-	HAL_ADCEx_InjectedStart(&hadc1);   // enable injected  readings
+	HAL_ADCEx_InjectedStart(&hadc1);   // enable injected readings
-	HAL_ADCEx_InjectedStart(&hadc2);   // enable injected  readings
+	HAL_ADCEx_InjectedStart(&hadc2);   // enable injected readings
 }
 
 // channel 0 -> temperature sensor, 1-> VIN
@@ -336,7 +333,7 @@ static void MX_TIM2_Init(void) {
 	HAL_TIMEx_MasterConfigSynchronization(&htim2, &sMasterConfig);
 
 	sConfigOC.OCMode = TIM_OCMODE_PWM1;
-	sConfigOC.Pulse = 255 + 13;//13 -> Delay of 5ms
+	sConfigOC.Pulse = 255 + 13;  //13 -> Delay of 5ms
 	//255 is the largest time period of the drive signal, and then offset ADC sample to be a bit delayed after this
 	/*
 	 * It takes 4 milliseconds for output to be stable after PWM turns off.

workspace/TS100/Core/BSP/Miniware/Setup.h

@@ -1,38 +1,38 @@
-/*
+/*
- * Setup.h
+ * Setup.h
- *
+ *
- *  Created on: 29Aug.,2017
+ *  Created on: 29Aug.,2017
- *      Author: Ben V. Brown
+ *      Author: Ben V. Brown
- */
+ */
-
+
-#ifndef SETUP_H_
+#ifndef SETUP_H_
-#define SETUP_H_
+#define SETUP_H_
-
+
-#ifdef __cplusplus
+#ifdef __cplusplus
-extern "C" {
+extern "C" {
-#endif
+#endif
-#include <hardware.h>
+
-#include "stm32f1xx_hal.h"
+#include "stm32f1xx_hal.h"
-
+
-extern ADC_HandleTypeDef hadc1;
+extern ADC_HandleTypeDef hadc1;
-extern ADC_HandleTypeDef hadc2;
+extern ADC_HandleTypeDef hadc2;
-extern DMA_HandleTypeDef hdma_adc1;
+extern DMA_HandleTypeDef hdma_adc1;
-
+
-extern DMA_HandleTypeDef hdma_i2c1_rx;
+extern DMA_HandleTypeDef hdma_i2c1_rx;
-extern DMA_HandleTypeDef hdma_i2c1_tx;
+extern DMA_HandleTypeDef hdma_i2c1_tx;
-extern I2C_HandleTypeDef hi2c1;
+extern I2C_HandleTypeDef hi2c1;
-
+
-extern IWDG_HandleTypeDef hiwdg;
+extern IWDG_HandleTypeDef hiwdg;
-
+
-extern TIM_HandleTypeDef htim2;
+extern TIM_HandleTypeDef htim2;
-extern TIM_HandleTypeDef htim3;
+extern TIM_HandleTypeDef htim3;
-void Setup_HAL();
+void Setup_HAL();
-uint16_t getADC(uint8_t channel);
+uint16_t getADC(uint8_t channel);
-
+
-void HAL_TIM_MspPostInit(TIM_HandleTypeDef* htim);    //Since the hal header file does not define this one
+void HAL_TIM_MspPostInit(TIM_HandleTypeDef *htim); //Since the hal header file does not define this one
-
+
-#ifdef __cplusplus
+#ifdef __cplusplus
-}
+}
-#endif
+#endif
-
+
-#endif /* SETUP_H_ */
+#endif /* SETUP_H_ */

workspace/TS100/Core/BSP/Miniware/UnitSettings.h

@@ -0,0 +1,18 @@
+/*
+ * UnitSettings.h
+ *
+ *  Created on: 29 May 2020
+ *      Author: Ralim
+ */
+
+#ifndef BSP_MINIWARE_UNITSETTINGS_H_
+#define BSP_MINIWARE_UNITSETTINGS_H_
+//On the TS80, the LIS accel is mounted backwards
+#ifdef MODEL_TS80
+#define LIS_ORI_FLIP
+#endif
+
+
+
+
+#endif /* BSP_MINIWARE_UNITSETTINGS_H_ */

workspace/TS100/Core/BSP/Miniware/flash.c

@@ -0,0 +1,49 @@
+/*
+ * flash.c
+ *
+ *  Created on: 29 May 2020
+ *      Author: Ralim
+ */
+
+#include "BSP_Flash.h"
+#include "BSP.h"
+#include "string.h"
+#include "stm32f1xx_hal.h"
+/*Flash start OR'ed with the maximum amount of flash - 1024 bytes*/
+/*We use the last 1024 byte page*/
+#define FLASH_ADDR (0x8000000 |0xFC00)
+uint8_t flash_save_buffer(const uint8_t *buffer, const uint16_t length) {
+	FLASH_EraseInitTypeDef pEraseInit;
+	pEraseInit.TypeErase = FLASH_TYPEERASE_PAGES;
+	pEraseInit.Banks = FLASH_BANK_1;
+	pEraseInit.NbPages = 1;
+	pEraseInit.PageAddress = FLASH_ADDR;
+	uint32_t failingAddress = 0;
+	resetWatchdog();
+	__HAL_FLASH_CLEAR_FLAG(
+			FLASH_FLAG_EOP | FLASH_FLAG_WRPERR | FLASH_FLAG_PGERR | FLASH_FLAG_BSY);
+	HAL_FLASH_Unlock();
+	HAL_Delay(10);
+	resetWatchdog();
+	HAL_FLASHEx_Erase(&pEraseInit, &failingAddress);
+	//^ Erase the page of flash (1024 bytes on this stm32)
+	// erased the chunk
+	// now we program it
+	uint16_t *data = (uint16_t*) buffer;
+	HAL_FLASH_Unlock();
+	for (uint8_t i = 0; i < (length / 2); i++) {
+		resetWatchdog();
+		HAL_FLASH_Program(FLASH_TYPEPROGRAM_HALFWORD, FLASH_ADDR + (i * 2),
+				data[i]);
+	}
+	HAL_FLASH_Lock();
+	return 1;
+}
+
+void flash_read_buffer(uint8_t *buffer, const uint16_t length) {
+
+	uint16_t *data = (uint16_t*) buffer;
+	for (uint8_t i = 0; i < (length / 2); i++) {
+		data[i] = *((uint16_t*) (FLASH_ADDR + (i * 2)));
+	}
+}

workspace/TS100/Core/BSP/Miniware/logo.cpp

@@ -0,0 +1,27 @@
+/*
+ * logo.c
+ *
+ *  Created on: 29 May 2020
+ *      Author: Ralim
+ */
+
+#include "BSP.h"
+#include "OLED.hpp"
+// Second last page of flash set aside for logo image.
+#define FLASH_LOGOADDR (0x8000000 | 0xF800)
+
+// Logo header signature.
+#define LOGO_HEADER_VALUE 0xF00DAA55
+
+uint8_t showBootLogoIfavailable() {
+// Do not show logo data if signature is not found.
+	if (LOGO_HEADER_VALUE
+			!= *(reinterpret_cast<const uint32_t*>(FLASH_LOGOADDR))) {
+		return 0;
+	}
+
+	OLED::drawAreaSwapped(0, 0, 96, 16, (uint8_t*) (FLASH_LOGOADDR + 4));
+	OLED::refresh();
+	return 1;
+}
+

workspace/TS100/Core/BSP/Miniware/postRTOS.cpp

@@ -0,0 +1,13 @@
+#include "BSP.h"
+#include "FreeRTOS.h"
+#include "QC3.h"
+#include "Settings.h"
+#include "cmsis_os.h"
+#include "main.hpp"
+#include "power.hpp"
+#include "stdlib.h"
+#include "task.h"
+
+void postRToSInit() {
+    // Any after RTos setup
+}

workspace/TS100/Core/BSP/Miniware/preRTOS.cpp

@@ -0,0 +1,22 @@
+/*
+ * preRTOS.c
+ *
+ *  Created on: 29 May 2020
+ *      Author: Ralim
+ */
+
+#include <I2C_Wrapper.hpp>
+#include "BSP.h"
+#include "Setup.h"
+#include "Pins.h"
+void preRToSInit() {
+	/* Reset of all peripherals, Initializes the Flash interface and the Systick.
+	 */
+	HAL_Init();
+	Setup_HAL();  // Setup all the HAL objects
+	FRToSI2C::init();
+	HAL_Delay(50);
+	HAL_GPIO_WritePin(OLED_RESET_GPIO_Port, OLED_RESET_Pin, GPIO_PIN_SET);
+	HAL_Delay(50);
+
+}