From 884f22c8af46a43a2caab7eab8defefef08f3e78 Mon Sep 17 00:00:00 2001
From: "Ben V. Brown" <ralim@ralimtek.com>
Date: Tue, 18 Jun 2019 18:18:17 +1000
Subject: [PATCH] All models building

---
 workspace/TS100/Makefile    | 19 +++++++++++--------
 workspace/TS100/src/gui.cpp |  2 +-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/workspace/TS100/Makefile b/workspace/TS100/Makefile
index 4771ed64..efd9e6b8 100644
--- a/workspace/TS100/Makefile
+++ b/workspace/TS100/Makefile
@@ -42,7 +42,7 @@ OPTIM=-Os -flto -ffat-lto-objects -finline-small-functions -findirect-inlining -
 GLOBAL_DEFINES += -D STM32F103T8Ux -D STM32F1 -D STM32 -D USE_HAL_DRIVER -D STM32F103xB -D USE_RTOS_SYSTICK -D LANG_$(lang) -D LANG -D MODEL_$(model)
 
 # Enable debug code generation
-DEBUG=-g
+DEBUG=-g3
 # Without debug code
 #DEBUG=
 
@@ -55,14 +55,17 @@ LDSCRIPT=LinkerScript.ld
 
 # ------------------------------------------------------------------------------
 COMPILER=gcc
+# arm-none is the general ARM compiler, 
+# arm-atollic is the atollic customised compilers if you have them setup
+COMPILER_PREFIX=arm-none
 # programs ---------------------------------------------------------------------
-CC=arm-none-eabi-gcc
-CPP=arm-none-eabi-g++
-AS=arm-none-eabi-as
-GCOV=arm-none-eabi-gcov
-OBJCOPY=arm-none-eabi-objcopy
-OBJDUMP=arm-none-eabi-objdump
-SIZE=arm-none-eabi-size
+CC=$(COMPILER_PREFIX)-eabi-gcc
+CPP=$(COMPILER_PREFIX)-eabi-g++
+AS=$(COMPILER_PREFIX)-eabi-as
+GCOV=$(COMPILER_PREFIX)-eabi-gcov
+OBJCOPY=$(COMPILER_PREFIX)-eabi-objcopy
+OBJDUMP=$(COMPILER_PREFIX)-eabi-objdump
+SIZE=$(COMPILER_PREFIX)-eabi-size
 SREC=srec_cat
 SREC_INFO=srec_info
 
diff --git a/workspace/TS100/src/gui.cpp b/workspace/TS100/src/gui.cpp
index dd513f82..20c0c37f 100644
--- a/workspace/TS100/src/gui.cpp
+++ b/workspace/TS100/src/gui.cpp
@@ -305,7 +305,7 @@ static void settings_displayInputVRange(void) {
 	printShortDescription(0, 6);
 
 	if (systemSettings.cutoutSetting) {
-		OLED::printNumer(2 + systemSettings.cutoutSetting,1);
+		OLED::printNumber(2 + systemSettings.cutoutSetting,1);
 		OLED::print(SymbolCellCount);
 	} else {
 		OLED::print(SymbolDC);