mathieucarbou/MycilaJSY @ 10.0.0

mathieucarbou · Oct 21, 2024 · 9af831e · 9af831e
1 parent 824b0f4
commit 9af831e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/lib/MycilaRouter/MycilaRouter.cpp b/lib/MycilaRouter/MycilaRouter.cpp
@@ -93,7 +93,7 @@ void Mycila::Router::getMeasurements(Metrics& metrics) const {
     if (routing) {
       metrics.apparentPower = abs(_jsy->getApparentPower1());
       metrics.current = abs(_jsy->getCurrent1());
-      metrics.power = abs(_jsy->getPower1());
+      metrics.power = abs(_jsy->getActivePower1());
       metrics.powerFactor = abs(_jsy->getPowerFactor1());
       metrics.resistance = abs(_jsy->getResistance1());
       metrics.thdi = abs(_jsy->getTHDi1(0));

diff --git a/platformio.ini b/platformio.ini
@@ -67,7 +67,7 @@ lib_deps =
   mathieucarbou/MycilaESPConnect @ 6.0.3
   mathieucarbou/MycilaEasyDisplay @ 3.0.1
   mathieucarbou/MycilaHADiscovery @ 3.0.0
-  mathieucarbou/MycilaJSY @ 9.1.9
+  mathieucarbou/MycilaJSY @ 10.0.0
   mathieucarbou/MycilaLogger @ 3.2.0
   mathieucarbou/MycilaMQTT @ 4.2.2
   mathieucarbou/MycilaNTP @ 5.0.0

diff --git a/src/init/Config.cpp b/src/init/Config.cpp
@@ -140,8 +140,8 @@ Mycila::Task initConfigTask("Init Config", [](void* params) {
   // Electricity: JSY
   if (config.getBool(KEY_ENABLE_JSY)) {
     jsy.begin(YASOLR_JSY_SERIAL, config.get(KEY_PIN_JSY_RX).toInt(), config.get(KEY_PIN_JSY_TX).toInt());
-    if (jsy.isEnabled() && jsy.getBaudRate() != Mycila::JSYBaudRate::BAUD_38400)
-      jsy.setBaudRate(Mycila::JSYBaudRate::BAUD_38400);
+    if (jsy.isEnabled() && jsy.getBaudRate() != Mycila::JSY::BaudRate::BAUD_38400)
+      jsy.setBaudRate(Mycila::JSY::BaudRate::BAUD_38400);
   }
 
   // Electricity: PZEMs

diff --git a/src/init/Events.cpp b/src/init/Events.cpp
@@ -176,7 +176,7 @@ Mycila::Task initEventsTask("Init Events", [](void* params) {
         relay2.begin(config.get(KEY_PIN_RELAY2).toInt(), config.get(KEY_RELAY2_TYPE) == YASOLR_RELAY_TYPE_NC ? Mycila::RelayType::NC : Mycila::RelayType::NO);
 
     } else if (key == KEY_ENABLE_JSY) {
-      Mycila::JSYBaudRate bauds = jsy.getBaudRate();
+      Mycila::JSY::BaudRate bauds = jsy.getBaudRate();
       jsy.end();
       if (config.getBool(KEY_ENABLE_JSY)) {
         jsy.begin(YASOLR_JSY_SERIAL, config.get(KEY_PIN_JSY_RX).toInt(), config.get(KEY_PIN_JSY_TX).toInt(), bauds);
@@ -333,15 +333,15 @@ Mycila::Task initEventsTask("Init Events", [](void* params) {
     }
   });
 
-  jsy.setCallback([](const Mycila::JSYEventType eventType) {
-    if (eventType == Mycila::JSYEventType::EVT_CHANGE) {
+  jsy.setCallback([](const Mycila::JSY::EventType eventType) {
+    if (eventType == Mycila::JSY::EventType::EVT_CHANGE) {
       grid.localMetrics().update({
         .apparentPower = jsy.getApparentPower2(),
         .current = jsy.getCurrent2(),
         .energy = jsy.getEnergy2(),
         .energyReturned = jsy.getEnergyReturned2(),
         .frequency = jsy.getFrequency(),
-        .power = jsy.getPower2(),
+        .power = jsy.getActivePower2(),
         .powerFactor = jsy.getPowerFactor2(),
         .voltage = jsy.getVoltage2(),
       });