Fix build after merge

6 files changed, 46 insertions, 498 deletions

diff --git a/workspace/TS100/.cproject b/workspace/TS100/.cproject
index b1855fa4..cf57f62e 100644
--- a/workspace/TS100/.cproject
+++ b/workspace/TS100/.cproject
@@ -31,6 +31,11 @@
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.includepaths.1236938233" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="../"/>
 								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols.1567896324" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="MODEL_TS100"/>
+									<listOptionValue builtIn="false" value="STM32F103xB"/>
+								</option>
 								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1462975681" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.30611156" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
@@ -38,7 +43,7 @@
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.635455407" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.803860120" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
-									<listOptionValue builtIn="false" value="MODEL_TS80"/>
+									<listOptionValue builtIn="false" value="MODEL_TS100"/>
 									<listOptionValue builtIn="false" value="STM32F103xB"/>
 								</option>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.830444742" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
@@ -52,7 +57,7 @@
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM3}&quot;"/>
 								</option>
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.warnings.extra.831438684" name="Enable extra warning flags (-Wextra)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.warnings.extra" useByScannerDiscovery="false" value="true" valueType="boolean"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags.209834308" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags.209834308" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
 									<listOptionValue builtIn="false" value="-Wno-write-strings"/>
 								</option>
 								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1520167136" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
@@ -62,7 +67,7 @@
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1467281053" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.definedsymbols.786921488" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
-									<listOptionValue builtIn="false" value="MODEL_TS80"/>
+									<listOptionValue builtIn="false" value="MODEL_TS100"/>
 									<listOptionValue builtIn="false" value="STM32F103xB"/>
 								</option>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.includepaths.1822309991" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
@@ -98,6 +103,7 @@
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.otherflags.329644110" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
 									<listOptionValue builtIn="false" value="-flto"/>
 								</option>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.cref.145186443" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.cref" useByScannerDiscovery="false" value="true" valueType="boolean"/>
 								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.input.1684195922" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
@@ -138,5 +144,9 @@
 	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
 	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
-	<storageModule moduleId="refreshScope"/>
+	<storageModule moduleId="refreshScope" versionNumber="2">
+		<configuration configurationName="Release">
+			<resource resourceType="PROJECT" workspacePath="/TS100"/>
+		</configuration>
+	</storageModule>
 </cproject>
diff --git a/workspace/TS100/.settings/language.settings.xml b/workspace/TS100/.settings/language.settings.xml
index 4f569702..f18f24e1 100644
--- a/workspace/TS100/.settings/language.settings.xml
+++ b/workspace/TS100/.settings/language.settings.xml
@@ -6,7 +6,7 @@
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="727225808649545797" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="712310659903196406" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -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>
diff --git a/workspace/TS100/Core/Inc/hardware.h b/workspace/TS100/Core/Inc/hardware.h
index 0717fde3..f56e0dcd 100644
--- a/workspace/TS100/Core/Inc/hardware.h
+++ b/workspace/TS100/Core/Inc/hardware.h
@@ -9,6 +9,10 @@
 #define HARDWARE_H_
 #include "Setup.h"
 #include "stm32f1xx_hal.h"
+#include "FreeRTOS.h"
+#include "stm32f1xx_hal.h"
+#include "cmsis_os.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -131,7 +135,9 @@ void startQC(uint16_t divisor); // Tries to negotiate QC for highest voltage, mu
 // 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
