updates libs

mathieucarbou · Apr 1, 2024 · b16e4da · b16e4da
1 parent 7b0b7da
commit b16e4da
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/include/YaSolRMacros.h b/include/YaSolRMacros.h
@@ -441,23 +441,23 @@
 #endif
 
 #ifndef YASOLR_JSY_RX_PIN
-#define YASOLR_JSY_RX_PIN 17
+#define YASOLR_JSY_RX_PIN 16
 #endif
 
 #ifndef YASOLR_JSY_TX_PIN
-#define YASOLR_JSY_TX_PIN 16
+#define YASOLR_JSY_TX_PIN 17
 #endif
 
 #ifndef YASOLR_JSY_SERIAL
 #define YASOLR_JSY_SERIAL Serial2
 #endif
 
 #ifndef YASOLR_PZEM_RX_PIN
-#define YASOLR_PZEM_RX_PIN 27
+#define YASOLR_PZEM_RX_PIN 14
 #endif
 
 #ifndef YASOLR_PZEM_TX_PIN
-#define YASOLR_PZEM_TX_PIN 14
+#define YASOLR_PZEM_TX_PIN 27
 #endif
 
 #ifndef YASOLR_PZEM_SERIAL

diff --git a/include/YaSolRWebsite.h b/include/YaSolRWebsite.h
@@ -202,8 +202,8 @@ namespace YaSolR {
 
       // Electricity meter configuration
       Card _jsy = Card(&dashboard, BUTTON_CARD, "JSY");
-      Card _jsyRXPin = Card(&dashboard, TEXT_INPUT_CARD, "JSY RX Pin (Serial TX)");
-      Card _jsyTXPin = Card(&dashboard, TEXT_INPUT_CARD, "JSY TX Pin (Serial RX)");
+      Card _jsyRXPin = Card(&dashboard, TEXT_INPUT_CARD, "JSY TX Pin (Serial RX)");
+      Card _jsyTXPin = Card(&dashboard, TEXT_INPUT_CARD, "JSY RX Pin (Serial TX)");
       Card _jsyReset = Card(&dashboard, PUSH_BUTTON_CARD, "JSY Reset Energy");
       Card _zcd = Card(&dashboard, BUTTON_CARD, "ZCD");
       Card _zcdPin = Card(&dashboard, TEXT_INPUT_CARD, "ZCD Sync Pin");
@@ -256,8 +256,8 @@ namespace YaSolR {
       Card _output1AutoStoptTime = Card(&dashboard, TEXT_INPUT_CARD, "Auto Stop Time");
 
       Card _output1PZEM = Card(&dashboard, BUTTON_CARD, "PZEM-004T v3");
-      Card _output1PZEMRXPin = Card(&dashboard, TEXT_INPUT_CARD, "PZEM RX Pin (Serial TX)");
-      Card _output1PZEMTXPin = Card(&dashboard, TEXT_INPUT_CARD, "PZEM TX Pin (Serial RX)");
+      Card _output1PZEMRXPin = Card(&dashboard, TEXT_INPUT_CARD, "PZEM TX Pin (Serial RX)");
+      Card _output1PZEMTXPin = Card(&dashboard, TEXT_INPUT_CARD, "PZEM RX Pin (Serial TX)");
       Card _output1PZEMSync = Card(&dashboard, PUSH_BUTTON_CARD, "PZEM Pairing");
       Card _output1PZEMReset = Card(&dashboard, PUSH_BUTTON_CARD, "PZEM Reset Energy");
 
@@ -283,8 +283,8 @@ namespace YaSolR {
       Card _output2AutoStoptTime = Card(&dashboard, TEXT_INPUT_CARD, "Auto Stop Time");
 
       Card _output2PZEM = Card(&dashboard, BUTTON_CARD, "PZEM-004T v3");
-      Card _output2PZEMRXPin = Card(&dashboard, TEXT_INPUT_CARD, "PZEM RX Pin (Serial TX)");
-      Card _output2PZEMTXPin = Card(&dashboard, TEXT_INPUT_CARD, "PZEM TX Pin (Serial RX)");
+      Card _output2PZEMRXPin = Card(&dashboard, TEXT_INPUT_CARD, "PZEM TX Pin (Serial RX)");
+      Card _output2PZEMTXPin = Card(&dashboard, TEXT_INPUT_CARD, "PZEM RX Pin (Serial TX)");
       Card _output2PZEMSync = Card(&dashboard, PUSH_BUTTON_CARD, "PZEM Pairing");
       Card _output2PZEMReset = Card(&dashboard, PUSH_BUTTON_CARD, "PZEM Reset Energy");
 

diff --git a/platformio.ini b/platformio.ini
@@ -37,11 +37,11 @@ lib_deps =
   mathieucarbou/MycilaConfig @ 1.4.0
   mathieucarbou/MycilaEasyDisplay @ 1.0.2
   mathieucarbou/MycilaESPConnect @ 3.2.7
-  mathieucarbou/MycilaJSY @ 6.0.4
+  mathieucarbou/MycilaJSY @ 7.0.0
   mathieucarbou/MycilaLogger @ 2.2.0
   mathieucarbou/MycilaMQTT @ 3.0.1
   mathieucarbou/MycilaNTP @ 2.2.2
-  mathieucarbou/MycilaPZEM004Tv3 @ 1.1.6
+  mathieucarbou/MycilaPZEM004Tv3 @ 2.0.0
   mathieucarbou/MycilaRelay @ 3.0.1
   mathieucarbou/MycilaTaskManager @ 1.2.5
   mathieucarbou/MycilaTaskMonitor @ 2.0.0
@@ -382,7 +382,8 @@ build_flags =
   -D YASOLR_BUTTON_PIN=39
   -D YASOLR_OUTPUT1_RELAY_PIN=40
   -D YASOLR_BUZZER_PIN=8
-  -D YASOLR_PZEM_RX_PIN=11
+  -D YASOLR_PZEM_RX_PIN=14
+  -D YASOLR_PZEM_TX_PIN=11
 
 [env:oss-esp32s3]
 extends = env:oss-esp32