From bfded4595306ea18e04600d579e5f7146a2b5615 Mon Sep 17 00:00:00 2001 From: Patrick McDonagh Date: Thu, 1 Mar 2018 15:25:35 -0600 Subject: [PATCH] Updates PLCChannel with plc_type and fixes read procedure --- {{cookiecutter.driver_name}}/python-driver/Channel.py | 5 +++-- .../python-driver/{{cookiecutter.driver_name}}.py | 7 +++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/{{cookiecutter.driver_name}}/python-driver/Channel.py b/{{cookiecutter.driver_name}}/python-driver/Channel.py index 984fb7d..adb6680 100644 --- a/{{cookiecutter.driver_name}}/python-driver/Channel.py +++ b/{{cookiecutter.driver_name}}/python-driver/Channel.py @@ -192,7 +192,7 @@ class ModbusChannel(Channel): class PLCChannel(Channel): """PLC Channel Object.""" - def __init__(self, ip, mesh_name, plc_tag, data_type, chg_threshold, guarantee_sec, map_=False, write_enabled=False): + def __init__(self, ip, mesh_name, plc_tag, data_type, chg_threshold, guarantee_sec, map_=False, write_enabled=False, plc_type='CLX'): """Initialize the channel.""" super(PLCChannel, self).__init__(mesh_name, data_type, chg_threshold, guarantee_sec, map_, write_enabled) self.plc_ip = ip @@ -206,12 +206,13 @@ class PLCChannel(Channel): self.guarantee_sec = guarantee_sec self.map_ = map_ self.write_enabled = write_enabled + self.plc_type = plc_type def read(self): """Read the value.""" plc_value = None if self.plc_tag and self.plc_ip: - read_value = read_tag(self.plc_ip, self.plc_tag) + read_value = read_tag(self.plc_ip, self.plc_tag, plc_type=self.plc_type) if read_value: plc_value = read_value[0] diff --git a/{{cookiecutter.driver_name}}/python-driver/{{cookiecutter.driver_name}}.py b/{{cookiecutter.driver_name}}/python-driver/{{cookiecutter.driver_name}}.py index c1b34f7..1a5227c 100644 --- a/{{cookiecutter.driver_name}}/python-driver/{{cookiecutter.driver_name}}.py +++ b/{{cookiecutter.driver_name}}/python-driver/{{cookiecutter.driver_name}}.py @@ -3,9 +3,7 @@ import threading import sys from device_base import deviceBase -from Channel import Channel, read_tag, write_tag, BoolArrayChannels -from Maps import {{cookiecutter.driver_name}}_map as maps -from Maps import reverse_map +from Channel import Channel, read_tag, write_tag import persistence from random import randint from utilities import get_public_ip_address @@ -86,7 +84,8 @@ class start(threading.Thread, deviceBase): logger.warning("FORCE SEND: TRUE") for c in CHANNELS: - if c.read(self.forceSend): + v = c.read() + if c.check(self.forceSend): self.sendtodbDev(1, c.mesh_name, c.value, 0, '{{cookiecutter.driver_name}}')