Bring back the sun indicator (#195)

* Adding states to display in UI * Adding states to display in UI
helgeerbe · Apr 27, 2023 · 7006055 · 7006055
1 parent 6b437b5
commit 7006055
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 3 deletions.
diff --git a/include/PowerLimiter.h b/include/PowerLimiter.h
@@ -7,6 +7,11 @@
 #include <Hoymiles.h>
 #include <memory>
 
+#define PL_UI_STATE_INACTIVE 0
+#define PL_UI_STATE_CHARGING 1
+#define PL_UI_STATE_USE_SOLAR_ONLY 2
+#define PL_UI_STATE_USE_SOLAR_AND_BATTERY 3
+
 typedef enum {
     SHUTDOWN = 0, 
     ACTIVE
@@ -22,7 +27,7 @@ class PowerLimiterClass {
 public:
     void init();
     void loop();
-    plStates getPowerLimiterState();
+    uint8_t getPowerLimiterState();
     int32_t getLastRequestedPowewrLimit();
     void setDisable(bool disable);
     bool getDisable();

diff --git a/src/PowerLimiter.cpp b/src/PowerLimiter.cpp
@@ -96,8 +96,27 @@ void PowerLimiterClass::loop()
     setNewPowerLimit(inverter, newPowerLimit);
 }
 
-plStates PowerLimiterClass::getPowerLimiterState() {
-    return _plState;
+uint8_t PowerLimiterClass::getPowerLimiterState() {
+    CONFIG_T& config = Configuration.get();
+
+    std::shared_ptr<InverterAbstract> inverter = Hoymiles.getInverterByPos(config.PowerLimiter_InverterId);
+    if (inverter == nullptr || !inverter->isReachable()) {
+        return PL_UI_STATE_INACTIVE;
+    }
+
+    if (inverter->isProducing() && _batteryDischargeEnabled) {
+      return PL_UI_STATE_USE_SOLAR_AND_BATTERY;
+    }
+
+    if (inverter->isProducing() && !_batteryDischargeEnabled) {
+      return PL_UI_STATE_USE_SOLAR_ONLY;
+    }
+
+    if(VeDirect.veFrame.PPV > 0) {
+      return PL_UI_STATE_CHARGING;
+    }
+
+    return PL_UI_STATE_INACTIVE;
 }
 
 int32_t PowerLimiterClass::getLastRequestedPowewrLimit() {