From 96bda69a0a9a32abb551b65f1af8609f82492ed9 Mon Sep 17 00:00:00 2001
From: "Ben V. Brown" <Ralim@Ralimtek.com>
Date: Fri, 16 Sep 2016 21:52:28 +1000
Subject: [PATCH] Fix heater drive

Needed to enable the AFIO clock for the disabling reset to work.
---
 workspace/ts100/.cproject  | 8 ++++----
 workspace/ts100/.gitignore | 1 +
 workspace/ts100/src/Bios.c | 9 +++++----
 3 files changed, 10 insertions(+), 8 deletions(-)
 create mode 100644 workspace/ts100/.gitignore

diff --git a/workspace/ts100/.cproject b/workspace/ts100/.cproject
index 2c047c33..2dfc12a8 100644
--- a/workspace/ts100/.cproject
+++ b/workspace/ts100/.cproject
@@ -30,10 +30,10 @@
 								<option id="fr.ac6.managedbuild.gnu.c.compiler.option.optimization.level.963224364" name="Optimization Level" superClass="fr.ac6.managedbuild.gnu.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="fr.ac6.managedbuild.gnu.c.optimization.level.more" valueType="enumerated"/>
 								<option id="gnu.c.compiler.option.debugging.level.400507088" name="Debug Level" superClass="gnu.c.compiler.option.debugging.level" useByScannerDiscovery="false" value="gnu.c.debugging.level.default" valueType="enumerated"/>
 								<option id="gnu.c.compiler.option.include.paths.1436405353" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
-									<listOptionValue builtIn="false" value="/home/ralim/Repo/ts100/workspace/ts100/inc"/>
-									<listOptionValue builtIn="false" value="/home/ralim/Repo/ts100/workspace/ts100/StdPeriph_Driver/inc"/>
-									<listOptionValue builtIn="false" value="/home/ralim/Repo/ts100/workspace/ts100/CMSIS/core"/>
-									<listOptionValue builtIn="false" value="/home/ralim/Repo/ts100/workspace/ts100/CMSIS/device"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/inc}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/StdPeriph_Driver/inc}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/CMSIS/core}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/CMSIS/device}&quot;"/>
 								</option>
 								<option id="gnu.c.compiler.option.preprocessor.def.symbols.1155214152" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="STM32F103T8Ux"/>
diff --git a/workspace/ts100/.gitignore b/workspace/ts100/.gitignore
new file mode 100644
index 00000000..3df573fe
--- /dev/null
+++ b/workspace/ts100/.gitignore
@@ -0,0 +1 @@
+/Debug/
diff --git a/workspace/ts100/src/Bios.c b/workspace/ts100/src/Bios.c
index e062612a..8ceba44e 100644
--- a/workspace/ts100/src/Bios.c
+++ b/workspace/ts100/src/Bios.c
@@ -8,13 +8,11 @@
  2015/07/07   ͳһ������
  *******************************************************************************/
 
-#include <Hardware.h>
-
 #include "APP_Version.h"
 #include "Bios.h"
 #include "I2C.h"
 #include "CTRL.h"
-
+#include <Hardware.h>
 /******************************************************************************/
 #define ADC1_DR_Address    ((u32)0x4001244C)
 
@@ -137,6 +135,10 @@ void NVIC_Config(u16 tab_offset) {
  *******************************************************************************/
 void GPIO_Config(void) {
 	GPIO_InitTypeDef GPIO_InitStructure;
+	RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOB | RCC_APB2Periph_AFIO, ENABLE); // GPIOB & AFIO
+
+	GPIO_PinRemapConfig(GPIO_Remap_SWJ_NoJTRST, ENABLE);
+	GPIO_PinRemapConfig(GPIO_Remap_SWJ_JTAGDisable, ENABLE);
 
 	GPIOA_OUTPUT()
 	;
@@ -164,7 +166,6 @@ void GPIO_Config(void) {
 	GPIO_Init(GPIOA, &GPIO_InitStructure);
 
 //------- Heat_Pin - Iron enable output PB4--------------------------------------------------------//
-	GPIO_PinRemapConfig(GPIO_Remap_SWJ_NoJTRST, ENABLE); //Disable  PB4=JNTRST
 
 	GPIO_InitStructure.GPIO_Pin = HEAT_PIN;
 	GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;