Update to latest mbed and add Makefile

Author: colescott

.gitignore

@@ -96,3 +96,6 @@ test_suite.json
 
 # default delivery dir
 DELIVERY/
+
+# clang compile commands
+compile_commands.json

bms/.gdbinit

@@ -0,0 +1,5 @@
+target remote | openocd -f board/st_nucleo_f3.cfg -c "gdb_port pipe"
+set remote hardware-breakpoint-limit 6
+set remote hardware-watchpoint-limit 4
+mon reset halt
+load

bms/.gitignore

@@ -1,2 +1,3 @@
 .mbedbuild
-cmake_build/
+cmake_build/
+lib-mbed-ltc681x

bms/CMakeLists.txt

@@ -12,26 +12,30 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-register -Wno-deprecated-declaratio
 
 include(${MBED_PATH}/tools/cmake/app.cmake)
 
-add_subdirectory(${MBED_PATH})
+project(${APP_TARGET})
+
 
 # Libraries
+add_subdirectory(${MBED_PATH})
 add_subdirectory(lib-mbed-ltc681x)
 
-add_executable(${APP_TARGET}
-    src/Main.cpp
-    src/BmsThread.cpp
-    src/EnergusTempSensor.cpp
-    src/LTC6811.cpp
-)
-#target_include_directories(${APP_TARGET} ${ltc681x_SOURCE_DIR})
+
+add_executable(${APP_TARGET})
 
 mbed_configure_app_target(${APP_TARGET})
 
-project(${APP_TARGET})
+target_sources(${APP_TARGET}
+    PRIVATE
+        src/Main.cpp
+        src/BmsThread.cpp
+        src/EnergusTempSensor.cpp
+        src/LTC6811.cpp
+)
 
 target_link_libraries(${APP_TARGET}
-    mbed-os
-    lib-mbed-ltc681x
+    PRIVATE
+        mbed-os
+        lib-mbed-ltc681x
 )
 
 mbed_set_post_build(${APP_TARGET})

bms/Makefile

@@ -0,0 +1,67 @@
+#
+# Build file for Formula Slug FS-2 bms
+#
+
+MBED_TOOLCHAIN := GCC_ARM
+MBED_TARGET := LPC1768
+MBED_BUILD_PROFILE := release
+
+BUILD_DIR := cmake_build
+
+DEPENDENCIES := mbed-os lib-mbed-ltc681x
+
+.PHONY: all
+all: build-release
+
+#
+# Dependency pulling
+# 
+
+.PHONY: deps
+deps: $(DEPENDENCIES)
+
+$(DEPENDENCIES):
+	mbed-tools deploy
+
+#
+# Build profiles
+#
+
+$(BUILD_DIR):
+	mbed-tools configure -t $(MBED_TOOLCHAIN) -m $(MBED_TARGET) -b $(MBED_BUILD_PROFILE)
+
+.PHONY: build
+build: deps $(BUILD_DIR)
+	mbed-tools compile -t $(MBED_TOOLCHAIN) -m $(MBED_TARGET) -b $(MBED_BUILD_PROFILE)
+
+.PHONY: build-debug
+build-debug: MBED_BUILD_PROFILE=debug
+build-debug: build
+
+.PHONY: build-release
+build-release: MBED_BUILD_PROFILE=release
+build-release: build
+
+#
+# Flashing to devices
+#
+
+.PHONY: flash
+flash: deps $(BUILD_DIR)
+	mbed-tools compile -t $(MBED_TOOLCHAIN) -m $(MBED_TARGET) -b $(MBED_BUILD_PROFILE) -f
+
+#
+# STM32 F303 debug
+#
+
+.PHONY: debug
+debug: build-debug
+	arm-none-eabi-gdb -x .gdbinit ./$(BUILD_DIR)/$(MBED_TARGET)/$(MBED_BUILD_PROFILE)/$(MBED_TOOLCHAIN)/bms.elf
+
+#
+# Utilities
+#
+
+.PHONY: clean
+clean:
+	rm -rf $(BUILD_DIR)

bms/README.md

