From f077c0241f502838d90dae1126e4e699e0bb1967 Mon Sep 17 00:00:00 2001
From: "Ben V. Brown" <Ralim@Ralimtek.com>
Date: Tue, 25 Jul 2017 08:28:33 +1000
Subject: [PATCH] Fix order of definitions for some variables

---
 workspace/ts100/.cproject       |  1 +
 workspace/ts100/inc/Interrupt.h | 13 ++++++-------
 workspace/ts100/src/Bios.c      |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/workspace/ts100/.cproject b/workspace/ts100/.cproject
index b52c9918..f4bbcc93 100644
--- a/workspace/ts100/.cproject
+++ b/workspace/ts100/.cproject
@@ -50,6 +50,7 @@
 								<option id="gnu.c.compiler.option.dialect.std.1983627145" name="Language standard" superClass="gnu.c.compiler.option.dialect.std" useByScannerDiscovery="true" value="gnu.c.compiler.dialect.c11" valueType="enumerated"/>
 								<option id="gnu.c.compiler.option.warnings.nowarn.1227270879" name="Inhibit all warnings (-w)" superClass="gnu.c.compiler.option.warnings.nowarn" useByScannerDiscovery="false" value="false" valueType="boolean"/>
 								<option id="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.fdata.1556802580" name="Place the data in their own section (-fdata-sections)" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.fdata" useByScannerDiscovery="false" value="true" valueType="boolean"/>
+								<option id="gnu.c.compiler.option.warnings.extrawarn.826041739" superClass="gnu.c.compiler.option.warnings.extrawarn" useByScannerDiscovery="false" value="true" valueType="boolean"/>
 								<inputType id="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.input.c.1635097739" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.input.c"/>
 								<inputType id="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.input.s.211510996" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.input.s"/>
 							</tool>
diff --git a/workspace/ts100/inc/Interrupt.h b/workspace/ts100/inc/Interrupt.h
index c7eba7c1..84464bba 100644
--- a/workspace/ts100/inc/Interrupt.h
+++ b/workspace/ts100/inc/Interrupt.h
@@ -8,11 +8,11 @@
 /* Functions for access to data */
 extern volatile uint32_t system_Ticks;
 void delayMs(uint32_t ticks);
-volatile extern uint32_t lastKeyPress;
-volatile extern uint32_t lastMovement;
+extern volatile uint32_t lastKeyPress;
+extern volatile uint32_t lastMovement;
 
-volatile extern uint8_t keyState;
-volatile extern uint8_t rawKeys;
+extern volatile uint8_t keyState;
+extern volatile uint8_t rawKeys;
 
 inline uint32_t millis() {
 	return system_Ticks;
@@ -39,9 +39,8 @@ inline uint16_t getButtons() {
 inline uint16_t getRawButtons() {
 	return rawKeys;
 }
-inline void restoreButtons()
-{
-	keyState=getRawButtons();
+inline void restoreButtons() {
+	keyState = getRawButtons();
 }
 
 /*IRQ prototypes*/
diff --git a/workspace/ts100/src/Bios.c b/workspace/ts100/src/Bios.c
index c81fc5a6..0f6e576b 100644
--- a/workspace/ts100/src/Bios.c
+++ b/workspace/ts100/src/Bios.c
@@ -250,7 +250,7 @@ void Clear_Watchdog(void) {
 
 //TIM3_ISR handles the tick of the timer 3 IRQ
 void TIM3_ISR(void) {
-	volatile static u8 heat_flag = 0;
+	static volatile u8 heat_flag = 0;
 	//heat flag == used to make the pin toggle
 	//As the output is passed through a cap, the iron is on whilever we provide a square wave drive output