From c101f1a7b11e6514c27adeb4738d629497fa7d84 Mon Sep 17 00:00:00 2001
From: Jaakko Haakana <jaakko@haakana.net>
Date: Mon, 9 Jun 2025 22:40:27 +0300
Subject: [PATCH] Initial changes

---
 Software/src/battery/BATTERIES.h              | 19 +------------------
 Software/src/battery/BMW-I3-BATTERY.h         |  3 ++-
 Software/src/battery/BMW-IX-BATTERY.h         |  3 ++-
 Software/src/battery/BMW-PHEV-BATTERY.h       |  3 ++-
 Software/src/battery/BMW-SBOX.h               |  2 ++
 Software/src/battery/BOLT-AMPERA-BATTERY.h    |  3 ++-
 Software/src/battery/BYD-ATTO-3-BATTERY.h     |  3 ++-
 Software/src/battery/CELLPOWER-BMS.h          |  1 -
 Software/src/battery/CHADEMO-BATTERY.h        |  1 -
 Software/src/battery/CMFA-EV-BATTERY.h        |  1 -
 Software/src/battery/DALY-BMS.h               |  3 ---
 Software/src/battery/ECMP-BATTERY.h           |  1 -
 Software/src/battery/FOXESS-BATTERY.h         |  1 -
 .../src/battery/GEELY-GEOMETRY-C-BATTERY.h    |  1 -
 .../src/battery/IMIEV-CZERO-ION-BATTERY.h     |  1 -
 Software/src/battery/JAGUAR-IPACE-BATTERY.h   |  1 -
 Software/src/battery/KIA-E-GMP-BATTERY.h      |  1 -
 Software/src/battery/KIA-HYUNDAI-64-BATTERY.h |  1 -
 .../src/battery/KIA-HYUNDAI-HYBRID-BATTERY.h  |  1 -
 Software/src/battery/MEB-BATTERY.h            |  1 -
 Software/src/battery/MG-5-BATTERY.h           |  1 -
 Software/src/battery/NISSAN-LEAF-BATTERY.h    |  1 -
 Software/src/battery/ORION-BMS.h              |  1 -
 Software/src/battery/PYLON-BATTERY.h          |  1 -
 .../src/battery/RANGE-ROVER-PHEV-BATTERY.h    |  1 -
 Software/src/battery/RENAULT-KANGOO-BATTERY.h |  1 -
 Software/src/battery/RENAULT-TWIZY.h          |  1 -
 .../src/battery/RENAULT-ZOE-GEN1-BATTERY.h    |  1 -
 .../src/battery/RENAULT-ZOE-GEN2-BATTERY.h    |  1 -
 Software/src/battery/RJXZS-BMS.h              |  1 -
 Software/src/battery/SANTA-FE-PHEV-BATTERY.h  |  1 -
 Software/src/battery/SIMPBMS-BATTERY.h        |  1 -
 Software/src/battery/SONO-BATTERY.h           |  1 -
 Software/src/battery/TESLA-BATTERY.h          |  1 -
 Software/src/battery/TEST-FAKE-BATTERY.h      |  1 -
 Software/src/battery/VOLVO-SPA-BATTERY.h      |  1 -
 .../src/battery/VOLVO-SPA-HYBRID-BATTERY.h    |  1 -
 Software/src/include.h                        |  2 +-
 38 files changed, 14 insertions(+), 56 deletions(-)

diff --git a/Software/src/battery/BATTERIES.h b/Software/src/battery/BATTERIES.h
index a1e38da3..eaad5bd8 100644
--- a/Software/src/battery/BATTERIES.h
+++ b/Software/src/battery/BATTERIES.h
@@ -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"
diff --git a/Software/src/battery/BMW-I3-BATTERY.h b/Software/src/battery/BMW-I3-BATTERY.h
index 9a60a0ce..cf79f4db 100644
--- a/Software/src/battery/BMW-I3-BATTERY.h
+++ b/Software/src/battery/BMW-I3-BATTERY.h
@@ -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:
diff --git a/Software/src/battery/BMW-IX-BATTERY.h b/Software/src/battery/BMW-IX-BATTERY.h
index 68935fad..ed67cb10 100644
--- a/Software/src/battery/BMW-IX-BATTERY.h
+++ b/Software/src/battery/BMW-IX-BATTERY.h
@@ -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:
diff --git a/Software/src/battery/BMW-PHEV-BATTERY.h b/Software/src/battery/BMW-PHEV-BATTERY.h
index c50992c5..98f0e640 100644
--- a/Software/src/battery/BMW-PHEV-BATTERY.h
+++ b/Software/src/battery/BMW-PHEV-BATTERY.h
@@ -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:
diff --git a/Software/src/battery/BMW-SBOX.h b/Software/src/battery/BMW-SBOX.h
index ad4046f6..1909c48b 100644
--- a/Software/src/battery/BMW-SBOX.h
+++ b/Software/src/battery/BMW-SBOX.h
@@ -2,7 +2,9 @@
 #define BMW_SBOX_CONTROL_H
 #include "../include.h"
 
