Updated EVT-Core and Namespaces

Updated EVT-Core to the latest version, then renamed the DEV namespace to dev because it fits the new EVT core standard

Signed-off-by: Taylor Lineman <git@actuallytaylor.com>

Author: ActuallyTaylor

include/BMS.hpp

@@ -1,21 +1,19 @@
 #pragma once
 
-#include <cstdint>
-
-#include <EVT/io/CANDevice.hpp>
-#include <EVT/io/CANOpenMacros.hpp>
-#include <co_core.h>
+#include <core/io/CANDevice.hpp>
+#include <core/io/CANOpenMacros.hpp>
+#include <core/io/pin.hpp>
+#include <core/dev/IWDG.hpp>
 
 #include <BMSCANOpenMacros.hpp>
 #include <BQSettingStorage.hpp>
-#include <EVT/dev/IWDG.hpp>
-#include <EVT/io/pin.hpp>
 #include <ResetHandler.hpp>
 #include <SystemDetect.hpp>
+
 #include <dev/Interlock.hpp>
 #include <dev/ThermistorMux.hpp>
 
-namespace IO = EVT::core::IO;
+namespace IO = core::io;
 
 namespace BMS {
 
@@ -85,9 +83,9 @@ class BMS : public CANDevice {
      * @param[in] resetHandler Handler for reset messages
      * @param[in] iwdg Internal watchdog to ensure the BMS code is running without getting stuck
      */
-    BMS(BQSettingsStorage& bqSettingsStorage, DEV::BQ76952 bq, DEV::Interlock& interlock,
+    BMS(BQSettingsStorage& bqSettingsStorage, dev::BQ76952 bq, dev::Interlock& interlock,
         IO::GPIO& alarm, SystemDetect& systemDetect, IO::GPIO& bmsOK, IO::GPIO& errorLed,
-        DEV::ThermistorMux& thermMux, ResetHandler& resetHandler, EVT::core::DEV::IWDG& iwdg);
+        dev::ThermistorMux& thermMux, ResetHandler& resetHandler, core::dev::IWDG& iwdg);
 
     /**
      * The node ID used to identify the device on the CAN network.
@@ -189,7 +187,7 @@ class BMS : public CANDevice {
     /**
      * Interface to the BQ chip
      */
-    DEV::BQ76952 bq;
+    dev::BQ76952 bq;
 
     /**
      * The current state of the BMS
@@ -199,7 +197,7 @@ class BMS : public CANDevice {
     /**
      * The interlock which is used to detect a cable plugged in
      */
-    DEV::Interlock& interlock;
+    dev::Interlock& interlock;
 
     /**
      * This GPIO is connected to the ALARM pin of the BQ
@@ -235,12 +233,12 @@ class BMS : public CANDevice {
     /**
      * Multiplexer to handle pack thermistors
      */
-    DEV::ThermistorMux thermistorMux;
+    dev::ThermistorMux thermistorMux;
 
     /**
      * Internal watchdog to detect STM hang
      */
-    EVT::core::DEV::IWDG& iwdg;
+    core::dev::IWDG& iwdg;
 
     /**
      * Boolean flag which represents that a state has just changed
@@ -327,7 +325,7 @@ class BMS : public CANDevice {
      * by reading the voltage from the BQ chip and is then exposed over
      * CANopen.
      */
-    uint16_t cellVoltage[DEV::BQ76952::NUM_CELLS] = {};
+    uint16_t cellVoltage[dev::BQ76952::NUM_CELLS] = {};
 
     /**
      * Used to store values which the BMS updates.

include/BMSCANOpenMacros.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <EVT/io/CANOpenMacros.hpp>
+#include <core/io/CANOpenMacros.hpp>
 
 /**
  * This macro creates a TPDO settings object for an extra node on a single

include/BQSettingStorage.hpp

@@ -2,7 +2,7 @@
 
 #include <cstdint>
 
-#include <EVT/dev/storage/M24C32.hpp>
+#include <core/dev/storage/M24C32.hpp>
 
 #include <BQSetting.hpp>
 #include <dev/BQ76952.hpp>
@@ -37,7 +37,7 @@ class BQSettingsStorage {
      * @param eeprom EEPROM instance that stores settings
      * @param bq BQ instance to send settings to
      */
-    BQSettingsStorage(EVT::core::DEV::M24C32& eeprom, DEV::BQ76952& bq);
+    BQSettingsStorage(core::dev::M24C32& eeprom, dev::BQ76952& bq);
 
     /**
      * Get the number of settings stored for the BQ
@@ -94,7 +94,7 @@ class BQSettingsStorage {
      *
      * @return The EEPROM instance
      */
-    EVT::core::DEV::M24C32& getEEPROM();
+    core::dev::M24C32& getEEPROM();
 
     /**
      * Reset the transfer setting logic
@@ -126,7 +126,7 @@ class BQSettingsStorage {
      * @param[out] isComplete Flag that represents all settings have been transferred
      * @return The resulting status of the transfer operation
      */
-    BMS::DEV::BQ76952::Status transferSetting(bool& isComplete);
+    dev::BQ76952::Status transferSetting(bool& isComplete);
 
     /**
      * Check if the settings are stored and can be used
@@ -158,11 +158,11 @@ class BQSettingsStorage {
     /**
      * EEPROM for storing the BQ settings.
      */
-    EVT::core::DEV::M24C32& eeprom;
+    core::dev::M24C32& eeprom;
     /**
      * The BQ chip interface
      */
-    DEV::BQ76952& bq;
+    dev::BQ76952& bq;
     /**
      * This is a count of the number of settings that have been written into
      * EEPROM. This is used for determining if all the settings have been
@@ -175,7 +175,7 @@ class BQSettingsStorage {
      */
     uint16_t numSettingsTransferred = 0;
 
-    friend class BMS;
+    friend class bms;
 };
 
 }// namespace BMS

