Skip to content

Commit

Permalink
feat: add multiple Merging devices (#96)
Browse files Browse the repository at this point in the history
* feat: add multiple Merging devices

* fix: rename file and update slug

---------

Co-authored-by: Sjur Fredriksen <[email protected]>
  • Loading branch information
MartinMaeland and sjurtf authored Aug 14, 2024
1 parent fc6f574 commit 26b89a9
Show file tree
Hide file tree
Showing 10 changed files with 148 additions and 0 deletions.
46 changes: 46 additions & 0 deletions device-types/Merging/Anubis-SPS.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
---
manufacturer: Merging
model: Anubis SPS
slug: merging-anubis-sps
airflow: right-to-left
weight: 0.95
weight_unit: kg
front_image: true
rear_image: true
power-ports:
- name: PSU main DC 9V-15V
comment: PoE+ parallell/redundant
type: dc-terminal
maximum_draw: 18
allocated_draw: 15
interfaces:
- name: 1 PoE
comment: Ravenna / AES67 (MGMT) DEF switched, ALT ST 2022-7
type: 1000base-t
description: RJ45
mgmt_only: false
poe_mode: pd
poe_type: type2-ieee802.3at
- name: '2'
comment: Ravenna / AES67 (MGMT) DEF switched, ALT ST 2022-7
type: 1000base-t
description: RJ45
mgmt_only: false
- name: GPIO/MIDI IN/OUT
type: other
description: 6.35mm TRS Female
- name: MIC / LINE IN 1-2
type: other
description: Combo Locking Neutrik XLR3 female / 6.35mm TRS female
- name: INST / LINE IN 3-4 front
type: other
description: 6.35mm TRS female
- name: MAIN OUT 1/L + 2/R
type: other
description: XLR3 male
- name: LINE OUT 3-4
type: other
description: 6.35mm TRS female
- name: HP out 1-2 front
type: other
description: 6.35mm TRS female
40 changes: 40 additions & 0 deletions device-types/Merging/Anubis.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
---
manufacturer: Merging
model: Anubis
slug: merging-anubis
airflow: right-to-left
weight: 0.95
weight_unit: kg
front_image: true
rear_image: true
power-ports:
- name: PSU main DC 9V-15V
comment: PoE+ parallell/redundant
type: dc-terminal
maximum_draw: 18
allocated_draw: 15
interfaces:
- name: Ravenna / AES67 (MGMT)
type: 1000base-t
description: Neutrik EtherCON
mgmt_only: false
poe_mode: pd
poe_type: type2-ieee802.3at
- name: GPIO/MIDI IN/OUT
type: other
description: 6.35mm TRS Female
- name: MIC / LINE IN 1-2
type: other
description: Combo Locking Neutrik XLR3 female / 6.35mm TRS female
- name: INST / LINE IN 3-4 front
type: other
description: 6.35mm TRS female
- name: MAIN OUT 1/L + 2/R
type: other
description: XLR3 male
- name: LINE OUT 3-4
type: other
description: 6.35mm TRS female
- name: HP out 1-2 front
type: other
description: 6.35mm TRS female
52 changes: 52 additions & 0 deletions device-types/Merging/Hapi-MKII.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
---
manufacturer: Merging
model: Hapi MKII
slug: merging-hapi-mkii
u_height: 1.0
is_full_depth: true
airflow: passive
weight: 4.5
weight_unit: kg
front_image: true
rear_image: true
power-ports:
- name: PSU main AC
type: iec-60320-c14
maximum_draw: 30
allocated_draw: 30
- name: PSU optional redundant DC
type: dc-terminal
maximum_draw: 30
allocated_draw: 30
interfaces:
- name: Ravenna / MGMT Primary
type: 1000base-t
mgmt_only: false
- name: Ravenna / MGMT Secondary
type: 1000base-t
mgmt_only: false
- name: SYNC LTC/Video Ref/MIDI
type: other
description: 15 pin D-sub female
- name: WCLK In
type: other
- name: WCLK out
type: other
- name: SPDIF / ADAT IN
type: other
description: TOSLINK JIS F05
- name: SPDIF / ADAT OUT
type: other
description: TOSLINK JIS F05
- name: AES IN/OUT 1-8
type: other
description: 25 pin D-sub female
- name: HP out 1 front
type: other
description: 6,35mm TRS female
- name: HP out 2 front
type: other
description: 3,5mm TRS female
module-bays:
- name: SLOT 1
- name: SLOT 2
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added elevation-images/Merging/merging-anubis.front.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added elevation-images/Merging/merging-anubis.rear.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions module-types/Merging/ADA8S.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
manufacturer: Merging
model: ADA8S
interfaces:
- name: MIC / LINE IN 1-8
type: other
description: 25 pin D-sub female AES59 / Tascam analog
- name: LINE OUT 1-8
type: other
description: 25 pin D-sub female AES59 / Tascam analog

0 comments on commit 26b89a9

Please sign in to comment.