Initial changes

This commit is contained in:
Jaakko Haakana 2025-06-09 22:40:27 +03:00
parent 75c66cb6d3
commit c101f1a7b1
38 changed files with 14 additions and 56 deletions

View file

@ -11,29 +11,12 @@ extern Battery* battery2;
void setup_can_shunt();
#ifdef BMW_SBOX
#include "BMW-SBOX.h"
#endif
#ifdef BMW_I3_BATTERY
#include "BMW-I3-BATTERY.h"
#endif
#ifdef BMW_IX_BATTERY
#include "BMW-IX-BATTERY.h"
#endif
#ifdef BMW_PHEV_BATTERY
#include "BMW-PHEV-BATTERY.h"
#endif
#ifdef BOLT_AMPERA_BATTERY
#include "BMW-SBOX.h"
#include "BOLT-AMPERA-BATTERY.h"
#endif
#ifdef BYD_ATTO_3_BATTERY
#include "BYD-ATTO-3-BATTERY.h"
#endif
#ifdef CELLPOWER_BMS
#include "CELLPOWER-BMS.h"

View file

@ -7,8 +7,9 @@
#include "BMW-I3-HTML.h"
#include "CanBattery.h"
#define BATTERY_SELECTED
#ifdef BMW_I3_BATTERY
#define SELECTED_BATTERY_CLASS BmwI3Battery
#endif
class BmwI3Battery : public CanBattery {
public:

View file

@ -5,8 +5,9 @@
#include "BMW-IX-HTML.h"
#include "CanBattery.h"
#define BATTERY_SELECTED
#ifdef BMW_IX_BATTERY
#define SELECTED_BATTERY_CLASS BmwIXBattery
#endif
class BmwIXBattery : public CanBattery {
public:

View file

@ -5,8 +5,9 @@
#include "BMW-PHEV-HTML.h"
#include "CanBattery.h"
#define BATTERY_SELECTED
#ifdef BMW_PHEV_BATTERY
#define SELECTED_BATTERY_CLASS BmwPhevBattery
#endif
class BmwPhevBattery : public CanBattery {
public:

View file

@ -2,7 +2,9 @@
#define BMW_SBOX_CONTROL_H
#include "../include.h"
#ifdef BMW_SBOX
#define SELECTED_SHUNT_CLASS BmwSbox
#endif
#include "Shunt.h"

View file

@ -6,8 +6,9 @@
#include "BOLT-AMPERA-HTML.h"
#include "CanBattery.h"
#define BATTERY_SELECTED
#ifdef BOLT_AMPERA_BATTERY
#define SELECTED_BATTERY_CLASS BoltAmperaBattery
#endif
class BoltAmperaBattery : public CanBattery {
public:

View file

@ -18,8 +18,9 @@
//#define SKIP_TEMPERATURE_SENSOR_NUMBER 1
/* Do not modify the rows below */
#define BATTERY_SELECTED
#ifdef BYD_ATTO_3_BATTERY
#define SELECTED_BATTERY_CLASS BydAttoBattery
#endif
#define CELLCOUNT_EXTENDED 126
#define CELLCOUNT_STANDARD 104

View file

@ -5,7 +5,6 @@
#include "CELLPOWER-HTML.h"
#include "CanBattery.h"
#define BATTERY_SELECTED
#define SELECTED_BATTERY_CLASS CellPowerBms
class CellPowerBms : public CanBattery {

View file

@ -11,7 +11,6 @@
// other measurement sources may be added in the future
#define ISA_SHUNT
#define BATTERY_SELECTED
#define SELECTED_BATTERY_CLASS ChademoBattery
class ChademoBattery : public CanBattery {

View file

@ -5,7 +5,6 @@
#include "CMFA-EV-HTML.h"
#include "CanBattery.h"
#define BATTERY_SELECTED
#define SELECTED_BATTERY_CLASS CmfaEvBattery
class CmfaEvBattery : public CanBattery {

View file

@ -13,9 +13,6 @@
#define POWER_PER_DEGREE_C 60 // max power added/removed per degree above/below 0°C
#define POWER_AT_0_DEGREE_C 800 // power at 0°C
/* Do not modify any rows below*/
#define BATTERY_SELECTED
#define RS485_BATTERY_SELECTED
#define SELECTED_BATTERY_CLASS DalyBms
class DalyBms : public RS485Battery {

View file

@ -6,7 +6,6 @@
#include "CanBattery.h"
#include "ECMP-HTML.h"
#define BATTERY_SELECTED
#define SELECTED_BATTERY_CLASS EcmpBattery
class EcmpBattery : public CanBattery {

View file

@ -5,7 +5,6 @@
#include "CanBattery.h"
#define BATTERY_SELECTED
#define SELECTED_BATTERY_CLASS FoxessBattery
class FoxessBattery : public CanBattery {

View file

@ -6,7 +6,6 @@
#include "CanBattery.h"
#include "GEELY-GEOMETRY-C-HTML.h"
#define BATTERY_SELECTED
#define SELECTED_BATTERY_CLASS GeelyGeometryCBattery
#define POLL_SOC 0x4B35

View file

@ -5,7 +5,6 @@
#include "CanBattery.h"
#define BATTERY_SELECTED
#define SELECTED_BATTERY_CLASS ImievCZeroIonBattery
class ImievCZeroIonBattery : public CanBattery {

View file

@ -3,7 +3,6 @@
#include "CanBattery.h"
#define BATTERY_SELECTED
#define SELECTED_BATTERY_CLASS JaguarIpaceBattery
#define MAX_PACK_VOLTAGE_DV 4546 //5000 = 500.0V

View file

@ -9,7 +9,6 @@ extern ACAN2517FD canfd;
#define ESTIMATE_SOC_FROM_CELLVOLTAGE
#define BATTERY_SELECTED
#define SELECTED_BATTERY_CLASS KiaEGmpBattery
class KiaEGmpBattery : public CanBattery {

View file

@ -7,7 +7,6 @@
#include "CanBattery.h"
#include "KIA-HYUNDAI-64-HTML.h"
#define BATTERY_SELECTED
#define SELECTED_BATTERY_CLASS KiaHyundai64Battery
class KiaHyundai64Battery : public CanBattery {

View file

@ -5,7 +5,6 @@
#include "CanBattery.h"
#define BATTERY_SELECTED
#define SELECTED_BATTERY_CLASS KiaHyundaiHybridBattery
class KiaHyundaiHybridBattery : public CanBattery {

View file

@ -5,7 +5,6 @@
#include "CanBattery.h"
#include "MEB-HTML.h"
#define BATTERY_SELECTED
#define SELECTED_BATTERY_CLASS MebBattery
class MebBattery : public CanBattery {

View file

@ -5,7 +5,6 @@
#include "CanBattery.h"
#define BATTERY_SELECTED
#define SELECTED_BATTERY_CLASS Mg5Battery
class Mg5Battery : public CanBattery {

View file

@ -7,7 +7,6 @@
#include "CanBattery.h"
#include "NISSAN-LEAF-HTML.h"
#define BATTERY_SELECTED
#define SELECTED_BATTERY_CLASS NissanLeafBattery
#define EXTENDED_DATA_PTR (&datalayer_extended.nissanleaf)

View file

@ -5,7 +5,6 @@
#include "CanBattery.h"
#define BATTERY_SELECTED
#define SELECTED_BATTERY_CLASS OrionBms
class OrionBms : public CanBattery {

View file

@ -6,7 +6,6 @@
#include "../include.h"
#include "CanBattery.h"
#define BATTERY_SELECTED
#define SELECTED_BATTERY_CLASS PylonBattery
class PylonBattery : public CanBattery {

View file

@ -5,7 +5,6 @@
#include "CanBattery.h"
#define BATTERY_SELECTED
#define SELECTED_BATTERY_CLASS RangeRoverPhevBattery
class RangeRoverPhevBattery : public CanBattery {

View file

@ -5,7 +5,6 @@
#include "CanBattery.h"
#define BATTERY_SELECTED
#define SELECTED_BATTERY_CLASS RenaultKangooBattery
class RenaultKangooBattery : public CanBattery {

View file

@ -3,7 +3,6 @@
#include "../include.h"
#include "CanBattery.h"
#define BATTERY_SELECTED
#define SELECTED_BATTERY_CLASS RenaultTwizyBattery
class RenaultTwizyBattery : public CanBattery {

View file

@ -4,7 +4,6 @@
#include "CanBattery.h"
#include "RENAULT-ZOE-GEN1-HTML.h"
#define BATTERY_SELECTED
#define SELECTED_BATTERY_CLASS RenaultZoeGen1Battery
#define MAX_PACK_VOLTAGE_DV 4200 //5000 = 500.0V

View file

@ -5,7 +5,6 @@
#include "CanBattery.h"
#include "RENAULT-ZOE-GEN2-HTML.h"
#define BATTERY_SELECTED
#define SELECTED_BATTERY_CLASS RenaultZoeGen2Battery
class RenaultZoeGen2Battery : public CanBattery {

View file

@ -5,7 +5,6 @@
#include "CanBattery.h"
#define BATTERY_SELECTED
#define SELECTED_BATTERY_CLASS RjxzsBms
class RjxzsBms : public CanBattery {

View file

@ -5,7 +5,6 @@
#include "../include.h"
#include "CanBattery.h"
#define BATTERY_SELECTED
#define SELECTED_BATTERY_CLASS SantaFePhevBattery
class SantaFePhevBattery : public CanBattery {

View file

@ -5,7 +5,6 @@
#include "CanBattery.h"
#define BATTERY_SELECTED
#define SELECTED_BATTERY_CLASS SimpBmsBattery
class SimpBmsBattery : public CanBattery {

View file

@ -5,7 +5,6 @@
#include "CanBattery.h"
#define BATTERY_SELECTED
#define SELECTED_BATTERY_CLASS SonoBattery
class SonoBattery : public CanBattery {

View file

@ -5,7 +5,6 @@
#include "CanBattery.h"
#include "TESLA-HTML.h"
#define BATTERY_SELECTED
#ifdef TESLA_MODEL_3Y_BATTERY
#define SELECTED_BATTERY_CLASS TeslaModel3YBattery
#endif

View file

@ -4,7 +4,6 @@
#include "../include.h"
#include "CanBattery.h"
#define BATTERY_SELECTED
#define SELECTED_BATTERY_CLASS TestFakeBattery
class TestFakeBattery : public CanBattery {

View file

@ -6,7 +6,6 @@
#include "CanBattery.h"
#include "VOLVO-SPA-HTML.h"
#define BATTERY_SELECTED
#define SELECTED_BATTERY_CLASS VolvoSpaBattery
class VolvoSpaBattery : public CanBattery {

View file

@ -6,7 +6,6 @@
#include "CanBattery.h"
#include "VOLVO-SPA-HYBRID-HTML.h"
#define BATTERY_SELECTED
#define SELECTED_BATTERY_CLASS VolvoSpaHybridBattery
class VolvoSpaHybridBattery : public CanBattery {

View file

@ -39,7 +39,7 @@
#endif
#endif
#ifndef BATTERY_SELECTED
#if !defined(COMMON_IMAGE) && !defined(SELECTED_BATTERY_CLASS)
#error No battery selected! Choose one from the USER_SETTINGS.h file
#endif