Fix for push to production

2018-06-20 16:46:15 -05:00
parent 129c0f6e2c
commit a48be1162f
20 changed files with 12 additions and 28 deletions
--- a/PLC/Multi-Pond/Controller/Controller/Compile.ic
+++ b/PLC/Multi-Pond/Controller/Controller/Compile.ic
@@ -1 +1 @@
-COMPILED
+TO RELINK
--- a/PLC/Multi-Pond/Controller/Controller/Micro820/Micro820/Compile.ics
+++ b/PLC/Multi-Pond/Controller/Controller/Micro820/Micro820/Compile.ics
@@ -1 +0,0 @@
-TO RELINK
--- a/PLC/Multi-Pond/Controller/Controller/Micro820/Micro820/Compile.ict
+++ b/PLC/Multi-Pond/Controller/Controller/Micro820/Micro820/Compile.ict
@@ -1 +0,0 @@
-COMPILED
--- a/PLC/Multi-Pond/Controller/Controller/Micro820/Micro820/Compile_ADDCALIBRATIONPOINT.ict
+++ b/PLC/Multi-Pond/Controller/Controller/Micro820/Micro820/Compile_ADDCALIBRATIONPOINT.ict
@@ -1 +0,0 @@
-COMPILED
--- a/PLC/Multi-Pond/Controller/Controller/Micro820/Micro820/Compile_CALIBRATION.ict
+++ b/PLC/Multi-Pond/Controller/Controller/Micro820/Micro820/Compile_CALIBRATION.ict
@@ -1 +0,0 @@
-COMPILED
--- a/PLC/Multi-Pond/Controller/Controller/Micro820/Micro820/Compile_DELETECALIBRATIONPOINT.ict
+++ b/PLC/Multi-Pond/Controller/Controller/Micro820/Micro820/Compile_DELETECALIBRATIONPOINT.ict
@@ -1 +0,0 @@
-COMPILED
--- a/PLC/Multi-Pond/Controller/Controller/Micro820/Micro820/Compile_FINDNUMBEROFCALPOINTS.ict
+++ b/PLC/Multi-Pond/Controller/Controller/Micro820/Micro820/Compile_FINDNUMBEROFCALPOINTS.ict
@@ -1 +0,0 @@
-COMPILED
--- a/PLC/Multi-Pond/Controller/Controller/Micro820/Micro820/Compile_GETSCALINGPARAMETERS.ict
+++ b/PLC/Multi-Pond/Controller/Controller/Micro820/Micro820/Compile_GETSCALINGPARAMETERS.ict
@@ -1 +0,0 @@
-COMPILED
--- a/PLC/Multi-Pond/Controller/Controller/Micro820/Micro820/Compile_LINEARSCALE.ict
+++ b/PLC/Multi-Pond/Controller/Controller/Micro820/Micro820/Compile_LINEARSCALE.ict
@@ -1 +0,0 @@
-COMPILED
--- a/PLC/Multi-Pond/Controller/Controller/Micro820/Micro820/Compile_SCALING.ict
+++ b/PLC/Multi-Pond/Controller/Controller/Micro820/Micro820/Compile_SCALING.ict
@@ -1 +0,0 @@
-COMPILED
--- a/PLC/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820.icp
+++ b/PLC/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820.icp
@@ -1,7 +0,0 @@
-CALIBRATION(156):F,ADDCALIBRATIONPOINT(157);F,DELETECALIBRATIONPOINT(158);
-ADDCALIBRATIONPOINT(157):F,FINDNUMBEROFCALPOINTS(155);
-DELETECALIBRATIONPOINT(158):
-SCALING(159):F,LINEARSCALE(154);FB,GETSCALINGPARAMETERS(161);
-FINDNUMBEROFCALPOINTS(155):
-LINEARSCALE(154):
-GETSCALINGPARAMETERS(161):F,FINDNUMBEROFCALPOINTS(155);
--- a/PLC/Multi-Pond/Controller/Controller/PrjLibrary.mdb
+++ b/PLC/Multi-Pond/Controller/Controller/PrjLibrary.mdb
--- a/PLC/Multi-Pond/Controller/Controller/RMD.info
+++ b/PLC/Multi-Pond/Controller/Controller/RMD.info
@@ -1,2 +1,2 @@
 [RMDManager]