+#ifdef BMW_SBOX
 #define SELECTED_SHUNT_CLASS BmwSbox
+#endif
 
 #include "Shunt.h"
 
diff --git a/Software/src/battery/BOLT-AMPERA-BATTERY.h b/Software/src/battery/BOLT-AMPERA-BATTERY.h
index 57fdba84..bf3e6fac 100644
--- a/Software/src/battery/BOLT-AMPERA-BATTERY.h
+++ b/Software/src/battery/BOLT-AMPERA-BATTERY.h
@@ -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:
diff --git a/Software/src/battery/BYD-ATTO-3-BATTERY.h b/Software/src/battery/BYD-ATTO-3-BATTERY.h
index 84baa4d5..7d665622 100644
--- a/Software/src/battery/BYD-ATTO-3-BATTERY.h
+++ b/Software/src/battery/BYD-ATTO-3-BATTERY.h
@@ -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
diff --git a/Software/src/battery/CELLPOWER-BMS.h b/Software/src/battery/CELLPOWER-BMS.h
index 15a4662f..eef6b0d2 100644
--- a/Software/src/battery/CELLPOWER-BMS.h
+++ b/Software/src/battery/CELLPOWER-BMS.h
@@ -5,7 +5,6 @@
 #include "CELLPOWER-HTML.h"
 #include "CanBattery.h"
 
