Moving PZEM to use hardware serial by default, fix out of range values (#837)

README.md

@@ -4,9 +4,9 @@ ESPurna ("spark" in Catalan) is a custom firmware for ESP8285/ESP8266 based smar
 It uses the Arduino Core for ESP8266 framework and a number of 3rd party libraries.
 
 [![version](https://img.shields.io/badge/version-1.12.7a-brightgreen.svg)](CHANGELOG.md)
-[![branch](https://img.shields.io/badge/branch-dev-orange.svg)](https://github.org/xoseperez/espurna/tree/dev/)
-[![travis](https://travis-ci.org/xoseperez/espurna.svg?branch=dev)](https://travis-ci.org/xoseperez/espurna)
-[![codacy](https://img.shields.io/codacy/grade/c9496e25cf07434cba786b462cb15f49/dev.svg)](https://www.codacy.com/app/xoseperez/espurna/dashboard)
+[![branch](https://img.shields.io/badge/branch-sensors-orange.svg)](https://github.org/xoseperez/espurna/tree/sensors/)
+[![travis](https://travis-ci.org/xoseperez/espurna.svg?branch=sensors)](https://travis-ci.org/xoseperez/espurna)
+[![codacy](https://img.shields.io/codacy/grade/c9496e25cf07434cba786b462cb15f49/sensors.svg)](https://www.codacy.com/app/xoseperez/espurna/dashboard)
 [![license](https://img.shields.io/github/license/xoseperez/espurna.svg)](LICENSE)
 <br />
 [![donate](https://img.shields.io/badge/donate-PayPal-blue.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=xose%2eperez%40gmail%2ecom&lc=US&no_note=0&currency_code=EUR&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHostedGuest)

code/espurna/config/sensors.h

@@ -428,7 +428,7 @@
 #endif
 
 #ifndef PZEM004T_USE_SOFT
-#define PZEM004T_USE_SOFT               1       // Use software serial
+#define PZEM004T_USE_SOFT               0       // Use software serial
 #endif
 
 #ifndef PZEM004T_RX_PIN
@@ -440,7 +440,7 @@
 #endif
 
 #ifndef PZEM004T_HW_PORT
-#define PZEM004T_HW_PORT                Serial1 // Hardware serial port (if PZEM004T_USE_SOFT == 0)
+#define PZEM004T_HW_PORT                Serial  // Hardware serial port (if PZEM004T_USE_SOFT == 0)
 #endif
 
 //------------------------------------------------------------------------------

code/espurna/sensor.ino

@@ -183,6 +183,7 @@ void _sensorWebSocketStart(JsonObject& root) {
 
         #if PZEM004T_SUPPORT
             if (sensor->getID() == SENSOR_PZEM004T_ID) {
+                root["pzemVisible"] = 1;
                 root["pwrVisible"] = 1;
             }
         #endif

code/espurna/sensors/PZEM004TSensor.h

@@ -84,7 +84,11 @@ class PZEM004TSensor : public BaseSensor {
         // Descriptive name of the sensor
         String description() {
             char buffer[28];
-            snprintf(buffer, sizeof(buffer), "PZEM004T @ SwSerial(%u,%u)", _pin_rx, _pin_tx);
+            if (_serial) {
+                snprintf(buffer, sizeof(buffer), "PZEM004T @ HwSerial");
+            } else {
+                snprintf(buffer, sizeof(buffer), "PZEM004T @ SwSerial(%u,%u)", _pin_rx, _pin_tx);
+            }
             return String(buffer);
         }
 
@@ -109,11 +113,13 @@ class PZEM004TSensor : public BaseSensor {
 
         // Current value for slot # index
         double value(unsigned char index) {
-            if (index == 0) return _pzem->current(_ip);
-            if (index == 1) return _pzem->voltage(_ip);
-            if (index == 2) return _pzem->power(_ip);
-            if (index == 3) return _pzem->energy(_ip);
-            return 0;
+            double response = 0;
+            if (index == 0) response = _pzem->current(_ip);
+            if (index == 1) response = _pzem->voltage(_ip);
+            if (index == 2) response = _pzem->power(_ip);
+            if (index == 3) response = _pzem->energy(_ip) * 3600;
+            if (response < 0) response = 0;
+            return response;
         }
 
     protected:

code/html/index.html

@@ -1075,7 +1075,7 @@
                                     </select>
                                 </div>
 
-                                <div class="pure-g module module-hlw module-cse module-emon">
+                                <div class="pure-g module module-hlw module-cse module-emon module-pzem">
                                     <label class="pure-u-1 pure-u-lg-1-4">Energy units</label>
                                     <select name="energyUnits" tabindex="16" class="pure-u-1 pure-u-lg-1-4">
                                         <option value="0">Joules (J)</option>