Resolve Issues with modbus interfacer and pymodbus

src/emonhub.py

@@ -206,8 +206,6 @@ def _update_settings(self, settings):
                     if not 'Type' in I:
                         continue
                     self._log.info("Creating " + I['Type'] + " '%s' ", name)
-                    if I['Type'] in ('EmonModbusTcpInterfacer','EmonFroniusModbusTcpInterfacer') and not pymodbus_found :
-                        self._log.error("Python module pymodbus not installed. unable to load modbus interfacer")
                     # This gets the class from the 'Type' string
                     interfacer = getattr(ehi, I['Type'])(name,**I['init_settings'])
                     interfacer.set(**I['runtimesettings'])

src/interfacers/tmp/EmonFroniusModbusTcpInterfacer.py → src/interfacers/EmonFroniusModbusTcpInterfacer.py

@@ -3,7 +3,7 @@
 import logging
 from pymodbus.constants import Endian
 from pymodbus.payload import BinaryPayloadDecoder
-import EmonModbusTcpInterfacer as EmonModbusTcpInterfacer
+from EmonModbusTcpInterfacer import EmonModbusTcpInterfacer
 
 """class EmonModbusTcpInterfacer
 Monitors Solar Inverter using modbus tcp

src/interfacers/tmp/EmonModbusTcpInterfacer.py → src/interfacers/EmonModbusTcpInterfacer.py

@@ -1,4 +1,17 @@
-import time
++#!/usr/bin/python
++# EmonModbusTcpInterfacer released for use by OpenEnergyMonitor project
++# GNU GENERAL PUBLIC LICENSE -  Version 2, June 1991
++# See LICENCE and README file for details
++
++__author__ = 'Chris Thuys'
++
++try:
++      import pymodbus
++      pymodbus_found = True
++except ImportError:
++      pymodbus_found = False
++
++import time
 import Cargo
 from pymodbus.constants import Endian
 from pymodbus.payload import BinaryPayloadDecoder
@@ -45,7 +58,8 @@ def close(self):
 
     def _open_modTCP(self,modbus_IP,modbus_port):
         """ Open connection to modbus device """
-
+        if not pymodbus_found :
+            self._log.error("Python module pymodbus not installed or found. Unable to open modbus connection")
         try:
             c = ModbusClient(modbus_IP,modbus_port)
             if c.connect():

src/interfacers/__init__.py

@@ -12,7 +12,7 @@
   "EmonHubSMASolarInterfacer",
   "EmonHubGraphiteInterfacer",
   "EmonHubBMWInterfacer",
-  # "EmonModbusTcpInterfacer",
+  "EmonModbusTcpInterfacer",
+  "EmonFroniusModbusTcpInterfacer",
   "EmonHubTemplateInterfacer"
-  #"EmonFroniusModbusTcpInterfacer"
-]
+  ]