diff --git a/bonn1master.json b/bonn1master.json index 25e11aa..659f36d 100644 --- a/bonn1master.json +++ b/bonn1master.json @@ -2,14 +2,15 @@ "target": "kasli", "variant": "bonn1master", "hw_rev": "v1.1", - "base": "standalone", + "base": "master", "core_addr": "10.0.16.100", "vendor": "QUARTIQ", + "ext_ref_frequency": 10e6, "peripherals": [ { "type": "dio", "board": "DIO_BNC", - "hw_rev": "v1.2", + "hw_rev": "v1.3", "ports": [ 0 ], @@ -19,7 +20,7 @@ { "type": "dio", "board": "DIO_BNC", - "hw_rev": "v1.2", + "hw_rev": "v1.3", "ports": [ 1 ], @@ -29,7 +30,7 @@ { "type": "dio", "board": "DIO_BNC", - "hw_rev": "v1.2", + "hw_rev": "v1.3", "ports": [ 2 ], @@ -39,7 +40,7 @@ { "type": "dio", "board": "DIO_BNC", - "hw_rev": "v1.2", + "hw_rev": "v1.3", "ports": [ 3 ], @@ -47,21 +48,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 }, { @@ -75,26 +64,18 @@ "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 ] } - ], - "_todo": [ - { - "type": "suservo", - "sampler_ports": [4, 5], - "urukul0_ports": [6, 7], - "clk_sel": 2 - } ] } diff --git a/bonn1satellite.json b/bonn1satellite.json index a6e6905..42c4fa1 100644 --- a/bonn1satellite.json +++ b/bonn1satellite.json @@ -3,22 +3,23 @@ "variant": "bonn1satellite", "hw_rev": "v1.1", "base": "satellite", + "core_addr": "10.0.16.100", "vendor": "QUARTIQ", "peripherals": [ { "type": "dio", "board": "DIO_BNC", - "hw_rev": "v1.2", + "hw_rev": "v1.3", "ports": [ 0 ], - "bank_direction_low": "output", + "bank_direction_low": "input", "bank_direction_high": "output" }, { "type": "dio", "board": "DIO_BNC", - "hw_rev": "v1.2", + "hw_rev": "v1.3", "ports": [ 1 ], @@ -28,7 +29,7 @@ { "type": "dio", "board": "DIO_BNC", - "hw_rev": "v1.2", + "hw_rev": "v1.3", "ports": [ 2 ], @@ -38,7 +39,7 @@ { "type": "dio", "board": "DIO_BNC", - "hw_rev": "v1.2", + "hw_rev": "v1.3", "ports": [ 3 ], @@ -46,47 +47,17 @@ "bank_direction_high": "output" }, { - "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", - "hw_rev": "v1.3", - "ports": [ - 6, - 7 - ], - "synchronization": true, + "type": "suservo", + "sampler_ports": [4, 5], + "urukul0_ports": [6, 7], "clk_sel": 2 }, { "type": "zotino", "hw_rev": "v1.3", "ports": [ - 10 + 9 ] } - ], - "_todo": [ - { - "type": "suservo", - "sampler_ports": [4, 5], - "urukul0_ports": [6, 7], - "clk_sel": 2 - } ] }