From 1e1a95612142e1da1d81cd368b4dbe0978d2e699 Mon Sep 17 00:00:00 2001 From: ciciwu Date: Thu, 23 Dec 2021 16:38:10 +0800 Subject: [PATCH] revert "add old version of the system" --- sias2.json | 50 ---------------------------------------------- siassatellite.json | 35 +++++++++++++++++++++----------- 2 files changed, 23 insertions(+), 62 deletions(-) delete mode 100644 sias2.json diff --git a/sias2.json b/sias2.json deleted file mode 100644 index 206ac79..0000000 --- a/sias2.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "target": "kasli", - "min_artiq_version": "6.0", - "variant": "sias2", - "hw_rev": "v2.0", - "base": "standalone", - "core_addr": "192.168.1.75", - "peripherals": [ - { - "type": "dio", - "board": "DIO_SMA", - "ports": [0], - "edge_counter": true, - "bank_direction_low": "input", - "bank_direction_high": "output" - }, - { - "type": "dio", - "board": "DIO_SMA", - "ports": [1], - "bank_direction_low": "output", - "bank_direction_high": "output" - }, - { - "type": "dio", - "board": "DIO_SMA", - "ports": [2], - "bank_direction_low": "output", - "bank_direction_high": "output" - }, - { - "type": "dio", - "board": "DIO_SMA", - "ports": [3], - "bank_direction_low": "output", - "bank_direction_high": "output" - }, - { - "type": "fastino", - "ports": [4] - }, - { - "type": "suservo", - "sampler_ports": [10, 11], - "urukul0_ports": [6, 7], - "urukul1_ports": [8, 9], - "clk_sel": 2 - } - ] -} \ No newline at end of file diff --git a/siassatellite.json b/siassatellite.json index a75c888..a93b67d 100644 --- a/siassatellite.json +++ b/siassatellite.json @@ -7,32 +7,43 @@ "peripherals": [ { "type": "dio", + "board": "DIO_SMA", "ports": [0], + "edge_counter": true, "bank_direction_low": "input", "bank_direction_high": "output" }, { "type": "dio", + "board": "DIO_SMA", "ports": [1], "bank_direction_low": "output", "bank_direction_high": "output" }, { - "type": "suservo", - "sampler_ports": [2, 3], - "urukul0_ports": [4, 5], - "urukul1_ports": [6, 7], - "clk_sel": 2 + "type": "dio", + "board": "DIO_SMA", + "ports": [2], + "bank_direction_low": "output", + "bank_direction_high": "output" }, { - "type": "urukul", - "dds": "ad9910", - "ports": [8, 9], - "clk_sel": 2 + "type": "dio", + "board": "DIO_SMA", + "ports": [3], + "bank_direction_low": "output", + "bank_direction_high": "output" }, { "type": "fastino", - "ports": [10] + "ports": [4] + }, + { + "type": "suservo", + "sampler_ports": [10, 11], + "urukul0_ports": [6, 7], + "urukul1_ports": [8, 9], + "clk_sel": 2 } - ] -} + ] +} \ No newline at end of file