-#define BATTERY_SELECTED
 #define SELECTED_BATTERY_CLASS CellPowerBms
 
 class CellPowerBms : public CanBattery {
diff --git a/Software/src/battery/CHADEMO-BATTERY.h b/Software/src/battery/CHADEMO-BATTERY.h
index 7e50841f..57851095 100644
--- a/Software/src/battery/CHADEMO-BATTERY.h
+++ b/Software/src/battery/CHADEMO-BATTERY.h
@@ -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 {
diff --git a/Software/src/battery/CMFA-EV-BATTERY.h b/Software/src/battery/CMFA-EV-BATTERY.h
index 0455838e..ebd51231 100644
--- a/Software/src/battery/CMFA-EV-BATTERY.h
+++ b/Software/src/battery/CMFA-EV-BATTERY.h
@@ -5,7 +5,6 @@
 #include "CMFA-EV-HTML.h"
 #include "CanBattery.h"
 
-#define BATTERY_SELECTED
 #define SELECTED_BATTERY_CLASS CmfaEvBattery
 
 class CmfaEvBattery : public CanBattery {
diff --git a/Software/src/battery/DALY-BMS.h b/Software/src/battery/DALY-BMS.h
index a8902f85..0ca1b020 100644
--- a/Software/src/battery/DALY-BMS.h
+++ b/Software/src/battery/DALY-BMS.h
@@ -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 {
diff --git a/Software/src/battery/ECMP-BATTERY.h b/Software/src/battery/ECMP-BATTERY.h
index ad3fb041..46e4a8c3 100644
--- a/Software/src/battery/ECMP-BATTERY.h
+++ b/Software/src/battery/ECMP-BATTERY.h
@@ -6,7 +6,6 @@
 #include "CanBattery.h"
 #include "ECMP-HTML.h"
 
-#define BATTERY_SELECTED
 #define SELECTED_BATTERY_CLASS EcmpBattery
 
 class EcmpBattery : public CanBattery {
diff --git a/Software/src/battery/FOXESS-BATTERY.h b/Software/src/battery/FOXESS-BATTERY.h
index b5102b8e..429f2a61 100644
--- a/Software/src/battery/FOXESS-BATTERY.h
+++ b/Software/src/battery/FOXESS-BATTERY.h
@@ -5,7 +5,6 @@
 
 #include "CanBattery.h"
 
-#define BATTERY_SELECTED
 #define SELECTED_BATTERY_CLASS FoxessBattery
 
 class FoxessBattery : public CanBattery {
diff --git a/Software/src/battery/GEELY-GEOMETRY-C-BATTERY.h b/Software/src/battery/GEELY-GEOMETRY-C-BATTERY.h
index f724c937..16a126fb 100644
--- a/Software/src/battery/GEELY-GEOMETRY-C-BATTERY.h
+++ b/Software/src/battery/GEELY-GEOMETRY-C-BATTERY.h
@@ -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
diff --git a/Software/src/battery/IMIEV-CZERO-ION-BATTERY.h b/Software/src/battery/IMIEV-CZERO-ION-BATTERY.h
index 7ed242a4..14008d61 100644
--- a/Software/src/battery/IMIEV-CZERO-ION-BATTERY.h
+++ b/Software/src/battery/IMIEV-CZERO-ION-BATTERY.h
@@ -5,7 +5,6 @@
 
 #include "CanBattery.h"
 
-#define BATTERY_SELECTED
 #define SELECTED_BATTERY_CLASS ImievCZeroIonBattery
 
 class ImievCZeroIonBattery : public CanBattery {
diff --git a/Software/src/battery/JAGUAR-IPACE-BATTERY.h b/Software/src/battery/JAGUAR-IPACE-BATTERY.h
index f91444a0..5c9435eb 100644
--- a/Software/src/battery/JAGUAR-IPACE-BATTERY.h
+++ b/Software/src/battery/JAGUAR-IPACE-BATTERY.h
@@ -3,7 +3,6 @@
 
 #include "CanBattery.h"
 
-#define BATTERY_SELECTED
 #define SELECTED_BATTERY_CLASS JaguarIpaceBattery
 
 #define MAX_PACK_VOLTAGE_DV 4546  //5000 = 500.0V
diff --git a/Software/src/battery/KIA-E-GMP-BATTERY.h b/Software/src/battery/KIA-E-GMP-BATTERY.h
index 13e8b6eb..01ec6fb3 100644
--- a/Software/src/battery/KIA-E-GMP-BATTERY.h
+++ b/Software/src/battery/KIA-E-GMP-BATTERY.h
@@ -9,7 +9,6 @@ extern ACAN2517FD canfd;
 
 #define ESTIMATE_SOC_FROM_CELLVOLTAGE
 
-#define BATTERY_SELECTED
 #define SELECTED_BATTERY_CLASS KiaEGmpBattery
 
 class KiaEGmpBattery : public CanBattery {
diff --git a/Software/src/battery/KIA-HYUNDAI-64-BATTERY.h b/Software/src/battery/KIA-HYUNDAI-64-BATTERY.h
index 62dbbde0..ba0181c4 100644
--- a/Software/src/battery/KIA-HYUNDAI-64-BATTERY.h
+++ b/Software/src/battery/KIA-HYUNDAI-64-BATTERY.h
@@ -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 {
diff --git a/Software/src/battery/KIA-HYUNDAI-HYBRID-BATTERY.h b/Software/src/battery/KIA-HYUNDAI-HYBRID-BATTERY.h
index 915fdcef..16753590 100644
--- a/Software/src/battery/KIA-HYUNDAI-HYBRID-BATTERY.h
+++ b/Software/src/battery/KIA-HYUNDAI-HYBRID-BATTERY.h
@@ -5,7 +5,6 @@
 
 #include "CanBattery.h"
 
-#define BATTERY_SELECTED
 #define SELECTED_BATTERY_CLASS KiaHyundaiHybridBattery
 
 class KiaHyundaiHybridBattery : public CanBattery {
diff --git a/Software/src/battery/MEB-BATTERY.h b/Software/src/battery/MEB-BATTERY.h
index 7895247c..c20f479d 100644
--- a/Software/src/battery/MEB-BATTERY.h
+++ b/Software/src/battery/MEB-BATTERY.h
@@ -5,7 +5,6 @@
 #include "CanBattery.h"
 #include "MEB-HTML.h"
 
-#define BATTERY_SELECTED
 #define SELECTED_BATTERY_CLASS MebBattery
 
 class MebBattery : public CanBattery {
diff --git a/Software/src/battery/MG-5-BATTERY.h b/Software/src/battery/MG-5-BATTERY.h
index ee34249a..4078d38c 100644
--- a/Software/src/battery/MG-5-BATTERY.h
+++ b/Software/src/battery/MG-5-BATTERY.h
@@ -5,7 +5,6 @@
 
 #include "CanBattery.h"
 
-#define BATTERY_SELECTED
 #define SELECTED_BATTERY_CLASS Mg5Battery
 
 class Mg5Battery : public CanBattery {
diff --git a/Software/src/battery/NISSAN-LEAF-BATTERY.h b/Software/src/battery/NISSAN-LEAF-BATTERY.h
index 16a68bc2..c29783a6 100644
--- a/Software/src/battery/NISSAN-LEAF-BATTERY.h
+++ b/Software/src/battery/NISSAN-LEAF-BATTERY.h
@@ -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)
 
diff --git a/Software/src/battery/ORION-BMS.h b/Software/src/battery/ORION-BMS.h
index e2785059..d06c2c90 100644
--- a/Software/src/battery/ORION-BMS.h
+++ b/Software/src/battery/ORION-BMS.h
@@ -5,7 +5,6 @@
 
 #include "CanBattery.h"
 
-#define BATTERY_SELECTED
 #define SELECTED_BATTERY_CLASS OrionBms
 
 class OrionBms : public CanBattery {
diff --git a/Software/src/battery/PYLON-BATTERY.h b/Software/src/battery/PYLON-BATTERY.h
index cf21aeb5..16843368 100644
--- a/Software/src/battery/PYLON-BATTERY.h
+++ b/Software/src/battery/PYLON-BATTERY.h
@@ -6,7 +6,6 @@
 #include "../include.h"
 #include "CanBattery.h"
 
-#define BATTERY_SELECTED
 #define SELECTED_BATTERY_CLASS PylonBattery
 
 class PylonBattery : public CanBattery {
diff --git a/Software/src/battery/RANGE-ROVER-PHEV-BATTERY.h b/Software/src/battery/RANGE-ROVER-PHEV-BATTERY.h
index d1f1b13a..fcde6148 100644
--- a/Software/src/battery/RANGE-ROVER-PHEV-BATTERY.h
+++ b/Software/src/battery/RANGE-ROVER-PHEV-BATTERY.h
@@ -5,7 +5,6 @@
 
 #include "CanBattery.h"
 
-#define BATTERY_SELECTED
 #define SELECTED_BATTERY_CLASS RangeRoverPhevBattery
 
 class RangeRoverPhevBattery : public CanBattery {
diff --git a/Software/src/battery/RENAULT-KANGOO-BATTERY.h b/Software/src/battery/RENAULT-KANGOO-BATTERY.h
index 535f0369..cadca65f 100644
--- a/Software/src/battery/RENAULT-KANGOO-BATTERY.h
+++ b/Software/src/battery/RENAULT-KANGOO-BATTERY.h
@@ -5,7 +5,6 @@
 
 #include "CanBattery.h"
 
-#define BATTERY_SELECTED
 #define SELECTED_BATTERY_CLASS RenaultKangooBattery
 
 class RenaultKangooBattery : public CanBattery {
diff --git a/Software/src/battery/RENAULT-TWIZY.h b/Software/src/battery/RENAULT-TWIZY.h
index f4ab501c..25f15c03 100644
--- a/Software/src/battery/RENAULT-TWIZY.h
+++ b/Software/src/battery/RENAULT-TWIZY.h
@@ -3,7 +3,6 @@
 #include "../include.h"
 #include "CanBattery.h"
 
-#define BATTERY_SELECTED
 #define SELECTED_BATTERY_CLASS RenaultTwizyBattery
 
 class RenaultTwizyBattery : public CanBattery {
diff --git a/Software/src/battery/RENAULT-ZOE-GEN1-BATTERY.h b/Software/src/battery/RENAULT-ZOE-GEN1-BATTERY.h
index 1e566b04..ea38c3a9 100644
--- a/Software/src/battery/RENAULT-ZOE-GEN1-BATTERY.h
+++ b/Software/src/battery/RENAULT-ZOE-GEN1-BATTERY.h
@@ -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
diff --git a/Software/src/battery/RENAULT-ZOE-GEN2-BATTERY.h b/Software/src/battery/RENAULT-ZOE-GEN2-BATTERY.h
index b3b2b5d7..faae6e73 100644
--- a/Software/src/battery/RENAULT-ZOE-GEN2-BATTERY.h
+++ b/Software/src/battery/RENAULT-ZOE-GEN2-BATTERY.h
@@ -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 {
diff --git a/Software/src/battery/RJXZS-BMS.h b/Software/src/battery/RJXZS-BMS.h
index baabbbb5..e6283f7a 100644
--- a/Software/src/battery/RJXZS-BMS.h
+++ b/Software/src/battery/RJXZS-BMS.h
@@ -5,7 +5,6 @@
 
 #include "CanBattery.h"
 
-#define BATTERY_SELECTED
 #define SELECTED_BATTERY_CLASS RjxzsBms
 
 class RjxzsBms : public CanBattery {
diff --git a/Software/src/battery/SANTA-FE-PHEV-BATTERY.h b/Software/src/battery/SANTA-FE-PHEV-BATTERY.h
index f73e80e3..2b240ba7 100644
--- a/Software/src/battery/SANTA-FE-PHEV-BATTERY.h
+++ b/Software/src/battery/SANTA-FE-PHEV-BATTERY.h
@@ -5,7 +5,6 @@
 #include "../include.h"
 #include "CanBattery.h"
 
-#define BATTERY_SELECTED
 #define SELECTED_BATTERY_CLASS SantaFePhevBattery
 
 class SantaFePhevBattery : public CanBattery {
diff --git a/Software/src/battery/SIMPBMS-BATTERY.h b/Software/src/battery/SIMPBMS-BATTERY.h
index ac33580d..7c5be60e 100644
--- a/Software/src/battery/SIMPBMS-BATTERY.h
+++ b/Software/src/battery/SIMPBMS-BATTERY.h
@@ -5,7 +5,6 @@
 
 #include "CanBattery.h"
 
-#define BATTERY_SELECTED
 #define SELECTED_BATTERY_CLASS SimpBmsBattery
 
 class SimpBmsBattery : public CanBattery {
diff --git a/Software/src/battery/SONO-BATTERY.h b/Software/src/battery/SONO-BATTERY.h
index 47907f5e..de62dcdd 100644
--- a/Software/src/battery/SONO-BATTERY.h
+++ b/Software/src/battery/SONO-BATTERY.h
@@ -5,7 +5,6 @@
 
 #include "CanBattery.h"
 
-#define BATTERY_SELECTED
 #define SELECTED_BATTERY_CLASS SonoBattery
 
 class SonoBattery : public CanBattery {
diff --git a/Software/src/battery/TESLA-BATTERY.h b/Software/src/battery/TESLA-BATTERY.h
index 7b60cb91..9910c838 100644
--- a/Software/src/battery/TESLA-BATTERY.h
+++ b/Software/src/battery/TESLA-BATTERY.h
@@ -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
diff --git a/Software/src/battery/TEST-FAKE-BATTERY.h b/Software/src/battery/TEST-FAKE-BATTERY.h
index ed79c8b1..1223a634 100644
--- a/Software/src/battery/TEST-FAKE-BATTERY.h
+++ b/Software/src/battery/TEST-FAKE-BATTERY.h
@@ -4,7 +4,6 @@
 #include "../include.h"
 #include "CanBattery.h"
 
-#define BATTERY_SELECTED
 #define SELECTED_BATTERY_CLASS TestFakeBattery
 
 class TestFakeBattery : public CanBattery {
diff --git a/Software/src/battery/VOLVO-SPA-BATTERY.h b/Software/src/battery/VOLVO-SPA-BATTERY.h
index 4ea009ed..b958d5da 100644
--- a/Software/src/battery/VOLVO-SPA-BATTERY.h
+++ b/Software/src/battery/VOLVO-SPA-BATTERY.h
@@ -6,7 +6,6 @@
 #include "CanBattery.h"
 #include "VOLVO-SPA-HTML.h"
 
-#define BATTERY_SELECTED
 #define SELECTED_BATTERY_CLASS VolvoSpaBattery
 
 class VolvoSpaBattery : public CanBattery {
diff --git a/Software/src/battery/VOLVO-SPA-HYBRID-BATTERY.h b/Software/src/battery/VOLVO-SPA-HYBRID-BATTERY.h
index 70b58cb8..e553dce7 100644
--- a/Software/src/battery/VOLVO-SPA-HYBRID-BATTERY.h
+++ b/Software/src/battery/VOLVO-SPA-HYBRID-BATTERY.h
@@ -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 {
diff --git a/Software/src/include.h b/Software/src/include.h
index d06d89dd..daacf9b0 100644
--- a/Software/src/include.h
+++ b/Software/src/include.h
@@ -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