From 81e87c86d0dc51e81edfffd0b53d0b0dcadb13a6 Mon Sep 17 00:00:00 2001
From: David Hilton <david.hilton.p@gmail.com>
Date: Sun, 28 Oct 2018 15:48:04 -0600
Subject: [PATCH] remove hardcoded MODEL_TS80 (#393)

* remove hardcoded MODEL_TS80

* #define MODEL_TS100 in sw4stm32/atollic config

* whitespace fix

* use sum of 'defined' instead of logic

* only print handle temp, not PCBVersion

* whitespace fix
---
 workspace/TS100/.cproject      |  7 +++++--
 workspace/TS100/inc/hardware.h | 10 +++++-----
 workspace/TS100/src/main.cpp   |  5 +++--
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/workspace/TS100/.cproject b/workspace/TS100/.cproject
index 1f09a218..f3845237 100644
--- a/workspace/TS100/.cproject
+++ b/workspace/TS100/.cproject
@@ -36,6 +36,7 @@
 								</option>
 								<option id="gnu.c.compiler.option.preprocessor.def.symbols.2127531885" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="STM32F103T8Ux"/>
+									<listOptionValue builtIn="false" value="MODEL_TS100"/>
 									<listOptionValue builtIn="false" value="STM32F1"/>
 									<listOptionValue builtIn="false" value="STM32"/>
 									<listOptionValue builtIn="false" value="DEBUG"/>
@@ -44,7 +45,7 @@
 									<listOptionValue builtIn="false" value="USE_RTOS_SYSTICK"/>
 								</option>
 								<option id="gnu.c.compiler.option.dialect.std.565083189" name="Language standard" superClass="gnu.c.compiler.option.dialect.std" useByScannerDiscovery="true" value="gnu.c.compiler.dialect.default" valueType="enumerated"/>
-								<option id="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.fdata.338139343" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.fdata" useByScannerDiscovery="false" value="true" valueType="boolean"/>
+								<option id="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.fdata.338139343" 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"/>
 								<inputType id="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.input.c.176392389" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.input.c"/>
 								<inputType id="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.input.s.893418158" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.input.s"/>
 							</tool>
@@ -63,6 +64,7 @@
 								</option>
 								<option id="gnu.cpp.compiler.option.preprocessor.def.766879664" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="STM32F103T8Ux"/>
+									<listOptionValue builtIn="false" value="MODEL_TS100"/>
 									<listOptionValue builtIn="false" value="STM32F1"/>
 									<listOptionValue builtIn="false" value="STM32"/>
 									<listOptionValue builtIn="false" value="DEBUG"/>
@@ -71,7 +73,7 @@
 									<listOptionValue builtIn="false" value="USE_RTOS_SYSTICK"/>
 								</option>
 								<option id="gnu.cpp.compiler.option.dialect.std.1681974405" name="Language standard" superClass="gnu.cpp.compiler.option.dialect.std" useByScannerDiscovery="true" value="gnu.cpp.compiler.dialect.default" valueType="enumerated"/>
-								<option id="fr.ac6.managedbuild.tool.gnu.cross.cpp.compiler.fdata.1463726438" superClass="fr.ac6.managedbuild.tool.gnu.cross.cpp.compiler.fdata" useByScannerDiscovery="false" value="true" valueType="boolean"/>
+								<option id="fr.ac6.managedbuild.tool.gnu.cross.cpp.compiler.fdata.1463726438" name="Place the data in their own section (-fdata-sections)" superClass="fr.ac6.managedbuild.tool.gnu.cross.cpp.compiler.fdata" useByScannerDiscovery="false" value="true" valueType="boolean"/>
 								<inputType id="fr.ac6.managedbuild.tool.gnu.cross.cpp.compiler.input.cpp.149685854" superClass="fr.ac6.managedbuild.tool.gnu.cross.cpp.compiler.input.cpp"/>
 								<inputType id="fr.ac6.managedbuild.tool.gnu.cross.cpp.compiler.input.s.1092052043" superClass="fr.ac6.managedbuild.tool.gnu.cross.cpp.compiler.input.s"/>
 							</tool>
@@ -99,6 +101,7 @@
 							</tool>
 						</toolChain>
 					</folderInfo>
+					<fileInfo id="fr.ac6.managedbuild.config.gnu.cross.exe.debug.1352500998.1352310611" name="LIS2DH12.hpp" rcbsApplicability="disable" resourcePath="inc/LIS2DH12.hpp" toolsToInvoke=""/>
 					<sourceEntries>
 						<entry excluding="Src/stm32f1xx_hal_timebase_tim_template.c|Src/stm32f1xx_hal_timebase_rtc_wakeup_template.c|Src/stm32f1xx_hal_timebase_rtc_alarm_template.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="HAL_Driver"/>
 						<entry excluding="Third_Party/FreeRTOS/Source/portable/MemMang/heap_1.c|Third_Party/FreeRTOS/Source/portable/MemMang/heap_2.c|Third_Party/FreeRTOS/Source/portable/MemMang/heap_3.c|Third_Party/FreeRTOS/Source/portable/MemMang/heap_5.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Middlewares"/>
diff --git a/workspace/TS100/inc/hardware.h b/workspace/TS100/inc/hardware.h
index c3c416a4..0b70f227 100644
--- a/workspace/TS100/inc/hardware.h
+++ b/workspace/TS100/inc/hardware.h
@@ -18,11 +18,11 @@ enum Orientation {
   ORIENTATION_RIGHT_HAND = 1,
   ORIENTATION_FLAT = 3
 };
-#define MODEL_TS80
-#ifndef MODEL_TS100
-	#ifndef MODEL_TS80
-#error "Please Define the model you are building for! MODEL=TS100 or MODEL=TS80"
-	#endif
+
+#if defined(MODEL_TS100) + defined(MODEL_TS80) > 1
+#error "Multiple models defined!"
+#elif defined(MODEL_TS100) + defined(MODEL_TS80) == 0
+#error "No model defined!"
 #endif
 
 #ifdef MODEL_TS100
diff --git a/workspace/TS100/src/main.cpp b/workspace/TS100/src/main.cpp
index 722a61d9..94599d85 100644
--- a/workspace/TS100/src/main.cpp
+++ b/workspace/TS100/src/main.cpp
@@ -654,7 +654,7 @@ void showVersion(void) {
 		OLED::setCursor(0, 0);  // Position the cursor at the 0,0 (top left)
 		OLED::setFont(1);       // small font
 #ifdef MODEL_TS100
-				OLED::print((char *)"V2.06 TS100");  // Print version number
+		OLED::print((char *)"V2.06 TS100");  // Print version number
 #else
 		OLED::print((char *) "V2.06 TS80");  // Print version number
 #endif
@@ -690,6 +690,7 @@ void showVersion(void) {
 			break;
 		case 10:
 			OLED::printNumber(getHandleTemperature(), 3);
+			break;
 		case 11:
 			OLED::printNumber(PCBVersion, 1);  // Print PCB ID number
 			break;
@@ -698,7 +699,7 @@ void showVersion(void) {
 			OLED::printNumber(idealQCVoltage,3);
 #else
 			OLED::print("Tek.com");
-			#endif
+#endif
 			break;
 		default:
 			break;