Stop UpdateIndex if there is an error

dbus-node-red-grid-meter/grid_meter.py

@@ -19,7 +19,7 @@ sys.path.insert(1, os.path.join(os.path.dirname(__file__), '/opt/victronenergy/d
 from vedbus import VeDbusService
 
 
-class NodeRedMetergrid-meter:
+class NodeRedGridMeter:
   def __init__(self, servicename, deviceinstance, paths, productname='grid-meter', connection='Node RED HTTP JSON service'):
     self._dbusservice = VeDbusService("{}.http_{:02d}".format(servicename, deviceinstance))
     self._paths = paths
@@ -68,21 +68,38 @@ class NodeRedMetergrid-meter:
     
     return int(value)
   
+  # if there is a grid meter disconnect or some other error, set mandatory values to None to stop ESS and set MPs to passthrough
+  def _errorState(self):
+    self._dbusservice['/Connected'] = 0
+    self._dbusservice['/Ac/Power'] = None
+    self._dbusservice['/Ac/Current'] = None
+    self._dbusservice['/Ac/L1/Voltage'] = None
+    self._dbusservice['/Ac/L2/Voltage'] = None
+    self._dbusservice['/Ac/L3/Voltage'] = None
+    self._dbusservice['/Ac/L1/Current'] = None
+    self._dbusservice['/Ac/L2/Current'] = None
+    self._dbusservice['/Ac/L3/Current'] = None
+    self._dbusservice['/Ac/L1/Power'] = None
+    self._dbusservice['/Ac/L2/Power'] = None
+    self._dbusservice['/Ac/L3/Power'] = None
+    return True
+  
   def _getNodeRedData(self):
     URL = "http://localhost:1880/meters"
     try:
         meter_r = requests.get(url = URL, timeout=5)
     except requests.exceptions.RequestException as e:
-        self._dbusservice['/Connected'] = 0
+        self._errorState()
         raise ConnectionError("No response from NodeRed - %s" % (URL))
        
     meter_data = meter_r.json()     
     
     # check for Json
     if not meter_data:
-        self._dbusservice['/Connected'] = 0
+        self._errorState()
         raise ValueError("Converting response to JSON failed")
     
+    # if there is not error parsing data, set connected to true
     self._dbusservice['/Connected'] = 1
     return meter_data
  
@@ -94,7 +111,7 @@ class NodeRedMetergrid-meter:
  
   def _update(self):   
     try:
-       #get data from NodeRed 3em
+       #get parsed data from NodeRed fuction
        meter_data = self._getNodeRedData()
        
        #send data to DBus
@@ -125,14 +142,17 @@ class NodeRedMetergrid-meter:
        logging.debug("---");
        
        # increment UpdateIndex - to show that new data is available
-       index = self._dbusservice['/UpdateIndex'] + 1  # increment index
-       if index > 255:   # maximum value of the index
-         index = 0       # overflow from 255 to 0
-       self._dbusservice['/UpdateIndex'] = index
+       if self._dbusservice['/Connected'] == 1 :
+         index = self._dbusservice['/UpdateIndex'] + 1  # increment index
+         if index > 255:   # maximum value of the index
+           index = 0       # overflow from 255 to 0
+         self._dbusservice['/UpdateIndex'] = index
 
        #update lastupdate vars
-       self._lastUpdate = time.time()              
+       self._lastUpdate = time.time()
+
     except Exception as e:
+       self._errorState()
        logging.critical('Error at %s', '_update', exc_info=e)
        
     # return true, otherwise add_timeout will be removed from GObject - see docs http://library.isr.ist.utl.pt/docs/pygtk2reference/gobject-functions.html#function-gobject--timeout-add
@@ -141,18 +161,17 @@ class NodeRedMetergrid-meter:
   def _handlechangedvalue(self, path, value):
     logging.debug("someone else updated %s to %s" % (path, value))
     return True # accept the change
- 
-
 
 def main():
   #configure logging
   logging.basicConfig(      format='%(asctime)s,%(msecs)d %(name)s %(levelname)s %(message)s',
                             datefmt='%Y-%m-%d %H:%M:%S',
                             level=logging.INFO,
-                            handlers=[
-                                logging.FileHandler("%s/current.log" % (os.path.dirname(os.path.realpath(__file__)))),
-                                logging.StreamHandler()
-                            ])
+                            #handlers=[
+                            #    logging.FileHandler("%s/current.log" % (os.path.dirname(os.path.realpath(__file__)))),
+                            #    logging.StreamHandler()
+                            #]
+  )
  
   try:
       logging.info("Start");
@@ -168,7 +187,7 @@ def main():
       _v = lambda p, v: (str(round(v, 1)) + ' V')   
      
       #start our main-service
-      pvac_output = NodeRedMetergrid-meter(
+      pvac_output = NodeRedGridMeter(
         servicename='com.victronenergy.grid',
         deviceinstance=40,
         paths={

dbus-node-red-pvinverter/pv_inverter.py

@@ -38,7 +38,7 @@ class NodeRedPVinverter:
     self._dbusservice.add_path('/CustomName', productname)      
     self._dbusservice.add_path('/FirmwareVersion', 1.0)
     self._dbusservice.add_path('/HardwareVersion', 0)
-    self._dbusservice.add_path('/Connected', 1)
+    self._dbusservice.add_path('/Connected', 0)
     self._dbusservice.add_path('/Position', 0)
     self._dbusservice.add_path('/Serial', 12345678)
     self._dbusservice.add_path('/UpdateIndex', 0)
@@ -66,21 +66,35 @@ class NodeRedPVinverter:
     
     return int(value)
   
+  # if there is a pv meter disconnect or some other error, set mandatory values to None to tidy up vrm view
+  def _errorState(self):
+    self._dbusservice['/Connected'] = 0
+    self._dbusservice['/Ac/Voltage'] = None
+    self._dbusservice['/Ac/L1/Voltage'] = None
+    self._dbusservice['/Ac/Current'] = None
+    self._dbusservice['/Ac/L1/Current'] = None
+    self._dbusservice['/Ac/Power'] = None
+    self._dbusservice['/Ac/L1/Power'] = None
+    return True
+  
   def _getNodeRedData(self):
     URL = "http://localhost:1880/meters"
     meter_r = requests.get(url = URL)
     
     # check for response
     if not meter_r:
+        self._errorState()
         raise ConnectionError("No response from NodeRed - %s" % (URL))
     
     meter_data = meter_r.json()     
     
     # check for Json
     if not meter_data:
+        self._errorState()
         raise ValueError("Converting response to JSON failed")
     
-    
+    # if there is no error parsing data, set connected to true
+    self._dbusservice['/Connected'] = 1
     return meter_data
  
  
@@ -91,7 +105,7 @@ class NodeRedPVinverter:
  
   def _update(self):   
     try:
-       #get data from NodeRed 3em
+       #get data from NodeRed
        meter_data = self._getNodeRedData()
        
        #send data to DBus
@@ -118,6 +132,7 @@ class NodeRedPVinverter:
        #update lastupdate vars
        self._lastUpdate = time.time()              
     except Exception as e:
+       self._errorState()
        logging.critical('Error at %s', '_update', exc_info=e)
        
     # return true, otherwise add_timeout will be removed from GObject - see docs http://library.isr.ist.utl.pt/docs/pygtk2reference/gobject-functions.html#function-gobject--timeout-add
@@ -134,10 +149,11 @@ def main():
   logging.basicConfig(      format='%(asctime)s,%(msecs)d %(name)s %(levelname)s %(message)s',
                             datefmt='%Y-%m-%d %H:%M:%S',
                             level=logging.INFO,
-                            handlers=[
-                                logging.FileHandler("%s/current.log" % (os.path.dirname(os.path.realpath(__file__)))),
-                                logging.StreamHandler()
-                            ])
+                            #handlers=[
+                            #    logging.FileHandler("%s/current.log" % (os.path.dirname(os.path.realpath(__file__)))),
+                            #    logging.StreamHandler()
+                            #])
+  )
  
   try:
       logging.info("Start");
@@ -158,20 +174,20 @@ def main():
         deviceinstance=46,
         paths={
           '/Ac/Energy/Forward': {'initial': None, 'textformat': _kwh}, # energy produced by pv inverter
-          '/Ac/Power': {'initial': 0, 'textformat': _w},
+          '/Ac/Power': {'initial': None, 'textformat': _w},
           
-          '/Ac/Current': {'initial': 0, 'textformat': _a},
-          '/Ac/Voltage': {'initial': 0, 'textformat': _v},
+          '/Ac/Current': {'initial': None, 'textformat': _a},
+          '/Ac/Voltage': {'initial': None, 'textformat': _v},
           
-          '/Ac/L1/Voltage': {'initial': 0, 'textformat': _v},
-          '/Ac/L2/Voltage': {'initial': 0, 'textformat': _v},
-          '/Ac/L3/Voltage': {'initial': 0, 'textformat': _v},
-          '/Ac/L1/Current': {'initial': 0, 'textformat': _a},
-          '/Ac/L2/Current': {'initial': 0, 'textformat': _a},
-          '/Ac/L3/Current': {'initial': 0, 'textformat': _a},
-          '/Ac/L1/Power': {'initial': 0, 'textformat': _w},
-          '/Ac/L2/Power': {'initial': 0, 'textformat': _w},
-          '/Ac/L3/Power': {'initial': 0, 'textformat': _w},
+          '/Ac/L1/Voltage': {'initial': None, 'textformat': _v},
+          '/Ac/L2/Voltage': {'initial': None, 'textformat': _v},
+          '/Ac/L3/Voltage': {'initial': None, 'textformat': _v},
+          '/Ac/L1/Current': {'initial': None, 'textformat': _a},
+          '/Ac/L2/Current': {'initial': None, 'textformat': _a},
+          '/Ac/L3/Current': {'initial': None, 'textformat': _a},
+          '/Ac/L1/Power': {'initial': None, 'textformat': _w},
+          '/Ac/L2/Power': {'initial': None, 'textformat': _w},
+          '/Ac/L3/Power': {'initial': None, 'textformat': _w},
           '/Ac/L1/Energy/Forward': {'initial': None, 'textformat': _kwh},
           '/Ac/L2/Energy/Forward': {'initial': None, 'textformat': _kwh},
           '/Ac/L3/Energy/Forward': {'initial': None, 'textformat': _kwh},