rusefi
/
wideband
mirror of https://github.com/rusefi/wideband.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Conditional compile ts (#298) 

* conditionally compile TS as it's a memory hog

* naming so dumps are easier to read
This commit is contained in:
Matthew Kennedy 2023-11-22 18:26:40 -08:00 committed by GitHub
parent f784d5d5b9
commit b23904362f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
firmware/Makefile
View File

@ -157,16 +157,21 @@ CPPSRC = $(ALLCPPSRC) \
max3185x.cpp \ max3185x.cpp \
uart.cpp \ uart.cpp \
auxout.cpp \ auxout.cpp \
livedata.cpp \
indication.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 \ sampling_thread.cpp \
heater_thread.cpp \ heater_thread.cpp \
main.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. # List ASM source files here.
ASMSRC = $(ALLASMSRC) ASMSRC = $(ALLASMSRC)

24
firmware/boards/f0_module/port.cpp
View File

@ -95,7 +95,7 @@ int InitConfiguration()
return 0; return 0;
} }
static Configuration c; static Configuration config;
Configuration* GetConfiguration() Configuration* GetConfiguration()
{ {
@ -104,7 +104,7 @@ Configuration* GetConfiguration()
// If config has been written before, use the stored configuration // If config has been written before, use the stored configuration
if (cfg.IsValid()) if (cfg.IsValid())
{ {
c = cfg; config = cfg;
} }
// Now, override the index with a hardware-strapped option (if present) // Now, override the index with a hardware-strapped option (if present)
@ -113,19 +113,19 @@ Configuration* GetConfiguration()
// See https://github.com/mck1117/wideband/issues/11 to explain this madness // See https://github.com/mck1117/wideband/issues/11 to explain this madness
switch (3 * sel1 + sel2) { switch (3 * sel1 + sel2) {
case 0: c.CanIndexOffset = 2; break; case 0: config.CanIndexOffset = 2; break;
case 1: c.CanIndexOffset = 0; break; case 1: config.CanIndexOffset = 0; break;
case 2: c.CanIndexOffset = 3; break; case 2: config.CanIndexOffset = 3; break;
case 3: c.CanIndexOffset = 4; break; case 3: config.CanIndexOffset = 4; break;
case 4: /* both floating, do nothing */ break; case 4: /* both floating, do nothing */ break;
case 5: c.CanIndexOffset = 1; break; case 5: config.CanIndexOffset = 1; break;
case 6: c.CanIndexOffset = 5; break; case 6: config.CanIndexOffset = 5; break;
case 7: c.CanIndexOffset = 6; break; case 7: config.CanIndexOffset = 6; break;
case 8: c.CanIndexOffset = 7; break; case 8: config.CanIndexOffset = 7; break;
default: break; default: break;
} }
return &c; return &config;
} }
void SetConfiguration() void SetConfiguration()
@ -136,7 +136,7 @@ void SetConfiguration()
// Copy data to flash // Copy data to flash
Flash::Write( Flash::Write(
reinterpret_cast<flashaddr_t>(&__configflash__start__), reinterpret_cast<flashaddr_t>(&__configflash__start__),
reinterpret_cast<const uint8_t*>(&c), reinterpret_cast<const uint8_t*>(&config),
sizeof(Configuration) sizeof(Configuration)
); );
} }

1
firmware/boards/f1_dual/board.mk
View File

@ -1,4 +1,5 @@
USE_BOOTLOADER = no USE_BOOTLOADER = no
ENABLE_TS = yes
MCU = cortex-m3 MCU = cortex-m3

1
firmware/boards/f1_dual_rev1/board.mk
View File

@ -1,4 +1,5 @@
USE_BOOTLOADER = no USE_BOOTLOADER = no
ENABLE_TS = yes
MCU = cortex-m3 MCU = cortex-m3

1
firmware/boards/f1_rev2/board.mk
View File

@ -1,4 +1,5 @@
USE_BOOTLOADER = no USE_BOOTLOADER = no
ENABLE_TS = yes
MCU = cortex-m3 MCU = cortex-m3

1
firmware/boards/f1_rev3/board.mk
View File

@ -1,4 +1,5 @@
USE_BOOTLOADER = no USE_BOOTLOADER = no
ENABLE_TS = yes
MCU = cortex-m3 MCU = cortex-m3

2
firmware/main.cpp
View File

@ -38,7 +38,9 @@ int main() {
StartPumpControl(); StartPumpControl();
InitAuxDac(); InitAuxDac();
#if ENABLE_TS
startTunerStudioConnectivity(); startTunerStudioConnectivity();
#endif
InitCan(); InitCan();
InitUart(); InitUart();

7
firmware/wideband_config.h
View File

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