diff --git a/.resources/0203a34b51bafcb1b4d98aa4e82b1e822e1c37f4d4fac7a65359958a8ce952c3 b/.resources/0203a34b51bafcb1b4d98aa4e82b1e822e1c37f4d4fac7a65359958a8ce952c3 new file mode 100644 index 00000000..dfc0f626 Binary files /dev/null and b/.resources/0203a34b51bafcb1b4d98aa4e82b1e822e1c37f4d4fac7a65359958a8ce952c3 differ diff --git a/.resources/16ca20a7d259f9ee8814f454c537703a616e6661faf1061ea8c6317575b8b79b b/.resources/16ca20a7d259f9ee8814f454c537703a616e6661faf1061ea8c6317575b8b79b deleted file mode 100644 index bb384c9e..00000000 Binary files a/.resources/16ca20a7d259f9ee8814f454c537703a616e6661faf1061ea8c6317575b8b79b and /dev/null differ diff --git a/.resources/3ec17e8b9b0ed9ea96799f7f2cd8543fbf75ef57c23aefe33b1933c7294e9e26 b/.resources/1fad796be8c8370c91a212df49fd0daa531a5041881334a1823421f54dad19c0 similarity index 98% rename from .resources/3ec17e8b9b0ed9ea96799f7f2cd8543fbf75ef57c23aefe33b1933c7294e9e26 rename to .resources/1fad796be8c8370c91a212df49fd0daa531a5041881334a1823421f54dad19c0 index e3627792..3cf04b8b 100644 --- a/.resources/3ec17e8b9b0ed9ea96799f7f2cd8543fbf75ef57c23aefe33b1933c7294e9e26 +++ b/.resources/1fad796be8c8370c91a212df49fd0daa531a5041881334a1823421f54dad19c0 @@ -32,7 +32,7 @@ }, "transforms": [ { - "expression": "coalesce({value},{view.params.forceFaultStatus},0)", + "expression": "coalesce({value},0)", "type": "expression" }, { @@ -149,7 +149,7 @@ }, "transforms": [ { - "expression": "coalesce({value},{view.params.forceFaultStatus},0)", + "expression": "coalesce({value},0)", "type": "expression" }, { @@ -198,7 +198,7 @@ }, "transforms": [ { - "expression": "coalesce({value},{view.params.forceFaultStatus},0)", + "expression": "coalesce({value},0)", "type": "expression" }, { diff --git a/.resources/28c0b6da60ab22fd82b37a23957842fa397033f41a658e867cfcc3ea696c080e b/.resources/28c0b6da60ab22fd82b37a23957842fa397033f41a658e867cfcc3ea696c080e new file mode 100644 index 00000000..27e82a33 --- /dev/null +++ b/.resources/28c0b6da60ab22fd82b37a23957842fa397033f41a658e867cfcc3ea696c080e @@ -0,0 +1,538 @@ +{ + "custom": { + "color": "#C2C2C2", + "priority": "No Active Alarms", + "state": "Closed" + }, + "params": { + "tagProps": [ + "/system/mcm01/test", + "value", + "value", + "value", + "value", + "value", + "value", + "value", + "value", + "value" + ] + }, + "propConfig": { + "custom.color": { + "binding": { + "config": { + "fallbackDelay": 2.5, + "mode": "indirect", + "references": { + "0": "{view.params.tagProps[0]}", + "fc": "{session.custom.fc}" + }, + "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/Color" + }, + "transforms": [ + { + "expression": "coalesce({value},0)", + "type": "expression" + }, + { + "fallback": "#000000", + "inputType": "scalar", + "mappings": [ + { + "input": 0, + "output": "#C2C2C2" + }, + { + "input": 1, + "output": "#FF0000" + }, + { + "input": 2, + "output": "#FFA500" + }, + { + "input": 3, + "output": "#0008FF" + }, + { + "input": 4, + "output": "#00FF00" + }, + { + "input": 5, + "output": "#FFF700" + }, + { + "input": 6, + "output": "#87CEEB" + }, + { + "input": 7, + "output": "#90EE90" + }, + { + "input": 8, + "output": "#964B00" + }, + { + "input": 9, + "output": "#FFFFFF" + }, + { + "input": 10, + "output": "#000000" + }, + { + "input": 11, + "output": "#8B0000" + }, + { + "input": 12, + "output": "#808080" + }, + { + "input": 13, + "output": "#8B8000" + }, + { + "input": 14, + "output": "#006400" + }, + { + "input": 15, + "output": "#FFFFC5" + }, + { + "input": 16, + "output": "#00008B" + }, + { + "input": 17, + "output": "#FF7276" + }, + { + "input": 18, + "output": "#556B2F" + }, + { + "input": 19, + "output": "#B43434" + }, + { + "input": 20, + "output": "#4682B4" + }, + { + "input": 21, + "output": "#FFD700" + } + ], + "outputType": "color", + "type": "map" + } + ], + "type": "tag" + }, + "persistent": true + }, + "custom.priority": { + "binding": { + "config": { + "fallbackDelay": 2.5, + "mode": "indirect", + "references": { + "0": "{view.params.tagProps[0]}", + "fc": "{session.custom.fc}" + }, + "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/Priority" + }, + "transforms": [ + { + "expression": "coalesce({value},0)", + "type": "expression" + }, + { + "fallback": null, + "inputType": "scalar", + "mappings": [ + { + "input": 0, + "output": "No Active Alarms" + }, + { + "input": 1, + "output": "High" + }, + { + "input": 2, + "output": "Medium" + }, + { + "input": 3, + "output": "Low" + }, + { + "input": 4, + "output": "Diagnostic" + } + ], + "outputType": "scalar", + "type": "map" + } + ], + "type": "tag" + }, + "persistent": true + }, + "custom.state": { + "binding": { + "config": { + "fallbackDelay": 2.5, + "mode": "indirect", + "references": { + "0": "{view.params.tagProps[0]}", + "fc": "{session.custom.fc}" + }, + "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/State" + }, + "transforms": [ + { + "expression": "coalesce({value},0)", + "type": "expression" + }, + { + "fallback": "Unknown", + "inputType": "scalar", + "mappings": [ + { + "input": 0, + "output": "Closed" + }, + { + "input": 1, + "output": "Actuated" + }, + { + "input": 2, + "output": "Communication Faulted" + }, + { + "input": 3, + "output": "Conveyor Running In Maintenance Mode" + }, + { + "input": 4, + "output": "Disabled" + }, + { + "input": 5, + "output": "Disconnected" + }, + { + "input": 6, + "output": "Stopped" + }, + { + "input": 7, + "output": "Enabled Not Running" + }, + { + "input": 8, + "output": "Encoder Fault" + }, + { + "input": 9, + "output": "Energy Management" + }, + { + "input": 10, + "output": "ESTOP Was Actuated" + }, + { + "input": 11, + "output": "EStopped" + }, + { + "input": 12, + "output": "EStopped Locally" + }, + { + "input": 13, + "output": "Extended Faulted" + }, + { + "input": 14, + "output": "Full" + }, + { + "input": 15, + "output": "Gaylord Start Pressed" + }, + { + "input": 16, + "output": "Jam Fault" + }, + { + "input": 17, + "output": "Jammed" + }, + { + "input": 18, + "output": "Loading Allowed" + }, + { + "input": 19, + "output": "Loading Not Allowed" + }, + { + "input": 20, + "output": "Low Air Pressure Fault Was Present" + }, + { + "input": 21, + "output": "Maintenance Mode" + }, + { + "input": 22, + "output": "Conveyor Stopped In Maintenance Mode" + }, + { + "input": 23, + "output": "Motor Faulted" + }, + { + "input": 24, + "output": "Motor Was Faulted" + }, + { + "input": 25, + "output": "Normal" + }, + { + "input": 26, + "output": "Off Inactive" + }, + { + "input": 27, + "output": "Open" + }, + { + "input": 28, + "output": "PLC Ready To Run" + }, + { + "input": 29, + "output": "Package Release Pressed" + }, + { + "input": 30, + "output": "Power Branch Was Faulted" + }, + { + "input": 31, + "output": "Pressed" + }, + { + "input": 32, + "output": "Ready To Receive" + }, + { + "input": 33, + "output": "Running" + }, + { + "input": 34, + "output": "Started" + }, + { + "input": 35, + "output": "Stopped" + }, + { + "input": 36, + "output": "System Started" + }, + { + "input": 37, + "output": "Unknown" + }, + { + "input": 38, + "output": "VFD Fault" + }, + { + "input": 39, + "output": "Conveyor Running In Power Saving Mode" + }, + { + "input": 40, + "output": "Conveyor Jogging In Maintenance Mode" + }, + { + "input": 41, + "output": "VFD Reset Required" + }, + { + "input": 42, + "output": "Jam Reset Push Button Pressed" + }, + { + "input": 43, + "output": "Start Push Button Pressed" + }, + { + "input": 44, + "output": "Stop Push Button Pressed" + }, + { + "input": 45, + "output": "No Container" + }, + { + "input": 46, + "output": "Ready To Be Enabled" + }, + { + "input": 47, + "output": "Half Full" + }, + { + "input": 48, + "output": "Enabled" + }, + { + "input": 49, + "output": "Tipper Faulted" + } + ], + "outputType": "scalar", + "type": "map" + } + ], + "type": "tag" + }, + "persistent": true + }, + "params.tagProps": { + "paramDirection": "input", + "persistent": true + } + }, + "props": { + "defaultSize": { + "height": 25, + "width": 25 + } + }, + "root": { + "children": [ + { + "meta": { + "name": "PX" + }, + "position": { + "height": 1, + "width": 1 + }, + "props": { + "elements": [ + { + "id": "defs1", + "name": "defs1", + "type": "defs" + }, + { + "fill": { + "paint": "#808080" + }, + "height": "47.417244", + "id": "beaconSquare", + "name": "beaconSquare", + "stroke": { + "paint": "#000000", + "width": "2.36887" + }, + "type": "rect", + "width": "47.337795", + "x": "1.450278", + "y": "1.3708278" + }, + { + "elements": [ + { + "id": "tspan3", + "name": "tspan3", + "stroke": { + "width": "1.15193" + }, + "text": "PX", + "type": "tspan", + "x": "24.958401", + "y": "31.781378" + } + ], + "fill": { + "paint": "#ffffff" + }, + "fontSize": "20.7347px", + "id": "beaconLabel", + "name": "beaconLabel", + "stroke": { + "width": "1.15193" + }, + "textAnchor": "middle", + "type": "text", + "x": "24.958401", + "y": "31.781378" + } + ], + "viewBox": "0 0 50 50" + }, + "type": "ia.shapes.svg" + } + ], + "events": { + "dom": { + "onClick": { + "config": { + "script": "\t#create tags lists for the device\n\tprops \u003d self.view.params.tagProps\n\ttags_table_dataset \u003d autStand.devices.getAllTags(self, props[0])\n\tsystem.perspective.openDock(\u0027Docked-East-Device\u0027,params\u003d{\u0027tagProps\u0027:props, \"tags\":tags_table_dataset})" + }, + "scope": "G", + "type": "script" + } + } + }, + "meta": { + "name": "root", + "tooltip": { + "enabled": true + } + }, + "propConfig": { + "meta.tooltip.text": { + "binding": { + "config": { + "expression": "if(\n {view.custom.state} !\u003d \"Closed\",\n \"Source Id: \" + {view.params.tagProps[0]} + \", Priority: \" + {view.custom.priority} + \", State: \" + {view.custom.state},\n \"Device Disconnected\"\n)\n" + }, + "type": "expr" + } + }, + "meta.visible": { + "binding": { + "config": { + "path": "session.custom.alarm_filter.show_px" + }, + "type": "property" + } + } + }, + "props": { + "mode": "percent", + "style": { + "cursor": "pointer" + } + }, + "type": "ia.container.coord" + } +} \ No newline at end of file diff --git a/.resources/3eebb1f1e6eaa57e1c4267a09463da5737bfa76052100c113350423c94233c02 b/.resources/3eebb1f1e6eaa57e1c4267a09463da5737bfa76052100c113350423c94233c02 new file mode 100644 index 00000000..0d1d62e4 Binary files /dev/null and b/.resources/3eebb1f1e6eaa57e1c4267a09463da5737bfa76052100c113350423c94233c02 differ diff --git a/.resources/664fd080a5366c6676dfa51c9e6cd6b85aa93208ef18cbd0416680df1d765cb5 b/.resources/5c5c04639b65919ba3d2b06a1e6b87fc0af1d48ebfde4e7bbe66e3d7a637d153 similarity index 98% rename from .resources/664fd080a5366c6676dfa51c9e6cd6b85aa93208ef18cbd0416680df1d765cb5 rename to .resources/5c5c04639b65919ba3d2b06a1e6b87fc0af1d48ebfde4e7bbe66e3d7a637d153 index b245a5c0..60c339e2 100644 --- a/.resources/664fd080a5366c6676dfa51c9e6cd6b85aa93208ef18cbd0416680df1d765cb5 +++ b/.resources/5c5c04639b65919ba3d2b06a1e6b87fc0af1d48ebfde4e7bbe66e3d7a637d153 @@ -35,7 +35,7 @@ }, "transforms": [ { - "expression": "coalesce({value},{view.params.forceFaultStatus},0)", + "expression": "coalesce({value},0)", "type": "expression" }, { @@ -152,7 +152,7 @@ }, "transforms": [ { - "expression": "coalesce({value},{view.params.forceFaultStatus},0)", + "expression": "coalesce({value},0)", "type": "expression" }, { @@ -201,7 +201,7 @@ }, "transforms": [ { - "expression": "coalesce({value},{view.params.forceFaultStatus},0)", + "expression": "coalesce({value},0)", "type": "expression" }, { diff --git a/.resources/7af9c642144e57f98e580caf55d85b23917fe605c119d0928cfe4edf6329e151 b/.resources/7af9c642144e57f98e580caf55d85b23917fe605c119d0928cfe4edf6329e151 deleted file mode 100644 index 3f132778..00000000 --- a/.resources/7af9c642144e57f98e580caf55d85b23917fe605c119d0928cfe4edf6329e151 +++ /dev/null @@ -1,208 +0,0 @@ -{ - "custom": { - "state": 0, - "string": "Inactive" - }, - "params": { - "tagProps": [ - "/system/mcm01/test", - "value", - "value", - "value", - "value", - "value", - "value", - "value", - "value", - "value" - ] - }, - "propConfig": { - "custom.state": { - "binding": { - "config": { - "fallbackDelay": 2.5, - "mode": "indirect", - "references": { - "0": "{view.params.tagProps[0]}", - "fc": "{session.custom.fc}" - }, - "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/STATE" - }, - "transforms": [ - { - "expression": "coalesce({value},0)", - "type": "expression" - }, - { - "fallback": null, - "inputType": "scalar", - "mappings": [ - { - "input": 1, - "output": 1 - }, - { - "input": 0, - "output": 0 - }, - { - "input": 2, - "output": 2 - }, - { - "input": 3, - "output": 3 - } - ], - "outputType": "scalar", - "type": "map" - } - ], - "type": "tag" - }, - "persistent": true - }, - "custom.string": { - "binding": { - "config": { - "path": "view.custom.state" - }, - "transforms": [ - { - "fallback": "Unknown", - "inputType": "scalar", - "mappings": [ - { - "input": 1, - "output": "Actuated" - }, - { - "input": 2, - "output": "Faulted" - }, - { - "input": 0, - "output": "Inactive" - } - ], - "outputType": "scalar", - "type": "map" - } - ], - "type": "property" - }, - "persistent": true - }, - "params.tagProps": { - "paramDirection": "input", - "persistent": true - } - }, - "props": { - "defaultSize": { - "height": 20, - "width": 30 - } - }, - "root": { - "children": [ - { - "meta": { - "name": "Label" - }, - "position": { - "height": 1, - "width": 1 - }, - "props": { - "text": "PX", - "textStyle": { - "fontSize": "1vw", - "textAlign": "center", - "textTransform": "uppercase" - } - }, - "type": "ia.display.label" - } - ], - "events": { - "dom": { - "onClick": { - "config": { - "script": "\tsystem.perspective.openDock(\u0027Docked-East-Device\u0027,params\u003d{\u0027tagProps\u0027:self.view.params.tagProps})" - }, - "scope": "G", - "type": "script" - }, - "onMouseEnter": { - "config": { - "script": "\tfrom time import sleep\n\t\n\talarm \u003d []\n\tmessage \u003d None\n\t\n\tsleep(0.5)\n\t\n\tif system.tag.exists(\"System/aws_data\"):\n\t\tif self.view.params.tagProps[0] !\u003d \"\":\n\t\t\ttags_to_read \u003d system.tag.readBlocking(\"System/aws_data\")\n\t\t\tdecode_alarm_data \u003d system.util.jsonDecode(tags_to_read[0].value)\n\t\t\talarm \u003d [decode_alarm_data[i] for i in decode_alarm_data\n\t\t\t\t\tif decode_alarm_data[i][\u0027sourceId\u0027].startswith(self.view.params.tagProps[0])]\n\t\tif alarm:\n\t\t\talarm \u003d sorted(alarm, key \u003d lambda t:t[\u0027timestamp\u0027], reverse\u003dTrue)\n\t\t\tmessage \u003d max(alarm, key \u003d lambda p:p[\u0027priority\u0027]).get(\u0027message\u0027)\n\t\t\tif len(alarm) \u003e 1:\n\t\t\t\tmessage +\u003d \" (+\" + str(len(alarm)-1) + \")\"\n\tself.view.custom.alarm_message \u003d message" - }, - "scope": "G", - "type": "script" - } - } - }, - "meta": { - "name": "root", - "tooltip": { - "enabled": true - } - }, - "propConfig": { - "meta.tooltip.text": { - "binding": { - "config": { - "expression": "\"Source Id: \" + {view.params.tagProps[0]} + \", Status: \" + {view.custom.string}\n" - }, - "type": "expr" - } - }, - "meta.visible": { - "binding": { - "config": { - "path": "session.custom.alarm_filter.show_px" - }, - "type": "property" - } - }, - "props.style.backgroundColor": { - "binding": { - "config": { - "path": "view.custom.state" - }, - "transforms": [ - { - "fallback": "#808080", - "inputType": "scalar", - "mappings": [ - { - "input": 1, - "output": "#00FF00" - }, - { - "input": 2, - "output": "#FF0000" - } - ], - "outputType": "color", - "type": "map" - } - ], - "type": "property" - } - } - }, - "props": { - "mode": "percent", - "style": { - "borderStyle": "solid", - "cursor": "pointer", - "overflow": "hidden", - "userSelect": "none" - } - }, - "type": "ia.container.coord" - } -} \ No newline at end of file diff --git a/.resources/863f6d20248316d84cbd65c32c3d7ef567d411cf63e58836925899a9ef87948f b/.resources/863f6d20248316d84cbd65c32c3d7ef567d411cf63e58836925899a9ef87948f deleted file mode 100644 index 801bbdaf..00000000 Binary files a/.resources/863f6d20248316d84cbd65c32c3d7ef567d411cf63e58836925899a9ef87948f and /dev/null differ diff --git a/.resources/53648eb36ecda26f42046d5fd92e53f2e35727995b215814b4542ba59dc6a8d8 b/.resources/b8e9e1a7bff33ddfe199543dfce8233fd1e1d17fceed443347edab892d8c4283 similarity index 94% rename from .resources/53648eb36ecda26f42046d5fd92e53f2e35727995b215814b4542ba59dc6a8d8 rename to .resources/b8e9e1a7bff33ddfe199543dfce8233fd1e1d17fceed443347edab892d8c4283 index 1494a4f6..7c0dfb52 100644 --- a/.resources/53648eb36ecda26f42046d5fd92e53f2e35727995b215814b4542ba59dc6a8d8 +++ b/.resources/b8e9e1a7bff33ddfe199543dfce8233fd1e1d17fceed443347edab892d8c4283 @@ -545,41 +545,12 @@ }, "type": "property" } - }, - "props.style.backgroundColor": { - "binding": { - "config": { - "path": "view.custom.state" - }, - "transforms": [ - { - "fallback": "#808080", - "inputType": "scalar", - "mappings": [ - { - "input": 1, - "output": "#00FF00" - }, - { - "input": 2, - "output": "#FF0000" - } - ], - "outputType": "color", - "type": "map" - } - ], - "type": "property" - } } }, "props": { "mode": "percent", "style": { - "borderStyle": "solid", - "cursor": "pointer", - "overflow": "hidden", - "userSelect": "none" + "cursor": "pointer" } }, "type": "ia.container.coord" diff --git a/.resources/c432115451f113a05e1c1a1005d5f37614d0c8c0a9c768592f100fbab44539a8 b/.resources/c432115451f113a05e1c1a1005d5f37614d0c8c0a9c768592f100fbab44539a8 new file mode 100644 index 00000000..f107fbe4 --- /dev/null +++ b/.resources/c432115451f113a05e1c1a1005d5f37614d0c8c0a9c768592f100fbab44539a8 @@ -0,0 +1,583 @@ +{ + "custom": { + "color": "#C2C2C2", + "priority": "No Active Alarms", + "state": "Closed" + }, + "params": { + "tagProps": [ + "value", + "value", + "value", + "value", + "value", + "value", + "value", + "value", + "value", + "value" + ] + }, + "propConfig": { + "custom.color": { + "binding": { + "config": { + "fallbackDelay": 2.5, + "mode": "indirect", + "references": { + "0": "{view.params.tagProps[0]}", + "fc": "{session.custom.fc}" + }, + "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/Color" + }, + "transforms": [ + { + "expression": "coalesce({value},0)", + "type": "expression" + }, + { + "fallback": "#000000", + "inputType": "scalar", + "mappings": [ + { + "input": 0, + "output": "#C2C2C2" + }, + { + "input": 1, + "output": "#FF0000" + }, + { + "input": 2, + "output": "#FFA500" + }, + { + "input": 3, + "output": "#0008FF" + }, + { + "input": 4, + "output": "#00FF00" + }, + { + "input": 5, + "output": "#FFF700" + }, + { + "input": 6, + "output": "#87CEEB" + }, + { + "input": 7, + "output": "#90EE90" + }, + { + "input": 8, + "output": "#964B00" + }, + { + "input": 9, + "output": "#FFFFFF" + }, + { + "input": 10, + "output": "#000000" + }, + { + "input": 11, + "output": "#8B0000" + }, + { + "input": 12, + "output": "#808080" + }, + { + "input": 13, + "output": "#8B8000" + }, + { + "input": 14, + "output": "#006400" + }, + { + "input": 15, + "output": "#FFFFC5" + }, + { + "input": 16, + "output": "#00008B" + }, + { + "input": 17, + "output": "#FF7276" + }, + { + "input": 18, + "output": "#556B2F" + }, + { + "input": 19, + "output": "#B43434" + }, + { + "input": 20, + "output": "#4682B4" + }, + { + "input": 21, + "output": "#FFD700" + } + ], + "outputType": "color", + "type": "map" + } + ], + "type": "tag" + }, + "persistent": true + }, + "custom.priority": { + "binding": { + "config": { + "fallbackDelay": 2.5, + "mode": "indirect", + "references": { + "0": "{view.params.tagProps[0]}", + "fc": "{session.custom.fc}" + }, + "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/Priority" + }, + "transforms": [ + { + "expression": "coalesce({value},0)", + "type": "expression" + }, + { + "fallback": null, + "inputType": "scalar", + "mappings": [ + { + "input": 0, + "output": "No Active Alarms" + }, + { + "input": 1, + "output": "High" + }, + { + "input": 2, + "output": "Medium" + }, + { + "input": 3, + "output": "Low" + }, + { + "input": 4, + "output": "Diagnostic" + } + ], + "outputType": "scalar", + "type": "map" + } + ], + "type": "tag" + }, + "persistent": true + }, + "custom.state": { + "binding": { + "config": { + "fallbackDelay": 2.5, + "mode": "indirect", + "references": { + "0": "{view.params.tagProps[0]}", + "fc": "{session.custom.fc}" + }, + "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/State" + }, + "transforms": [ + { + "expression": "coalesce({value},0)", + "type": "expression" + }, + { + "fallback": "Unknown", + "inputType": "scalar", + "mappings": [ + { + "input": 0, + "output": "Closed" + }, + { + "input": 1, + "output": "Actuated" + }, + { + "input": 2, + "output": "Communication Faulted" + }, + { + "input": 3, + "output": "Conveyor Running In Maintenance Mode" + }, + { + "input": 4, + "output": "Disabled" + }, + { + "input": 5, + "output": "Disconnected" + }, + { + "input": 6, + "output": "Stopped" + }, + { + "input": 7, + "output": "Enabled Not Running" + }, + { + "input": 8, + "output": "Encoder Fault" + }, + { + "input": 9, + "output": "Energy Management" + }, + { + "input": 10, + "output": "ESTOP Was Actuated" + }, + { + "input": 11, + "output": "EStopped" + }, + { + "input": 12, + "output": "EStopped Locally" + }, + { + "input": 13, + "output": "Extended Faulted" + }, + { + "input": 14, + "output": "Full" + }, + { + "input": 15, + "output": "Gaylord Start Pressed" + }, + { + "input": 16, + "output": "Jam Fault" + }, + { + "input": 17, + "output": "Jammed" + }, + { + "input": 18, + "output": "Loading Allowed" + }, + { + "input": 19, + "output": "Loading Not Allowed" + }, + { + "input": 20, + "output": "Low Air Pressure Fault Was Present" + }, + { + "input": 21, + "output": "Maintenance Mode" + }, + { + "input": 22, + "output": "Conveyor Stopped In Maintenance Mode" + }, + { + "input": 23, + "output": "Motor Faulted" + }, + { + "input": 24, + "output": "Motor Was Faulted" + }, + { + "input": 25, + "output": "Normal" + }, + { + "input": 26, + "output": "Off Inactive" + }, + { + "input": 27, + "output": "Open" + }, + { + "input": 28, + "output": "PLC Ready To Run" + }, + { + "input": 29, + "output": "Package Release Pressed" + }, + { + "input": 30, + "output": "Power Branch Was Faulted" + }, + { + "input": 31, + "output": "Pressed" + }, + { + "input": 32, + "output": "Ready To Receive" + }, + { + "input": 33, + "output": "Running" + }, + { + "input": 34, + "output": "Started" + }, + { + "input": 35, + "output": "Stopped" + }, + { + "input": 36, + "output": "System Started" + }, + { + "input": 37, + "output": "Unknown" + }, + { + "input": 38, + "output": "VFD Fault" + }, + { + "input": 39, + "output": "Conveyor Running In Power Saving Mode" + }, + { + "input": 40, + "output": "Conveyor Jogging In Maintenance Mode" + }, + { + "input": 41, + "output": "VFD Reset Required" + }, + { + "input": 42, + "output": "Jam Reset Push Button Pressed" + }, + { + "input": 43, + "output": "Start Push Button Pressed" + }, + { + "input": 44, + "output": "Stop Push Button Pressed" + }, + { + "input": 45, + "output": "No Container" + }, + { + "input": 46, + "output": "Ready To Be Enabled" + }, + { + "input": 47, + "output": "Half Full" + }, + { + "input": 48, + "output": "Enabled" + }, + { + "input": 49, + "output": "Tipper Faulted" + } + ], + "outputType": "scalar", + "type": "map" + } + ], + "type": "tag" + }, + "persistent": true + }, + "params.tagProps": { + "paramDirection": "inout", + "persistent": true + } + }, + "props": { + "defaultSize": { + "height": 40, + "width": 40 + } + }, + "root": { + "children": [ + { + "meta": { + "name": "MCM" + }, + "position": { + "height": 1, + "width": 1 + }, + "propConfig": { + "props.elements[1].fill.paint": { + "binding": { + "config": { + "path": "view.custom.color" + }, + "type": "property" + } + } + }, + "props": { + "elements": [ + { + "id": "defs1", + "name": "defs1", + "type": "defs" + }, + { + "fill": {}, + "height": "47.417244", + "id": "beaconSquare", + "name": "beaconSquare", + "stroke": { + "paint": "#000000", + "width": "2.36887" + }, + "type": "rect", + "width": "47.337795", + "x": "1.450278", + "y": "1.3708278" + }, + { + "elements": [ + { + "id": "tspan1", + "name": "tspan1", + "stroke": { + "width": "0.895573" + }, + "text": "MCM", + "type": "tspan", + "x": "24.985008", + "y": "29.648235" + } + ], + "fill": { + "paint": "#ffffff" + }, + "fontSize": "16.1203px", + "id": "beaconLabel", + "name": "beaconLabel", + "stroke": { + "width": "0.895573" + }, + "textAnchor": "middle", + "type": "text", + "x": "24.985008", + "y": "29.648235" + } + ], + "viewBox": "0 0 50 50" + }, + "type": "ia.shapes.svg" + } + ], + "events": { + "dom": { + "onClick": { + "config": { + "script": "\t#create tags lists for the device\n\tprops \u003d self.view.params.tagProps\n\ttags_table_dataset \u003d autStand.devices.getAllTags(self, props[0])\n\tsystem.perspective.openDock(\u0027Docked-East-Device\u0027,params\u003d{\u0027tagProps\u0027:props, \"tags\":tags_table_dataset})" + }, + "scope": "G", + "type": "script" + } + } + }, + "meta": { + "name": "root", + "tooltip": { + "enabled": true, + "location": "top-left", + "style": {} + } + }, + "propConfig": { + "meta.tooltip.style.classes": { + "binding": { + "config": { + "expression": "{view.custom.priority}" + }, + "transforms": [ + { + "fallback": "Alarms-Styles/NoAlarm", + "inputType": "scalar", + "mappings": [ + { + "input": 1, + "output": "Alarms-Styles/Diagnostic" + }, + { + "input": 2, + "output": "Alarms-Styles/Low" + }, + { + "input": 3, + "output": "Alarms-Styles/Medium" + }, + { + "input": 4, + "output": "Alarms-Styles/High" + } + ], + "outputType": "style-list", + "type": "map" + } + ], + "type": "expr" + } + }, + "meta.tooltip.text": { + "binding": { + "config": { + "expression": "if(\n {view.custom.state} !\u003d \"Closed\",\n \"Source Id: \" + {view.params.tagProps[0]} + \", Priority: \" + {view.custom.priority} + \", State: \" + {view.custom.state},\n \"Device Disconnected\"\n)\n" + }, + "type": "expr" + } + }, + "meta.visible": { + "binding": { + "config": { + "path": "session.custom.alarm_filter.show_dpm_mcm" + }, + "type": "property" + } + } + }, + "props": { + "mode": "percent", + "style": { + "cursor": "pointer", + "overflow": "hidden" + } + }, + "type": "ia.container.coord" + } +} \ No newline at end of file diff --git a/.resources/cf67bcb6bf634d36b271b0333f5d0c267181c391a7d8d5db690f71a6b06e3887 b/.resources/cf67bcb6bf634d36b271b0333f5d0c267181c391a7d8d5db690f71a6b06e3887 deleted file mode 100644 index 2b39b3de..00000000 Binary files a/.resources/cf67bcb6bf634d36b271b0333f5d0c267181c391a7d8d5db690f71a6b06e3887 and /dev/null differ diff --git a/.resources/f5b1eadba92893cb72e12407baff2c54cea89482dec9f0c05913bfe868404431 b/.resources/d252ed94f21d166ee6ad4e485f0a53e672e3f7ed36bd1100d3297315e730871d similarity index 99% rename from .resources/f5b1eadba92893cb72e12407baff2c54cea89482dec9f0c05913bfe868404431 rename to .resources/d252ed94f21d166ee6ad4e485f0a53e672e3f7ed36bd1100d3297315e730871d index 97331961..e0b35523 100644 --- a/.resources/f5b1eadba92893cb72e12407baff2c54cea89482dec9f0c05913bfe868404431 +++ b/.resources/d252ed94f21d166ee6ad4e485f0a53e672e3f7ed36bd1100d3297315e730871d @@ -6197,8 +6197,8 @@ "position": { "height": 0.0231, "width": 0.1286, - "x": 0.6839, - "y": 0.4963 + "x": 0.6844, + "y": 0.4927 }, "props": { "params": { @@ -7274,7 +7274,7 @@ "height": 0.0185, "width": 0.0157, "x": 0.4065, - "y": 0.5074 + "y": 0.5092 }, "props": { "params": { @@ -7303,7 +7303,7 @@ "height": 0.0185, "width": 0.0157, "x": 0.4432, - "y": 0.5074 + "y": 0.5092 }, "props": { "params": { @@ -7332,7 +7332,7 @@ "height": 0.0185, "width": 0.0157, "x": 0.4805, - "y": 0.5074 + "y": 0.5092 }, "props": { "params": { @@ -7361,7 +7361,7 @@ "height": 0.0185, "width": 0.0157, "x": 0.5503, - "y": 0.5083 + "y": 0.5101 }, "props": { "params": { @@ -7390,7 +7390,7 @@ "height": 0.0185, "width": 0.0157, "x": 0.5887, - "y": 0.5083 + "y": 0.5101 }, "props": { "params": { @@ -7419,7 +7419,7 @@ "height": 0.0185, "width": 0.0157, "x": 0.6248, - "y": 0.5083 + "y": 0.5101 }, "props": { "params": { @@ -7448,7 +7448,7 @@ "height": 0.0185, "width": 0.0157, "x": 0.6989, - "y": 0.5074 + "y": 0.5092 }, "props": { "params": { @@ -7477,7 +7477,7 @@ "height": 0.0185, "width": 0.0157, "x": 0.7357, - "y": 0.5074 + "y": 0.5092 }, "props": { "params": { @@ -7506,7 +7506,7 @@ "height": 0.0185, "width": 0.0157, "x": 0.7741, - "y": 0.5074 + "y": 0.5092 }, "props": { "params": { @@ -7533,7 +7533,7 @@ }, "position": { "height": 0.0278, - "width": 0.0221, + "width": 0.0156, "x": 0.2899, "y": 0.5556 }, @@ -8060,7 +8060,7 @@ "height": 0.0185, "width": 0.0157, "x": 0.4228, - "y": 0.5074 + "y": 0.5092 }, "props": { "params": { @@ -8089,7 +8089,7 @@ "height": 0.0185, "width": 0.0157, "x": 0.4595, - "y": 0.5074 + "y": 0.5092 }, "props": { "params": { @@ -8118,7 +8118,7 @@ "height": 0.0185, "width": 0.0157, "x": 0.4968, - "y": 0.5074 + "y": 0.5092 }, "props": { "params": { @@ -8147,7 +8147,7 @@ "height": 0.0185, "width": 0.0157, "x": 0.5666, - "y": 0.5083 + "y": 0.5101 }, "props": { "params": { @@ -8176,7 +8176,7 @@ "height": 0.0185, "width": 0.0157, "x": 0.6049, - "y": 0.5083 + "y": 0.5101 }, "props": { "params": { @@ -8205,7 +8205,7 @@ "height": 0.0185, "width": 0.0157, "x": 0.6412, - "y": 0.5083 + "y": 0.5101 }, "props": { "params": { @@ -8234,7 +8234,7 @@ "height": 0.0185, "width": 0.0157, "x": 0.7151, - "y": 0.5074 + "y": 0.5092 }, "props": { "params": { @@ -8263,7 +8263,7 @@ "height": 0.0185, "width": 0.0157, "x": 0.7519, - "y": 0.5074 + "y": 0.5092 }, "props": { "params": { @@ -8292,7 +8292,7 @@ "height": 0.0185, "width": 0.0157, "x": 0.7902, - "y": 0.5074 + "y": 0.5092 }, "props": { "params": { diff --git a/.resources/e8153b6a19d853132e5e9670cfb5514dd8e627135ea1a18fb905aadad457d560 b/.resources/e8153b6a19d853132e5e9670cfb5514dd8e627135ea1a18fb905aadad457d560 deleted file mode 100644 index 9338bac3..00000000 Binary files a/.resources/e8153b6a19d853132e5e9670cfb5514dd8e627135ea1a18fb905aadad457d560 and /dev/null differ diff --git a/.resources/ee70a939f87990c6164d9a19be5fc457e87ef22325862f9c14db276831b484b2 b/.resources/ee70a939f87990c6164d9a19be5fc457e87ef22325862f9c14db276831b484b2 deleted file mode 100644 index 254ba111..00000000 --- a/.resources/ee70a939f87990c6164d9a19be5fc457e87ef22325862f9c14db276831b484b2 +++ /dev/null @@ -1,247 +0,0 @@ -{ - "custom": { - "color": "#000", - "priority": 0, - "state": 0 - }, - "params": { - "tagProps": [ - "value", - "value", - "value", - "value", - "value", - "value", - "value", - "value", - "value", - "value" - ] - }, - "propConfig": { - "custom.color": { - "persistent": true - }, - "custom.priority": { - "binding": { - "config": { - "path": "view.custom.state" - }, - "transforms": [ - { - "fallback": 0, - "inputType": "scalar", - "mappings": [ - { - "input": 1, - "output": 4 - }, - { - "input": 2, - "output": 3 - }, - { - "input": 3, - "output": 2 - }, - { - "input": 4, - "output": 1 - } - ], - "outputType": "scalar", - "type": "map" - } - ], - "type": "property" - }, - "persistent": true - }, - "custom.state": { - "binding": { - "config": { - "fallbackDelay": 2.5, - "mode": "indirect", - "references": { - "0": "{view.params.tagProps[0]}", - "fc": "{session.custom.fc}" - }, - "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/STATE" - }, - "transforms": [ - { - "expression": "coalesce({value},0)", - "type": "expression" - } - ], - "type": "tag" - }, - "persistent": true - }, - "params.tagProps": { - "paramDirection": "inout", - "persistent": true - } - }, - "props": { - "defaultSize": { - "height": 40, - "width": 40 - } - }, - "root": { - "children": [ - { - "meta": { - "name": "MCM" - }, - "position": { - "height": 1, - "width": 1 - }, - "propConfig": { - "props.elements[1].fill.paint": { - "binding": { - "config": { - "path": "view.custom.color" - }, - "type": "property" - } - } - }, - "props": { - "elements": [ - { - "id": "defs1", - "name": "defs1", - "type": "defs" - }, - { - "fill": {}, - "height": "47.417244", - "id": "beaconSquare", - "name": "beaconSquare", - "stroke": { - "paint": "#000000", - "width": "2.36887" - }, - "type": "rect", - "width": "47.337795", - "x": "1.450278", - "y": "1.3708278" - }, - { - "elements": [ - { - "id": "tspan1", - "name": "tspan1", - "stroke": { - "width": "0.895573" - }, - "text": "MCM", - "type": "tspan", - "x": "24.985008", - "y": "29.648235" - } - ], - "fill": { - "paint": "#ffffff" - }, - "fontSize": "16.1203px", - "id": "beaconLabel", - "name": "beaconLabel", - "stroke": { - "width": "0.895573" - }, - "textAnchor": "middle", - "type": "text", - "x": "24.985008", - "y": "29.648235" - } - ], - "viewBox": "0 0 50 50" - }, - "type": "ia.shapes.svg" - } - ], - "events": { - "dom": { - "onClick": { - "config": { - "script": "\t#create tags lists for the device\n\tprops \u003d self.view.params.tagProps\n\ttags_table_dataset \u003d autStand.devices.getAllTags(self, props[0])\n\tsystem.perspective.openDock(\u0027Docked-East-Device\u0027,params\u003d{\u0027tagProps\u0027:props, \"tags\":tags_table_dataset})" - }, - "scope": "G", - "type": "script" - } - } - }, - "meta": { - "name": "root", - "tooltip": { - "enabled": true, - "location": "top-left", - "style": {} - } - }, - "propConfig": { - "meta.tooltip.style.classes": { - "binding": { - "config": { - "expression": "{view.custom.priority}" - }, - "transforms": [ - { - "fallback": "Alarms-Styles/NoAlarm", - "inputType": "scalar", - "mappings": [ - { - "input": 1, - "output": "Alarms-Styles/Diagnostic" - }, - { - "input": 2, - "output": "Alarms-Styles/Low" - }, - { - "input": 3, - "output": "Alarms-Styles/Medium" - }, - { - "input": 4, - "output": "Alarms-Styles/High" - } - ], - "outputType": "style-list", - "type": "map" - } - ], - "type": "expr" - } - }, - "meta.tooltip.text": { - "binding": { - "config": { - "expression": "\"Source Id: \" + {view.params.tagProps[0]} + \", Priority: \" + {view.custom.priority} + \", State: \" + {view.custom.state}" - }, - "type": "expr" - } - }, - "meta.visible": { - "binding": { - "config": { - "path": "session.custom.alarm_filter.show_dpm_mcm" - }, - "type": "property" - } - } - }, - "props": { - "mode": "percent", - "style": { - "cursor": "pointer", - "overflow": "hidden" - } - }, - "type": "ia.container.coord" - } -} \ No newline at end of file diff --git a/.resources/f61eb18bad133e6945c2608f78822675066c9ecfe4deff42e64db715ac766abd b/.resources/f61eb18bad133e6945c2608f78822675066c9ecfe4deff42e64db715ac766abd new file mode 100644 index 00000000..c408b2ae Binary files /dev/null and b/.resources/f61eb18bad133e6945c2608f78822675066c9ecfe4deff42e64db715ac766abd differ diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Custom_Views/test/resource.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Custom_Views/test/resource.json index d34b8251..7feff071 100644 --- a/BNA8/com.inductiveautomation.perspective/views/autStand/Custom_Views/test/resource.json +++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Custom_Views/test/resource.json @@ -9,8 +9,8 @@ "attributes": { "lastModification": { "actor": "admin", - "timestamp": "2025-09-11T14:32:19Z" + "timestamp": "2025-09-15T07:39:37Z" }, - "lastModificationSignature": "705138897d7dfa0155dfe65d72330e5c526c96bbd7565487a26a204ef6501e99" + "lastModificationSignature": "f05313380925fc65bd214e5c0a9e720847ecfafd29407324b63d5bf9f79bf09b" } } \ No newline at end of file diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Custom_Views/test/view.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Custom_Views/test/view.json index b245a5c0..60c339e2 100644 --- a/BNA8/com.inductiveautomation.perspective/views/autStand/Custom_Views/test/view.json +++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Custom_Views/test/view.json @@ -35,7 +35,7 @@ }, "transforms": [ { - "expression": "coalesce({value},{view.params.forceFaultStatus},0)", + "expression": "coalesce({value},0)", "type": "expression" }, { @@ -152,7 +152,7 @@ }, "transforms": [ { - "expression": "coalesce({value},{view.params.forceFaultStatus},0)", + "expression": "coalesce({value},0)", "type": "expression" }, { @@ -201,7 +201,7 @@ }, "transforms": [ { - "expression": "coalesce({value},{view.params.forceFaultStatus},0)", + "expression": "coalesce({value},0)", "type": "expression" }, { diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM02-NC SORTER/resource.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM02-NC SORTER/resource.json index 07b33348..29e835e3 100644 --- a/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM02-NC SORTER/resource.json +++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM02-NC SORTER/resource.json @@ -10,8 +10,8 @@ "attributes": { "lastModification": { "actor": "admin", - "timestamp": "2025-09-15T07:30:07Z" + "timestamp": "2025-09-15T07:38:25Z" }, - "lastModificationSignature": "3f41debdb880d05220f60eedde4cbec169c5b16080e03b3bbce7d91c778a6581" + "lastModificationSignature": "0c8ca470cf5211042edefeb853d979c3b23fc643769f56bfa4c4853fd0401195" } } \ No newline at end of file diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM02-NC SORTER/thumbnail.png b/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM02-NC SORTER/thumbnail.png index 2b39b3de..dfc0f626 100644 Binary files a/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM02-NC SORTER/thumbnail.png and b/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM02-NC SORTER/thumbnail.png differ diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM02-NC SORTER/view.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM02-NC SORTER/view.json index 97331961..e0b35523 100644 --- a/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM02-NC SORTER/view.json +++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM02-NC SORTER/view.json @@ -6197,8 +6197,8 @@ "position": { "height": 0.0231, "width": 0.1286, - "x": 0.6839, - "y": 0.4963 + "x": 0.6844, + "y": 0.4927 }, "props": { "params": { @@ -7274,7 +7274,7 @@ "height": 0.0185, "width": 0.0157, "x": 0.4065, - "y": 0.5074 + "y": 0.5092 }, "props": { "params": { @@ -7303,7 +7303,7 @@ "height": 0.0185, "width": 0.0157, "x": 0.4432, - "y": 0.5074 + "y": 0.5092 }, "props": { "params": { @@ -7332,7 +7332,7 @@ "height": 0.0185, "width": 0.0157, "x": 0.4805, - "y": 0.5074 + "y": 0.5092 }, "props": { "params": { @@ -7361,7 +7361,7 @@ "height": 0.0185, "width": 0.0157, "x": 0.5503, - "y": 0.5083 + "y": 0.5101 }, "props": { "params": { @@ -7390,7 +7390,7 @@ "height": 0.0185, "width": 0.0157, "x": 0.5887, - "y": 0.5083 + "y": 0.5101 }, "props": { "params": { @@ -7419,7 +7419,7 @@ "height": 0.0185, "width": 0.0157, "x": 0.6248, - "y": 0.5083 + "y": 0.5101 }, "props": { "params": { @@ -7448,7 +7448,7 @@ "height": 0.0185, "width": 0.0157, "x": 0.6989, - "y": 0.5074 + "y": 0.5092 }, "props": { "params": { @@ -7477,7 +7477,7 @@ "height": 0.0185, "width": 0.0157, "x": 0.7357, - "y": 0.5074 + "y": 0.5092 }, "props": { "params": { @@ -7506,7 +7506,7 @@ "height": 0.0185, "width": 0.0157, "x": 0.7741, - "y": 0.5074 + "y": 0.5092 }, "props": { "params": { @@ -7533,7 +7533,7 @@ }, "position": { "height": 0.0278, - "width": 0.0221, + "width": 0.0156, "x": 0.2899, "y": 0.5556 }, @@ -8060,7 +8060,7 @@ "height": 0.0185, "width": 0.0157, "x": 0.4228, - "y": 0.5074 + "y": 0.5092 }, "props": { "params": { @@ -8089,7 +8089,7 @@ "height": 0.0185, "width": 0.0157, "x": 0.4595, - "y": 0.5074 + "y": 0.5092 }, "props": { "params": { @@ -8118,7 +8118,7 @@ "height": 0.0185, "width": 0.0157, "x": 0.4968, - "y": 0.5074 + "y": 0.5092 }, "props": { "params": { @@ -8147,7 +8147,7 @@ "height": 0.0185, "width": 0.0157, "x": 0.5666, - "y": 0.5083 + "y": 0.5101 }, "props": { "params": { @@ -8176,7 +8176,7 @@ "height": 0.0185, "width": 0.0157, "x": 0.6049, - "y": 0.5083 + "y": 0.5101 }, "props": { "params": { @@ -8205,7 +8205,7 @@ "height": 0.0185, "width": 0.0157, "x": 0.6412, - "y": 0.5083 + "y": 0.5101 }, "props": { "params": { @@ -8234,7 +8234,7 @@ "height": 0.0185, "width": 0.0157, "x": 0.7151, - "y": 0.5074 + "y": 0.5092 }, "props": { "params": { @@ -8263,7 +8263,7 @@ "height": 0.0185, "width": 0.0157, "x": 0.7519, - "y": 0.5074 + "y": 0.5092 }, "props": { "params": { @@ -8292,7 +8292,7 @@ "height": 0.0185, "width": 0.0157, "x": 0.7902, - "y": 0.5074 + "y": 0.5092 }, "props": { "params": { diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/IO_Block/resource.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/IO_Block/resource.json index 279a4b87..1a94912c 100644 --- a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/IO_Block/resource.json +++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/IO_Block/resource.json @@ -10,8 +10,8 @@ "attributes": { "lastModification": { "actor": "admin", - "timestamp": "2025-09-15T07:22:11Z" + "timestamp": "2025-09-15T07:37:26Z" }, - "lastModificationSignature": "6ec599cb66372f723fbf6888e3cfc39c3269c25ea6cb7ff876376e83d369b6b6" + "lastModificationSignature": "336da382e2523cf4db921cd4bdcb4529c504eea46ee36232757267fc30a86438" } } \ No newline at end of file diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/IO_Block/thumbnail.png b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/IO_Block/thumbnail.png index 801bbdaf..0d1d62e4 100644 Binary files a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/IO_Block/thumbnail.png and b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/IO_Block/thumbnail.png differ diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/IO_Block/view.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/IO_Block/view.json index 1494a4f6..7c0dfb52 100644 --- a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/IO_Block/view.json +++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/IO_Block/view.json @@ -545,41 +545,12 @@ }, "type": "property" } - }, - "props.style.backgroundColor": { - "binding": { - "config": { - "path": "view.custom.state" - }, - "transforms": [ - { - "fallback": "#808080", - "inputType": "scalar", - "mappings": [ - { - "input": 1, - "output": "#00FF00" - }, - { - "input": 2, - "output": "#FF0000" - } - ], - "outputType": "color", - "type": "map" - } - ], - "type": "property" - } } }, "props": { "mode": "percent", "style": { - "borderStyle": "solid", - "cursor": "pointer", - "overflow": "hidden", - "userSelect": "none" + "cursor": "pointer" } }, "type": "ia.container.coord" diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/MCM/resource.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/MCM/resource.json index 09c2600b..3bf3a332 100644 --- a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/MCM/resource.json +++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/MCM/resource.json @@ -10,8 +10,8 @@ "attributes": { "lastModification": { "actor": "admin", - "timestamp": "2025-09-14T17:54:18Z" + "timestamp": "2025-09-15T07:41:39Z" }, - "lastModificationSignature": "2c56e60d1d7d01012ba05321f1069ffff0852a0ba1c8a048bc42734d06c800ae" + "lastModificationSignature": "679db3fe64359625a9d42da90661c9471717361c4ee07bc67f4ce90ac53f656b" } } \ No newline at end of file diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/MCM/thumbnail.png b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/MCM/thumbnail.png index bb384c9e..c408b2ae 100644 Binary files a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/MCM/thumbnail.png and b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/MCM/thumbnail.png differ diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/MCM/view.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/MCM/view.json index 254ba111..f107fbe4 100644 --- a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/MCM/view.json +++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/MCM/view.json @@ -1,8 +1,8 @@ { "custom": { - "color": "#000", - "priority": 0, - "state": 0 + "color": "#C2C2C2", + "priority": "No Active Alarms", + "state": "Closed" }, "params": { "tagProps": [ @@ -20,40 +20,168 @@ }, "propConfig": { "custom.color": { + "binding": { + "config": { + "fallbackDelay": 2.5, + "mode": "indirect", + "references": { + "0": "{view.params.tagProps[0]}", + "fc": "{session.custom.fc}" + }, + "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/Color" + }, + "transforms": [ + { + "expression": "coalesce({value},0)", + "type": "expression" + }, + { + "fallback": "#000000", + "inputType": "scalar", + "mappings": [ + { + "input": 0, + "output": "#C2C2C2" + }, + { + "input": 1, + "output": "#FF0000" + }, + { + "input": 2, + "output": "#FFA500" + }, + { + "input": 3, + "output": "#0008FF" + }, + { + "input": 4, + "output": "#00FF00" + }, + { + "input": 5, + "output": "#FFF700" + }, + { + "input": 6, + "output": "#87CEEB" + }, + { + "input": 7, + "output": "#90EE90" + }, + { + "input": 8, + "output": "#964B00" + }, + { + "input": 9, + "output": "#FFFFFF" + }, + { + "input": 10, + "output": "#000000" + }, + { + "input": 11, + "output": "#8B0000" + }, + { + "input": 12, + "output": "#808080" + }, + { + "input": 13, + "output": "#8B8000" + }, + { + "input": 14, + "output": "#006400" + }, + { + "input": 15, + "output": "#FFFFC5" + }, + { + "input": 16, + "output": "#00008B" + }, + { + "input": 17, + "output": "#FF7276" + }, + { + "input": 18, + "output": "#556B2F" + }, + { + "input": 19, + "output": "#B43434" + }, + { + "input": 20, + "output": "#4682B4" + }, + { + "input": 21, + "output": "#FFD700" + } + ], + "outputType": "color", + "type": "map" + } + ], + "type": "tag" + }, "persistent": true }, "custom.priority": { "binding": { "config": { - "path": "view.custom.state" + "fallbackDelay": 2.5, + "mode": "indirect", + "references": { + "0": "{view.params.tagProps[0]}", + "fc": "{session.custom.fc}" + }, + "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/Priority" }, "transforms": [ { - "fallback": 0, + "expression": "coalesce({value},0)", + "type": "expression" + }, + { + "fallback": null, "inputType": "scalar", "mappings": [ + { + "input": 0, + "output": "No Active Alarms" + }, { "input": 1, - "output": 4 + "output": "High" }, { "input": 2, - "output": 3 + "output": "Medium" }, { "input": 3, - "output": 2 + "output": "Low" }, { "input": 4, - "output": 1 + "output": "Diagnostic" } ], "outputType": "scalar", "type": "map" } ], - "type": "property" + "type": "tag" }, "persistent": true }, @@ -66,12 +194,220 @@ "0": "{view.params.tagProps[0]}", "fc": "{session.custom.fc}" }, - "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/STATE" + "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/State" }, "transforms": [ { "expression": "coalesce({value},0)", "type": "expression" + }, + { + "fallback": "Unknown", + "inputType": "scalar", + "mappings": [ + { + "input": 0, + "output": "Closed" + }, + { + "input": 1, + "output": "Actuated" + }, + { + "input": 2, + "output": "Communication Faulted" + }, + { + "input": 3, + "output": "Conveyor Running In Maintenance Mode" + }, + { + "input": 4, + "output": "Disabled" + }, + { + "input": 5, + "output": "Disconnected" + }, + { + "input": 6, + "output": "Stopped" + }, + { + "input": 7, + "output": "Enabled Not Running" + }, + { + "input": 8, + "output": "Encoder Fault" + }, + { + "input": 9, + "output": "Energy Management" + }, + { + "input": 10, + "output": "ESTOP Was Actuated" + }, + { + "input": 11, + "output": "EStopped" + }, + { + "input": 12, + "output": "EStopped Locally" + }, + { + "input": 13, + "output": "Extended Faulted" + }, + { + "input": 14, + "output": "Full" + }, + { + "input": 15, + "output": "Gaylord Start Pressed" + }, + { + "input": 16, + "output": "Jam Fault" + }, + { + "input": 17, + "output": "Jammed" + }, + { + "input": 18, + "output": "Loading Allowed" + }, + { + "input": 19, + "output": "Loading Not Allowed" + }, + { + "input": 20, + "output": "Low Air Pressure Fault Was Present" + }, + { + "input": 21, + "output": "Maintenance Mode" + }, + { + "input": 22, + "output": "Conveyor Stopped In Maintenance Mode" + }, + { + "input": 23, + "output": "Motor Faulted" + }, + { + "input": 24, + "output": "Motor Was Faulted" + }, + { + "input": 25, + "output": "Normal" + }, + { + "input": 26, + "output": "Off Inactive" + }, + { + "input": 27, + "output": "Open" + }, + { + "input": 28, + "output": "PLC Ready To Run" + }, + { + "input": 29, + "output": "Package Release Pressed" + }, + { + "input": 30, + "output": "Power Branch Was Faulted" + }, + { + "input": 31, + "output": "Pressed" + }, + { + "input": 32, + "output": "Ready To Receive" + }, + { + "input": 33, + "output": "Running" + }, + { + "input": 34, + "output": "Started" + }, + { + "input": 35, + "output": "Stopped" + }, + { + "input": 36, + "output": "System Started" + }, + { + "input": 37, + "output": "Unknown" + }, + { + "input": 38, + "output": "VFD Fault" + }, + { + "input": 39, + "output": "Conveyor Running In Power Saving Mode" + }, + { + "input": 40, + "output": "Conveyor Jogging In Maintenance Mode" + }, + { + "input": 41, + "output": "VFD Reset Required" + }, + { + "input": 42, + "output": "Jam Reset Push Button Pressed" + }, + { + "input": 43, + "output": "Start Push Button Pressed" + }, + { + "input": 44, + "output": "Stop Push Button Pressed" + }, + { + "input": 45, + "output": "No Container" + }, + { + "input": 46, + "output": "Ready To Be Enabled" + }, + { + "input": 47, + "output": "Half Full" + }, + { + "input": 48, + "output": "Enabled" + }, + { + "input": 49, + "output": "Tipper Faulted" + } + ], + "outputType": "scalar", + "type": "map" } ], "type": "tag" @@ -221,7 +557,7 @@ "meta.tooltip.text": { "binding": { "config": { - "expression": "\"Source Id: \" + {view.params.tagProps[0]} + \", Priority: \" + {view.custom.priority} + \", State: \" + {view.custom.state}" + "expression": "if(\n {view.custom.state} !\u003d \"Closed\",\n \"Source Id: \" + {view.params.tagProps[0]} + \", Priority: \" + {view.custom.priority} + \", State: \" + {view.custom.state},\n \"Device Disconnected\"\n)\n" }, "type": "expr" } diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/ProxSensor/resource.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/ProxSensor/resource.json index 110037ad..f2800955 100644 --- a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/ProxSensor/resource.json +++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/ProxSensor/resource.json @@ -4,13 +4,14 @@ "restricted": false, "overridable": true, "files": [ - "view.json" + "view.json", + "thumbnail.png" ], "attributes": { "lastModification": { "actor": "admin", - "timestamp": "2025-09-12T08:09:59Z" + "timestamp": "2025-09-15T07:40:35Z" }, - "lastModificationSignature": "2897dc2bf3ccfb312622119ddd5963cf65e7fd93b142ed405d3880e5153e2c67" + "lastModificationSignature": "337b2c6a40e4a4042c988c0cd61bb7758dd3502383a00724b8cae9760d75bb5e" } } \ No newline at end of file diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/ProxSensor/thumbnail.png b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/ProxSensor/thumbnail.png new file mode 100644 index 00000000..3375b720 Binary files /dev/null and b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/ProxSensor/thumbnail.png differ diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/ProxSensor/view.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/ProxSensor/view.json index 3f132778..27e82a33 100644 --- a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/ProxSensor/view.json +++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/ProxSensor/view.json @@ -1,7 +1,8 @@ { "custom": { - "state": 0, - "string": "Inactive" + "color": "#C2C2C2", + "priority": "No Active Alarms", + "state": "Closed" }, "params": { "tagProps": [ @@ -18,7 +19,7 @@ ] }, "propConfig": { - "custom.state": { + "custom.color": { "binding": { "config": { "fallbackDelay": 2.5, @@ -27,7 +28,124 @@ "0": "{view.params.tagProps[0]}", "fc": "{session.custom.fc}" }, - "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/STATE" + "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/Color" + }, + "transforms": [ + { + "expression": "coalesce({value},0)", + "type": "expression" + }, + { + "fallback": "#000000", + "inputType": "scalar", + "mappings": [ + { + "input": 0, + "output": "#C2C2C2" + }, + { + "input": 1, + "output": "#FF0000" + }, + { + "input": 2, + "output": "#FFA500" + }, + { + "input": 3, + "output": "#0008FF" + }, + { + "input": 4, + "output": "#00FF00" + }, + { + "input": 5, + "output": "#FFF700" + }, + { + "input": 6, + "output": "#87CEEB" + }, + { + "input": 7, + "output": "#90EE90" + }, + { + "input": 8, + "output": "#964B00" + }, + { + "input": 9, + "output": "#FFFFFF" + }, + { + "input": 10, + "output": "#000000" + }, + { + "input": 11, + "output": "#8B0000" + }, + { + "input": 12, + "output": "#808080" + }, + { + "input": 13, + "output": "#8B8000" + }, + { + "input": 14, + "output": "#006400" + }, + { + "input": 15, + "output": "#FFFFC5" + }, + { + "input": 16, + "output": "#00008B" + }, + { + "input": 17, + "output": "#FF7276" + }, + { + "input": 18, + "output": "#556B2F" + }, + { + "input": 19, + "output": "#B43434" + }, + { + "input": 20, + "output": "#4682B4" + }, + { + "input": 21, + "output": "#FFD700" + } + ], + "outputType": "color", + "type": "map" + } + ], + "type": "tag" + }, + "persistent": true + }, + "custom.priority": { + "binding": { + "config": { + "fallbackDelay": 2.5, + "mode": "indirect", + "references": { + "0": "{view.params.tagProps[0]}", + "fc": "{session.custom.fc}" + }, + "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/Priority" }, "transforms": [ { @@ -39,20 +157,24 @@ "inputType": "scalar", "mappings": [ { - "input": 1, - "output": 1 + "input": 0, + "output": "No Active Alarms" }, { - "input": 0, - "output": 0 + "input": 1, + "output": "High" }, { "input": 2, - "output": 2 + "output": "Medium" }, { "input": 3, - "output": 3 + "output": "Low" + }, + { + "input": 4, + "output": "Diagnostic" } ], "outputType": "scalar", @@ -63,34 +185,232 @@ }, "persistent": true }, - "custom.string": { + "custom.state": { "binding": { "config": { - "path": "view.custom.state" + "fallbackDelay": 2.5, + "mode": "indirect", + "references": { + "0": "{view.params.tagProps[0]}", + "fc": "{session.custom.fc}" + }, + "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/State" }, "transforms": [ + { + "expression": "coalesce({value},0)", + "type": "expression" + }, { "fallback": "Unknown", "inputType": "scalar", "mappings": [ + { + "input": 0, + "output": "Closed" + }, { "input": 1, "output": "Actuated" }, { "input": 2, - "output": "Faulted" + "output": "Communication Faulted" }, { - "input": 0, - "output": "Inactive" + "input": 3, + "output": "Conveyor Running In Maintenance Mode" + }, + { + "input": 4, + "output": "Disabled" + }, + { + "input": 5, + "output": "Disconnected" + }, + { + "input": 6, + "output": "Stopped" + }, + { + "input": 7, + "output": "Enabled Not Running" + }, + { + "input": 8, + "output": "Encoder Fault" + }, + { + "input": 9, + "output": "Energy Management" + }, + { + "input": 10, + "output": "ESTOP Was Actuated" + }, + { + "input": 11, + "output": "EStopped" + }, + { + "input": 12, + "output": "EStopped Locally" + }, + { + "input": 13, + "output": "Extended Faulted" + }, + { + "input": 14, + "output": "Full" + }, + { + "input": 15, + "output": "Gaylord Start Pressed" + }, + { + "input": 16, + "output": "Jam Fault" + }, + { + "input": 17, + "output": "Jammed" + }, + { + "input": 18, + "output": "Loading Allowed" + }, + { + "input": 19, + "output": "Loading Not Allowed" + }, + { + "input": 20, + "output": "Low Air Pressure Fault Was Present" + }, + { + "input": 21, + "output": "Maintenance Mode" + }, + { + "input": 22, + "output": "Conveyor Stopped In Maintenance Mode" + }, + { + "input": 23, + "output": "Motor Faulted" + }, + { + "input": 24, + "output": "Motor Was Faulted" + }, + { + "input": 25, + "output": "Normal" + }, + { + "input": 26, + "output": "Off Inactive" + }, + { + "input": 27, + "output": "Open" + }, + { + "input": 28, + "output": "PLC Ready To Run" + }, + { + "input": 29, + "output": "Package Release Pressed" + }, + { + "input": 30, + "output": "Power Branch Was Faulted" + }, + { + "input": 31, + "output": "Pressed" + }, + { + "input": 32, + "output": "Ready To Receive" + }, + { + "input": 33, + "output": "Running" + }, + { + "input": 34, + "output": "Started" + }, + { + "input": 35, + "output": "Stopped" + }, + { + "input": 36, + "output": "System Started" + }, + { + "input": 37, + "output": "Unknown" + }, + { + "input": 38, + "output": "VFD Fault" + }, + { + "input": 39, + "output": "Conveyor Running In Power Saving Mode" + }, + { + "input": 40, + "output": "Conveyor Jogging In Maintenance Mode" + }, + { + "input": 41, + "output": "VFD Reset Required" + }, + { + "input": 42, + "output": "Jam Reset Push Button Pressed" + }, + { + "input": 43, + "output": "Start Push Button Pressed" + }, + { + "input": 44, + "output": "Stop Push Button Pressed" + }, + { + "input": 45, + "output": "No Container" + }, + { + "input": 46, + "output": "Ready To Be Enabled" + }, + { + "input": 47, + "output": "Half Full" + }, + { + "input": 48, + "output": "Enabled" + }, + { + "input": 49, + "output": "Tipper Faulted" } ], "outputType": "scalar", "type": "map" } ], - "type": "property" + "type": "tag" }, "persistent": true }, @@ -101,43 +421,82 @@ }, "props": { "defaultSize": { - "height": 20, - "width": 30 + "height": 25, + "width": 25 } }, "root": { "children": [ { "meta": { - "name": "Label" + "name": "PX" }, "position": { "height": 1, "width": 1 }, "props": { - "text": "PX", - "textStyle": { - "fontSize": "1vw", - "textAlign": "center", - "textTransform": "uppercase" - } + "elements": [ + { + "id": "defs1", + "name": "defs1", + "type": "defs" + }, + { + "fill": { + "paint": "#808080" + }, + "height": "47.417244", + "id": "beaconSquare", + "name": "beaconSquare", + "stroke": { + "paint": "#000000", + "width": "2.36887" + }, + "type": "rect", + "width": "47.337795", + "x": "1.450278", + "y": "1.3708278" + }, + { + "elements": [ + { + "id": "tspan3", + "name": "tspan3", + "stroke": { + "width": "1.15193" + }, + "text": "PX", + "type": "tspan", + "x": "24.958401", + "y": "31.781378" + } + ], + "fill": { + "paint": "#ffffff" + }, + "fontSize": "20.7347px", + "id": "beaconLabel", + "name": "beaconLabel", + "stroke": { + "width": "1.15193" + }, + "textAnchor": "middle", + "type": "text", + "x": "24.958401", + "y": "31.781378" + } + ], + "viewBox": "0 0 50 50" }, - "type": "ia.display.label" + "type": "ia.shapes.svg" } ], "events": { "dom": { "onClick": { "config": { - "script": "\tsystem.perspective.openDock(\u0027Docked-East-Device\u0027,params\u003d{\u0027tagProps\u0027:self.view.params.tagProps})" - }, - "scope": "G", - "type": "script" - }, - "onMouseEnter": { - "config": { - "script": "\tfrom time import sleep\n\t\n\talarm \u003d []\n\tmessage \u003d None\n\t\n\tsleep(0.5)\n\t\n\tif system.tag.exists(\"System/aws_data\"):\n\t\tif self.view.params.tagProps[0] !\u003d \"\":\n\t\t\ttags_to_read \u003d system.tag.readBlocking(\"System/aws_data\")\n\t\t\tdecode_alarm_data \u003d system.util.jsonDecode(tags_to_read[0].value)\n\t\t\talarm \u003d [decode_alarm_data[i] for i in decode_alarm_data\n\t\t\t\t\tif decode_alarm_data[i][\u0027sourceId\u0027].startswith(self.view.params.tagProps[0])]\n\t\tif alarm:\n\t\t\talarm \u003d sorted(alarm, key \u003d lambda t:t[\u0027timestamp\u0027], reverse\u003dTrue)\n\t\t\tmessage \u003d max(alarm, key \u003d lambda p:p[\u0027priority\u0027]).get(\u0027message\u0027)\n\t\t\tif len(alarm) \u003e 1:\n\t\t\t\tmessage +\u003d \" (+\" + str(len(alarm)-1) + \")\"\n\tself.view.custom.alarm_message \u003d message" + "script": "\t#create tags lists for the device\n\tprops \u003d self.view.params.tagProps\n\ttags_table_dataset \u003d autStand.devices.getAllTags(self, props[0])\n\tsystem.perspective.openDock(\u0027Docked-East-Device\u0027,params\u003d{\u0027tagProps\u0027:props, \"tags\":tags_table_dataset})" }, "scope": "G", "type": "script" @@ -154,7 +513,7 @@ "meta.tooltip.text": { "binding": { "config": { - "expression": "\"Source Id: \" + {view.params.tagProps[0]} + \", Status: \" + {view.custom.string}\n" + "expression": "if(\n {view.custom.state} !\u003d \"Closed\",\n \"Source Id: \" + {view.params.tagProps[0]} + \", Priority: \" + {view.custom.priority} + \", State: \" + {view.custom.state},\n \"Device Disconnected\"\n)\n" }, "type": "expr" } @@ -166,41 +525,12 @@ }, "type": "property" } - }, - "props.style.backgroundColor": { - "binding": { - "config": { - "path": "view.custom.state" - }, - "transforms": [ - { - "fallback": "#808080", - "inputType": "scalar", - "mappings": [ - { - "input": 1, - "output": "#00FF00" - }, - { - "input": 2, - "output": "#FF0000" - } - ], - "outputType": "color", - "type": "map" - } - ], - "type": "property" - } } }, "props": { "mode": "percent", "style": { - "borderStyle": "solid", - "cursor": "pointer", - "overflow": "hidden", - "userSelect": "none" + "cursor": "pointer" } }, "type": "ia.container.coord" diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Solenoid/resource.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Solenoid/resource.json index 4bd64f64..17b57962 100644 --- a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Solenoid/resource.json +++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Solenoid/resource.json @@ -4,14 +4,13 @@ "restricted": false, "overridable": true, "files": [ - "view.json", - "thumbnail.png" + "view.json" ], "attributes": { "lastModification": { "actor": "admin", - "timestamp": "2025-09-15T07:28:19Z" + "timestamp": "2025-09-15T07:41:09Z" }, - "lastModificationSignature": "f0056ffb75860516f91a762eadcd77e329ff942fc8951e7b17cab2749d8e60b0" + "lastModificationSignature": "5a0e0cc8413a7e4f85992898bea6307a709ba1b21451d6f42d650377c8e73fec" } } \ No newline at end of file diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Solenoid/thumbnail.png b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Solenoid/thumbnail.png deleted file mode 100644 index 9338bac3..00000000 Binary files a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Solenoid/thumbnail.png and /dev/null differ diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Solenoid/view.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Solenoid/view.json index e3627792..3cf04b8b 100644 --- a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Solenoid/view.json +++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Solenoid/view.json @@ -32,7 +32,7 @@ }, "transforms": [ { - "expression": "coalesce({value},{view.params.forceFaultStatus},0)", + "expression": "coalesce({value},0)", "type": "expression" }, { @@ -149,7 +149,7 @@ }, "transforms": [ { - "expression": "coalesce({value},{view.params.forceFaultStatus},0)", + "expression": "coalesce({value},0)", "type": "expression" }, { @@ -198,7 +198,7 @@ }, "transforms": [ { - "expression": "coalesce({value},{view.params.forceFaultStatus},0)", + "expression": "coalesce({value},0)", "type": "expression" }, {