Update Hoywei-Turbo

Robert-Schimanek · Sep 26, 2024 · 986d14f · 986d14f
1 parent 4e212bd
commit 986d14f
Show file tree

Hide file tree

Showing 21 changed files with 26 additions and 22 deletions.
diff --git a/Hoywei-Turbo b/Hoywei-Turbo
diff --git a/include/Configuration.h b/include/Configuration.h
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
-#include "PinMapping.h"
+#include "HoyweiPinMapping.h"
 #include <cstdint>
 #include <ArduinoJson.h>
 

diff --git a/include/Huawei_can.h b/include/Huawei_can.h
@@ -125,6 +125,7 @@ friend class HoyweiHuaweiCanClass;
 class HuaweiCanClass {
 
 friend class HoyweiHuaweiCanClass;
+friend class DeviceManagerClass;
 
 public:
     void init(Scheduler& scheduler, uint8_t huawei_miso, uint8_t huawei_mosi, uint8_t huawei_clk, uint8_t huawei_irq, uint8_t huawei_cs, uint8_t huawei_power);

diff --git a/include/Led_Single.h b/include/Led_Single.h
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
-#include "PinMapping.h"
+#include "HoyweiPinMapping.h"
 #include <TaskSchedulerDeclarations.h>
 #include <TimeoutHelper.h>
 

diff --git a/include/PinMapping.h b/include/PinMapping.h
@@ -80,4 +80,4 @@ friend class HoyweiPinMappingClass;
     PinMapping_t _pinMapping;
 };
 
-extern PinMappingClass PinMapping;
+//extern PinMappingClass PinMapping;
diff --git a/src/BatteryCanReceiver.cpp b/src/BatteryCanReceiver.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #include "BatteryCanReceiver.h"
 #include "MessageOutput.h"
-#include "PinMapping.h"
+#include "HoyweiPinMapping.h"
 #include <driver/twai.h>
 
 bool BatteryCanReceiver::init(bool verboseLogging, char const* providerName)

diff --git a/src/InverterSettings.cpp b/src/InverterSettings.cpp
@@ -5,7 +5,7 @@
 #include "InverterSettings.h"
 #include <HoyweiConfiguration.h>
 #include "MessageOutput.h"
-#include "PinMapping.h"
+#include "HoyweiPinMapping.h"
 #include "SunPosition.h"
 #include "SPIPortManager.h"
 #include <Hoymiles.h>

diff --git a/src/JkBmsController.cpp b/src/JkBmsController.cpp
@@ -1,7 +1,7 @@
 #include <Arduino.h>
 #include <HoyweiConfiguration.h>
 #include "HardwareSerial.h"
-#include "PinMapping.h"
+#include "HoyweiPinMapping.h"
 #include "MessageOutput.h"
 #include "JkBmsDataPoints.h"
 #include "JkBmsController.h"

diff --git a/src/Led_Single.cpp b/src/Led_Single.cpp
@@ -7,7 +7,7 @@
 #include "Datastore.h"
 #include "MqttSettings.h"
 #include "NetworkSettings.h"
-#include "PinMapping.h"
+#include "HoyweiPinMapping.h"
 #include <Hoymiles.h>
 
 LedSingleClass LedSingle;

diff --git a/src/NetworkSettings.cpp b/src/NetworkSettings.cpp
@@ -5,7 +5,7 @@
 #include "NetworkSettings.h"
 #include <HoyweiConfiguration.h>
 #include "MessageOutput.h"
-#include "PinMapping.h"
+#include "HoyweiPinMapping.h"
 #include "Utils.h"
 #include "defaults.h"
 #include <ESPmDNS.h>

diff --git a/src/PinMapping.cpp b/src/PinMapping.cpp
@@ -170,7 +170,7 @@
 #define POWERMETER_PIN_DERE -1
 #endif
 