diff --git a/workspace/TS100/Core/Src/hardware.c b/workspace/TS100/Core/Src/hardware.c
deleted file mode 100644
index e660d560..00000000
--- a/workspace/TS100/Core/Src/hardware.c
+++ /dev/null
@@ -1,479 +0,0 @@
-/*
- * hardware.c
- *
- *  Created on: 2Sep.,2017
- *      Author: Ben V. Brown
- */
-
-// These are all the functions for interacting with the hardware
-#include "hardware.h"
-#include "FreeRTOS.h"
-#include "stm32f1xx_hal.h"
-#include "cmsis_os.h"
-volatile uint16_t PWMSafetyTimer = 0;
-volatile int16_t CalibrationTempOffset = 0;
-uint16_t tipGainCalValue = 0;
-void setTipType(enum TipType tipType, uint8_t manualCalGain) {
-	if (manualCalGain)
-		tipGainCalValue = manualCalGain;
-	else
-		tipGainCalValue = lookupTipDefaultCalValue(tipType);
-}
-void setCalibrationOffset(int16_t offSet) {
-	CalibrationTempOffset = offSet;
-}
-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 tipMeasurementToC(uint16_t raw) {
-	//((Raw Tip-RawOffset) * calibrationgain) / 1000 = tip delta in CX10
-	// tip delta in CX10 + handleTemp in CX10 = tip absolute temp in CX10
-	// Div answer by 10 to get final result
-
-	uint32_t tipDelta = ((raw - CalibrationTempOffset) * tipGainCalValue)
-			/ 1000;
-	tipDelta += getHandleTemperature();
-
-	return tipDelta / 10;
-}
-uint16_t ctoTipMeasurement(uint16_t temp) {
-	//[ (temp-handle/10) * 10000 ]/calibrationgain = tip raw delta
-	// tip raw delta + tip offset = tip ADC reading
-	int32_t TipRaw = ((temp - (getHandleTemperature() / 10)) * 10000)
-			/ tipGainCalValue;
-	TipRaw += CalibrationTempOffset;
-	return TipRaw;
-}
-
-uint16_t tipMeasurementToF(uint16_t raw) {
-	// Convert result from C to F
-	return (tipMeasurementToC(raw) * 9) / 5 + 32;
-}
-uint16_t ftoTipMeasurement(uint16_t temp) {
-	// Convert the temp back to C from F
-	return ctoTipMeasurement(((temp - 32) * 5) / 9);
-}
-
-uint16_t getTipInstantTemperature() {
-	uint16_t sum;
-	sum = hadc1.Instance->JDR1;
-	sum += hadc1.Instance->JDR2;
-	sum += hadc1.Instance->JDR3;
-	sum += hadc1.Instance->JDR4;
-	sum += hadc2.Instance->JDR1;
-	sum += hadc2.Instance->JDR2;
-	sum += hadc2.Instance->JDR3;
-	sum += hadc2.Instance->JDR4;
-	return sum;  // 8x over sample
-}
-/*
- * Loopup table for the tip calibration values for
- * the gain of the tip's
- * This can be found by line of best fit of TipRaw on X, and TipTemp-handle on
- * Y. Then take the m term * 10000
- * */
-uint16_t lookupTipDefaultCalValue(enum TipType tipID) {
-#ifdef MODEL_TS100
-	switch (tipID) {
-		case TS_D24:
-		return 141;
-		break;
-		case TS_BC2:
-		return (133 + 129) / 2;
-		break;
-		case TS_C1:
-		return 133;
-		break;
-		case TS_B2:
-		return 133;
-		default:
-		return 132;  // make this the average of all
-		break;
-	}
-#else
-	switch (tipID) {
-	case TS_D25:
-		return 154;
-		break;
-	case TS_B02:
-		return 154;
-		break;
-	default:
-		return 154;  // make this the average of all
-		break;
-	}
-#endif
-}
-
-uint16_t getTipRawTemp(uint8_t refresh) {
-	static uint16_t lastSample = 0;
-
-	if (refresh) {
-		lastSample = getTipInstantTemperature();
-	}
-
-	return lastSample;
-}
-
-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
-#define BATTFILTERDEPTH 32
-	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;
-}
-#ifdef MODEL_TS80
-uint8_t QCMode = 0;
-uint8_t QCTries = 0;
-void seekQC(int16_t Vx10, uint16_t divisor) {
-	if (QCMode == 5)
-		startQC(divisor);
-	if (QCMode == 0)
-		return;  // NOT connected to a QC Charger
-
-	if (Vx10 < 45)
-		return;
-	if (Vx10 > 130)
-		Vx10 = 130;  //Cap max value at 13V
-	// Seek the QC to the Voltage given if this adapter supports continuous mode
-	// try and step towards the wanted value
-
-	// 1. Measure current voltage
-	int16_t vStart = getInputVoltageX10(divisor, 0);
-	int difference = Vx10 - vStart;
-
-	// 2. calculate ideal steps (0.2V changes)
-
-	int steps = difference / 2;
-	if (QCMode == 3) {
-		while (steps < 0) {
-			HAL_GPIO_WritePin(GPIOB, GPIO_PIN_3, GPIO_PIN_RESET);	//D+0.6
-			HAL_GPIO_WritePin(GPIOA, GPIO_PIN_8, GPIO_PIN_SET);	//D-3.3V
-			HAL_GPIO_WritePin(GPIOA, GPIO_PIN_10, GPIO_PIN_SET);	// D-3.3Vs
-			vTaskDelay(3);
-			HAL_GPIO_WritePin(GPIOA, GPIO_PIN_8, GPIO_PIN_RESET);	//-0.6V
-			HAL_Delay(1);
-			HAL_GPIO_WritePin(GPIOA, GPIO_PIN_8, GPIO_PIN_SET);
-
-			HAL_Delay(1);
-			steps++;
-		}
-		while (steps > 0) {
-			// step once up
-			HAL_GPIO_WritePin(GPIOB, GPIO_PIN_3, GPIO_PIN_RESET);
-			HAL_GPIO_WritePin(GPIOA, GPIO_PIN_8, GPIO_PIN_SET);
-			HAL_GPIO_WritePin(GPIOA, GPIO_PIN_10, GPIO_PIN_SET);
-			vTaskDelay(3);
-
-			HAL_GPIO_WritePin(GPIOB, GPIO_PIN_3, GPIO_PIN_SET);
-			HAL_Delay(1);
-			HAL_GPIO_WritePin(GPIOB, GPIO_PIN_3, GPIO_PIN_RESET);
-
-			HAL_Delay(1);
-			steps--;
-		}
-	}
-	// Re-measure
-	/* Disabled due to nothing to test and code space of around 1k*/
-#ifdef QC2_ROUND_DOWN
-	steps = vStart - getInputVoltageX10(195);
-	if (steps < 0) steps = -steps;
-	if (steps > (difference / 2)) {
-		// No continuous mode, so QC2
-		QCMode = 2;
-		// Goto nearest
-		if (Vx10 > 10.5) {
-			// request 12V
-			// D- = 0.6V, D+ = 0.6V
-			// Clamp PB3
-			HAL_GPIO_WritePin(GPIOB, GPIO_PIN_3, GPIO_PIN_RESET);// pull down D+
-			HAL_GPIO_WritePin(GPIOA, GPIO_PIN_10, GPIO_PIN_SET);
-			HAL_GPIO_WritePin(GPIOA, GPIO_PIN_8, GPIO_PIN_RESET);
-
-		} else {
-			// request 9V
-			HAL_GPIO_WritePin(GPIOB, GPIO_PIN_3, GPIO_PIN_SET);
-			HAL_GPIO_WritePin(GPIOA, GPIO_PIN_10, GPIO_PIN_SET);
-			HAL_GPIO_WritePin(GPIOA, GPIO_PIN_8, GPIO_PIN_RESET);
-		}
-	}
-#endif
-}
-
-// Must be called after FreeRToS Starts
-void startQC(uint16_t divisor) {
-	// Pre check that the input could be >5V already, and if so, dont both
-	// negotiating as someone is feeding in hv
-	uint16_t vin = getInputVoltageX10(divisor, 1);
-	if (vin > 150)
-		return;	// Over voltage
-	if (vin > 100) {
-		QCMode = 1;  // ALready at ~12V
-		return;
-	}
-	GPIO_InitTypeDef GPIO_InitStruct;
-
-	// Tries to negotiate QC for 9V
-	// This is a multiple step process.
-	// 1. Set around 0.6V on D+ for 1.25 Seconds or so
-	// 2. After this It should un-short D+->D- and instead add a 20k pulldown on
-	// D-
-	// 3. Now set D+ to 3.3V and D- to 0.6V to request 9V
-	// OR both at 0.6V for 12V request (if the adapter can do it).
-	// If 12V is implimented then should fallback to 9V after validation
-	// Step 1. We want to pull D+ to 0.6V
-	// Pull PB3 donwn to ground
-	HAL_GPIO_WritePin(GPIOB, GPIO_PIN_3, GPIO_PIN_RESET);// pull low to put 0.6V on D+
-	HAL_GPIO_WritePin(GPIOA, GPIO_PIN_10, GPIO_PIN_RESET);
-	HAL_GPIO_WritePin(GPIOA, GPIO_PIN_8, GPIO_PIN_RESET);
-	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);
-	HAL_GPIO_WritePin(GPIOB, GPIO_PIN_3, GPIO_PIN_RESET);// pull low to put 0.6V on D+
-	HAL_GPIO_WritePin(GPIOA, GPIO_PIN_10, GPIO_PIN_RESET);
-	HAL_GPIO_WritePin(GPIOA, GPIO_PIN_8, GPIO_PIN_RESET);
-
-	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);
-
-	// Delay 1.25 seconds
-	uint8_t enteredQC = 0;
-	for (uint16_t i = 0; i < 130 && enteredQC == 0; i++) {
-		//		HAL_Delay(10);
-		vTaskDelay(1);
-
-	}
-	// Check if D- is low to spot a QC charger
-	if (HAL_GPIO_ReadPin(GPIOA, GPIO_PIN_11) == GPIO_PIN_RESET)
-		enteredQC = 1;
-	if (enteredQC) {
-		// We have a QC capable charger
-		HAL_GPIO_WritePin(GPIOB, GPIO_PIN_3, GPIO_PIN_SET);
-		HAL_GPIO_WritePin(GPIOA, GPIO_PIN_10, GPIO_PIN_SET);
-		HAL_GPIO_WritePin(GPIOA, GPIO_PIN_8, GPIO_PIN_RESET);
-
-		GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
-		GPIO_InitStruct.Pin = GPIO_PIN_10 | GPIO_PIN_8;
-		HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
-		HAL_GPIO_WritePin(GPIOB, GPIO_PIN_3, GPIO_PIN_SET);
-		HAL_GPIO_WritePin(GPIOA, GPIO_PIN_10, GPIO_PIN_SET);
-		HAL_GPIO_WritePin(GPIOA, GPIO_PIN_8, GPIO_PIN_RESET);
-
-		// Wait for frontend ADC to stabilise
-		QCMode = 4;
-		for (uint8_t i = 0; i < 10; i++) {
-			if (getInputVoltageX10(divisor, 1) > 80) {
-				// yay we have at least QC2.0 or QC3.0
-				QCMode = 3;	// We have at least QC2, pray for 3
-				HAL_GPIO_WritePin(GPIOB, GPIO_PIN_3, GPIO_PIN_RESET);
-				HAL_GPIO_WritePin(GPIOA, GPIO_PIN_8, GPIO_PIN_SET);
-				HAL_GPIO_WritePin(GPIOA, GPIO_PIN_10, GPIO_PIN_SET);
-				return;
-			}
-			vTaskDelay(10);  // 100mS
-		}
-		QCMode = 5;
-		QCTries++;
-		if (QCTries > 10) // 10 goes to get it going
-			QCMode = 0;
-	} else {
-		// no QC
-		QCMode = 0;
-
-	}
-	if (QCTries > 10)
-		QCMode = 0;
-}
-// Get tip resistance in milliohms
-uint32_t calculateTipR() {
-	static uint32_t lastRes = 0;
-	if (lastRes)
-		return lastRes;
-	// We inject a small current into the front end of the iron,
-	// By measuring the Vdrop over the tip we can calculate the resistance
-	// Turn PA0 into an output and drive high to inject (3.3V-0.6)/(6K8+Rtip)
-	// current PA0->Diode -> 6K8 -> Tip -> GND So the op-amp will amplify the
-	// small signal across the tip and convert this into an easily read voltage
-	GPIO_InitTypeDef GPIO_InitStruct;
-	GPIO_InitStruct.Pin = GPIO_PIN_0;
-	GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
-	GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
-	HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
-	HAL_GPIO_WritePin(GPIOA, GPIO_PIN_0, GPIO_PIN_RESET);	// Set low first
-	setTipPWM(0);
-	vTaskDelay(1);
-	uint32_t offReading = getTipRawTemp(1);
-	for (uint8_t i = 0; i < 49; i++) {
-		vTaskDelay(1);  // delay to allow it to stabilize
-		HAL_IWDG_Refresh(&hiwdg);
-		offReading += getTipRawTemp(1);
-	}
-
-	// Turn on
-	HAL_GPIO_WritePin(GPIOA, GPIO_PIN_0, GPIO_PIN_SET);  // Set hgih
-	vTaskDelay(1); // delay to allow it too stabilize
-	uint32_t onReading = getTipInstantTemperature();
-	for (uint8_t i = 0; i < 49; i++) {
-		vTaskDelay(1);  // delay to allow it to stabilize
-		HAL_IWDG_Refresh(&hiwdg);
-		onReading += getTipRawTemp(1);
-	}
-
-	HAL_GPIO_WritePin(GPIOA, GPIO_PIN_0, GPIO_PIN_RESET); // Turn the output off finally
-	GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
-	HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
-	uint32_t difference = onReading - offReading;
-	// V = IR, therefore I = V/R
-	// We can divide this reading by a known "gain" to get the resulting
-	// resistance This was determined emperically This tip is 4.688444162 ohms,
-	// 4688 milliohms (Measured using 4 terminal measurement) 25x oversampling
-	// reads this as around 47490 Almost perfectly 10x the milliohms value This
-	// will drift massively with tip temp However we really only need 10x ohms
-	lastRes = (difference / 21) + 1;	// ceil
-	return lastRes;
-}
-static unsigned int sqrt32(unsigned long n) {
-	unsigned int c = 0x8000;
-	unsigned int g = 0x8000;
-
-	for (;;) {
-		if (g * g > n)
-			g ^= c;
-		c >>= 1;
-		if (c == 0)
-			return g;
-		g |= c;
-	}
-}
-int16_t calculateMaxVoltage(uint8_t useHP) {
-	// This measures the tip resistance, then it calculates the appropriate
-	// voltage To stay under ~18W. Mosfet is "9A", so no issues there
-	// QC3.0 supports up to 18W, which is 2A @9V and 1.5A @12V
-	uint32_t milliOhms = calculateTipR();
-	// Check no tip
-	if (milliOhms > 10000)
-		return -1;
-	//Because of tolerance, if a user has asked for the higher power mode, then just goto 12V and call it a day
-	if (useHP)
-		return 120;
-	//
-	// V = sqrt(18W*R)
-	// Convert this to sqrt(18W)*sqrt(milli ohms)*sqrt(1/1000)
-
-	uint32_t Vx = sqrt32(milliOhms);
-	if (useHP)
-		Vx *= 1549;	//sqrt(24)*sqrt(1/1000)*10000
-	else
-		Vx *= 1342;	// sqrt(18) * sqrt(1/1000)*10000
-
-	// Round to nearest 200mV,
-	// So divide by 100 to start, to get in Vxx
-	Vx /= 100;
-	if (Vx % 10 >= 5)
-		Vx += 10;
-	Vx /= 10;
-	// Round to nearest increment of 2
-	if (Vx % 2 == 1)
-		Vx++;
-	//Because of how bad the tolerance is on detecting the tip resistance is
-	//Its more functional to bin this
-	if (Vx < 90)
-		Vx = 90;
-	else if (Vx >= 105)
-		Vx = 120;
-	return Vx;
-}
-
-#endif
-volatile uint8_t pendingPWM = 0;
-
-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 vApplicationIdleHook(void) {
-	HAL_IWDG_Refresh(&hiwdg);
-}
-
-/* USER CODE BEGIN GET_IDLE_TASK_MEMORY */
-static StaticTask_t xIdleTaskTCBBuffer;
-static StackType_t xIdleStack[configMINIMAL_STACK_SIZE];
-
-void vApplicationGetIdleTaskMemory(StaticTask_t **ppxIdleTaskTCBBuffer,
-		StackType_t **ppxIdleTaskStackBuffer, uint32_t *pulIdleTaskStackSize) {
-	*ppxIdleTaskTCBBuffer = &xIdleTaskTCBBuffer;
-	*ppxIdleTaskStackBuffer = &xIdleStack[0];
-	*pulIdleTaskStackSize = configMINIMAL_STACK_SIZE;
-	/* place for user code */
-}
-/* USER CODE END GET_IDLE_TASK_MEMORY */
diff --git a/workspace/TS100/Core/Src/hardware.cpp b/workspace/TS100/Core/Src/hardware.cpp
index daf0659e..2fd574a1 100644
--- a/workspace/TS100/Core/Src/hardware.cpp
+++ b/workspace/TS100/Core/Src/hardware.cpp
@@ -7,9 +7,6 @@
 
 // These are all the functions for interacting with the hardware
 #include "hardware.h"