include/ResetHandler.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <EVT/io/types/CANMessage.hpp>
+#include <core/io/types/CANMessage.hpp>
 
 namespace BMS {
 
@@ -19,7 +19,7 @@ class ResetHandler {
      *
      * @param msg Message to register
      */
-    void registerInput(EVT::core::IO::CANMessage msg);
+    void registerInput(core::io::CANMessage msg);
 
     /**
      * Check whether reset messages have been received, indicating that the BMS
@@ -43,7 +43,7 @@ class ResetHandler {
         {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07};
 
     /** Array of last MSG_HIST_LEN messages received */
-    EVT::core::IO::CANMessage msgHistory[MSG_HIST_LEN] = {};
+    core::io::CANMessage msgHistory[MSG_HIST_LEN] = {};
     /** Index of the last registered message */
     uint8_t lastRegMsgIndex = 0;
 };

include/dev/BQ76952.hpp

@@ -1,14 +1,14 @@
 #pragma once
 
-#include <EVT/io/I2C.hpp>
-#include <EVT/io/GPIO.hpp>
+#include <core/io/I2C.hpp>
+#include <core/io/GPIO.hpp>
 
 #include <BMSInfo.hpp>
 #include <BQSetting.hpp>
 
 #include <co_obj.h>
 
-namespace BMS::DEV {
+namespace BMS::dev {
 
 /**
  * Represents the functionality of the BQ76952. This is a layer of abstraction
@@ -51,7 +51,7 @@ class BQ76952 {
      * @param[in] i2cAddress The address of the BQ76952 to use
      * @param[in] resetPin GPIO instance to reset the BQ
      */
-    BQ76952(EVT::core::IO::I2C& i2c, uint8_t i2cAddress, EVT::core::IO::GPIO& resetPin);
+    BQ76952(core::io::I2C& i2c, uint8_t i2cAddress, core::io::GPIO& resetPin);
 
     /**
      * Write out the given setting
@@ -285,11 +285,11 @@ class BQ76952 {
     static constexpr uint16_t BQ_ID = 0x7695;
 
     /** I2C bus to communicate over */
-    EVT::core::IO::I2C& i2c;
+    core::io::I2C& i2c;
     /** The address of the BQ on the I2C bus */
     uint8_t i2cAddress;
     /** Reset pin of the BQ */
-    EVT::core::IO::GPIO& resetPin;
+    core::io::GPIO& resetPin;
 };
 
-}// namespace BMS::DEV
+}// namespace BMS::dev

