diff --git a/BNA8/com.inductiveautomation.perspective/session-props/props.json b/BNA8/com.inductiveautomation.perspective/session-props/props.json index f0b7493f..e9215657 100644 --- a/BNA8/com.inductiveautomation.perspective/session-props/props.json +++ b/BNA8/com.inductiveautomation.perspective/session-props/props.json @@ -209,7 +209,7 @@ } }, "props": { - "address": "[0:0:0:0:0:0:0:1]", + "address": "127.0.0.1", "device": {}, "geolocation": {}, "locale": "en-US", diff --git a/BNA8/com.inductiveautomation.perspective/session-props/resource.json b/BNA8/com.inductiveautomation.perspective/session-props/resource.json index f40d4003..61d6c4ac 100644 --- a/BNA8/com.inductiveautomation.perspective/session-props/resource.json +++ b/BNA8/com.inductiveautomation.perspective/session-props/resource.json @@ -9,8 +9,8 @@ "attributes": { "lastModification": { "actor": "admin", - "timestamp": "2025-10-31T13:53:32Z" + "timestamp": "2025-10-31T14:05:56Z" }, - "lastModificationSignature": "d4368fe7a54df2197decbe5cda6e41c69d2e354514c4351c78117510e4c3b650" + "lastModificationSignature": "0ee1aeb2d5cedcc9e1172c7b5dadf8ff3557de65a85b72c9df8e8b8bd657b373" } } \ No newline at end of file diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM-Views/MCM01/resource.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM-Views/MCM01/resource.json index af91de28..df6630c8 100644 --- a/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM-Views/MCM01/resource.json +++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM-Views/MCM01/resource.json @@ -10,8 +10,8 @@ "attributes": { "lastModification": { "actor": "admin", - "timestamp": "2025-10-31T12:57:34Z" + "timestamp": "2025-10-31T14:10:34Z" }, - "lastModificationSignature": "cd7cd0ae305676d52d5ee22cdb49033e177d32769ab608b062bcef13447641a9" + "lastModificationSignature": "d05274537e727972f1f414fd49756f037a8946f0f5e9e95305fc39326adb41e4" } } \ No newline at end of file diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM-Views/MCM01/thumbnail.png b/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM-Views/MCM01/thumbnail.png index 14b38f4b..fa91c768 100644 Binary files a/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM-Views/MCM01/thumbnail.png and b/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM-Views/MCM01/thumbnail.png differ diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM-Views/MCM01/view.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM-Views/MCM01/view.json index 451032af..e5ebce44 100644 --- a/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM-Views/MCM01/view.json +++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM-Views/MCM01/view.json @@ -1365,7 +1365,7 @@ }, "params": { "tagProps": [ - "System/MCM01/Photoeye/TPE/UL15_1_TPE1", + "System/MCM01/PE/TPE/UL15_1_TPE1", "value", "value", "value", @@ -1401,7 +1401,7 @@ "props": { "params": { "tagProps": [ - "System/MCM01/Photoeye/TPE/UL15_2_TPE1", + "System/MCM01/PE/TPE/UL15_2_TPE1", "value", "value", "value", @@ -1437,7 +1437,7 @@ "props": { "params": { "tagProps": [ - "System/MCM01/Photoeye/TPE/UL15_3_TPE1", + "System/MCM01/PE/TPE/UL15_3_TPE1", "value", "value", "value", @@ -1473,7 +1473,7 @@ "props": { "params": { "tagProps": [ - "System/MCM01/Photoeye/TPE/UL15_4_TPE1", + "System/MCM01/PE/TPE/UL15_4_TPE1", "value", "value", "value", @@ -1509,7 +1509,7 @@ "props": { "params": { "tagProps": [ - "System/MCM01/Photoeye/TPE/PS3_1_TPE1", + "System/MCM01/PE/TPE/PS3_1_TPE1", "value", "value", "value", @@ -1542,7 +1542,7 @@ "props": { "params": { "tagProps": [ - "System/MCM01/Photoeye/TPE/UL14_1_TPE1", + "System/MCM01/PE/TPE/UL14_1_TPE1", "value", "value", "value", @@ -1575,7 +1575,7 @@ "props": { "params": { "tagProps": [ - "System/MCM01/Photoeye/TPE/UL14_2_TPE1", + "System/MCM01/PE/TPE/UL14_2_TPE1", "value", "value", "value", @@ -1608,7 +1608,7 @@ "props": { "params": { "tagProps": [ - "System/MCM01/Photoeye/TPE/UL14_3_TPE1", + "System/MCM01/PE/TPE/UL14_3_TPE1", "value", "value", "value", @@ -1644,7 +1644,7 @@ "props": { "params": { "tagProps": [ - "System/MCM01/Photoeye/TPE/UL14_4_TPE1", + "System/MCM01/PE/TPE/UL14_4_TPE1", "value", "value", "value", @@ -1680,7 +1680,7 @@ "props": { "params": { "tagProps": [ - "System/MCM01/Photoeye/TPE/PS3_1_TPE2", + "System/MCM01/PE/TPE/PS3_1_TPE2", "value", "value", "value", @@ -1716,7 +1716,7 @@ "props": { "params": { "tagProps": [ - "System/MCM01/Photoeye/TPE/PS3_1_TPE3", + "System/MCM01/PE/TPE/PS3_1_TPE3", "value", "value", "value", @@ -1752,7 +1752,7 @@ "props": { "params": { "tagProps": [ - "System/MCM01/Photoeye/TPE/PS3_2_TPE1", + "System/MCM01/PE/TPE/PS3_2_TPE1", "value", "value", "value", @@ -1788,7 +1788,7 @@ "props": { "params": { "tagProps": [ - "System/MCM01/Photoeye/TPE/PS3_3_TPE1", + "System/MCM01/PE/TPE/PS3_3_TPE1", "value", "value", "value", @@ -1821,7 +1821,7 @@ "props": { "params": { "tagProps": [ - "System/MCM01/Photoeye/TPE/PS3_4_TPE1", + "System/MCM01/PE/TPE/PS3_4_TPE1", "value", "value", "value", @@ -1857,7 +1857,7 @@ "props": { "params": { "tagProps": [ - "System/MCM01/Photoeye/TPE/PS3_5_TPE1", + "System/MCM01/PE/TPE/PS3_5_TPE1", "value", "value", "value", @@ -1893,7 +1893,7 @@ "props": { "params": { "tagProps": [ - "System/MCM01/Photoeye/TPE/PS3_7_TPE1", + "System/MCM01/PE/TPE/PS3_7_TPE1", "value", "value", "value", @@ -1929,7 +1929,7 @@ "props": { "params": { "tagProps": [ - "System/MCM01/Photoeye/TPE/PS3_8_TPE1", + "System/MCM01/PE/TPE/PS3_8_TPE1", "value", "value", "value", @@ -1965,7 +1965,7 @@ "props": { "params": { "tagProps": [ - "System/MCM01/Photoeye/TPE/PS3_9AL_TPE1", + "System/MCM01/PE/TPE/PS3_9AL_TPE1", "value", "value", "value", @@ -2001,7 +2001,7 @@ "props": { "params": { "tagProps": [ - "System/MCM01/Photoeye/TPE/PS3_10_TPE1", + "System/MCM01/PE/TPE/PS3_10_TPE1", "value", "value", "value", @@ -2037,7 +2037,7 @@ "props": { "params": { "tagProps": [ - "System/MCM01/Photoeye/TPE/PS3_11_TPE1", + "System/MCM01/PE/TPE/PS3_11_TPE1", "value", "value", "value", @@ -5534,7 +5534,7 @@ "props": { "params": { "tagProps": [ - "System/MCM01/Photoeye/TPE/PS3_6_TPE1", + "System/MCM01/PE/TPE/PS3_6_TPE1", "value", "value", "value", diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Photoeye_Tracking/resource.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Photoeye_Tracking/resource.json index e46224ab..c175b7e1 100644 --- a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Photoeye_Tracking/resource.json +++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Photoeye_Tracking/resource.json @@ -10,8 +10,8 @@ "attributes": { "lastModification": { "actor": "admin", - "timestamp": "2025-10-31T12:52:28Z" + "timestamp": "2025-10-31T14:08:39Z" }, - "lastModificationSignature": "e0fd780018d36504131809bcc0a856adb173c881c57c404dab8b798ab05823d5" + "lastModificationSignature": "5eae072baa786a4edf2f019e2016dd3d702249f3349968a3257d22cadc40c899" } } \ No newline at end of file diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Photoeye_Tracking/thumbnail.png b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Photoeye_Tracking/thumbnail.png index fbebbf62..fcb8694b 100644 Binary files a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Photoeye_Tracking/thumbnail.png and b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Photoeye_Tracking/thumbnail.png differ diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Photoeye_Tracking/view.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Photoeye_Tracking/view.json index 1c77149e..1abaa374 100644 --- a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Photoeye_Tracking/view.json +++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Photoeye_Tracking/view.json @@ -1,16 +1,16 @@ { "custom": { - "color": "#C2C2C2", + "color": "#47FF47", "isHighlited": false, "overlayColor": "#ffffff", "priority": "No Active Alarms", - "state": "Closed" + "state": "CLEAR" }, "params": { "demoColor": -1, "highlight": "", "tagProps": [ - "System/MCM02/Photoeyes/TPE/PS3_12_TPE1", + "System/MCM01/PE/TPE/PS3_1_TPE1", "value", "value", "value", @@ -26,15 +26,41 @@ "custom.color": { "binding": { "config": { - "expression": "now(1000)" + "fallbackDelay": 2.5, + "mode": "indirect", + "references": { + "0": "{view.params.tagProps[0]}", + "fc": "{session.custom.fc}" + }, + "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/Color" }, "transforms": [ { - "code": "\tstate \u003d str(self.custom.state).strip().upper() # normalize input\n\t\n\tif state \u003d\u003d \"CLOSED\": \n\t\treturn \"#C2C2C2\"\n\t\n\timport datetime\n\tsecond \u003d datetime.datetime.now().second % 2 # 0 or 1 for blinking\n\t\n\tif state \u003d\u003d \"CLEAR\":\n\t return \"#1fff1a\"\n\telif state \u003d\u003d \"BLOCKED\":\n\t return \"#000\"\n\telif state \u003d\u003d \"DISABLED\":\n\t return \"#3800fd\"\n\telif state \u003d\u003d \"JAMMED\":\n\t return \"#f9050d\" if second \u003d\u003d 0 else \"#1fff1a\"\n\telif state \u003d\u003d \"JAMMED/BLOCKED\":\n\t return \"#f9050d\" if second \u003d\u003d 0 else \"#000\"\n", - "type": "script" + "expression": "if(\r\n {view.params.demoColor} \u003e\u003d 0,\r\n {view.params.demoColor},\r\n coalesce({value}, -1)\r\n)\r\n", + "type": "expression" + }, + { + "fallback": "#AAAAAA", + "inputType": "scalar", + "mappings": [ + { + "input": 4, + "output": "#47FF47" + }, + { + "input": 27, + "output": "#000000" + }, + { + "input": 17, + "output": "#FF8C00" + } + ], + "outputType": "color", + "type": "map" } ], - "type": "expr" + "type": "tag" }, "persistent": true }, @@ -144,7 +170,7 @@ }, "transforms": [ { - "expression": "if(\r\n {view.params.demoColor} \u003e\u003d 0,\r\n {view.params.demoColor},\r\n coalesce({value}, 0)\r\n)\r\n", + "expression": "if(\r\n {view.params.demoColor} \u003e\u003d 0,\r\n {view.params.demoColor},\r\n coalesce({value}, -1)\r\n)\r\n", "type": "expression" }, { @@ -152,24 +178,16 @@ "inputType": "scalar", "mappings": [ { - "input": 50, + "input": 27, "output": "CLEAR" }, { - "input": 51, + "input": 0, "output": "BLOCKED" }, { - "input": 52, - "output": "DISABLED" - }, - { - "input": 53, + "input": 17, "output": "JAMMED" - }, - { - "input": 54, - "output": "JAMMED/BLOCKED" } ], "outputType": "scalar",