From 9cb9279948b1fe75bccb0e0c28cba28697c98fd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20J=C3=B6rdens?= Date: Wed, 23 Oct 2019 17:40:45 +0000 Subject: [PATCH 1/5] bonn1: re-enumerate --- bonn1master.json | 16 ++++++++-------- bonn1satellite.json | 29 +++++++++++++---------------- 2 files changed, 21 insertions(+), 24 deletions(-) diff --git a/bonn1master.json b/bonn1master.json index 25e11aa..650befd 100644 --- a/bonn1master.json +++ b/bonn1master.json @@ -9,7 +9,7 @@ { "type": "dio", "board": "DIO_BNC", - "hw_rev": "v1.2", + "hw_rev": "v1.3", "ports": [ 0 ], @@ -19,7 +19,7 @@ { "type": "dio", "board": "DIO_BNC", - "hw_rev": "v1.2", + "hw_rev": "v1.3", "ports": [ 1 ], @@ -29,7 +29,7 @@ { "type": "dio", "board": "DIO_BNC", - "hw_rev": "v1.2", + "hw_rev": "v1.3", "ports": [ 2 ], @@ -39,7 +39,7 @@ { "type": "dio", "board": "DIO_BNC", - "hw_rev": "v1.2", + "hw_rev": "v1.3", "ports": [ 3 ], @@ -75,15 +75,15 @@ "clk_sel": 2 }, { - "type": "zotino", - "hw_rev": "v1.3", + "type": "grabber", + "hw_rev": "v1.0", "ports": [ 10 ] }, { - "type": "grabber", - "hw_rev": "v1.1", + "type": "zotino", + "hw_rev": "v1.3", "ports": [ 11 ] diff --git a/bonn1satellite.json b/bonn1satellite.json index a6e6905..1a21602 100644 --- a/bonn1satellite.json +++ b/bonn1satellite.json @@ -8,7 +8,7 @@ { "type": "dio", "board": "DIO_BNC", - "hw_rev": "v1.2", + "hw_rev": "v1.3", "ports": [ 0 ], @@ -18,7 +18,7 @@ { "type": "dio", "board": "DIO_BNC", - "hw_rev": "v1.2", + "hw_rev": "v1.3", "ports": [ 1 ], @@ -28,7 +28,7 @@ { "type": "dio", "board": "DIO_BNC", - "hw_rev": "v1.2", + "hw_rev": "v1.3", "ports": [ 2 ], @@ -38,7 +38,7 @@ { "type": "dio", "board": "DIO_BNC", - "hw_rev": "v1.2", + "hw_rev": "v1.3", "ports": [ 3 ], @@ -48,20 +48,10 @@ { "type": "sampler", "hw_rev": "v2.2", - "ports": [ - 8, - 9 - ] - }, - { - "type": "urukul", - "hw_rev": "v1.3", "ports": [ 4, 5 - ], - "synchronization": true, - "clk_sel": 2 + ] }, { "type": "urukul", @@ -73,11 +63,18 @@ "synchronization": true, "clk_sel": 2 }, + { + "type": "stabilizer", + "hw_rev": "v1.0", + "ports": [ + 8 + ] + }, { "type": "zotino", "hw_rev": "v1.3", "ports": [ - 10 + 9 ] } ], From d63e2e21a3d98239b8c508ea115b64c7200a58ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20J=C3=B6rdens?= Date: Tue, 19 Nov 2019 15:06:40 +0000 Subject: [PATCH 2/5] bonn1satellite: drop stabilizer (independent) --- bonn1satellite.json | 7 ------- 1 file changed, 7 deletions(-) diff --git a/bonn1satellite.json b/bonn1satellite.json index 1a21602..3000b0b 100644 --- a/bonn1satellite.json +++ b/bonn1satellite.json @@ -63,13 +63,6 @@ "synchronization": true, "clk_sel": 2 }, - { - "type": "stabilizer", - "hw_rev": "v1.0", - "ports": [ - 8 - ] - }, { "type": "zotino", "hw_rev": "v1.3", From b9322cb57a4249710746896a38f562544652931c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20J=C3=B6rdens?= Date: Tue, 26 Nov 2019 10:56:55 +0000 Subject: [PATCH 3/5] bonn: master --- bonn1master.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bonn1master.json b/bonn1master.json index 650befd..2ed344c 100644 --- a/bonn1master.json +++ b/bonn1master.json @@ -2,7 +2,7 @@ "target": "kasli", "variant": "bonn1master", "hw_rev": "v1.1", - "base": "standalone", + "base": "master", "core_addr": "10.0.16.100", "vendor": "QUARTIQ", "peripherals": [ From 8a0b638636bf3cf44e4b9dd3bf7c1f10785be6ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20J=C3=B6rdens?= Date: Fri, 29 Nov 2019 09:30:45 +0000 Subject: [PATCH 4/5] bonn: master/satellite and suservo-one-urukul --- bonn1master.json | 26 +++----------------------- bonn1satellite.json | 29 +++++------------------------ 2 files changed, 8 insertions(+), 47 deletions(-) diff --git a/bonn1master.json b/bonn1master.json index 2ed344c..f1242e0 100644 --- a/bonn1master.json +++ b/bonn1master.json @@ -47,21 +47,9 @@ "bank_direction_high": "output" }, { - "type": "sampler", - "hw_rev": "v2.2", - "ports": [ - 4, - 5 - ] - }, - { - "type": "urukul", - "hw_rev": "v1.3", - "ports": [ - 6, - 7 - ], - "synchronization": true, + "type": "suservo", + "sampler_ports": [4, 5], + "urukul0_ports": [6, 7], "clk_sel": 2 }, { @@ -88,13 +76,5 @@ 11 ] } - ], - "_todo": [ - { - "type": "suservo", - "sampler_ports": [4, 5], - "urukul0_ports": [6, 7], - "clk_sel": 2 - } ] } diff --git a/bonn1satellite.json b/bonn1satellite.json index 3000b0b..42c4fa1 100644 --- a/bonn1satellite.json +++ b/bonn1satellite.json @@ -3,6 +3,7 @@ "variant": "bonn1satellite", "hw_rev": "v1.1", "base": "satellite", + "core_addr": "10.0.16.100", "vendor": "QUARTIQ", "peripherals": [ { @@ -12,7 +13,7 @@ "ports": [ 0 ], - "bank_direction_low": "output", + "bank_direction_low": "input", "bank_direction_high": "output" }, { @@ -46,21 +47,9 @@ "bank_direction_high": "output" }, { - "type": "sampler", - "hw_rev": "v2.2", - "ports": [ - 4, - 5 - ] - }, - { - "type": "urukul", - "hw_rev": "v1.3", - "ports": [ - 6, - 7 - ], - "synchronization": true, + "type": "suservo", + "sampler_ports": [4, 5], + "urukul0_ports": [6, 7], "clk_sel": 2 }, { @@ -70,13 +59,5 @@ 9 ] } - ], - "_todo": [ - { - "type": "suservo", - "sampler_ports": [4, 5], - "urukul0_ports": [6, 7], - "clk_sel": 2 - } ] } From b52a2e208b7b6458152c61f0a7cd63b9f420223a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20J=C3=B6rdens?= Date: Fri, 29 Nov 2019 16:29:01 +0000 Subject: [PATCH 5/5] bonn1master: ext ref --- bonn1master.json | 1 + 1 file changed, 1 insertion(+) diff --git a/bonn1master.json b/bonn1master.json index f1242e0..659f36d 100644 --- a/bonn1master.json +++ b/bonn1master.json @@ -5,6 +5,7 @@ "base": "master", "core_addr": "10.0.16.100", "vendor": "QUARTIQ", + "ext_ref_frequency": 10e6, "peripherals": [ { "type": "dio",