diff --git a/device-types/Riedel/bl-ant-1010-19g-eu-g2.yaml b/device-types/Riedel/bl-ant-1010-19g-eu-g2.yaml index 1971b297..36ce78f4 100644 --- a/device-types/Riedel/bl-ant-1010-19g-eu-g2.yaml +++ b/device-types/Riedel/bl-ant-1010-19g-eu-g2.yaml @@ -25,15 +25,16 @@ interfaces: enabled: true mgmt_only: false rf_role: station +console-server-ports: - name: LINK 1 - type: other - enabled: true - mgmt_only: false + type: rj-45 + label: 1 - LINK + description: Port for daisy chaining multiple antennas. +console-ports: - name: LINK 2 - type: other - enabled: true - mgmt_only: false + type: rj-45 + label: LINK - 2 + description: Port for daisy chaining multiple antennas. - name: USB-C - type: other - enabled: true - mgmt_only: false + type: usb-c + description: Service use only. diff --git a/device-types/Riedel/connect-voip-ipx16.yaml b/device-types/Riedel/connect-voip-ipx16.yaml index cda0123b..9d58f397 100644 --- a/device-types/Riedel/connect-voip-ipx16.yaml +++ b/device-types/Riedel/connect-voip-ipx16.yaml @@ -17,18 +17,6 @@ power-ports: type: iec-60320-c14 maximum_draw: 30 interfaces: - - name: CLOCK 1 - type: other - enabled: false - mgmt_only: false - label: CLOCK 1 - description: BNC - These interfaces are currently unused and no\ \ electrical connection should be made to them. - - name: CLOCK 2 - type: other - enabled: false - mgmt_only: false - label: CLOCK 2 - description: BNC - These interfaces are currently unused and\ \ no electrical connection should be made to them. - name: LAN 1 type: 100base-tx enabled: true @@ -39,10 +27,17 @@ interfaces: enabled: true mgmt_only: false label: LAN 2 - - name: TTL/RELAY Interface +console-ports: + - name: CLOCK 1 type: other - enabled: true - mgmt_only: false + label: CLOCK 1 + description: BNC - These interfaces are currently unused and no\ \ electrical connection should be made to them. + - name: CLOCK 2 + type: other + label: CLOCK 2 + description: BNC - These interfaces are currently unused and\ \ no electrical connection should be made to them. + - name: TTL/RELAY Interface + type: db-25 label: TTL/RELAY description: D-SUB 25 pin - Through this interface, external control\ \ signals can be used. It provides eight TTL inputs/outputs as well as\ \ eight relay contacts. diff --git a/device-types/Riedel/dsp-1216hl.yaml b/device-types/Riedel/dsp-1216hl.yaml new file mode 100644 index 00000000..cb293b2e --- /dev/null +++ b/device-types/Riedel/dsp-1216hl.yaml @@ -0,0 +1,53 @@ +--- +manufacturer: Riedel +model: DSP-1216HL +slug: riedel-dsp-1216hl +description: Intercom panel, desktop, 16 keys +u_height: 0.0 +is_full_depth: false +weight: 2525 +weight_unit: g +front_image: true +rear_image: true +power-ports: + - name: Power input + type: iec-60320-c14 + maximum_draw: 15 +console-ports: + - name: GPI-IN + label: GPI-IN + type: de-9 + description: Sub-D9 (female) 3× GPI input, Uin = +5 V ... +48 V + - name: GPI-OUT + label: GPI-OUT + type: de-9 + description: Sub-D9 (male) 3× GPI output, Umax 48 V/300 mA, protected by\ self-healing fuse +interfaces: + - name: mgnt + label: MGNT + type: 1000base-t + enabled: true + mgmt_only: true + description: Management port + - name: eth1 + label: ETH 1 + type: 1000base-t + enabled: true + mgmt_only: false + description: AES67/Ethernet + - name: eth2 + label: ETH 2 + type: 1000base-t + enabled: true + mgmt_only: false + description: AES67/Ethernet + - name: eth3 + type: 1000base-x-sfp + enabled: true + mgmt_only: false + description: AES67/Ethernet + - name: eth4 + type: 1000base-x-sfp + enabled: true + mgmt_only: false + description: AES67/Ethernet diff --git a/device-types/Riedel/esp-1216hl.yaml b/device-types/Riedel/esp-1216hl.yaml index a6622565..c049b948 100644 --- a/device-types/Riedel/esp-1216hl.yaml +++ b/device-types/Riedel/esp-1216hl.yaml @@ -9,21 +9,18 @@ weight: 2.1 weight_unit: kg front_image: true rear_image: true -power-ports: - - name: Mains Power Connector - type: iec-60320-c14 - maximum_draw: 15 - allocated_draw: 15 -interfaces: +console-ports: - name: Expansion I/O 1 + type: rj-45 label: EXP I/O - type: other - enabled: true - mgmt_only: false description: RJ45, up to 6 ESP-1216HL can be cascaded with one RSP-12XXHL. +console-server-ports: - name: Expansion I/O 2 + type: rj-45 label: EXP I/O - type: other - enabled: true - mgmt_only: false description: RJ45, up to 6 ESP-1216HL can be cascaded with one RSP-12XXHL. +power-ports: + - name: Mains Power Connector + type: iec-60320-c14 + maximum_draw: 15 + allocated_draw: 15 diff --git a/device-types/Riedel/rsp-1216hl.yaml b/device-types/Riedel/rsp-1216hl.yaml index bb4a7d77..a62e0e1f 100644 --- a/device-types/Riedel/rsp-1216hl.yaml +++ b/device-types/Riedel/rsp-1216hl.yaml @@ -13,105 +13,74 @@ power-ports: - name: Power input type: iec-60320-c14 maximum_draw: 15 -interfaces: +console-ports: - name: AUDIO A label: AUDIO A - type: other - enabled: true - mgmt_only: false - description: RJ45 Analog 4-Wire Input/Output Connectors + type: rj-45 + description: RJ45 Analog 4-Wire Input/Output Connector - name: AUDIO B label: AUDIO B - type: other - enabled: true - mgmt_only: false - description: RJ45 Analog 4-Wire Input/Output Connectors - - name: DP - label: DP - type: other - enabled: true - mgmt_only: false - description: DisplayPort - - name: ETH 1 - label: ETH 1 - type: 1000base-t - enabled: true - mgmt_only: false - description: AES67/Ethernet - - name: ETH 2 - label: ETH 2 - type: 1000base-t - enabled: true - mgmt_only: false - description: AES67/Ethernet - - name: ETH 3 - label: ETH 3 - type: 1000base-x-sfp - enabled: true - mgmt_only: false - description: AES67/Ethernet - - name: ETH 4 - label: ETH 4 - type: 1000base-x-sfp - enabled: true - mgmt_only: false - description: AES67/Ethernet - - name: EXP - label: EXP - type: other - enabled: true - mgmt_only: false - description: RJ45 port for connecting expansion panel. + type: rj-45 + description: RJ45 Analog 4-Wire Input/Output Connector - name: GPI-IN label: GPI-IN - type: other - enabled: true - mgmt_only: false + type: de-9 description: Sub-D9 (female) 3× GPI input, Uin = +5 V ... +48 V - name: GPI-OUT label: GPI-OUT - type: other - enabled: true - mgmt_only: false - description: Sub-D9 (male) 3× GPI output, Umax 48 V/300 mA, protected by self-healing fuse + type: de-9 + description: Sub-D9 (male) 3× GPI output, Umax 48 V/300 mA, protected by\ self-healing fuse - name: Headset A label: HEADSET A - type: other - enabled: true - mgmt_only: false - description: RJ45 Headset Connectors + type: rj-45 + description: RJ45 Headset Connector - name: Headset B label: HEADSET B - type: other - enabled: true - mgmt_only: false - description: RJ45 Headset Connectors + type: rj-45 + description: RJ45 Headset Connector - name: MATRIX 1 label: MATRIX 1 - type: other - enabled: true - mgmt_only: false + type: rj-45 description: RJ45 Artist Matrix Connectors (AES3) - name: MATRIX 2 label: MATRIX 2 type: other - enabled: true - mgmt_only: false description: BNC Artist Matrix Connectors (AES3) - - name: MGNT + - name: USB-A + type: usb-a + description: Front USB Connector + - name: USB-C + label: USB + type: usb-c + description: Rear USB Connector +interfaces: + - name: mgnt label: MGNT - type: other + type: 1000base-t enabled: true mgmt_only: true - description: Management port (future use) - - name: USB-A - type: other + description: Management port + - name: eth1 + label: ETH 1 + type: 1000base-t enabled: true mgmt_only: false - description: Front USB Connector - - name: USB-C - label: USB - type: other + description: AES67/Ethernet + - name: eth2 + label: ETH 2 + type: 1000base-t enabled: true mgmt_only: false - description: Rear USB Connector + description: AES67/Ethernet + - name: eth3 + label: ETH 3 + type: 1000base-x-sfp + enabled: true + mgmt_only: false + description: AES67/Ethernet + - name: eth4 + label: ETH 4 + type: 1000base-x-sfp + enabled: true + mgmt_only: false + description: AES67/Ethernet diff --git a/device-types/Riedel/rsp-1232hl.yaml b/device-types/Riedel/rsp-1232hl.yaml index b411ee8d..db6f8f50 100644 --- a/device-types/Riedel/rsp-1232hl.yaml +++ b/device-types/Riedel/rsp-1232hl.yaml @@ -13,105 +13,79 @@ power-ports: - name: Power input type: iec-60320-c14 maximum_draw: 20 -interfaces: +console-server-ports: + - name: EXP + label: EXP + type: rj-45 + description: RJ45 port for connecting expansion panel. +console-ports: - name: AUDIO A label: AUDIO A - type: other - enabled: true - mgmt_only: false - description: RJ45 Analog 4-Wire Input/Output Connectors + type: rj-45 + description: RJ45 Analog 4-Wire Input/Output Connector - name: AUDIO B label: AUDIO B - type: other - enabled: true - mgmt_only: false - description: RJ45 Analog 4-Wire Input/Output Connectors - - name: DP - label: DP - type: other - enabled: true - mgmt_only: false - description: DisplayPort - - name: ETH 1 - label: ETH 1 - type: 1000base-t - enabled: true - mgmt_only: false - description: AES67/Ethernet - - name: ETH 2 - label: ETH 2 - type: 1000base-t - enabled: true - mgmt_only: false - description: AES67/Ethernet - - name: ETH 3 - label: ETH 3 - type: 1000base-x-sfp - enabled: true - mgmt_only: false - description: AES67/Ethernet - - name: ETH 4 - label: ETH 4 - type: 1000base-x-sfp - enabled: true - mgmt_only: false - description: AES67/Ethernet - - name: EXP - label: EXP - type: other - enabled: true - mgmt_only: false - description: RJ45 port for connecting expansion panel. + type: rj-45 + description: RJ45 Analog 4-Wire Input/Output Connector - name: GPI-IN label: GPI-IN - type: other - enabled: true - mgmt_only: false + type: de-9 description: Sub-D9 (female) 3× GPI input, Uin = +5 V ... +48 V - name: GPI-OUT label: GPI-OUT - type: other - enabled: true - mgmt_only: false - description: Sub-D9 (male) 3× GPI output, Umax 48 V/300 mA, protected by\ \ self-healing fuse + type: de-9 + description: Sub-D9 (male) 3× GPI output, Umax 48 V/300 mA, protected by\ self-healing fuse - name: Headset A label: HEADSET A - type: other - enabled: true - mgmt_only: false - description: RJ45 Headset Connectors + type: rj-45 + description: RJ45 Headset Connector - name: Headset B label: HEADSET B - type: other - enabled: true - mgmt_only: false - description: RJ45 Headset Connectors + type: rj-45 + description: RJ45 Headset Connector - name: MATRIX 1 label: MATRIX 1 - type: other - enabled: true - mgmt_only: false + type: rj-45 description: RJ45 Artist Matrix Connectors (AES3) - name: MATRIX 2 label: MATRIX 2 type: other - enabled: true - mgmt_only: false description: BNC Artist Matrix Connectors (AES3) - - name: Management + - name: USB-A + type: usb-a + description: Front USB Connector + - name: USB-C + label: USB + type: usb-c + description: Rear USB Connector +interfaces: + - name: mgnt label: MGNT - type: other + type: 1000base-t enabled: true mgmt_only: true - description: Management port (future use) - - name: USB-A - type: other + description: Management port + - name: eth1 + label: ETH 1 + type: 1000base-t enabled: true mgmt_only: false - description: Front USB Connector - - name: USB-C - label: USB - type: other + description: AES67/Ethernet + - name: eth2 + label: ETH 2 + type: 1000base-t enabled: true mgmt_only: false - description: Rear USB Connector + description: AES67/Ethernet + - name: eth3 + label: ETH 3 + type: 1000base-x-sfp + enabled: true + mgmt_only: false + description: AES67/Ethernet + - name: eth4 + label: ETH 4 + type: 1000base-x-sfp + enabled: true + mgmt_only: false + description: AES67/Ethernet diff --git a/device-types/Riedel/uic-128-ii.yaml b/device-types/Riedel/uic-128-ii.yaml index 729912e2..ee6c56f3 100644 --- a/device-types/Riedel/uic-128-ii.yaml +++ b/device-types/Riedel/uic-128-ii.yaml @@ -7,24 +7,23 @@ weight: 410 weight_unit: g subdevice_role: child interfaces: - - name: Bay {module} - Media 1 + - name: media1 label: dice symbol 2 type: 1000base-x-sfp enabled: true mgmt_only: false - - name: Bay {module} - Media 2 + - name: media2 label: dice symbol 3 type: 1000base-x-sfp enabled: true mgmt_only: false - - name: Bay {module} - USB Type-C - label: dice symbol 4 - type: other - enabled: true - mgmt_only: false - - name: Bay {module} - Management + - name: management label: dice symbol 5 type: 1000base-t enabled: true mgmt_only: false description: Interface to configure the Artist-1024 node or network. +console-ports: + - name: USB Type-C + label: dice symbol 4 + type: usb-c diff --git a/device-types/Riedel/uic-128.yaml b/device-types/Riedel/uic-128.yaml index c8d7bf5e..d9a87423 100644 --- a/device-types/Riedel/uic-128.yaml +++ b/device-types/Riedel/uic-128.yaml @@ -7,20 +7,23 @@ weight: 410 weight_unit: g subdevice_role: child interfaces: - - name: Bay {module} - Management - type: 1000base-t - enabled: true - mgmt_only: false - description: Interface to configure the Artist-1024 node or network. - - name: Bay {module} - Media 1 + - name: media1 + label: dice symbol 2 type: 1000base-x-sfp enabled: true mgmt_only: false - - name: Bay {module} - Media 2 + - name: media2 + label: dice symbol 3 type: 1000base-x-sfp enabled: true mgmt_only: false - - name: Bay {module} - USB Type-C - type: other + - name: management + label: dice symbol 5 + type: 1000base-t enabled: true mgmt_only: false + description: Interface to configure the Artist-1024 node or network. +console-ports: + - name: USB Type-C + label: dice symbol 4 + type: usb-c diff --git a/elevation-images/Riedel/riedel-artist-1024.rear.png b/elevation-images/Riedel/riedel-artist-1024.rear.png old mode 100755 new mode 100644 diff --git a/elevation-images/Riedel/riedel-dsp-1216hl.front.png b/elevation-images/Riedel/riedel-dsp-1216hl.front.png new file mode 100644 index 00000000..c7316080 Binary files /dev/null and b/elevation-images/Riedel/riedel-dsp-1216hl.front.png differ diff --git a/elevation-images/Riedel/riedel-dsp-1216hl.rear.png b/elevation-images/Riedel/riedel-dsp-1216hl.rear.png new file mode 100644 index 00000000..16b83c81 Binary files /dev/null and b/elevation-images/Riedel/riedel-dsp-1216hl.rear.png differ