-PinMappingClass PinMapping;
+//PinMappingClass PinMapping;
 
 PinMappingClass::PinMappingClass()
 {

diff --git a/src/PowerMeterSerialSdm.cpp b/src/PowerMeterSerialSdm.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #include "PowerMeterSerialSdm.h"
-#include "PinMapping.h"
+#include "HoyweiPinMapping.h"
 #include "MessageOutput.h"
 
 PowerMeterSerialSdm::~PowerMeterSerialSdm()

diff --git a/src/PowerMeterSerialSml.cpp b/src/PowerMeterSerialSml.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #include "PowerMeterSerialSml.h"
-#include "PinMapping.h"
+#include "HoyweiPinMapping.h"
 #include "MessageOutput.h"
 
 bool PowerMeterSerialSml::init()

diff --git a/src/PylontechCanReceiver.cpp b/src/PylontechCanReceiver.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #include "PylontechCanReceiver.h"
 #include "MessageOutput.h"
-#include "PinMapping.h"
+#include "HoyweiPinMapping.h"
 #include <driver/twai.h>
 #include <ctime>
 

diff --git a/src/PytesCanReceiver.cpp b/src/PytesCanReceiver.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #include "PytesCanReceiver.h"
 #include "MessageOutput.h"
-#include "PinMapping.h"
+#include "HoyweiPinMapping.h"
 #include <driver/twai.h>
 #include <ctime>
 

diff --git a/src/VictronMppt.cpp b/src/VictronMppt.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #include "VictronMppt.h"
 #include <HoyweiConfiguration.h>
-#include "PinMapping.h"
+#include "HoyweiPinMapping.h"
 #include "MessageOutput.h"
 #include "SerialPortManager.h"
 

diff --git a/src/VictronSmartShunt.cpp b/src/VictronSmartShunt.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #include "VictronSmartShunt.h"
 #include <HoyweiConfiguration.h>
-#include "PinMapping.h"
+#include "HoyweiPinMapping.h"
 #include "MessageOutput.h"
 #include "SerialPortManager.h"
 

diff --git a/src/WebApi_Huawei.cpp b/src/WebApi_Huawei.cpp
@@ -6,7 +6,7 @@
 #include <HoyweiHuaweiCan.h>
 #include <HoyweiConfiguration.h>
 #include "MessageOutput.h"
-#include "PinMapping.h"
+#include "HoyweiPinMapping.h"
 #include "HoyweiWebApi.h"
 #include "WebApi_errors.h"
 #include <AsyncJson.h>

diff --git a/src/WebApi_device.cpp b/src/WebApi_device.cpp
@@ -5,7 +5,7 @@
 #include "WebApi_device.h"
 #include <HoyweiConfiguration.h>
 #include "Display_Graphic.h"
-#include "PinMapping.h"
+#include "HoyweiPinMapping.h"
 #include "Utils.h"
 #include "HoyweiWebApi.h"
 #include "WebApi_errors.h"
@@ -29,7 +29,7 @@ void WebApiDeviceClass::onDeviceAdminGet(AsyncWebServerRequest* request)
     AsyncJsonResponse* response = new AsyncJsonResponse();
     auto& root = response->getRoot();
     const CONFIG_T& config = Configuration.get();
-    const PinMapping_t& pin = PinMapping.get();
+    const PinMapping_Extended_t& pin = PinMapping.get();
 
     auto curPin = root["curPin"].to<JsonObject>();
     curPin["name"] = config.Dev_PinMapping;
@@ -50,6 +50,9 @@ void WebApiDeviceClass::onDeviceAdminGet(AsyncWebServerRequest* request)
     cmtPinObj["gpio2"] = pin.cmt_gpio2;
     cmtPinObj["gpio3"] = pin.cmt_gpio3;
 
+    auto inverterPinObj = curPin["inverter"].to<JsonObject>();
+    inverterPinObj["power"] = pin.inverter_power;
+
     auto ethPinObj = curPin["eth"].to<JsonObject>();
     ethPinObj["enabled"] = pin.eth_enabled;
     ethPinObj["phy_addr"] = pin.eth_phy_addr;

diff --git a/src/WebApi_sysstatus.cpp b/src/WebApi_sysstatus.cpp
@@ -5,7 +5,7 @@
 #include "WebApi_sysstatus.h"
 #include <HoyweiConfiguration.h>
 #include "NetworkSettings.h"
-#include "PinMapping.h"
+#include "HoyweiPinMapping.h"
 #include "HoyweiWebApi.h"
 #include "__compiled_constants.h"
 #include <AsyncJson.h>

diff --git a/src/main.cpp b/src/main.cpp
@@ -26,7 +26,7 @@
 #include "MqttSettings.h"
 #include "NetworkSettings.h"
 #include "NtpSettings.h"
-#include "PinMapping.h"
+#include "HoyweiPinMapping.h"
 #include "Scheduler.h"
 #include "SunPosition.h"
 #include "Utils.h"
@@ -210,7 +210,7 @@ void setup()
 
     // OneMoreThing.init(scheduler); // If you want to test one more thing you must uncomment this
 
-    // DeviceManager.init(scheduler);
+    DeviceManager.init(scheduler);
 }
 
 void loop()