missing header files and ccp

Fault on my side for doing a manual separation between WIP files and Github

include/OutlanderCanHeater.h

@@ -0,0 +1,44 @@
+/*
+ * This file is part of the Zombieverter VCU project.
+ *
+ * Copyright (C) 2018 Johannes Huebner <[email protected]>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef OUTLANDERCANHEATER_H
+#define OUTLANDERCANHEATER_H
+
+//#include <libopencm3/stm32/usart.h>
+#include <heater.h>
+
+
+class OutlanderCanHeater : public Heater
+{
+   public:
+      void SetTargetTemperature(float temp);
+      void SetCanInterface(CanHardware* c);
+      void DecodeCAN(int id, uint32_t data[2]);
+      void SetPower(uint16_t power, bool HeatReq);
+      void Task100Ms();
+
+   private:
+      int8_t currentTemperature;
+      int8_t desiredTemperature;
+
+      bool shouldHeat;
+      static void handle398(uint32_t data[2]);
+
+};
+
+#endif // OUTLANDERCANHEATER_H

include/kangoobms.h

@@ -0,0 +1,51 @@
+/*
+ * This file is part of the ZombieVerter project.
+ *
+ * Copyright (C) 2022 Charlie Smurthwaite
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef KANGOOBMS_H
+#define KANGOOBMS_H
+#include <stdint.h>
+
+class KangooBMS: public BMS
+{
+   public:
+      virtual void SetCanInterface(CanHardware* c);
+      void DecodeCAN(int id, uint8_t * data);
+      float MaxChargeCurrent();
+      float GetCurrent();
+      void Task100Ms();
+   private:
+      bool BMSDataValid();
+      bool ChargeAllowed();
+      int messageCounter = 0;
+      int chargeCurrentLimit = 0;
+      int timeoutCounter = 0;
+      uint16_t maxChargeAllowed = 0;
+      uint8_t maxInput = 0;
+      uint8_t maxOutput = 0;
+      uint16_t isolationResistance = 0;
+      float minCellV = 0;
+      float maxCellV = 0;
+      float minTempC = 0;
+      float maxTempC = 0;
+      float stateOfCharge = 0;
+      float current = 0;
+      float remainingKHW = 0;
+      float batteryVoltage = 500; //higher than possible so cannot complete precharge until BMS reports battery voltage 
+};
+#endif // SIMPBMS_H

src/kangoobms.cpp

@@ -0,0 +1,152 @@
+/*
+ * This file is part of the ZombieVerter project.
+ *
+ * Copyright (C) 2022 Charlie Smurthwaite
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "stm32_vcu.h"
+#include "stm32_can.h"
+#include <kangoobms.h>
+/*
+ * This module receives messages from SimpBMS and updates the
+ * BMS_MinV, BMS_MaxV, BMS_MinT and BMS_MaxT parameters with the
+ * received values. It also implements a timeout to indicate whether
+ * the BMS is actively sending data or not. This data can be
+ * used to safely stop any charging process if the BMS is not
+ * working correctly.
+ */
+
+void KangooBMS::SetCanInterface(CanHardware* c)
+{
+   can = c;
+   can->RegisterUserMessage(0x155);
+   can->RegisterUserMessage(0x424);
+   can->RegisterUserMessage(0x425);
+   can->RegisterUserMessage(0x7BB);
+
+}
+
+bool KangooBMS::BMSDataValid() {
+   // Return false if primary BMS is not sending data.
+   if(timeoutCounter < 1) return false;
+   return true;
+}
+
+float KangooBMS::GetCurrent() 
+{
+   return current;
+}
+
+// Return the maximum charge current allowed by the BMS.
+float KangooBMS::MaxChargeCurrent()
+{
+   // if(!ChargeAllowed()) return 0;
+   // return chargeCurrentLimit / 1000.0;
+   return maxChargeAllowed / batteryVoltage;
+}
+
+// Process voltage and temperature message from SimpBMS.
+void KangooBMS::DecodeCAN(int id, uint8_t *data)
+{
+   if (id == 0x155)
+   {
+      // Reset timeout counter to the full timeout value
+      timeoutCounter = Param::GetInt(Param::BMS_Timeout) * 10;
+      stateOfCharge = (float) ((data[4] << 8) + data[5]) * 0.0025;
+      //maxCharging = data[0] * 300;
+
+      int16_t rawCurrent = ((data[1] << 8) + data[2]) & 0xFFF;
+      rawCurrent = (float)(rawCurrent * 0.25);
+      rawCurrent = rawCurrent - 500;
+      current = rawCurrent;
+
+      batteryVoltage = (float) ((data[6] << 8) + data[7]) / 2;
+
+      maxChargeAllowed = data[0] * 300;
+
+   } else if (id == 0x424) {
+
+      minTempC = (uint8_t)(data[4]) - 40;
+      maxTempC = (uint8_t)(data[7]) - 40;
+
+      maxInput = data[2] * 0.5;
+      maxOutput = data[3] * 0.5;
+
+   } else if (id == 0x425) {
+      minCellV = (((float)(((data[6] & 0x01) << 8) + data[7]) + 100) * 10);
+      maxCellV = ((float)(((data[4] & 0x03) << 7) + ((data[5] >> 1) + 100)) * 10);
+      remainingKHW = (float)(data[1] * 0.1);
+
+      isolationResistance = data[4] >> 2;
+      isolationResistance = isolationResistance + (data[3] << 6);
+   } 
+}
+
+void KangooBMS::Task100Ms() {
+   // Decrement timeout counter.
+   if(timeoutCounter > 0) timeoutCounter--;
+
+   if(Param::GetInt(Param::opmode) != MOD_OFF) {
+      //send can message
+      uint8_t bytes[8];
+      bytes[0]=0x07;
+      bytes[1]=0x1D;
+      bytes[2]=0x00;
+      bytes[3]=0x02;
+      bytes[4]=0xB2;
+      bytes[5]=0x80;
+      bytes[6]=0xB2;
+      bytes[7]=0xD8;
+
+      if(Param::GetInt(Param::opmode) == MOD_CHARGE) {
+         bytes[7]=0xD9;
+      }
+
+      if (messageCounter >=5 ) {
+         bytes[4]=0x5D;
+         bytes[6]=0x5D;
+      }
+      can->Send(0x423, (uint32_t*)bytes, 8);
+
+      messageCounter++;
+      if (messageCounter > 10) {
+         messageCounter = 0;
+      }
+   }
+
+   Param::SetFloat(Param::BMS_Vmin, minCellV);
+   Param::SetFloat(Param::BMS_Vmax, maxCellV);
+   Param::SetFloat(Param::BMS_Tmin, minTempC);
+   Param::SetFloat(Param::BMS_Tmax, maxTempC);
+   Param::SetFloat(Param::KWh, remainingKHW);
+   Param::SetFloat(Param::SOC, stateOfCharge);
+   Param::SetFloat(Param::udcsw, batteryVoltage - 30);
+   Param::SetInt(Param::BMS_MaxCharge, maxChargeAllowed);
+   Param::SetInt(Param::BMS_MaxInput, maxInput);
+   Param::SetInt(Param::BMS_MaxOutput, maxOutput);
+   Param::SetInt(Param::BMS_Isolation, isolationResistance);
+   Param::SetInt(Param::BMS_ChargeLim, MaxChargeCurrent());
+
+   //On the Kangoo charging is positive current, discharge is negative
+   if (BMSDataValid()) {
+      Param::SetFloat(Param::idc, current);
+   } else {
+      Param::SetFloat(Param::idc, 0);
+   }
+
+
+
+}