-TASK=BUILD
+TASK=REBUILD
--- a/PLC/Multi-Pond/Controller/Controller/RmcVariables
+++ b/PLC/Multi-Pond/Controller/Controller/RmcVariables
--- a/PLC/Multi-Pond/Controller/Controller/persist.ccwx
+++ b/PLC/Multi-Pond/Controller/Controller/persist.ccwx
--- a/PLC/Multi-Pond/Multi-Pond.v12.ccwsuo
+++ b/PLC/Multi-Pond/Multi-Pond.v12.ccwsuo
--- a/plcpond/html-templates/Overview.html
+++ b/plcpond/html-templates/Overview.html
@@ -74,7 +74,7 @@
            data-displayName="Pond 1 Volume"
            data-units="BBL"
            data-min="0"
-            data-max="50000"
+            data-max="1000000"
            data-decimalPlaces="0"
            data-channelId="<%= channels['plcpond.pond1volume'].channelId %>"
            data-timestamp="<%= channels['plcpond.pond1volume'].timestamp %>"
@@ -86,7 +86,7 @@
                data-displayName="Pond 2 Volume"
                data-units="BBL"
                data-min="0"
-                data-max="50000"
+                data-max="1000000"
                data-decimalPlaces="0"
                data-channelId="<%= channels['plcpond.pond2volume'].channelId %>"
                data-timestamp="<%= channels['plcpond.pond2volume'].timestamp %>"
@@ -100,7 +100,7 @@
                data-displayName="Pond 3 Volume"
                data-units="BBL"
                data-min="0"
-                data-max="50000"
+                data-max="1000000"
                data-decimalPlaces="0"
                data-channelId="<%= channels['plcpond.pond3volume'].channelId %>"
                data-timestamp="<%= channels['plcpond.pond3volume'].timestamp %>"
@@ -114,7 +114,7 @@
                data-displayName="Pond 4 Volume"
                data-units="BBL"
                data-min="0"
-                data-max="50000"
+                data-max="1000000"
                data-decimalPlaces="0"
                data-channelId="<%= channels['plcpond.pond4volume'].channelId %>"
                data-timestamp="<%= channels['plcpond.pond4volume'].timestamp %>"
@@ -128,7 +128,7 @@
                data-displayName="Pond Volume Total"
                data-units="BBL"
                data-min="0"
-                data-max="200000"
+                data-max="1000000"
                data-decimalPlaces="0"
                data-channelId="<%= channels['plcpond.pondvolumetotal'].channelId %>"
                data-timestamp="<%= channels['plcpond.pondvolumetotal'].timestamp %>"
--- a/plcpond/python-driver/config.txt
+++ b/plcpond/python-driver/config.txt
@@ -2,7 +2,7 @@
    "driverFileName": "plcpond.py",
    "deviceName": "plcpond",
    "driverId": "0220",
-    "releaseVersion": "1",
+    "releaseVersion": "2",
    "files": {
        "file1": "plcpond.py",
        "file2": "utilities.py",
--- a/plcpond/python-driver/driverConfig.json
+++ b/plcpond/python-driver/driverConfig.json
@@ -6,6 +6,6 @@
        "utilities.py",
        "Channel.py"
    ],
-    "version": 1,
+    "version": 2,
    "s3BucketName": "plcpond"
 }
--- a/plcpond/python-driver/plcpond.py
+++ b/plcpond/python-driver/plcpond.py
@@ -64,7 +64,7 @@ class start(threading.Thread, deviceBase):
        deviceBase.__init__(self, name=name, number=number, mac=mac, Q=Q, mcu=mcu, companyId=companyId, offset=offset, mqtt=mqtt, Nodes=Nodes)

        self.daemon = True
-        self.version = "1"
+        self.version = "2"
        self.finished = threading.Event()
        self.force_send = False
        threading.Thread.start(self)
@@ -78,7 +78,7 @@ class start(threading.Thread, deviceBase):

    def run(self):
        """Actually run the driver."""
-        wait_sec = 15
+        wait_sec = 30
        for i in range(0, wait_sec):
            print("plcpond driver will start in {} seconds".format(wait_sec - i))
            time.sleep(1)
@@ -241,7 +241,7 @@ class start(threading.Thread, deviceBase):
        tag_n = str(new_val['tag'])  # "cmd_Start"
        val_n = new_val['val']
        w = write_tag(str(PLC_IP_ADDRESS), tag_n, val_n)
-        print("Result of plcpond_writeplctag(self, {}, {}) = {}".format(name, value, w))
+        logger.info("Result of plcpond_writeplctag(self, {}, {}) = {}".format(name, value, w))
        if w is None:
            w = "Error writing to PLC..."
        return w