Update to Mbed 6.7

And a whole lot of other stuff

Author: colescott

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "bms/deps/optional"]
+	path = bms/deps/optional
+	url = https://github.com/TartanLlama/optional.git

bms/CanSpec.md renamed to CanSpec.md

@@ -1,2 +1,2 @@
-mbed-os
-optional
+.mbedbuild
+cmake_build/

bms/.gitignore

@@ -0,0 +1,39 @@
+# Copyright (c) 2021 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.19.0)
+
+set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/mbed-os CACHE INTERNAL "")
+set(MBED_CONFIG_PATH ${CMAKE_CURRENT_BINARY_DIR} CACHE INTERNAL "")
+set(APP_TARGET bms)
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-register")
+
+include(${MBED_PATH}/tools/cmake/app.cmake)
+
+add_subdirectory(${MBED_PATH})
+
+# Libraries
+#add_library(optional INTERFACE deps/optional)
+
+add_executable(${APP_TARGET}
+    src/Main.cpp
+    src/BmsThread.cpp
+    src/EnergusTempSensor.cpp
+    src/LTC6811Bus.cpp
+    src/LTC6811.cpp
+)
+
+mbed_configure_app_target(${APP_TARGET})
+
+project(${APP_TARGET})
+
+target_link_libraries(${APP_TARGET} mbed-os)
+
+mbed_set_post_build(${APP_TARGET})
+
+option(VERBOSE_BUILD "Have a verbose build process")
+if(VERBOSE_BUILD)
+    set(CMAKE_VERBOSE_MAKEFILE ON)
+endif()

bms/.mbed

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

bms/.mbedignore

@@ -2,12 +2,6 @@
 
 #include "mbed.h"
 
-
-// Global pointer to serial object
-//
-// This allows for all files to access the serial output
-extern Serial* serial;
-
 // Global pointer to can bus object
 //
 // This allows for all files to access the can bus output

bms/CMakeLists.txt

@@ -0,0 +1,97 @@
+#include "BmsThread.h"
+
+BMSThread::BMSThread(LTC6811Bus* bus, unsigned int frequency, std::vector<Queue<BmsEvent, mailboxSize>*> mailboxes) : m_bus(bus), mailboxes(mailboxes) {
+  m_delay = 1000 / frequency;
+  for (int i = 0; i < BMS_BANK_COUNT; i++) {
+    m_chips.push_back(LTC6811(*bus, i));
+  }
+  for (int i = 0; i < BMS_BANK_COUNT; i++) {
+    //m_chips[i].getConfig().gpio5 = LTC6811::GPIOOutputState::kLow;
+    //m_chips[i].getConfig().gpio4 = LTC6811::GPIOOutputState::kPassive;
+
+    m_chips[i].updateConfig();
+  }
+}
+
+void BMSThread::threadWorker() {
+  std::array<uint16_t, BMS_BANK_COUNT * BMS_BANK_CELL_COUNT> allVoltages;
+  std::array<std::optional<int8_t>, BMS_BANK_COUNT * BMS_BANK_TEMP_COUNT> allTemps;
+
+  while (true) {
+    // Measure from all BMS banks
+    for (int i = 0; i < BMS_BANK_COUNT; i++) {
+      LTC6811::Configuration& conf = m_chips[i].getConfig();
+
+      // Turn on status LED
+      conf.gpio5 = LTC6811::GPIOOutputState::kLow;
+      m_chips[i].updateConfig();
+
+      uint16_t* voltages = m_chips[i].getVoltages();
+
+      // Measure all temperature sensors on the current bank
+      uint16_t temperatures[BMS_BANK_TEMP_COUNT];
+      for (unsigned int j = 0; j < BMS_BANK_TEMP_COUNT; j++) {
+        conf.gpio1 = (j & 0x01) ? LTC6811::GPIOOutputState::kHigh
+          : LTC6811::GPIOOutputState::kLow;
+        conf.gpio2 = (j & 0x02) ? LTC6811::GPIOOutputState::kHigh
+          : LTC6811::GPIOOutputState::kLow;
+        conf.gpio3 = (j & 0x04) ? LTC6811::GPIOOutputState::kHigh
+          : LTC6811::GPIOOutputState::kLow;
+        conf.gpio4 = LTC6811::GPIOOutputState::kPassive;
+        m_chips[i].updateConfig();
+
+        // Wait for config changes to take effect
+        ThisThread::sleep_for(3);
+
+        uint16_t* temps = m_chips[i].getGpioPin(GpioSelection::k4);
+        temperatures[j] = temps[j] / 10;
+
+        delete temps;
+      }
+
+      // Turn off status LED
+      conf.gpio5 = LTC6811::GPIOOutputState::kHigh;
+      m_chips[i].updateConfig();
+
+      //
+      // Process values
+      //
+      for (int j = 0; j < 12; j++) {
+        uint16_t voltage = voltages[j] / 10;
+
+        int index = BMS_CELL_MAP[j];
+        if (index != -1) {
+          allVoltages[(BMS_BANK_CELL_COUNT * i) + index] = voltage;
+        }
+      }
+
+      for (unsigned int j = 0; j < BMS_BANK_TEMP_COUNT; j++) {
+        auto temp = convertTemp(temperatures[j]);
+        allTemps[(BMS_BANK_TEMP_COUNT * i) + j] = temp;
+      }
+
+      delete voltages;
+    }
+
+    for(auto mailbox : mailboxes) {
+      if(!mailbox->full()) {
+        {
+          auto msg = new VoltageMeasurement();
+          msg->voltageValues = allVoltages;
+          mailbox->put((BmsEvent*) msg);
+        }
+        {
+          auto msg = new TemperatureMeasurement();
+          msg->temperatureValues = allTemps;
+          mailbox->put((BmsEvent*) msg);
+        }
+      }
+    }
+  }
+}
+
+void BMSThread::throwBmsFault()  {
+  m_discharging = false;
+  //palClearLine(LINE_BMS_FLT);
+  //palSetLine(LINE_CHARGER_CONTROL);
+}