modpoll 1.3.3__tar.gz → 1.4.1__tar.gz

{modpoll-1.3.3 → modpoll-1.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: modpoll
-Version: 1.3.3
+Version: 1.4.1
 Summary: A New Command-line Tool for Modbus and MQTT
 Home-page: https://github.com/gavinying/modpoll
 Author: Ying Shaodong
@@ -146,7 +146,7 @@ ref,input_reg11,30012,int32,rw
 ref,input_reg12,30014,int32,rw
 ref,input_reg13,30016,float32,rw
 ref,input_reg14,30018,float32,rw
-poll,holding_register,40000,20,BE_BE
+poll,holding_register,40000,44,BE_BE
 ref,holding_reg01,40000,uint16,rw
 ref,holding_reg02,40001,uint16,rw
 ref,holding_reg03,40002,uint16,rw
@@ -161,6 +161,11 @@ ref,holding_reg11,40012,int32,rw
 ref,holding_reg12,40014,int32,rw
 ref,holding_reg13,40016,float32,rw
 ref,holding_reg14,40018,float32,rw
+ref,holding_reg15,40020,uint64,rw
+ref,holding_reg16,40024,int64,rw
+ref,holding_reg17,40028,float64,rw
+ref,holding_reg18,40032,float64,rw
+ref,holding_reg19,40036,string16,rw
 ```
 
 This configuration tells *modpoll* to do the following for each poll,

{modpoll-1.3.3 → modpoll-1.4.1}/README.md

@@ -122,7 +122,7 @@ ref,input_reg11,30012,int32,rw
 ref,input_reg12,30014,int32,rw
 ref,input_reg13,30016,float32,rw
 ref,input_reg14,30018,float32,rw
-poll,holding_register,40000,20,BE_BE
+poll,holding_register,40000,44,BE_BE
 ref,holding_reg01,40000,uint16,rw
 ref,holding_reg02,40001,uint16,rw
 ref,holding_reg03,40002,uint16,rw
@@ -137,6 +137,11 @@ ref,holding_reg11,40012,int32,rw
 ref,holding_reg12,40014,int32,rw
 ref,holding_reg13,40016,float32,rw
 ref,holding_reg14,40018,float32,rw
+ref,holding_reg15,40020,uint64,rw
+ref,holding_reg16,40024,int64,rw
+ref,holding_reg17,40028,float64,rw
+ref,holding_reg18,40032,float64,rw
+ref,holding_reg19,40036,string16,rw
 ```
 
 This configuration tells *modpoll* to do the following for each poll,

{modpoll-1.3.3 → modpoll-1.4.1}/modpoll/arg_parser.py

@@ -39,8 +39,8 @@ def get_parser():
     parser.add_argument(
         "--interval",
         type=float,
-        default=1.0,
-        help="The time interval in seconds between two polling, Defaults to 1.0",
+        default=0.5,
+        help="The time interval in seconds between two polling, Defaults to 0.5",
     )
     parser.add_argument(
         "--tcp", help="Act as a Modbus TCP master, connecting to host TCP"

{modpoll-1.3.3 → modpoll-1.4.1}/modpoll/modbus_task.py

@@ -58,6 +58,7 @@ class Poller:
         self.readableReferences: List[Reference] = []
         self.disabled = False
         self.failcounter = 0
+        self.logger = logging.getLogger(__name__)
 
     def poll(self, master) -> bool:
         if self.disabled or not master:
@@ -104,9 +105,18 @@ class Poller:
                     cur_ref += 1
                 if cur_ref >= self.start_address + ref_count:
                     break
-                self._decode_and_update_reference(ref, decoder)
+                try:
+                    self._decode_and_update_reference(ref, decoder)
+                    self.device.update_reference(ref)
+                except UnicodeDecodeError:
+                    self.logger.error(
+                        f"Failed to decode unicode string for reference: {ref.name}, check the reference address or length of string in configuration file"
+                    )
+                except:
+                    self.logger.error(
+                        f"Failed to decode value for reference: {ref.name}"
+                    )
                 cur_ref += ref.ref_width
-                self.device.update_reference(ref)
             self.update_statistics(True)
             return True
         except ModbusException:
@@ -171,8 +181,6 @@ class Poller:
             ref.update_value(
                 decoder.decode_string(ref.ref_width * 2).decode("utf-8").rstrip("\x00")
             )
-        else:
-            decoder.skip_bytes(2)  # Skip unknown types
 
     def add_readable_reference(self, ref: "Reference"):
         if ref not in self.readableReferences:
@@ -264,10 +272,11 @@ class ModbusHandler:
         config_file: str,
         mqtt_handler: Optional[MqttHandler] = None,
         timeout: float = 3.0,
-        interval: float = 1.0,
+        interval: float = 0.5,
         daemon: bool = False,
         mqtt_publish_topic_pattern: Optional[str] = None,
         mqtt_diagnostics_topic_pattern: Optional[str] = None,
+        mqtt_single_publish: bool = False,
     ):
         self.modbus_client = modbus_client
         self.config_file = config_file
@@ -277,6 +286,7 @@ class ModbusHandler:
         self.daemon = daemon
         self.mqtt_publish_topic_pattern = mqtt_publish_topic_pattern
         self.mqtt_diagnostics_topic_pattern = mqtt_diagnostics_topic_pattern
+        self.mqtt_single_publish = mqtt_single_publish
         self.connected = False
         self.deviceList: List[Device] = []
         self.logger = logging.getLogger(__name__)
@@ -319,7 +329,7 @@ class ModbusHandler:
                         continue
                     device_name = row[1].strip()
                     try:
-                        device_id = int(row[2])
+                        device_id = int(row[2], 0)
                     except ValueError:
                         self.logger.error(f"Invalid device ID for {device_name}")
                         continue
@@ -357,8 +367,8 @@ class ModbusHandler:
             return None
         fc = row[1].lower()
         try:
-            start_address = int(row[2])
-            size = int(row[3])
+            start_address = int(row[2], 0)
+            size = int(row[3], 0)
         except ValueError:
             self.logger.error("Invalid start address or size for poller")
             return None
@@ -401,7 +411,7 @@ class ModbusHandler:
             return None
         ref_name = row[1].replace(" ", "_")
         try:
-            address = int(row[2])
+            address = int(row[2], 0)
         except ValueError:
             self.logger.error(f"Invalid address for reference {ref_name}")
             return None
@@ -507,22 +517,37 @@ class ModbusHandler:
             print(table)
 
     def publish_data(self, timestamp=None, on_change=False):
-        if not self.mqtt_handler:
-            return
-        if not self.mqtt_publish_topic_pattern:
+        if not self.mqtt_handler or not self.mqtt_publish_topic_pattern:
             return
+
         for dev in self.deviceList:
+            if not dev.pollSuccess:
+                self.logger.debug(
+                    f"Skip publishing for disconnected device: {dev.name}"
+                )
+                continue
+
             payload = {}
             for ref in dev.references.values():
                 if not on_change or ref.val != ref.last_val:
-                    value = (
+                    ref_val = (
                         round(ref.val, FLOAT_TYPE_PRECISION)
                         if isinstance(ref.val, float)
                         else ref.val
                     )
-                    payload[ref.name] = value
-            if payload:
-                if timestamp:
+                    key = f"{ref.name}|{ref.unit}" if ref.unit else ref.name
+                    payload[key] = ref_val
+
+                    if self.mqtt_single_publish:
+                        topic = f"{self.mqtt_publish_topic_pattern.replace('{{device_name}}', dev.name)}/{ref.name}"
+                        if isinstance(ref_val, list):
+                            for i, entry in enumerate(ref_val):
+                                self.mqtt_handler.publish(f"{topic}/{i}", entry)
+                        else:
+                            self.mqtt_handler.publish(topic, ref_val)
+
+            if payload and not self.mqtt_single_publish:
+                if timestamp is not None:
                     payload["timestamp"] = timestamp
                 topic = self.mqtt_publish_topic_pattern.replace(
                     "{{device_name}}", dev.name
@@ -581,6 +606,7 @@ def setup_modbus_handlers(args, mqtt_handler: Optional[MqttHandler] = None):
             daemon=args.daemon,
             mqtt_publish_topic_pattern=args.mqtt_publish_topic_pattern,
             mqtt_diagnostics_topic_pattern=args.mqtt_diagnostics_topic_pattern,
+            mqtt_single_publish=args.mqtt_single,
         )
         if modbus_handler.load_config():
             modbus_handlers.append(modbus_handler)

{modpoll-1.3.3 → modpoll-1.4.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "modpoll"
-version = "v1.3.3"
+version = "v1.4.1"
 description = "A New Command-line Tool for Modbus and MQTT"
 authors = ["Ying Shaodong <helloysd@gmail.com>"]
 repository = "https://github.com/gavinying/modpoll"