Feat/max1148 adc interface

include/ACU_Constants.h

@@ -37,7 +37,6 @@ namespace ACUInterfaces {
     constexpr int ADC0_CLK = 13;
     constexpr int ADC0_SPEED = 2000000; // 1 MHz
     /* ADC Versions*/
-    constexpr int MAX114X_VERSION = 8;
     /* Channels on ADC */
     constexpr int ISO_PACK_N_CHANNEL         = 0;
     constexpr int ISO_PACK_P_CHANNEL         = 1;
@@ -49,14 +48,14 @@ namespace ACUInterfaces {
     constexpr int PACK_OUT_FILTERED_CHANNEL  = 7;
 
     /* SCALE/OFFSETS on ADC */
-    const float ISO_PACK_N_SCALE = 1;
-    const float ISO_PACK_P_SCALE = 1;
-    const float PACK_VOLTAGE_SENSE_SCALE = 1;
+    const float ISO_PACK_N_SCALE = 0.0656553030302;
+    const float ISO_PACK_P_SCALE = 0.0656553030302;
+    const float PACK_VOLTAGE_SENSE_SCALE = 0.0410345643939;
     const float SHUNT_CURRENT_OUT_SCALE = 0.03125;
     const float SHUNT_CURRENT_P_SCALE = 0.00025;
     const float SHUNT_CURRENT_N_SCALE = 0.00025;
-    const float TS_OUT_FILTERED_SCALE = 1;
-    const float PACK_OUT_FILTERED_SCALE = 1;
+    const float TS_OUT_FILTERED_SCALE = 0.0547254764211;
+    const float PACK_OUT_FILTERED_SCALE = 0.0547254764211;
     const float ISO_PACK_N_OFFSET = 0;
     const float ISO_PACK_P_OFFSET = 0;
     const float PACK_VOLTAGE_SENSE_OFFSET = 0;
@@ -93,7 +92,6 @@ namespace ACUConstants
     constexpr size_t NUM_CHIPS = 12;
     constexpr size_t NUM_CELL_TEMPS = 48;
     constexpr size_t NUM_CHIP_SELECTS = 2;
-    constexpr size_t NUM_MAX1148_CHANNELS = 8;
 
     const float VALID_SHDN_OUT_MIN_VOLTAGE_THRESHOLD = 12.0F;
     const uint32_t MIN_ALLOWED_INVALID_SHDN_OUT_MS = 10;  // 10 ms -- requies 100 Hz samp freq.

include/ACU_InterfaceTasks.h

@@ -25,7 +25,7 @@
 using chip_type = LTC6811_Type_e;
 using BMSDriverInstance_t = BMSDriverInstance<ACUConstants::NUM_CHIPS, ACUConstants::NUM_CHIP_SELECTS, chip_type::LTC6811_1>;
 using BMSFaultDataManagerInstance_t = BMSFaultDataManagerInstance<ACUConstants::NUM_CHIPS>;
-using MAX1148ADCInstance_t = MAX114XInterfaceInstance<ACUConstants::NUM_MAX1148_CHANNELS, ACUInterfaces::MAX114X_VERSION>;
+// using MAX1148ADCInstance_t = MAX114XInterfaceInstance<ACUConstants::NUM_MAX1148_CHANNELS, ACUInterfaces::MAX114X_VERSION>;
 /**
  * Init Functions - to be called in setup@
  */

lib/interfaces/include/ADCInterface.h

@@ -4,6 +4,7 @@
 #include <Arduino.h>
 #include "SharedFirmwareTypes.h"
 #include "etl/singleton.h"
+#include "MAX114XInterface.h"
 
 using pin = size_t;
 
@@ -15,16 +16,27 @@ namespace adc_default_parameters
 
     constexpr const uint32_t IMD_STARTUP_TIME = 2000;
     constexpr const float TEENSY41_MAX_INPUT_VOLTAGE = 3.3F;
-}
+
+    constexpr int MAX114X_VERSION = 8;
+    constexpr size_t NUM_MAX1148_CHANNELS = 8;
+};
+
 struct ADCPinout_s 
 {
-    pin teensy_imd_ok_pin; 
+    pin teensy_imd_ok_pin;
     pin teensy_precharge_pin;
     pin teensy_shdn_out_pin;
     pin teensy_ts_out_filtered_pin;
     pin teensy_pack_out_filtered_pin;
     pin teensy_bspd_current_pin;
     pin teensy_scaled_24V_pin;
+
+    // MAX114X
+    pin spiPinCS;
+    pin spiPinSDI;
+    pin spiPinSDO;
+    pin spiPinCLK;
+
 };
 
 struct ADCConversions_s