include/dev/Interlock.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
-#include <EVT/io/GPIO.hpp>
+#include <core/io/GPIO.hpp>
 
-namespace BMS::DEV {
+namespace BMS::dev {
 
 /**
  * Represents the interlock which detects if the battery is has a cable
@@ -16,7 +16,7 @@ class Interlock {
      *
      * @pre The GPIO is set as an input
      */
-    explicit Interlock(EVT::core::IO::GPIO& gpio);
+    explicit Interlock(core::io::GPIO& gpio);
 
     /**
      * See if a cable is detected in the interlock
@@ -25,10 +25,10 @@ class Interlock {
 
 private:
     /** Active high state of the detect GPIO */
-    static constexpr EVT::core::IO::GPIO::State ACTIVE_STATE = EVT::core::IO::GPIO::State::HIGH;
+    static constexpr core::io::GPIO::State ACTIVE_STATE = core::io::GPIO::State::HIGH;
 
     /** GPIO which is used to read the detect state */
-    EVT::core::IO::GPIO& gpio;
+    core::io::GPIO& gpio;
 };
 
-}// namespace BMS::DEV
+}// namespace BMS::dev

include/dev/ThermistorMux.hpp

@@ -1,13 +1,13 @@
 #pragma once
 
-#include <EVT/dev/Thermistor.hpp>
-#include <EVT/io/GPIO.hpp>
-#include <EVT/utils/time.hpp>
+#include <core/dev/Thermistor.hpp>
+#include <core/io/GPIO.hpp>
+#include <core/utils//time.hpp>
 
-namespace IO = EVT::core::IO;
-namespace time = EVT::core::time;
+namespace IO = core::io;
+namespace time = core::time;
 
