From 74da693836083387ae55fba93c51678f2a9ccd84 Mon Sep 17 00:00:00 2001 From: Taryel Hlontsi Date: Wed, 18 Sep 2024 16:47:43 +0200 Subject: [PATCH] Update data --- src/data/controller-models.json | 258 ++++++++++++++++++-------------- src/data/controllers.json | 16 +- 2 files changed, 154 insertions(+), 120 deletions(-) diff --git a/src/data/controller-models.json b/src/data/controller-models.json index 08b3f59..93a8815 100644 --- a/src/data/controller-models.json +++ b/src/data/controller-models.json @@ -2,13 +2,22 @@ { "Name": "ThirdPartyInput", "RunAs": "Client-script", - "Script": "import time\r\nt = int(time.time() * 1000)\r\ncounter = 0\r\nchunks = []\r\nchunks.append(2)\r\nchunks.append(counter)\r\nchunks.append((t >> 48))\r\nchunks.append((t >> 32) & 0xFFFF)\r\nchunks.append((t >> 16) & 0xFFFF)\r\nchunks.append(t & 0xFFFF)\r\nchunks.append(128)\r\nchunks.append(5)\r\nchunks.append(65)\r\ninstance.write_multiple_registers(505, chunks)", + "Script": "import time\r\nt = int(time.time() * 1000)\r\ncounter = 0\r\nchunks = []\r\nchunks.append(2)\r\nchunks.append(counter)\r\nchunks.append((t >> 48))\r\nchunks.append((t >> 32) & 0xFFFF)\r\nchunks.append((t >> 16) & 0xFFFF)\r\nchunks.append(t & 0xFFFF)\r\nchunks.append(128)\r\nchunks.append(1)\r\nchunks.append(65)\r\ninstance.write_multiple_registers(505, chunks)", "ScriptExample": "import time\r\nt = int(time.time() * 1000)\r\ncounter = 0\r\nchunks = []\r\nchunks.append(2)\r\nchunks.append(counter)\r\nchunks.append((t >> 48))\r\nchunks.append((t >> 32) & 0xFFFF)\r\nchunks.append((t >> 16) & 0xFFFF)\r\nchunks.append(t & 0xFFFF)\r\nchunks.append(129)\r\nchunks.append(1)\r\nchunks.append(65)\r\ninstance.write_multiple_registers(505, chunks)" }, { "Name": "Ads", "RunAs": "Client", "Registers": [ + { + "CanOverride": false, + "Name": "ThirdExposedTurbine", + "Type": "Input", + "Function": "F4", + "Address": 771, + "DisplayAs": "RawBinary", + "PossibleValues": [] + }, { "CanOverride": false, "Name": "Status", @@ -149,130 +158,34 @@ ] }, { - "Name": "CIP300", + "Name": "CIP400", "RunAs": "Server", "Registers": [ { "CanOverride": true, - "Name": "PhotecellSensing", - "Type": "Input", - "Function": "F4", - "Address": 20202, - "DisplayAs": "DropdownVariants", - "PossibleValues": [ - { - "Night": 1 - }, - { - "Twilight": 2 - }, - { - "Day": 3 - }, - { - "FailSafeIntensity": 255 - } - ] - }, - { - "CanOverride": true, - "Name": "FullSystemStatus", - "Type": "Input", - "Function": "F4", - "Address": 19000, - "DisplayAs": "DropdownVariants", - "PossibleValues": [ - { - "Normal": 1 - }, - { - "Fail": 2 - }, - { - "Alarm": 3 - }, - { - "FailAndAlarm": 4 - }, - { - "BAD": 666 - } - ] - }, - { - "CanOverride": true, - "Name": "TimeOfDay", - "Type": "Input", - "Function": "F4", - "Address": 20200, - "DisplayAs": "DropdownVariants", - "PossibleValues": [ - { - "ControllerOff": 0 - }, - { - "Night": 1 - }, - { - "Twilight": 2 - }, - { - "Day": 3 - }, - { - "Off": 4 - }, - { - "SarMode1": 16 - }, - { - "SarMode2": 17 - }, - { - "FailSafeIntensity": 255 - } - ] - }, - { - "CanOverride": false, - "Name": "ForcedOffAdls", + "Name": "Dimming", "Type": "Holding", - "Function": "F3", - "Address": 20210, + "Function": "F6", + "Address": 20203, "DisplayAs": "DropdownVariants", "PossibleValues": [ + { + "100%": 128 + }, + { + "30%": 129 + }, + { + "10%": 130 + }, { "Auto": 0 }, { - "AircraftNotDetected": 128 - }, - { - "AircraftDetected": 129 + "Garbage": 512 } ] - } - ], - "DisplayVariants": [ - "DropdownVariants", - "RawBinary", - "RawInteger" - ], - "Functions": [ - "F1", - "F2", - "F3", - "F4", - "F5", - "F6", - "F15", - "F16" - ] - }, - { - "Name": "CIP400", - "RunAs": "Server", - "Registers": [ + }, { "CanOverride": true, "Name": "SelfStatus", @@ -425,6 +338,127 @@ "F16" ] }, + { + "Name": "CIP300", + "RunAs": "Server", + "Registers": [ + { + "CanOverride": true, + "Name": "PhotecellSensing", + "Type": "Input", + "Function": "F4", + "Address": 20202, + "DisplayAs": "DropdownVariants", + "PossibleValues": [ + { + "Night": 1 + }, + { + "Twilight": 2 + }, + { + "Day": 3 + }, + { + "FailSafeIntensity": 255 + } + ] + }, + { + "CanOverride": true, + "Name": "FullSystemStatus", + "Type": "Input", + "Function": "F4", + "Address": 19000, + "DisplayAs": "DropdownVariants", + "PossibleValues": [ + { + "Normal": 1 + }, + { + "Fail": 2 + }, + { + "Alarm": 3 + }, + { + "FailAndAlarm": 4 + }, + { + "BAD": 666 + } + ] + }, + { + "CanOverride": true, + "Name": "TimeOfDay", + "Type": "Input", + "Function": "F4", + "Address": 20200, + "DisplayAs": "DropdownVariants", + "PossibleValues": [ + { + "ControllerOff": 0 + }, + { + "Night": 1 + }, + { + "Twilight": 2 + }, + { + "Day": 3 + }, + { + "Off": 4 + }, + { + "SarMode1": 16 + }, + { + "SarMode2": 17 + }, + { + "FailSafeIntensity": 255 + } + ] + }, + { + "CanOverride": false, + "Name": "ForcedOffAdls", + "Type": "Holding", + "Function": "F3", + "Address": 20210, + "DisplayAs": "DropdownVariants", + "PossibleValues": [ + { + "Auto": 0 + }, + { + "AircraftNotDetected": 128 + }, + { + "AircraftDetected": 129 + } + ] + } + ], + "DisplayVariants": [ + "DropdownVariants", + "RawBinary", + "RawInteger" + ], + "Functions": [ + "F1", + "F2", + "F3", + "F4", + "F5", + "F6", + "F15", + "F16" + ] + }, { "Name": "Quantec", "RunAs": "Server", diff --git a/src/data/controllers.json b/src/data/controllers.json index c2f83c5..f5d031c 100644 --- a/src/data/controllers.json +++ b/src/data/controllers.json @@ -1,16 +1,10 @@ [ { "Type": "CIP400", - "Enabled": true, + "Enabled": false, "Ip": "127.0.0.1", "Port": 11507 }, - { - "Type": "Quantec", - "Enabled": true, - "Ip": "127.0.0.1", - "Port": 11704 - }, { "Type": "ThirdPartyInput", "Enabled": true, @@ -25,7 +19,7 @@ }, { "Type": "CIP300", - "Enabled": true, + "Enabled": false, "Ip": "127.0.0.1", "Port": 11508 }, @@ -34,5 +28,11 @@ "Enabled": true, "Ip": "127.0.0.1", "Port": 11705 + }, + { + "Type": "Quantec", + "Enabled": true, + "Ip": "127.0.0.1", + "Port": 11802 } ] \ No newline at end of file