@@ -48,6 +60,51 @@ struct ADCConfigs_s
 {
     uint32_t imd_startup_time;
     float teensy41_max_input_voltage;
+    int spiSpeed;
+};
+
+struct ADCChannels_s
+{
+    int iso_pack_n_channel;
+    int iso_pack_p_channel;
+    int pack_voltage_sense_channel;
+    int shunt_current_out_channel;
+    int shunt_current_p_channel;
+    int shunt_current_n_channel;
+    int ts_out_filtered_channel;
+    int pack_out_filtered_channel;
+};
+
+struct ADCScales_s
+{
+    float iso_pack_n_scale;
+    float iso_pack_p_scale;
+    float pack_voltage_sense_scale;
+    float shunt_current_out_scale;
+    float shunt_current_p_scale;
+    float shunt_current_n_scale;
+    float ts_out_filtered_scale;
+    float pack_out_filtered_scale;
+};
+
+struct ADCOffsets_s
+{
+    float iso_pack_n_offset;
+    float iso_pack_p_offset;
+    float pack_voltage_sense_offset;
+    float shunt_current_out_offset;
+    float shunt_current_p_offset;
+    float shunt_current_n_offset;
+    float ts_out_filtered_offset;
+    float pack_out_filtered_offset;
+};
+
+struct MAX114XChannels_s
+{
+    CHANNEL_TYPE_e channelPair0;
+    CHANNEL_TYPE_e channelPair1;
+    CHANNEL_TYPE_e channelPair2;
+    CHANNEL_TYPE_e channelPair3;
 };
 
 struct ADCInterfaceParams_s
@@ -56,6 +113,11 @@ struct ADCInterfaceParams_s
     ADCConversions_s conversions;
     ADCThresholds_s thresholds;
     ADCConfigs_s configs;
+    ADCChannels_s channels;
+    ADCScales_s scales;
+    ADCOffsets_s offsets;
+    MAX114XChannels_s pairs;
+    int spiSpeed;
     float bit_resolution;
 };
 
@@ -64,6 +126,11 @@ class ADCInterface
 public:
     ADCInterface(ADCPinout_s pinout,
                 ADCConversions_s conversions,
+                ADCChannels_s channels,
+                ADCScales_s scales,
+                ADCOffsets_s offsets,
+                MAX114XChannels_s pairs,
+                int spiSpeed,
                 float bit_resolution,
                 ADCThresholds_s thresholds = {
                     .teensy41_min_digital_read_voltage_thresh = adc_default_parameters::TEENSY41_MIN_DIGITAL_READ_VOLTAGE_THRESH,
@@ -87,14 +154,58 @@ class ADCInterface
                 }(),
                 thresholds, 
                 configs, 
-                bit_resolution} {}
+                channels,
+                scales,
+                offsets,
+                pairs,
+                spiSpeed,
+                bit_resolution},
+            _max114x_instance(
+                    _adc_parameters.pinout.spiPinCS,
+                    _adc_parameters.pinout.spiPinSDI,
+                    _adc_parameters.pinout.spiPinSDO,
+                    _adc_parameters.pinout.spiPinCLK,
+                    _adc_parameters.spiSpeed,
+                    std::array<float, adc_default_parameters::NUM_MAX1148_CHANNELS> {
+                        _adc_parameters.scales.iso_pack_n_scale,
+                        _adc_parameters.scales.iso_pack_p_scale,
+                        _adc_parameters.scales.pack_voltage_sense_scale,
+                        _adc_parameters.scales.shunt_current_out_scale,
+                        _adc_parameters.scales.shunt_current_p_scale,
+                        _adc_parameters.scales.shunt_current_n_scale,
+                        _adc_parameters.scales.ts_out_filtered_scale,
+                        _adc_parameters.scales.pack_out_filtered_scale,
+                    }.data(),
+                    std::array<float, adc_default_parameters::NUM_MAX1148_CHANNELS> {
+                        _adc_parameters.offsets.iso_pack_n_offset,
+                        _adc_parameters.offsets.iso_pack_p_offset,
+                        _adc_parameters.offsets.pack_voltage_sense_offset,
+                        _adc_parameters.offsets.shunt_current_out_offset,
+                        _adc_parameters.offsets.shunt_current_p_offset,
+                        _adc_parameters.offsets.shunt_current_n_offset,
+                        _adc_parameters.offsets.ts_out_filtered_offset,
+                        _adc_parameters.offsets.pack_out_filtered_offset,
+                    }.data(),
+                    std::array<CHANNEL_TYPE_e, adc_default_parameters::NUM_MAX1148_CHANNELS / 2> {
+                        _adc_parameters.pairs.channelPair0,
+                        _adc_parameters.pairs.channelPair1,
+                        _adc_parameters.pairs.channelPair2,
+                        _adc_parameters.pairs.channelPair3
+                    }
+            )
+            {}
 
     /**
      * @pre constructor called and instance created
      * @post Pins on Teensy configured and written as IN/OUT
     */ 
     void init(uint32_t init_millis);
 
