diff --git a/stfcmaster.json b/stfcmaster.json index 3c2dbd5..c9fba4d 100644 --- a/stfcmaster.json +++ b/stfcmaster.json @@ -3,6 +3,7 @@ "min_artiq_version": "6.0", "variant": "stfcmaster", "hw_rev": "v2.0", + "ext_ref_frequency": 10e6, "base": "master", "core_addr": "192.168.1.75", "peripherals": [ @@ -14,12 +15,12 @@ "type": "dio", "ports": [3], "bank_direction_low": "input", - "bank_direction_high": "output" + "bank_direction_high": "input" }, { "type": "dio", "ports": [4], - "bank_direction_low": "output", + "bank_direction_low": "input", "bank_direction_high": "output" }, { @@ -43,6 +44,18 @@ { "type": "fastino", "ports": [9] + }, + { + "type": "mirny", + "ports": [10], + "clk_sel": "mmcx", + "refclk": 125e6 + }, + { + "type": "mirny", + "ports": [11], + "clk_sel": "mmcx", + "refclk": 125e6 } ] } \ No newline at end of file diff --git a/stfcsatellite.json b/stfcsatellite.json index d948057..2c4e709 100644 --- a/stfcsatellite.json +++ b/stfcsatellite.json @@ -6,36 +6,18 @@ "base": "satellite", "peripherals": [ { - "type": "urukul", - "dds": "ad9910", - "ports": [0, 1], + "type": "suservo", + "sampler_ports": [8, 9], + "urukul0_ports": [0, 1], + "urukul1_ports": [2, 3], "clk_sel": 2 }, { - "type": "urukul", - "dds": "ad9910", - "ports": [2, 3], + "type": "suservo", + "sampler_ports": [10, 11], + "urukul0_ports": [6, 7], + "urukul1_ports": [5, 6], "clk_sel": 2 - }, - { - "type": "urukul", - "dds": "ad9910", - "ports": [4, 5], - "clk_sel": 2 - }, - { - "type": "urukul", - "dds": "ad9910", - "ports": [6, 7], - "clk_sel": 2 - }, - { - "type": "sampler", - "ports": [8, 9] - }, - { - "type": "sampler", - "ports": [10, 11] } ] }