Added YAMLs and images for Ubiquiti devices: UNAS Pro, ENVR, UNVR Pro…

…, UniFi Dream Machine Pro variants, and associated images. Fixed power plug on several ubiquiti devices for ubiquiti RPS connector. Added more images. Added E7, E7 Campus, E7 Audience and associated images. Cleaned up files for consistency. Added airflow direction, weight, etc to many files. Fixed image mapping and removed orphaned image.

device-types/Ubiquiti/USW-Enterprise-24-PoE.yaml

@@ -4,15 +4,14 @@ model: UniFi Switch Enterprise 24 PoE
 slug: ubiquiti-unifi-switch-enterprise-24-poe
 part_number: USW-Enterprise-24-PoE
 comments: 'UniFi Switch Enterprise 24 PoE (150W + max. 400W PoE), (12) 2.5 Gigabit PoE+ IEEE 802.3af/at, (12) 1 Gigabit PoE+ IEEE 802.3af/at, (2) SFP+\nDimensions:
-  442.4 x 43.7 x 325 mm (17.4 x 1.7 x 12.8")\n[Switch Enterprise 24 PoE Datasheet](https://dl.ui.com/ds/usw-enterprise-24-poe_ds)'
+  442.4 x 43.7 x 325 mm (17.4 x 1.7 x 12.8")\n[Switch Enterprise 24 PoE Techspecs](https://techspecs.ui.com/unifi/switching/usw-enterprise-24-poe)'
 u_height: 1
 is_full_depth: false
-weight: 11.46
+front_image: true
+rear_image: true
+weight: 11.5
 weight_unit: lb
-power-ports:
-  - name: PSU1
-    type: iec-60320-c14
-    maximum_draw: 550
+airflow: front-to-rear
 interfaces:
   - name: Port 1
     type: 1000base-t
@@ -114,3 +113,10 @@ interfaces:
     type: 10gbase-x-sfpp
   - name: SFP+ 26
     type: 10gbase-x-sfpp
+power-ports:
+  - name: Input
+    type: iec-60320-c14
+    maximum_draw: 460
+  - name: USP-RPS connector for PSU failover
+    type: ubiquiti-smartpower
+    maximum_draw: 460

device-types/Ubiquiti/USW-Enterprise-48-PoE.yaml

@@ -3,12 +3,15 @@ manufacturer: Ubiquiti
 model: UniFi Switch Enterprise 48 PoE
 slug: ubiquiti-unifi-switch-enterprise-48-poe
 part_number: USW-Enterprise-48-PoE
-comments: |
-  UniFi Switch Enterprise 48 PoE (150W + max. 720W PoE), (48) 2.5 Gigabit PoE+ IEEE 802.3af/at, (4) SFP+
-
-  Dimensions: 442 x 44 x 400 mm (17.4 x 1.7 x 15.7")
+comments: 'UniFi Switch Enterprise 48 PoE (150W + max. 720W PoE), (48) 2.5 Gigabit PoE+ IEEE 802.3af/at, (4) SFP+\nDimensions:
+  442.4 x 43.7 x 325 mm (17.4 x 1.7 x 12.8")\n[Switch Enterprise 48 PoE Techspecs](https://techspecs.ui.com/unifi/switching/usw-enterprise-48-poe)'
 u_height: 1
-is_full_depth: true
+is_full_depth: false
+front_image: true
+rear_image: true
+weight: 13.9
+weight_unit: lb
+airflow: front-to-rear
 interfaces:
   - name: Port 1
     type: 2.5gbase-t
@@ -214,3 +217,6 @@ power-ports:
   - name: Input
     type: iec-60320-c14
     maximum_draw: 870
+  - name: USP-RPS connector for PSU failover
+    type: ubiquiti-smartpower
+    maximum_draw: 600

device-types/Ubiquiti/USW-Pro-24-PoE.yaml

@@ -2,15 +2,15 @@
 manufacturer: Ubiquiti
 model: UniFi Switch 24 Pro PoE Gen2
 slug: ubiquiti-unifi-switch-24-pro-poe-gen2
-part_number: USW-PRO-24-POE
-comments: |
-  UniFi Switch 24 Pro PoE (50W + max. 400W PoE), Gen2, (24) Gigabit, (1-16) Gigabit PoE+ IEEE 802.3af/at, (17-24) Gigabit 60W PoE++ IEEE 802.3bt, (2) SFP+
-
-  Dimensions: 442.4 x 285.4 x 43.7 mm (17.42 x 11.24 x 1.72")
+part_number: USW-Pro-24-POE
+comments: 'UniFi Switch 24 Pro PoE (50W + max. 400W PoE), Gen2, (24) Gigabit, (1-16) Gigabit PoE+ IEEE 802.3af/at, (17-24) Gigabit 60W PoE++ IEEE 802.3bt, (2) SFP+\nDimensions: 442.4 x 285.4 x 43.7 mm (17.42 x 11.24 x 1.72")\n[Switch Switch 24 Pro PoE Techspecs](https://techspecs.ui.com/unifi/switching/usw-pro-24-poe)'
 u_height: 1
 is_full_depth: false
 front_image: true
 rear_image: true
+weight: 9.7
+weight_unit: lb
+airflow: front-to-rear
 interfaces:
   - name: Port 1
     type: 1000base-t
@@ -116,3 +116,6 @@ power-ports:
   - name: Input
     type: iec-60320-c14
     maximum_draw: 450
+  - name: USP-RPS connector for PSU failover
+    type: ubiquiti-smartpower
+    maximum_draw: 450

device-types/Ubiquiti/USW-Pro-24.yaml

@@ -1,16 +1,16 @@
 ---
 manufacturer: Ubiquiti
-model: USW-PRO-24
-slug: ubiquiti-usw-pro-24
-comments: |
-  [UniFi Switch Pro 24](https://store.ui.com/collections/unifi-network-switching/products/usw-pro-24)
-
-  24-port switch with (24) Gigabit RJ45 ports and (2) 10G SFP+ ports. Powerful second-generation UniFi switching
-
-  Dimensions: 442.4 x 285.4 x 43.7 mm (17.42 x 11.24 x 1.72")
+model: UniFi Switch 24 Pro
+slug: ubiquiti-unifi-switch-24-pro
+part_number: USW-Pro-24
+comments: 'UniFi Switch 24 Pro (50W), (24) Gigabit, (1-16) Gigabit, (17-24) Gigabit, (2) SFP+\nDimensions: 442.4 x 285 x 44 mm (17.4 x 11.2 x 1.7")\n[Switch Switch 24 Pro Techspecs](https://techspecs.ui.com/unifi/switching/usw-pro-24)'
 u_height: 1
+is_full_depth: false
 front_image: true
-is_full_depth: true
+rear_image: true
+weight: 7.9
+weight_unit: lb
+airflow: front-to-rear
 interfaces:
   - name: Port 1
     type: 1000base-t
@@ -67,4 +67,7 @@ interfaces:
 power-ports:
   - name: Input
     type: iec-60320-c14
-    maximum_draw: 450
+    maximum_draw: 30
+  - name: USP-RPS connector for PSU failover
+    type: ubiquiti-smartpower
+    maximum_draw: 30

device-types/Ubiquiti/USW-Pro-48-PoE.yaml

@@ -3,12 +3,14 @@ manufacturer: Ubiquiti
 model: UniFi Switch 48 Pro PoE Gen2
 slug: ubiquiti-unifi-switch-48-pro-poe-gen2
 part_number: USW-PRO-48-POE
-comments: |
-  UniFi Switch 48 Pro PoE (60W + max. 600W PoE), Gen2, (48) Gigabit, (1-40) Gigabit PoE+ IEEE 802.3af/at, (41-48) 60W PoE++ IEEE 802.3bt, (4) SFP+
-
-  Dimensions: 442.4 x 399.6 x 43.7 mm (17.42 x 15.73 x 1.72")
+comments: 'UniFi Switch 48 Pro PoE (60W + max. 600W PoE), Gen2, (48) Gigabit, (1-40) Gigabit PoE+ IEEE 802.3af/at, (41-48) 60W PoE++ IEEE 802.3bt, (4) SFP+\nDimensions: 442.4 x 399.6 x 43.7 mm (17.42 x 15.73 x 1.72")\n[Switch Switch 48 Pro PoE Techspecs](https://techspecs.ui.com/unifi/switching/usw-pro-48-poe)'
 u_height: 1
-is_full_depth: true
+is_full_depth: false
+front_image: true
+rear_image: true
+weight: 14
+weight_unit: lb
+airflow: front-to-rear
 interfaces:
   - name: Port 1
     type: 1000base-t
@@ -214,3 +216,6 @@ power-ports:
   - name: Input
     type: iec-60320-c14
     maximum_draw: 660
+  - name: USP-RPS connector for PSU failover
+    type: ubiquiti-smartpower
+    maximum_draw: 600 # 600W max output from RPS

device-types/Ubiquiti/USW-Pro-48.yaml

@@ -3,12 +3,14 @@ manufacturer: Ubiquiti
 model: UniFi Switch 48 Pro
 slug: ubiquiti-unifi-switch-48-pro
 part_number: USW-Pro-48
-comments: |
-  UniFi Switch 48 Pro, Gen2, (48) Gigabit, (4) SFP+
-
-  Dimensions: 442.4 x 285.4 x 43.7 mm (17.42 x 15.73 x 1.72")
+comments: 'UniFi Switch 48 Pro (60W), (48) Gigabit, (4) SFP+\nDimensions: 442.4 x 285 x 44 mm (17.4 x 11.2 x 1.7")\n[Switch Switch 48 Pro Techspecs](https://techspecs.ui.com/unifi/switching/usw-pro-48)'
 u_height: 1
-is_full_depth: true
+is_full_depth: false
+front_image: true
+rear_image: true
+weight: 9
+weight_unit: lb
+airflow: front-to-rear
 interfaces:
   - name: Port 1
     type: 1000base-t
@@ -118,3 +120,6 @@ power-ports:
   - name: Input
     type: iec-60320-c14
     maximum_draw: 60
+  - name: USP-RPS connector for PSU failover
+    type: ubiquiti-smartpower
+    maximum_draw: 60

device-types/Ubiquiti/USW-Pro-Aggregation.yaml

@@ -3,12 +3,14 @@ manufacturer: Ubiquiti
 model: UniFi Switch Pro Aggregation
 slug: ubiquiti-unifi-switch-pro-aggregation
 part_number: USW-Pro-Aggregation
-comments: |
-  UniFi Switch Pro Aggregation, 10G 28-Port and 25G 4-Port Managed Aggregation Switch, 100W, (28) SFP+ (4) SFP28
-
-  Dimensions: 442 x 325 x 44 mm (17.4 x 12.8 x 1.7")
+comments: 'UniFi Switch Pro Aggregation, 10G 28-Port and 25G 4-Port Managed Aggregation Switch, 100W, (28) SFP+ (4) SFP28\nDimensions: 442 x 325 x 44 mm (17.4 x 12.8 x 1.7")\n[UniFi Switch Pro Aggregation Techspecs](https://techspecs.ui.com/unifi/switching/usw-pro-aggregation)'
 u_height: 1
 is_full_depth: false
+front_image: true
+rear_image: true
+weight: 10.4
+weight_unit: lb
+airflow: front-to-rear
 interfaces:
   - name: SFP+ 1
     type: 10gbase-x-sfpp
@@ -80,3 +82,4 @@ power-ports:
     maximum_draw: 100
   - name: USP-RPS DC input
     type: ubiquiti-smartpower
+    maximum_draw: 50

device-types/Ubiquiti/USW-Pro-Max-24-PoE.yaml

@@ -3,13 +3,10 @@ manufacturer: Ubiquiti
 model: UniFi Switch Pro Max 24 PoE
 slug: ubiquiti-unifi-switch-pro-max-24-poe
 part_number: USW-Pro-Max-24-PoE
-comments: |
-  UniFi Switch 24 Pro Max PoE (50W + max. 400W PoE), (16) Gigabit + (8) 2.5GbE, (1-8) Gigabit PoE+ IEEE 802.3af/at, (9-16) Gigabit PoE++ IEEE 802.3bt, (17-24) 2.5GbE 60W PoE++ IEEE 802.3bt, (2) SFP+
-
-  Dimensions: 442 x 325 x 44 mm (17.4 x 12.8 x 1.7")
+comments: 'UniFi Switch 24 Pro Max PoE (50W + max. 400W PoE), (16) Gigabit + (8) 2.5GbE, (1-8) Gigabit PoE+ IEEE 802.3af/at, (9-16) Gigabit PoE++ IEEE 802.3bt, (17-24) 2.5GbE 60W PoE++ IEEE 802.3bt, (2) SFP+\nDimensions: 442 x 325 x 44 mm (17.4 x 12.8 x 1.7")\n[UniFi Switch Pro Max 24 PoE Techspecs](https://techspecs.ui.com/unifi/switching/usw-pro-max-24-poe)'
 u_height: 1
-weight: 5.20
-weight_unit: kg
+weight: 11.5
+weight_unit: lb
 airflow: front-to-rear
 is_full_depth: false
 front_image: true
@@ -119,6 +116,6 @@ power-ports:
   - name: Input
     type: iec-60320-c14
     maximum_draw: 450
-  - name: USP-RPS Input
-    type: iec-60320-c20  # Standard connector for RPS
-    maximum_draw: 450
+  - name: USP-RPS connector for PSU failover
+    type: ubiquiti-smartpower
+    maximum_draw: 450 # 450W max output from RPS

device-types/Ubiquiti/USW-Pro-Max-24.yaml

@@ -3,13 +3,10 @@ manufacturer: Ubiquiti
 model: UniFi Switch Pro Max 24
 slug: ubiquiti-unifi-switch-pro-max-24
 part_number: USW-Pro-Max-24
-comments: |
-  UniFi Switch 24 Pro Max (non-PoE) with total non-blocking throughput of 56 Gbps. Features (16) Gigabit Ethernet ports, (8) 1/2.5GbE ports, and (2) 10G SFP+ uplink ports.
-
-  Dimensions: 442 x 325 x 44 mm (17.4 x 12.8 x 1.7")
+comments: 'UniFi Switch 24 Pro Max (non-PoE) with total non-blocking throughput of 56 Gbps. Features (16) Gigabit Ethernet ports, (8) 1/2.5GbE ports, and (2) 10G SFP+ uplink ports.\nDimensions: 442 x 325 x 44 mm (17.4 x 12.8 x 1.7")\n[UniFi Switch Pro Max 24 Techspecs](https://techspecs.ui.com/unifi/switching/usw-pro-max-24)'
 u_height: 1
-weight: 4.3
-weight_unit: kg
+weight: 9.5
+weight_unit: lb
 airflow: front-to-rear
 is_full_depth: false
 front_image: true
@@ -74,6 +71,6 @@ power-ports:
   - name: AC Input
     type: iec-60320-c14
     maximum_draw: 50
-  - name: USP-RPS Input
-    type: iec-60320-c20  # Standard connector for RPS
+  - name: USP-RPS connector for PSU failover
+    type: ubiquiti-smartpower
     maximum_draw: 50

device-types/Ubiquiti/USW-Pro-Max-48-PoE.yaml

@@ -3,13 +3,10 @@ manufacturer: Ubiquiti
 model: UniFi Switch Pro Max 48 PoE
 slug: ubiquiti-unifi-switch-pro-max-48-poe
 part_number: USW-Pro-Max-48-PoE
-comments: |
-  UniFi Switch 48 Pro Max PoE with total available PoE of 720W. Features (32) Gigabit PoE/PoE+ ports (including 8 PoE++), (16) 2.5GbE PoE++ ports, and (4) 10G SFP+ uplink ports.
-
-  Dimensions: 442.4 x 400 x 44 mm (17.4 x 15.7 x 1.7")
+comments: 'UniFi Switch 48 Pro Max PoE with total available PoE of 720W. Features (32) Gigabit PoE/PoE+ ports (including 8 PoE++), (16) 2.5GbE PoE++ ports, and (4) 10G SFP+ uplink ports.\nDimensions: 442.4 x 400 x 44 mm (17.4 x 15.7 x 1.7")\n[UniFi Switch Pro Max 48 PoE Techspecs](https://techspecs.ui.com/unifi/switching/usw-pro-max-48-poe)'
 u_height: 1
-weight: 6.3
-weight_unit: kg
+weight: 13.9
+weight_unit: lb
 airflow: front-to-rear
 is_full_depth: false
 front_image: true
@@ -224,5 +221,5 @@ power-ports:
     type: iec-60320-c14
     maximum_draw: 820
   - name: USP-RPS connector for PSU failover
-    type: iec-60320-c20  # Updated from usp-rps
-    maximum_draw: 600 # 600w out max from RPS total, but can do 600w
+    type: ubiquiti-smartpower
+    maximum_draw: 600 # 600W max output from RPS

device-types/Ubiquiti/USW-Pro-Max-48.yaml

@@ -3,13 +3,10 @@ manufacturer: Ubiquiti
 model: UniFi Switch Pro Max 48
 slug: ubiquiti-unifi-switch-pro-max-48
 part_number: USW-Pro-Max-48
-comments: |
-  UniFi Switch 48 Pro Max (non-PoE) with total non-blocking throughput of 112 Gbps. Features (32) Gigabit Ethernet ports, (16) 1/2.5GbE ports, and (4) 10G SFP+ uplink ports.
-
-  Dimensions: 442 x 325 x 44 mm (17.4 x 12.8 x 1.7")
+comments: 'UniFi Switch 48 Pro Max (non-PoE) with total non-blocking throughput of 112 Gbps. Features (32) Gigabit Ethernet ports, (16) 1/2.5GbE ports, and (4) 10G SFP+ uplink ports.\nDimensions: 442 x 325 x 44 mm (17.4 x 12.8 x 1.7")\n[UniFi Switch Pro Max 48 Techspecs](https://techspecs.ui.com/unifi/switching/usw-pro-max-48)'
 u_height: 1
-weight: 4.9
-weight_unit: kg
+weight: 10.8
+weight_unit: lb
 airflow: front-to-rear
 is_full_depth: false
 front_image: true
@@ -126,6 +123,6 @@ power-ports:
   - name: AC Input
     type: iec-60320-c14
     maximum_draw: 100
-  - name: USP-RPS Input
-    type: iec-60320-c20  # Updated to reflect standard support
-    maximum_draw: 600
+  - name: USP-RPS connector for PSU failover
+    type: ubiquiti-smartpower
+    maximum_draw: 100 # 100W max