-namespace BMS::DEV {
+namespace BMS::dev {
 
 /**
  * Multiplexer connected to thermistors
@@ -34,7 +34,7 @@ class ThermistorMux {
     /** Array of MUX select pins */
     IO::GPIO* muxSelectArr[3];
     /** Thermistor instance to read the temperatures with */
-    EVT::core::DEV::Thermistor therm;
+    core::dev::Thermistor therm;
 
     /**
      * Conversion equation from ADC counts to temperature in Celsius
@@ -54,4 +54,4 @@ class ThermistorMux {
     }
 };
 
-}// namespace BMS::DEV
+}// namespace BMS::dev

libs/EVT-core

@@ -1,18 +1,20 @@
 #include <BMS.hpp>
 
-#include <EVT/utils/log.hpp>
-#include <EVT/utils/time.hpp>
+#include <core/utils/log.hpp>
+#include <core/utils/time.hpp>
 #include <cstring>
 
-namespace time = EVT::core::time;
-namespace log = EVT::core::log;
+#include <core/dev/IWDG.hpp>
+
+namespace time = core::time;
+namespace log = core::log;
 
 namespace BMS {
 
-BMS::BMS(BQSettingsStorage& bqSettingsStorage, DEV::BQ76952 bq,
-         DEV::Interlock& interlock, IO::GPIO& alarm, SystemDetect& systemDetect,
-         IO::GPIO& bmsOK, IO::GPIO& errorLed, DEV::ThermistorMux& thermMux,
-         ResetHandler& resetHandler, EVT::core::DEV::IWDG& iwdg) : bqSettingsStorage(bqSettingsStorage),
+BMS::BMS(BQSettingsStorage& bqSettingsStorage, dev::BQ76952 bq,
+         dev::Interlock& interlock, IO::GPIO& alarm, SystemDetect& systemDetect,
+         IO::GPIO& bmsOK, IO::GPIO& errorLed, dev::ThermistorMux& thermMux,
+         ResetHandler& resetHandler, core::dev::IWDG& iwdg) : bqSettingsStorage(bqSettingsStorage),
                                                                    bq(bq), state(State::START), interlock(interlock),
                                                                    alarm(alarm), systemDetect(systemDetect), resetHandler(resetHandler),
                                                                    bmsOK(bmsOK), errorLed(errorLed), thermistorMux(thermMux),
@@ -146,7 +148,7 @@ void BMS::startState() {
             .temp1 = 0,
             .temp2 = 0,
         };
-        memset(thermistorTemperature, 0, DEV::BQ76952::NUM_CELLS * sizeof(uint16_t));
+        memset(thermistorTemperature, 0, dev::BQ76952::NUM_CELLS * sizeof(uint16_t));
         memset(bqStatusArr, 0, sizeof(uint8_t) * 3);
         errorRegister = 0;
         lastCheckedThermNum = -1;
@@ -165,8 +167,8 @@ void BMS::startState() {
     }
 
     // Check to see if communication is possible with the BQ chip
-    DEV::BQ76952::Status status = bq.communicationStatus();
-    if (status != DEV::BQ76952::Status::OK) {
+    dev::BQ76952::Status status = bq.communicationStatus();
+    if (status != dev::BQ76952::Status::OK) {
 
         // Increment the number of errors that have taken place
         numBqAttemptsMade++;
@@ -249,7 +251,7 @@ void BMS::transferSettingsState() {
 
     bool isComplete = false;
     auto result = bqSettingsStorage.transferSetting(isComplete);
-    if (result != DEV::BQ76952::Status::OK) {
+    if (result != dev::BQ76952::Status::OK) {
         numBqAttemptsMade++;
 
         // If the number of errors are over the max
@@ -398,25 +400,25 @@ void BMS::updateBQData() {
         }
     }
 
-    DEV::BQ76952::Status result = bq.getCellVoltage(cellVoltage, totalVoltage, voltageInfo);
+    dev::BQ76952::Status result = bq.getCellVoltage(cellVoltage, totalVoltage, voltageInfo);
 
-    if (result == DEV::BQ76952::Status::OK) {
+    if (result == dev::BQ76952::Status::OK) {
         result = bq.getTotalVoltage(batteryVoltage);
     }
 
-    if (result == DEV::BQ76952::Status::OK) {
+    if (result == dev::BQ76952::Status::OK) {
         result = bq.getCurrent(current);
     }
 
-    if (result == DEV::BQ76952::Status::OK) {
+    if (result == dev::BQ76952::Status::OK) {
         result = bq.getTemps(bqTempInfo);
     }
 
-    if (result == DEV::BQ76952::Status::OK) {
+    if (result == dev::BQ76952::Status::OK) {
         result = bq.getBQStatus(bqStatusArr);
     }
 
-    if (result != DEV::BQ76952::Status::OK) {
+    if (result != dev::BQ76952::Status::OK) {
         numBqAttemptsMade++;
 
         // If the number of errors are over the max
@@ -482,7 +484,7 @@ void BMS::clearVoltageReadings() {
     voltageInfo = {0, 0, 0, 0};
 
     // Zero out all cell voltages
-    memset(cellVoltage, 0, DEV::BQ76952::NUM_CELLS * sizeof(uint16_t));
+    memset(cellVoltage, 0, dev::BQ76952::NUM_CELLS * sizeof(uint16_t));
 }
 
 }// namespace BMS

src/BMS.cpp

@@ -1,8 +1,8 @@
 #include <BQSetting.hpp>
 
-#include <EVT/utils/log.hpp>
+#include <core/utils/log.hpp>
 
-namespace log = EVT::core::log;
+namespace log = core::log;
 
 namespace BMS {