-#include "FreeRTOS.h"
-#include "stm32f1xx_hal.h"
-#include "cmsis_os.h"
 #include "history.hpp"
 volatile uint16_t PWMSafetyTimer = 0;
 volatile int16_t CalibrationTempOffset = 0;
@@ -477,3 +474,21 @@ void HAL_TIM_PWM_PulseFinishedCallback(TIM_HandleTypeDef *htim) {
 		HAL_TIM_PWM_Stop(&htim3, TIM_CHANNEL_1);
 	}
 }
+
+
+void vApplicationIdleHook(void) {
+	HAL_IWDG_Refresh(&hiwdg);
+}
+
+/* USER CODE BEGIN GET_IDLE_TASK_MEMORY */
+static StaticTask_t xIdleTaskTCBBuffer;
+static StackType_t xIdleStack[configMINIMAL_STACK_SIZE];
+
+void vApplicationGetIdleTaskMemory(StaticTask_t **ppxIdleTaskTCBBuffer,
+		StackType_t **ppxIdleTaskStackBuffer, uint32_t *pulIdleTaskStackSize) {
+	*ppxIdleTaskTCBBuffer = &xIdleTaskTCBBuffer;
+	*ppxIdleTaskStackBuffer = &xIdleStack[0];
+	*pulIdleTaskStackSize = configMINIMAL_STACK_SIZE;
+	/* place for user code */
+}
+/* USER CODE END GET_IDLE_TASK_MEMORY */
diff --git a/workspace/TS100/Core/Src/main.cpp b/workspace/TS100/Core/Src/main.cpp
index c3eb9076..488f511a 100644
--- a/workspace/TS100/Core/Src/main.cpp
+++ b/workspace/TS100/Core/Src/main.cpp
@@ -20,16 +20,16 @@ int16_t idealQCVoltage = 0;
 // FreeRTOS variables
 
 osThreadId GUITaskHandle;
