conditionally compile TS as it's a memory hog

mck1117 · Nov 23, 2023 · f53da88 · f53da88
1 parent f784d5d
commit f53da88
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 12 deletions.
diff --git a/firmware/Makefile b/firmware/Makefile
@@ -157,16 +157,21 @@ CPPSRC = $(ALLCPPSRC) \
           max3185x.cpp \
           uart.cpp \
           auxout.cpp \
-          livedata.cpp \
           indication.cpp \
-          console/binary/tunerstudio.cpp \
-          console/binary/tunerstudio_io.cpp \
-          console/binary/tunerstudio_io_serial.cpp \
-          console/binary/tunerstudio_commands.cpp \
           sampling_thread.cpp \
           heater_thread.cpp \
           main.cpp
 
+ifneq ($(ENABLE_TS),)
+CPPSRC += console/binary/tunerstudio.cpp \
+          console/binary/tunerstudio_io.cpp \
+          console/binary/tunerstudio_io_serial.cpp \
+          console/binary/tunerstudio_commands.cpp \
+          livedata.cpp \
+
+DDEFS += -DTS_ENABLED=TRUE
+endif
+
 # List ASM source files here.
 ASMSRC = $(ALLASMSRC)
 

diff --git a/firmware/boards/f1_dual/board.mk b/firmware/boards/f1_dual/board.mk
@@ -1,4 +1,5 @@
 USE_BOOTLOADER = no
+ENABLE_TS = yes
 
 MCU = cortex-m3
 

diff --git a/firmware/boards/f1_dual_rev1/board.mk b/firmware/boards/f1_dual_rev1/board.mk
@@ -1,4 +1,5 @@
 USE_BOOTLOADER = no
+ENABLE_TS = yes
 
 MCU = cortex-m3
 

diff --git a/firmware/boards/f1_rev2/board.mk b/firmware/boards/f1_rev2/board.mk
@@ -1,4 +1,5 @@
 USE_BOOTLOADER = no
+ENABLE_TS = yes
 
 MCU = cortex-m3
 

diff --git a/firmware/boards/f1_rev3/board.mk b/firmware/boards/f1_rev3/board.mk
@@ -1,4 +1,5 @@
 USE_BOOTLOADER = no
+ENABLE_TS = yes
 
 MCU = cortex-m3
 

diff --git a/firmware/main.cpp b/firmware/main.cpp
@@ -38,7 +38,9 @@ int main() {
     StartPumpControl();
     InitAuxDac();
 
+#if ENABLE_TS
     startTunerStudioConnectivity();
+#endif
 
     InitCan();
     InitUart();

diff --git a/firmware/wideband_config.h b/firmware/wideband_config.h
@@ -48,10 +48,3 @@
 #define HEATER_BATTERY_ON_VOLTAGE	9.5
 // mininal battery voltage to continue heating
 #define HEATER_BATTETY_OFF_VOLTAGE  8.5
-
-// *******************************
-//    TunerStudio configuration
-// *******************************
-#if defined(TS_PRIMARY_UART_PORT) || defined(TS_PRIMARY_SERIAL_PORT)
-#define TS_ENABLED
-#endif