+    /**
+    * Samples from MAX114X adc
+    */
+    void tick();
+
     /**
      * @return the state of the IMD, HIGH = NO FAULT
     */
@@ -144,7 +255,27 @@ class ADCInterface
      * @return shdn out voltage
     */
     volt read_shdn_out_voltage();
-
+
+    /**
+     * @return ISO Pack Differential
+    */
+    float read_iso_pack();
+
+    /**
+     * @return pack voltage sense
+    */
+    float read_pack_voltage_sense();
+
+    /**
+     * @return shunt current single channel
+    */
+    float read_shunt_current();
+
+    /**
+     * @return shunt current differential channels
+    */
+    float read_differential_shunt_current();
+
     /**
      * @return ADC parameters
      */
@@ -157,6 +288,7 @@ class ADCInterface
 
 private:
     const ADCInterfaceParams_s _adc_parameters = {};
+    MAX114XInterface<adc_default_parameters::NUM_MAX1148_CHANNELS, adc_default_parameters::MAX114X_VERSION> _max114x_instance;
 
     /**
      * @brief true while within the IMD startup window (set in init())

lib/interfaces/include/MAX114XInterface.h

@@ -2,7 +2,6 @@
 #define MAX114XINTERFACE_H
 
 #include "AnalogSensorsInterface.h"
-
 #include <SPI.h>
 
 /**

lib/interfaces/src/ADCInterface.cpp

@@ -14,14 +14,17 @@ void ADCInterface::init(uint32_t init_millis) {
     _in_imd_startup_period = true; 
 }
 
+void ADCInterface::tick() {
+    _max114x_instance.tick();
+}
+
 bool ADCInterface::read_imd_ok(uint32_t curr_millis) {
     if (_in_imd_startup_period) {
         if ((curr_millis - _init_millis) >= _adc_parameters.configs.imd_startup_time) { // give 2 seconds for IMD to startup
             _in_imd_startup_period = false;
         }
         return true;
     }
-    //
     return static_cast<float>(analogRead(_adc_parameters.pinout.teensy_imd_ok_pin)) * (_adc_parameters.configs.teensy41_max_input_voltage / _adc_parameters.bit_resolution) > _adc_parameters.thresholds.teensy41_min_digital_read_voltage_thresh; // idk if this would actually work, like if a LOW is a threshold or smth
 }
 
@@ -74,6 +77,22 @@ volt ADCInterface::read_global_lv_value() {
     return data;
 }
 
+float ADCInterface::read_iso_pack() {
+    return _max114x_instance.getLastSampleConverted(_adc_parameters.channels.iso_pack_n_channel);
+}
+
+float ADCInterface::read_pack_voltage_sense() {
+    return _max114x_instance.getLastSampleConverted(_adc_parameters.channels.pack_voltage_sense_channel);
+}
+
+float ADCInterface::read_shunt_current() {
+    return _max114x_instance.getLastSampleConverted(_adc_parameters.channels.shunt_current_out_channel);
+}
+
+float ADCInterface::read_differential_shunt_current() {
+    return _max114x_instance.getLastSampleConverted(_adc_parameters.channels.shunt_current_p_channel);
+}
+
 const ADCInterfaceParams_s& ADCInterface::get_adc_params() const {
     return _adc_parameters;
 }

platformio.ini

@@ -40,7 +40,8 @@ lib_deps =
 	blemasle/MCP23017@^2.0.0
   https://github.com/FabioBatSilva/ArduinoFake.git
   https://github.com/eranpeer/FakeIt.git
-
+  https://github.com/hytech-racing/shared_firmware_interfaces.git#5baf17a0f6d83d0a9d571d6bf56f409d2c8ad98a
+
 [env:teensy41]
 test_framework=googletest
 ; including only the current main file for compiling to keep old main still around for now while 
@@ -97,7 +98,7 @@ build_src_filter =
   -<main_can_test.cpp>
   +<main_spi_test.cpp>
   +<ACU_Constants.cpp>
-
+  
 build_unflags = -std=gnu++11
 build_flags =
   -std=c++17