From a95a3d939e780a2e12438da89bd9b22efdb88318 Mon Sep 17 00:00:00 2001 From: SingularitySurfer Date: Thu, 16 Jun 2022 14:34:54 +0000 Subject: [PATCH] replace bonn2 with bonn2master and add bonn2satellite, bonn3 and bonn4 --- bonn2.json => bonn2master.json | 4 +- bonn2satellite.json | 41 ++++++++++++++++++++ bonn3.json | 46 +++++++++++++++++++++++ bonn4.json | 68 ++++++++++++++++++++++++++++++++++ 4 files changed, 157 insertions(+), 2 deletions(-) rename bonn2.json => bonn2master.json (96%) create mode 100644 bonn2satellite.json create mode 100644 bonn3.json create mode 100644 bonn4.json diff --git a/bonn2.json b/bonn2master.json similarity index 96% rename from bonn2.json rename to bonn2master.json index f368e81..96c268b 100644 --- a/bonn2.json +++ b/bonn2master.json @@ -1,10 +1,10 @@ { "_description": "Universität Bonn, Thorsten Groh", "target": "kasli", - "variant": "bonn2", + "variant": "bonn2master", "hw_rev": "v2.0", "ext_ref_frequency": 10e6, - "base": "standalone", + "base": "master", "core_addr": "10.34.16.100", "vendor": "QUARTIQ", "peripherals": [ diff --git a/bonn2satellite.json b/bonn2satellite.json new file mode 100644 index 0000000..3b3f2c1 --- /dev/null +++ b/bonn2satellite.json @@ -0,0 +1,41 @@ +{ + "_description": "Universität Bonn, Thorsten Groh", + "target": "kasli", + "variant": "bonn2satellite", + "hw_rev": "v2.0", + "min_artiq_version": "6.0", + "base": "satellite", + "vendor": "QUARTIQ", + "peripherals": [ + { + "type": "dio", + "board": "DIO_BNC", + "ports": [0], + "hw_rev": "v1.2", + "bank_direction_low": "output", + "bank_direction_high": "output" + }, + { + "type": "dio", + "board": "DIO_BNC", + "ports": [1], + "hw_rev": "v1.2", + "bank_direction_low": "output", + "bank_direction_high": "output" + }, + { + "type": "urukul", + "hw_rev": "v1.5", + "ports": [2, 3], + "clk_sel": 2, + "synchronization": true + }, + { + "type": "mirny", + "hw_rev": "v1.1", + "ports": [4], + "clk_sel": 1, + "refclk": 125e6 + } + ] +} diff --git a/bonn3.json b/bonn3.json new file mode 100644 index 0000000..c491751 --- /dev/null +++ b/bonn3.json @@ -0,0 +1,46 @@ +{ + "_description": "Universität Bonn, Thorsten Groh", + "target": "kasli", + "variant": "bonn3", + "hw_rev": "v2.0", + "ext_ref_frequency": 10e6, + "base": "standalone", + "core_addr": "10.34.16.100", + "vendor": "QUARTIQ", + "peripherals": [ + { + "type": "dio", + "board": "DIO_BNC", + "ports": [0], + "hw_rev": "v1.2", + "bank_direction_low": "input", + "bank_direction_high": "output" + }, + { + "type": "dio", + "board": "DIO_BNC", + "ports": [1], + "hw_rev": "v1.2", + "bank_direction_low": "output", + "bank_direction_high": "output" + }, + { + "type": "suservo", + "sampler_ports": [4, 5], + "urukul0_ports": [2, 3], + "clk_sel": 2 + }, + { + "type": "mirny", + "hw_rev": "v1.1", + "ports": [6], + "clk_sel": 1, + "refclk": 125e6 + }, + { + "type": "zotino", + "hw_rev": "v1.3", + "ports": [7] + } + ] +} diff --git a/bonn4.json b/bonn4.json new file mode 100644 index 0000000..3983019 --- /dev/null +++ b/bonn4.json @@ -0,0 +1,68 @@ +{ + "_description": "Universität Bonn, Nana El Mellal", + "target": "kasli", + "variant": "bonn4", + "hw_rev": "v2.0", + "ext_ref_frequency": 10e6, + "base": "standalone", + "core_addr": "10.34.16.100", + "vendor": "QUARTIQ", + "peripherals": [ + { + "type": "dio", + "board": "DIO_SMA", + "ports": [0], + "hw_rev": "v1.2", + "bank_direction_low": "input", + "bank_direction_high": "output" + }, + { + "type": "dio", + "board": "DIO_SMA", + "ports": [1], + "hw_rev": "v1.2", + "bank_direction_low": "output", + "bank_direction_high": "output" + }, + { + "type": "dio", + "board": "DIO_SMA", + "ports": [2], + "hw_rev": "v1.2", + "bank_direction_low": "output", + "bank_direction_high": "output" + }, + { + "type": "dio", + "board": "DIO_SMA", + "ports": [3], + "hw_rev": "v1.2", + "bank_direction_low": "output", + "bank_direction_high": "output" + }, + { + "type": "phaser", + "ports": [4], + "hw_rev": "v1.1", + "clk_sel": 2 + }, + { + "type": "urukul", + "hw_rev": "v1.5", + "ports": [5, 6], + "clk_sel": 2, + "synchronization": true + }, + { + "type": "suservo", + "sampler_ports": [8, 9], + "urukul0_ports": [7, 10], + "clk_sel": 2 + }, + { + "type": "zotino", + "hw_rev": "v1.3", + "ports": [11] + } + ] +}