sv/IronOS
1
0
Fork 0
forked from me/IronOS
Code Pull Requests Activity

All models building

Browse Source
This commit is contained in:
Ben V. Brown
2019-06-18 18:18:17 +10:00
parent acd4d69f7d
commit 884f22c8af
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
workspace/TS100/Makefile
View File

@@ -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) 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 # Enable debug code generation
DEBUG=-g DEBUG=-g3
# Without debug code # Without debug code
#DEBUG= #DEBUG=
@@ -55,14 +55,17 @@ LDSCRIPT=LinkerScript.ld
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
COMPILER=gcc 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 --------------------------------------------------------------------- # programs ---------------------------------------------------------------------
CC=arm-none-eabi-gcc CC=$(COMPILER_PREFIX)-eabi-gcc
CPP=arm-none-eabi-g++ CPP=$(COMPILER_PREFIX)-eabi-g++
AS=arm-none-eabi-as AS=$(COMPILER_PREFIX)-eabi-as
GCOV=arm-none-eabi-gcov GCOV=$(COMPILER_PREFIX)-eabi-gcov
OBJCOPY=arm-none-eabi-objcopy OBJCOPY=$(COMPILER_PREFIX)-eabi-objcopy
OBJDUMP=arm-none-eabi-objdump OBJDUMP=$(COMPILER_PREFIX)-eabi-objdump
SIZE=arm-none-eabi-size SIZE=$(COMPILER_PREFIX)-eabi-size
SREC=srec_cat SREC=srec_cat
SREC_INFO=srec_info SREC_INFO=srec_info

2
workspace/TS100/src/gui.cpp
View File

@@ -305,7 +305,7 @@ static void settings_displayInputVRange(void) {
printShortDescription(0, 6); printShortDescription(0, 6);
if (systemSettings.cutoutSetting) { if (systemSettings.cutoutSetting) {
OLED::printNumer(2 + systemSettings.cutoutSetting,1); OLED::printNumber(2 + systemSettings.cutoutSetting,1);
OLED::print(SymbolCellCount); OLED::print(SymbolCellCount);
} else { } else {
OLED::print(SymbolDC); OLED::print(SymbolDC);