-static const size_t GUITaskStackSize = 1024/4;
+static const size_t GUITaskStackSize = 1024 / 4;
 uint32_t GUITaskBuffer[GUITaskStackSize];
 osStaticThreadDef_t GUITaskControlBlock;
 
 osThreadId PIDTaskHandle;
-static const size_t PIDTaskStackSize =512 / 4;
+static const size_t PIDTaskStackSize = 512 / 4;
 uint32_t PIDTaskBuffer[PIDTaskStackSize];
 osStaticThreadDef_t PIDTaskControlBlock;
 osThreadId MOVTaskHandle;
-static const size_t MOVTaskStackSize = 512/4;
+static const size_t MOVTaskStackSize = 512 / 4;
 uint32_t MOVTaskBuffer[MOVTaskStackSize];
 osStaticThreadDef_t MOVTaskControlBlock;
 
@@ -102,9 +102,6 @@ int main(void) {
 	}
 }
 
-
-
-
 /* StartPIDTask function */
 void startPIDTask(void const *argument __unused) {
 	/*
@@ -119,13 +116,12 @@ void startPIDTask(void const *argument __unused) {
 
 #ifdef MODEL_TS80
 	//Set power management code to the tip resistance in ohms * 10
-	setupPower(calculateTipR() / 100);
+
 	TickType_t lastPowerPulse = 0;
 #else
-	setupPower(85);
 
 #endif
-	history<int32_t> tempError = { { 0 }, 0, 0 };
+	history<int32_t, 16> tempError = { { 0 }, 0, 0 };
 	currentlyActiveTemperatureTarget = 0; // Force start with no output (off). If in sleep / soldering this will
 										  // be over-ridden rapidly
 	pidTaskNotification = xTaskGetCurrentTaskHandle();
@@ -172,7 +168,7 @@ void startPIDTask(void const *argument __unused) {
 #endif
 
 				int32_t milliWattsNeeded = tempToMilliWatts(tempError.average(),
-						mass, rawC);
+						mass);
 				// note that milliWattsNeeded is sometimes negative, this counters overshoot
 				//  from I term's inertia.
 				milliWattsOut += milliWattsNeeded;