diff --git a/.resources/082532adc0f4c5e560c592eac0e08f17a24635fdf83b8d27b0652bf890a995aa b/.resources/082532adc0f4c5e560c592eac0e08f17a24635fdf83b8d27b0652bf890a995aa deleted file mode 100644 index 8f1e91e1..00000000 Binary files a/.resources/082532adc0f4c5e560c592eac0e08f17a24635fdf83b8d27b0652bf890a995aa and /dev/null differ diff --git a/.resources/64eefa95776f04d036e6f6890819733cba9a7736d349ae67cab3152e82abf3cf b/.resources/146d5d926d4577d60e11f4f9856516ccdbad47249f5187923cf00f144acb8958 similarity index 98% rename from .resources/64eefa95776f04d036e6f6890819733cba9a7736d349ae67cab3152e82abf3cf rename to .resources/146d5d926d4577d60e11f4f9856516ccdbad47249f5187923cf00f144acb8958 index fb8719ba..6c291c33 100644 --- a/.resources/64eefa95776f04d036e6f6890819733cba9a7736d349ae67cab3152e82abf3cf +++ b/.resources/146d5d926d4577d60e11f4f9856516ccdbad47249f5187923cf00f144acb8958 @@ -267,7 +267,7 @@ "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, \"name\":self.view.custom.deviceName} )" + "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, \"name\":\"\"} )" }, "scope": "G", "type": "script" diff --git a/.resources/7f6725a9c6e0b1e8f9f0dec0eb76ec8e5ee3d81917b5e01a1311c8eeb8a8f8ad b/.resources/2349ccd477787b2eaef95c81173428b7c700af7a0de1b3ebf004b73e0b72496c similarity index 98% rename from .resources/7f6725a9c6e0b1e8f9f0dec0eb76ec8e5ee3d81917b5e01a1311c8eeb8a8f8ad rename to .resources/2349ccd477787b2eaef95c81173428b7c700af7a0de1b3ebf004b73e0b72496c index 49fa2221..e43a8809 100644 --- a/.resources/7f6725a9c6e0b1e8f9f0dec0eb76ec8e5ee3d81917b5e01a1311c8eeb8a8f8ad +++ b/.resources/2349ccd477787b2eaef95c81173428b7c700af7a0de1b3ebf004b73e0b72496c @@ -227,12 +227,10 @@ global_device_mapping = {} def build_device_mapping(full_tag_path): """ - Builds global_device_mapping for devices under the same PLC and parent device. - Adds support for: - - Chute FIOM devices (e.g. S03_CH109_FIOM_1 when clicking S03_CH109) - - Shared JR and PE devices used by multiple chutes (e.g. S03_1_JR1, S03_1_LRPE1) + Builds global_device_mapping for devices under the same Conveyor and Chute. + Support for: + - Shared JR and Long Range PE devices used by multiple chutes (e.g. S03_1_JR1, S03_1_LRPE1) """ - system.perspective.print(full_tag_path) global global_device_mapping global_device_mapping.clear() diff --git a/.resources/82dde9c38b1b6e0f29491d3d170ddc8440b0bb41c1f6e0c686b3f1113c185b88 b/.resources/3b9e4967e9b70413fdcc4e8dd3201d3d51a6678a2138c6bb726efb8f18e765b6 similarity index 95% rename from .resources/82dde9c38b1b6e0f29491d3d170ddc8440b0bb41c1f6e0c686b3f1113c185b88 rename to .resources/3b9e4967e9b70413fdcc4e8dd3201d3d51a6678a2138c6bb726efb8f18e765b6 index 01a68619..af7f13e0 100644 --- a/.resources/82dde9c38b1b6e0f29491d3d170ddc8440b0bb41c1f6e0c686b3f1113c185b88 +++ b/.resources/3b9e4967e9b70413fdcc4e8dd3201d3d51a6678a2138c6bb726efb8f18e765b6 @@ -1,7 +1,7 @@ { "custom": { "PLC": "MCM02", - "device": "PE2", + "device": "NSC1_1_PS1", "showTags": true, "state": "Offline", "view": "autStand/Equipment/Photoeye_Chute" @@ -9,7 +9,7 @@ "params": { "name": "", "tagProps": [ - "System/MCM02/Chute/S03_CH101/PE2", + "System/MCM02/PS/NSC1_1_PS1", "value", "value", "value", @@ -53,7 +53,7 @@ }, "onChange": { "enabled": null, - "script": "\tname \u003d self.view.custom.device\n\t\n\t# Use a list of tuples to maintain order - longer matches first\n\tdevice_mapping \u003d [\n\t # Encoder variations (check these first before \u0027EN\u0027)\n\t (\u0027ENSH\u0027, \u0027Encoder\u0027),\n\t (\u0027ENW\u0027, \u0027Encoder\u0027),\n\t (\u0027ENCODER\u0027, \u0027Encoder\u0027),\n\t \n\t # Photoeye variations\n\t (\u0027LRPE\u0027, \u0027Photoeye_Tracking\u0027),\n\t (\u0027TPE\u0027, \u0027Photoeye_Tracking\u0027),\n\t \n\t # IO_Block variations\n\t (\u0027SIO\u0027, \u0027IO_Block\u0027),\n\t (\u0027FIOM\u0027, \u0027IO_Block\u0027),\n\t (\u0027FIO_\u0027, \u0027IO_Block\u0027),\n\t \n\t # Button variations (check after encoder)\n\t (\u0027EN\u0027, \u0027Chute_Button\u0027),\n\t (\u0027JR\u0027, \u0027Button\u0027),\n\t \n\t # Photoeye (shorter version after longer ones)\n\t (\u0027TPE\u0027, \u0027Photoeye_Tracking\u0027),\n\t (\u0027PE\u0027, \u0027Photoeye_Chute\u0027),\n\t \n\t # Other devices variations \n\t (\u0027DPM\u0027, \u0027DPM\u0027),\n\t (\u0027EPC\u0027, \u0027EPC\u0027),\n\t (\u0027MCM\u0027, \u0027MCM\u0027),\n\t (\u0027PRX\u0027, \u0027ProxSensor\u0027),\n\t (\u0027SS\u0027, \u0027SS_Button\u0027),\n\t (\u0027SOL\u0027, \u0027Solenoid\u0027),\n\t \n\t # Beacon Variations (single letters last)\n\t (\u0027B\u0027, \u0027Beacon\u0027),\n\t (\u0027G\u0027, \u0027Beacon\u0027),\n\t (\u0027R\u0027, \u0027Beacon\u0027),\n\t (\u0027H\u0027, \u0027Beacon\u0027),\n\t (\u0027A\u0027, \u0027Beacon\u0027),\n\t (\u0027S03\u0027, \u0027Scanner\u0027)\n\t]\n\t\n\tview \u003d \"\"\n\t\n\tfor key, value in device_mapping:\n\t if key in name:\n\t\t\tview \u003d value\n\t\t\tself.custom.view \u003d \"autStand/Equipment/\" + view\n\t\t\treturn \n\t\n\tself.custom.view \u003d \"autStand/Equipment/Camera\"" + "script": "\tname \u003d self.view.custom.device\n\t\n\t# Use a list of tuples to maintain order - longer matches first\n\tdevice_mapping \u003d [\n#\t (\u0027PS\u0027, \u0027PressureSensor\u0027)\n\t \n\t # Encoder variations (check these first before \u0027EN\u0027)\n\t (\u0027ENSH\u0027, \u0027Encoder\u0027),\n\t (\u0027ENW\u0027, \u0027Encoder\u0027),\n\t (\u0027ENCODER\u0027, \u0027Encoder\u0027),\n\t \n\t # Photoeye variations\n\t (\u0027LRPE\u0027, \u0027Photoeye_Tracking\u0027),\n\t (\u0027TPE\u0027, \u0027Photoeye_Tracking\u0027),\n\t \n\t # IO_Block variations\n\t (\u0027SIO\u0027, \u0027IO_Block\u0027),\n\t (\u0027FIOM\u0027, \u0027IO_Block\u0027),\n\t (\u0027FIO_\u0027, \u0027IO_Block\u0027),\n\t \n\t # Button variations (check after encoder)\n\t (\u0027EN\u0027, \u0027Chute_Button\u0027),\n\t (\u0027JR\u0027, \u0027Button\u0027),\n\t \n\t # Photoeye (shorter version after longer ones)\n\t (\u0027TPE\u0027, \u0027Photoeye_Tracking\u0027),\n\t (\u0027PE\u0027, \u0027Photoeye_Chute\u0027),\n\t \n\t # Other devices variations \n\t (\u0027DPM\u0027, \u0027DPM\u0027),\n\t (\u0027EPC\u0027, \u0027EPC\u0027),\n\t (\u0027MCM\u0027, \u0027MCM\u0027),\n\t (\u0027PRX\u0027, \u0027ProxSensor\u0027),\n\t (\u0027SS\u0027, \u0027SS_Button\u0027),\n\t (\u0027SOL\u0027, \u0027Solenoid\u0027),\n\t \n\t # Beacon Variations (single letters last)\n\t (\u0027B\u0027, \u0027Beacon\u0027),\n\t (\u0027G\u0027, \u0027Beacon\u0027),\n\t (\u0027R\u0027, \u0027Beacon\u0027),\n\t (\u0027H\u0027, \u0027Beacon\u0027),\n\t (\u0027A\u0027, \u0027Beacon\u0027),\n\t (\u0027S03\u0027, \u0027Scanner\u0027)\n\t\t\n\t]\n\t\n\tview \u003d \"\"\n\t\n\tfor key, value in device_mapping:\n\t if key in name:\n\t\t\tview \u003d value\n\t\t\tself.custom.view \u003d \"autStand/Equipment/\" + view\n\t\t\treturn \n\t\n\tself.custom.view \u003d \"autStand/Equipment/Camera\"" }, "persistent": true }, diff --git a/.resources/be7eb49ea05dfc053fd810fa656ca5ebfd4a9d74f45276440666535c75ad22bc b/.resources/55db07074533f19633d988a894ca8169332debd81fe7b672a84c711c74a649ef similarity index 99% rename from .resources/be7eb49ea05dfc053fd810fa656ca5ebfd4a9d74f45276440666535c75ad22bc rename to .resources/55db07074533f19633d988a894ca8169332debd81fe7b672a84c711c74a649ef index 57f2d25e..e9697aed 100644 --- a/.resources/be7eb49ea05dfc053fd810fa656ca5ebfd4a9d74f45276440666535c75ad22bc +++ b/.resources/55db07074533f19633d988a894ca8169332debd81fe7b672a84c711c74a649ef @@ -1,8 +1,8 @@ { "custom": { - "scale": 1.7, + "scale": 1, "x": 0, - "y": -505.882352941 + "y": 0 }, "params": { "controls": { @@ -399,7 +399,7 @@ "position": { "height": 0.0324, "width": 0.0182, - "x": 0.0811 + "x": 0.1019 }, "propConfig": { "meta.visible": { diff --git a/.resources/80ac16aa301672cbaec4a0474eaec009ffb521b649240f5cb7226c7c341b84fc b/.resources/80ac16aa301672cbaec4a0474eaec009ffb521b649240f5cb7226c7c341b84fc new file mode 100644 index 00000000..2ab363f5 Binary files /dev/null and b/.resources/80ac16aa301672cbaec4a0474eaec009ffb521b649240f5cb7226c7c341b84fc differ diff --git a/.resources/b2245dafe9ca29018f0cee4e6f80bb8dc2ade0cdb35ff3399a2ef90b8e10df27 b/.resources/b2245dafe9ca29018f0cee4e6f80bb8dc2ade0cdb35ff3399a2ef90b8e10df27 new file mode 100644 index 00000000..06936499 Binary files /dev/null and b/.resources/b2245dafe9ca29018f0cee4e6f80bb8dc2ade0cdb35ff3399a2ef90b8e10df27 differ diff --git a/.resources/b50febf3b2bb9722e2abb1d150d173085807bba08aa572b5732b8fba9315b8a5 b/.resources/b50febf3b2bb9722e2abb1d150d173085807bba08aa572b5732b8fba9315b8a5 new file mode 100644 index 00000000..2649fc88 Binary files /dev/null and b/.resources/b50febf3b2bb9722e2abb1d150d173085807bba08aa572b5732b8fba9315b8a5 differ diff --git a/.resources/4c21f91131d4f5f30e95919eaf3dd0c1315bcd0a69e7f9b7a5dd95e31a6183d7 b/.resources/cbc80129506b4b90dc8a0d16162817a371514cb296a585a56b94ffe830ad92cf similarity index 95% rename from .resources/4c21f91131d4f5f30e95919eaf3dd0c1315bcd0a69e7f9b7a5dd95e31a6183d7 rename to .resources/cbc80129506b4b90dc8a0d16162817a371514cb296a585a56b94ffe830ad92cf index cbb1cbcd..5f2c79eb 100644 --- a/.resources/4c21f91131d4f5f30e95919eaf3dd0c1315bcd0a69e7f9b7a5dd95e31a6183d7 +++ b/.resources/cbc80129506b4b90dc8a0d16162817a371514cb296a585a56b94ffe830ad92cf @@ -1,10 +1,11 @@ def calculateFocus(self, child, scale=1.7): """ + Please don't modify! Hybrid focusing: - - MCM01: precise per-rotation affine for (dx, dy) (unchanged) + - MCM01: precise per-rotation affine for (dx, dy) - MCM02: search-style mapping: * 0°/180°: strong horizontal (dx from x,y), dy very gentle (clamped) - * 90°/270°: dx = 0, dy from x (fits your left/right anchors) + * 90°/270°: dx = 0, dy from x left/right anchors) """ # --- rotation --- @@ -28,7 +29,7 @@ def calculateFocus(self, child, scale=1.7): except: zone = "MCM01" - # ======== MCM01 (your proven mapping, unchanged) ======== + # ======== MCM01 ======== COEFFS_MCM01 = { 0: dict(ax= 956.86984, bx=-1853.94329, cx= -17.57191, ay= 124.82245, by= -191.28916, cy= 227.58568), @@ -40,9 +41,9 @@ def calculateFocus(self, child, scale=1.7): ay=-1341.88064, by= 1615.55073, cy= 142.77638), } - # ======== MCM02 (fit from your new table) ======== + # ======== MCM02 ======== - # 0°: dx ≈ a + b*x + c*y (LS fit on: left/right/center/top/bottom) + # 0°: dx ≈ a + b*x + c*y _M2_DX_0 = dict(a= 691.72633028, b=-1788.01433165, c= 295.57517840) # dy kept light & clamped around center (use a small gain around 0.5) def _m2_dy0(y): diff --git a/.resources/cc772364ccb53cb8dacf892921f7a4582a7b6456af20d97d7a4be194d38d27d3 b/.resources/cc772364ccb53cb8dacf892921f7a4582a7b6456af20d97d7a4be194d38d27d3 deleted file mode 100644 index 7639dde8..00000000 Binary files a/.resources/cc772364ccb53cb8dacf892921f7a4582a7b6456af20d97d7a4be194d38d27d3 and /dev/null differ diff --git a/.resources/48ae4f700f82d75778261331ebc0848ab285fd14c13ba71fd535e1f387cef569 b/.resources/feba2ada5390187859d7c3ca16de05be0c00db3cb88befb9051a8f1bc00584f5 similarity index 98% rename from .resources/48ae4f700f82d75778261331ebc0848ab285fd14c13ba71fd535e1f387cef569 rename to .resources/feba2ada5390187859d7c3ca16de05be0c00db3cb88befb9051a8f1bc00584f5 index 1955bcc7..92858fdf 100644 --- a/.resources/48ae4f700f82d75778261331ebc0848ab285fd14c13ba71fd535e1f387cef569 +++ b/.resources/feba2ada5390187859d7c3ca16de05be0c00db3cb88befb9051a8f1bc00584f5 @@ -33,7 +33,7 @@ "covert": true, "dpm_view_path": "autStand/Custom_Views/Enternet-Windows/DPMS/DPM Devices/MCM02/NCS1_1_DPM1", "fc": "BNA8", - "rotation": "270deg", + "rotation": "0deg", "show_dpm_device_view": true, "show_dpm_view": true }, diff --git a/BNA8_autStand/com.inductiveautomation.perspective/views/autStand/Docked_Views/Controller-Equipment/Information-Docked-East-Device/resource.json b/BNA8_autStand/com.inductiveautomation.perspective/views/autStand/Docked_Views/Controller-Equipment/Information-Docked-East-Device/resource.json index 7c7bea96..036f6594 100644 --- a/BNA8_autStand/com.inductiveautomation.perspective/views/autStand/Docked_Views/Controller-Equipment/Information-Docked-East-Device/resource.json +++ b/BNA8_autStand/com.inductiveautomation.perspective/views/autStand/Docked_Views/Controller-Equipment/Information-Docked-East-Device/resource.json @@ -10,8 +10,8 @@ "attributes": { "lastModification": { "actor": "admin", - "timestamp": "2025-11-07T13:55:08Z" + "timestamp": "2025-11-10T08:31:52Z" }, - "lastModificationSignature": "ec0003b6640ced92e4151dbe532c0349d2d3ddc8e09646a978e5359d7955292d" + "lastModificationSignature": "becc8a5c7acecf6f8adb56342e078d629e2aae3e26c0db451c7b495dc5b7e310" } } \ No newline at end of file diff --git a/BNA8_autStand/com.inductiveautomation.perspective/views/autStand/Docked_Views/Controller-Equipment/Information-Docked-East-Device/thumbnail.png b/BNA8_autStand/com.inductiveautomation.perspective/views/autStand/Docked_Views/Controller-Equipment/Information-Docked-East-Device/thumbnail.png index 7639dde8..041b2be9 100644 Binary files a/BNA8_autStand/com.inductiveautomation.perspective/views/autStand/Docked_Views/Controller-Equipment/Information-Docked-East-Device/thumbnail.png and b/BNA8_autStand/com.inductiveautomation.perspective/views/autStand/Docked_Views/Controller-Equipment/Information-Docked-East-Device/thumbnail.png differ diff --git a/BNA8_autStand/com.inductiveautomation.perspective/views/autStand/Docked_Views/Controller-Equipment/Information-Docked-East-Device/view.json b/BNA8_autStand/com.inductiveautomation.perspective/views/autStand/Docked_Views/Controller-Equipment/Information-Docked-East-Device/view.json index 01a68619..f6921bd2 100644 --- a/BNA8_autStand/com.inductiveautomation.perspective/views/autStand/Docked_Views/Controller-Equipment/Information-Docked-East-Device/view.json +++ b/BNA8_autStand/com.inductiveautomation.perspective/views/autStand/Docked_Views/Controller-Equipment/Information-Docked-East-Device/view.json @@ -1,15 +1,15 @@ { "custom": { "PLC": "MCM02", - "device": "PE2", + "device": "NSC1_1_PS1", "showTags": true, "state": "Offline", - "view": "autStand/Equipment/Photoeye_Chute" + "view": "autStand/Equipment/PressureSensor" }, "params": { "name": "", "tagProps": [ - "System/MCM02/Chute/S03_CH101/PE2", + "System/MCM02/PS/NSC1_1_PS1", "value", "value", "value", @@ -53,7 +53,7 @@ }, "onChange": { "enabled": null, - "script": "\tname \u003d self.view.custom.device\n\t\n\t# Use a list of tuples to maintain order - longer matches first\n\tdevice_mapping \u003d [\n\t # Encoder variations (check these first before \u0027EN\u0027)\n\t (\u0027ENSH\u0027, \u0027Encoder\u0027),\n\t (\u0027ENW\u0027, \u0027Encoder\u0027),\n\t (\u0027ENCODER\u0027, \u0027Encoder\u0027),\n\t \n\t # Photoeye variations\n\t (\u0027LRPE\u0027, \u0027Photoeye_Tracking\u0027),\n\t (\u0027TPE\u0027, \u0027Photoeye_Tracking\u0027),\n\t \n\t # IO_Block variations\n\t (\u0027SIO\u0027, \u0027IO_Block\u0027),\n\t (\u0027FIOM\u0027, \u0027IO_Block\u0027),\n\t (\u0027FIO_\u0027, \u0027IO_Block\u0027),\n\t \n\t # Button variations (check after encoder)\n\t (\u0027EN\u0027, \u0027Chute_Button\u0027),\n\t (\u0027JR\u0027, \u0027Button\u0027),\n\t \n\t # Photoeye (shorter version after longer ones)\n\t (\u0027TPE\u0027, \u0027Photoeye_Tracking\u0027),\n\t (\u0027PE\u0027, \u0027Photoeye_Chute\u0027),\n\t \n\t # Other devices variations \n\t (\u0027DPM\u0027, \u0027DPM\u0027),\n\t (\u0027EPC\u0027, \u0027EPC\u0027),\n\t (\u0027MCM\u0027, \u0027MCM\u0027),\n\t (\u0027PRX\u0027, \u0027ProxSensor\u0027),\n\t (\u0027SS\u0027, \u0027SS_Button\u0027),\n\t (\u0027SOL\u0027, \u0027Solenoid\u0027),\n\t \n\t # Beacon Variations (single letters last)\n\t (\u0027B\u0027, \u0027Beacon\u0027),\n\t (\u0027G\u0027, \u0027Beacon\u0027),\n\t (\u0027R\u0027, \u0027Beacon\u0027),\n\t (\u0027H\u0027, \u0027Beacon\u0027),\n\t (\u0027A\u0027, \u0027Beacon\u0027),\n\t (\u0027S03\u0027, \u0027Scanner\u0027)\n\t]\n\t\n\tview \u003d \"\"\n\t\n\tfor key, value in device_mapping:\n\t if key in name:\n\t\t\tview \u003d value\n\t\t\tself.custom.view \u003d \"autStand/Equipment/\" + view\n\t\t\treturn \n\t\n\tself.custom.view \u003d \"autStand/Equipment/Camera\"" + "script": "\tname \u003d self.view.custom.device\n\t\n\t# Use a list of tuples to maintain order - longer matches first\n\tdevice_mapping \u003d [\n\t (\u0027PS\u0027, \u0027PressureSensor\u0027),\n\t \t \n\t # Encoder variations (check these first before \u0027EN\u0027)\n\t (\u0027ENSH\u0027, \u0027Encoder\u0027),\n\t (\u0027ENW\u0027, \u0027Encoder\u0027),\n\t (\u0027ENCODER\u0027, \u0027Encoder\u0027),\n\t \n\t # Photoeye variations\n\t (\u0027LRPE\u0027, \u0027Photoeye_Tracking\u0027),\n\t (\u0027TPE\u0027, \u0027Photoeye_Tracking\u0027),\n\t \n\t # IO_Block variations\n\t (\u0027SIO\u0027, \u0027IO_Block\u0027),\n\t (\u0027FIOM\u0027, \u0027IO_Block\u0027),\n\t (\u0027FIO_\u0027, \u0027IO_Block\u0027),\n\t \n\t # Button variations (check after encoder)\n\t (\u0027EN\u0027, \u0027Chute_Button\u0027),\n\t (\u0027JR\u0027, \u0027Button\u0027),\n\t \n\t # Photoeye (shorter version after longer ones)\n\t (\u0027TPE\u0027, \u0027Photoeye_Tracking\u0027),\n\t (\u0027PE\u0027, \u0027Photoeye_Chute\u0027),\n\t \n\t # Other devices variations \n\t (\u0027DPM\u0027, \u0027DPM\u0027),\n\t (\u0027EPC\u0027, \u0027EPC\u0027),\n\t (\u0027MCM\u0027, \u0027MCM\u0027),\n\t (\u0027PRX\u0027, \u0027ProxSensor\u0027),\n\t (\u0027SS\u0027, \u0027SS_Button\u0027),\n\t (\u0027SOL\u0027, \u0027Solenoid\u0027),\n\t \n\t # Beacon Variations (single letters last)\n\t (\u0027B\u0027, \u0027Beacon\u0027),\n\t (\u0027G\u0027, \u0027Beacon\u0027),\n\t (\u0027R\u0027, \u0027Beacon\u0027),\n\t (\u0027H\u0027, \u0027Beacon\u0027),\n\t (\u0027A\u0027, \u0027Beacon\u0027),\n\t (\u0027S03\u0027, \u0027Scanner\u0027)\n\t\t\n\t]\n\t\n\tview \u003d \"\"\n\t\n\tfor key, value in device_mapping:\n\t if key in name:\n\t\t\tview \u003d value\n\t\t\tself.custom.view \u003d \"autStand/Equipment/\" + view\n\t\t\treturn \n\t\n\tself.custom.view \u003d \"autStand/Equipment/Camera\"" }, "persistent": true }, diff --git a/BNA8_autStand/com.inductiveautomation.perspective/views/autStand/Equipment/Button/resource.json b/BNA8_autStand/com.inductiveautomation.perspective/views/autStand/Equipment/Button/resource.json index 77f74535..50d03467 100644 --- a/BNA8_autStand/com.inductiveautomation.perspective/views/autStand/Equipment/Button/resource.json +++ b/BNA8_autStand/com.inductiveautomation.perspective/views/autStand/Equipment/Button/resource.json @@ -10,8 +10,8 @@ "attributes": { "lastModification": { "actor": "admin", - "timestamp": "2025-11-08T15:19:46Z" + "timestamp": "2025-11-10T08:25:40Z" }, - "lastModificationSignature": "98a6c0b91032ad41732f547f4ec9d2e44fef6d9ed2d0cbf94471fadb1c89990c" + "lastModificationSignature": "52742c79e4927a83828abf86779dc63ef42e5774fa305c136260b225f27aeab2" } } \ No newline at end of file diff --git a/BNA8_autStand/com.inductiveautomation.perspective/views/autStand/Equipment/Button/thumbnail.png b/BNA8_autStand/com.inductiveautomation.perspective/views/autStand/Equipment/Button/thumbnail.png index 303931b8..06936499 100644 Binary files a/BNA8_autStand/com.inductiveautomation.perspective/views/autStand/Equipment/Button/thumbnail.png and b/BNA8_autStand/com.inductiveautomation.perspective/views/autStand/Equipment/Button/thumbnail.png differ diff --git a/BNA8_autStand/com.inductiveautomation.perspective/views/autStand/Equipment/PressureSensor/resource.json b/BNA8_autStand/com.inductiveautomation.perspective/views/autStand/Equipment/PressureSensor/resource.json index 0be2df13..3bdada1a 100644 --- a/BNA8_autStand/com.inductiveautomation.perspective/views/autStand/Equipment/PressureSensor/resource.json +++ b/BNA8_autStand/com.inductiveautomation.perspective/views/autStand/Equipment/PressureSensor/resource.json @@ -10,8 +10,8 @@ "attributes": { "lastModification": { "actor": "admin", - "timestamp": "2025-11-08T15:17:45Z" + "timestamp": "2025-11-10T08:27:20Z" }, - "lastModificationSignature": "08dafc4ff229fb0d9c58e5fd60cd3d4312c9de7f2480fd40a4b899d406952d49" + "lastModificationSignature": "4373a81e6c47b64828242db9f688b9c8cec9f7b8145551f7218721bc53e9d9ce" } } \ No newline at end of file diff --git a/BNA8_autStand/com.inductiveautomation.perspective/views/autStand/Equipment/PressureSensor/view.json b/BNA8_autStand/com.inductiveautomation.perspective/views/autStand/Equipment/PressureSensor/view.json index fb8719ba..6c291c33 100644 --- a/BNA8_autStand/com.inductiveautomation.perspective/views/autStand/Equipment/PressureSensor/view.json +++ b/BNA8_autStand/com.inductiveautomation.perspective/views/autStand/Equipment/PressureSensor/view.json @@ -267,7 +267,7 @@ "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, \"name\":self.view.custom.deviceName} )" + "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, \"name\":\"\"} )" }, "scope": "G", "type": "script"