Merge pull request #80 from lenvm/feature/naming-consistency

Update file naming and macro naming for consistency, add missing notifications for PYLON_CAN and CHADEMO_BATTERY

Software/src/battery/BATTERIES.h

@@ -1,23 +1,15 @@
 #ifndef BATTERIES_H
 #define BATTERIES_H
 
-#ifdef BATTERY_TYPE_LEAF
-  #include "NISSAN-LEAF-BATTERY.h" //See this file for more LEAF battery settings
-#endif
-
-#ifdef TESLA_MODEL_3_BATTERY
-  #include "TESLA-MODEL-3-BATTERY.h" //See this file for more Tesla battery settings
-#endif
-
-#ifdef RENAULT_ZOE_BATTERY
-  #include "RENAULT-ZOE-BATTERY.h" //See this file for more Zoe battery settings
-#endif
-
 #ifdef BMW_I3_BATTERY
   #include "BMW-I3-BATTERY.h" //See this file for more i3 battery settings
 #endif
 
-#ifdef IMIEV_ION_CZERO_BATTERY
+#ifdef CHADEMO_BATTERY
+	#include "CHADEMO-BATTERY.h" //See this file for more Chademo settings
+#endif
+
+#ifdef IMIEV_CZERO_ION_BATTERY
   #include "IMIEV-CZERO-ION-BATTERY.h" //See this file for more triplet battery settings
 #endif
 
@@ -25,8 +17,16 @@
   #include "KIA-HYUNDAI-64-BATTERY.h" //See this file for more 64kWh battery settings
 #endif
 
-#ifdef CHADEMO
-	#include "CHADEMO-BATTERY.h" //See this file for more Chademo settings
+#ifdef NISSAN_LEAF_BATTERY
+  #include "NISSAN-LEAF-BATTERY.h" //See this file for more LEAF battery settings
+#endif
+
+#ifdef RENAULT_ZOE_BATTERY
+  #include "RENAULT-ZOE-BATTERY.h" //See this file for more Zoe battery settings
+#endif
+
+#ifdef TESLA_MODEL_3_BATTERY
+  #include "TESLA-MODEL-3-BATTERY.h" //See this file for more Tesla battery settings
 #endif
 
 #endif

Software/src/inverter/BYD-MODBUS.cpp

@@ -1,4 +1,4 @@
-#include "MODBUS-BYD.h"
+#include "BYD-MODBUS.h"
 
 void update_modbus_registers_byd() {
     //Updata for ModbusRTU Server for BYD

Software/src/inverter/BYD-MODBUS.h

@@ -1,5 +1,5 @@
-#ifndef MODBUS_BYD_H
-#define MODBUS_BYD_H
+#ifndef BYD_MODBUS_H
+#define BYD_MODBUS_H
 #include <Arduino.h>
 
 #define MB_RTU_NUM_VALUES 30000

Software/src/inverter/INVERTERS.h

@@ -1,12 +1,20 @@
 #ifndef INVERTERS_H
 #define INVERTERS_H
 
-#ifdef SOLAX_CAN
-  #include "SOLAX-CAN.h"
+#ifdef BYD_CAN
+  #include "BYD-CAN.h"
 #endif
 
-#ifdef CAN_BYD
-  #include "BYD-CAN.h"
+#ifdef BYD_MODBUS
+  #include "BYD-MODBUS.h"
+#endif
+
+#ifdef LUNA2000_MODBUS
+  #include "LUNA2000-MODBUS.h"
+#endif
+
+#ifdef PYLON_CAN
+  #include "PYLON-CAN.h"
 #endif
 
 #ifdef SMA_CAN
@@ -17,16 +25,8 @@
   #include "SOFAR-CAN.h"
 #endif
 
-#ifdef PYLON_CAN
-  #include "PYLON-CAN.h"
-#endif
-
-#ifdef MODBUS_BYD
-  #include "MODBUS-BYD.h"
-#endif
-
-#ifdef MODBUS_LUNA2000
-  #include "MODBUS-LUNA2000.h"
+#ifdef SOLAX_CAN
+  #include "SOLAX-CAN.h"
 #endif
 
 #endif

Software/src/inverter/LUNA2000-MODBUS.cpp

@@ -1,4 +1,4 @@
-#include "MODBUS-LUNA2000.h"
+#include "LUNA2000-MODBUS.h"
 
 void update_modbus_registers_luna2000()
 {

Software/src/inverter/LUNA2000-MODBUS.h

@@ -1,5 +1,5 @@
-#ifndef MODBUS_LUNA2000_H
-#define MODBUS_LUNA2000_H
+#ifndef LUNA2000_MODBUS_H
+#define LUNA2000_MODBUS_H
 #include <Arduino.h>
 
 #define MB_RTU_NUM_VALUES 50000