@@ -0,0 +1,21 @@
+# FS-2 bms software
+
+This directory contains the software for the battery management system (BMS) for the FS-2 race car.
+
+## Requirements
+
+The following software is required for building:
+- [mbed-tools](https://github.com/ARMmbed/mbed-tools)
+- [GNU Arm Embedded Toolchain](https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm)
+
+## Building
+
+To build the software simply run
+
+```bash
+make build
+```
+
+This will download all required dependencies and configure and build the project.
+
+*NOTE: The build may fail on the first invocation due to an issue with mbed. In this case simply re-run the build command.*

bms/mbed-os.lib

@@ -1 +1 @@
-https://github.com/ARMmbed/mbed-os#master
+https://github.com/ARMmbed/mbed-os#mbed-os-6.15.0

bms/mbed_app.json

@@ -1,6 +1,11 @@
 {
     "target_overrides": {
         "LPC1768": {
+            "platform.stdio-baud-rate": 115200,
+            "platform.default-serial-baud-rate": 115200,
+            "MBED_CONF_PLATFORM_ERROR_FILENAME_CAPTURE_ENABLED": "True"
+        },
+        "NUCLEO_F303K8": {
             "platform.stdio-baud-rate": 115200,
             "platform.default-serial-baud-rate": 115200
         }

bms/src/BmsConfig.h

@@ -19,7 +19,7 @@ extern DigitalOut* chargerControl;
 
 // Number of LTC6811 battery banks to communicate with
 #ifndef BMS_BANK_COUNT
-#define BMS_BANK_COUNT 1
+#define BMS_BANK_COUNT 4
 #endif
 
 // Number of cell voltage readings per LTC6811
@@ -82,42 +82,90 @@ const int BMS_CELL_MAP[12] = {0, 1, 2, 3, -1, -1, 4, 5, 6, -1, -1, -1};
 //
 // To be set high and held high when software enters fault state
 #ifndef BMS_PIN_BMS_FLT
-#define BMS_PIN_BMS_FLT p10
+
+#ifdef TARGET_LPC1768
+  #define BMS_PIN_BMS_FLT p10
+#elif TARGET_NUCLEO_F303K8
+  #define BMS_PIN_BMS_FLT PB_0
+#else
+  #error "Unknown board for BMS_PIN_BMS_FLT"
+#endif
+
 #endif
 
 // BMS fault latch
 //
 // Readback from BMS fault relay to be broadcasted on CAN bus
 #ifndef BMS_PIN_BMS_FLT_LAT
-#define BMS_PIN_BMS_FLT_LAT NC
+
+#ifdef TARGET_LPC1768
+  #define BMS_PIN_BMS_FLT_LAT p12
+#elif TARGET_NUCLEO_F303K8
+  #define BMS_PIN_BMS_FLT_LAT PF_1
+#else
+  #error "Unknown board for BMS_PIN_BMS_FLT_LAT"
+#endif
+
 #endif
 
 // IMD status input
 //
 // Reads PWM output from IMD board
 #ifndef BMS_PIN_IMD_STATUS
-#define BMS_PIN_IMD_STATUS NC
+
+#ifdef TARGET_LPC1768
+  #define BMS_PIN_IMD_STATUS p14
+#elif TARGET_NUCLEO_F303K8
+  #define BMS_PIN_IMD_STATUS PF_0
+#else
+  #error "Unknown board for BMS_PIN_IMD_STATUS"
+#endif
+
 #endif
 
 // IMD fault latch
 //
 // Readback from IMD fault relay to be broadcasted on CAN bus
 #ifndef BMS_PIN_IMD_FLT_LAT
-#define BMS_PIN_IMD_FLT_LAT NC
+
+#ifdef TARGET_LPC1768
+  #define BMS_PIN_IMD_FLT_LAT p13
+#elif TARGET_NUCLEO_F303K8
+  #define BMS_PIN_IMD_FLT_LAT PA_8
+#else
+  #error "Unknown board for BMS_PIN_IMD_FLT_LAT"
+#endif
+
 #endif
 
 // Charger output
 //
 // To be pulled high to enable charger
 #ifndef BMS_PIN_CHARGER_CONTROL
-#define BMS_PIN_CHARGER_CONTROL p11
+
+#ifdef TARGET_LPC1768
+  #define BMS_PIN_CHARGER_CONTROL p11
+#elif TARGET_NUCLEO_F303K8
+  #define BMS_PIN_CHARGER_CONTROL PB_1
+#else
+  #error "Unknown board for BMS_PIN_CHARGER_CONTROL"
+#endif
+
 #endif
 
 // Current input
 //
 // Input from analog current sensor
 #ifndef BMS_PIN_SIG_CURRENT
-#define BMS_PIN_SIG_CURRENT NC
+
+#ifdef TARGET_LPC1768
+  #define BMS_PIN_SIG_CURRENT p15
+#elif TARGET_NUCLEO_F303K8
+  #define BMS_PIN_SIG_CURRENT PA_0
+#else
+  #error "Unknown board for BMS_PIN_SIG_CURRENT"
+#endif
+
 #endif
 
 
@@ -127,22 +175,54 @@ const int BMS_CELL_MAP[12] = {0, 1, 2, 3, -1, -1, 4, 5, 6, -1, -1, -1};
 
 // SPI master out slave in
 #ifndef BMS_PIN_SPI_MOSI
-#define BMS_PIN_SPI_MOSI p5
+
+#ifdef TARGET_LPC1768
+  #define BMS_PIN_SPI_MOSI p5
+#elif TARGET_NUCLEO_F303K8
+  #define BMS_PIN_SPI_MOSI PA_7
+#else
+  #error "Unknown board for BMS_PIN_SPI_MOSI"
+#endif
+
 #endif
 
 // SPI master in slave out
 #ifndef BMS_PIN_SPI_MISO
-#define BMS_PIN_SPI_MISO p6
+
+#ifdef TARGET_LPC1768
+  #define BMS_PIN_SPI_MISO p6
+#elif TARGET_NUCLEO_F303K8
+  #define BMS_PIN_SPI_MISO PA_6
+#else
+  #error "Unknown board for BMS_PIN_SPI_MISO"
+#endif
+
 #endif
 
 // SPI clock
 #ifndef BMS_PIN_SPI_SCLK
-#define BMS_PIN_SPI_SCLK p7
+
+#ifdef TARGET_LPC1768
+  #define BMS_PIN_SPI_SCLK p7
+#elif TARGET_NUCLEO_F303K8
+  #define BMS_PIN_SPI_SCLK PA_5
+#else
+  #error "Unknown board for BMS_PIN_SPI_SCLK"
+#endif
+
 #endif
 
 // SPI chip select
 #ifndef BMS_PIN_SPI_SSEL
-#define BMS_PIN_SPI_SSEL p8
+
+#ifdef TARGET_LPC1768
+  #define BMS_PIN_SPI_SSEL p8
+#elif TARGET_NUCLEO_F303K8
+  #define BMS_PIN_SPI_SSEL PA_4
+#else
+  #error "Unknown board for BMS_PIN_SPI_SSEL"
+#endif
+
 #endif
 
 
@@ -152,12 +232,28 @@ const int BMS_CELL_MAP[12] = {0, 1, 2, 3, -1, -1, 4, 5, 6, -1, -1, -1};
 
 // CAN TX pin to transceiver
 #ifndef BMS_PIN_CAN_TX
-#define BMS_PIN_CAN_TX p29
+
+#ifdef TARGET_LPC1768
+  #define BMS_PIN_CAN_TX p29
+#elif TARGET_NUCLEO_F303K8
+  #define BMS_PIN_CAN_TX PA_12
+#else
+  #error "Unknown board for BMS_PIN_CAN_TX"
+#endif
+
 #endif
 
 // CAN RX pin from transceiver
 #ifndef BMS_PIN_CAN_RX
-#define BMS_PIN_CAN_RX p30
+
+#ifdef TARGET_LPC1768
+  #define BMS_PIN_CAN_RX p30
+#elif TARGET_NUCLEO_F303K8
+  #define BMS_PIN_CAN_RX PA_11
+#else
+  #error "Unknown board for BMS_PIN_CAN_RX"
+#endif
+
 #endif
 
 // CAN frequency to used