Added Demo Kit as 1T satellite

Technosystem-Labs · Nov 29, 2021 · a1e331c · a1e331c
1 parent 375ae72
commit a1e331c
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 10 deletions.
diff --git a/Makefile b/Makefile
@@ -11,13 +11,18 @@ export ddbpatch
 help:
 	echo "Please specify target!"
 
-all: 5t.ddb 1tc1.ddb 5tc1.ddb 5tc2-standalone.ddb 1tc1.gw 5tc1.gw 5tc2.gw 5tc2-standalone.gw
+all: 5t.ddb 1t.ddb 1tc1.ddb 5tc1.ddb 5tc2-standalone.ddb 1tc1.gw 5tc1.gw 5tc2-satellite.gw 5tc2-standalone.gw demokit-satellite.gw
 
 5t.ddb:
 	mkdir -p experiments
-	dartiq run "artiq_ddb_template -s 1 gw/aegis-5tc2.json gw/aegis-5tc1.json > experiments/device_db_5t.py"
+	dartiq run "artiq_ddb_template -s 1 gw/aegis-5tc2-satellite.json gw/aegis-5tc1.json > experiments/device_db_5t.py"
 	echo "$$ddbpatch" >> experiments/device_db_5t.py
 
+1t.ddb:
+	mkdir -p experiments
+	dartiq run "artiq_ddb_template -s 1 gw/aegis-demokit-satellite.json -s 2 gw/aegis-demokit-satellite.json gw/aegis-1tc1.json > experiments/device_db_1t.py"
+	echo "$$ddbpatch" >> experiments/device_db_1t.py
+
 1tc1.ddb 5tc1.ddb 5tc2-standalone.ddb:
 	mkdir -p experiments
 	dartiq run "artiq_ddb_template gw/aegis-$(basename $@).json > experiments/device_db_$(basename $@).py"
@@ -29,21 +34,25 @@ all: 5t.ddb 1tc1.ddb 5tc1.ddb 5tc2-standalone.ddb 1tc1.gw 5tc1.gw 5tc2.gw 5tc2-s
 	cp artiq_kasli/kasli-aegis-$(basename $@)/software/bootloader/bootloader.bin artiq_kasli/kasli-aegis-$(basename $@)/bootloader.bin
 	cp artiq_kasli/kasli-aegis-$(basename $@)/software/runtime/runtime.fbi artiq_kasli/kasli-aegis-$(basename $@)/runtime.fbi
 
-5tc2-satellite.gw:
+5tc2-satellite.gw demokit-satellite.gw:
 	dartiq run "python -m artiq.gateware.targets.kasli_generic gw/aegis-$(basename $@).json"
 	cp artiq_kasli/kasli-aegis-$(basename $@)/gateware/top.bit artiq_kasli/kasli-aegis-$(basename $@)/top.bit
 	cp artiq_kasli/kasli-aegis-$(basename $@)/software/bootloader/bootloader.bin artiq_kasli/kasli-aegis-$(basename $@)/bootloader.bin
 	cp artiq_kasli/kasli-aegis-$(basename $@)/software/satman/satman.fbi artiq_kasli/kasli-aegis-$(basename $@)/satman.fbi
 
-1tc1.flash 5tc1.flash 5tc2-satellite.flash 5tc2-standalone.flash:
+1tc1.flash 5tc1.flash 5tc2-satellite.flash 5tc2-standalone.flash demokit-satellite.flash:
 	dartiq run "artiq_flash -t kasli -V aegis-$(basename $@) -d ./artiq_kasli erase gateware bootloader firmware start"
 
 cleanup_gw:
 	find artiq_kasli/ -type d -name gateware -exec rm -rf {} +
 	find artiq_kasli/ -type d -name software -exec rm -rf {} +
 
 release_tarball:
-	tar -cvzf aegis-release-vX.X.X.tar.gz artiq_kasli experiments 
+	tar -cvzf aegis-release-vX.X.X.tar.gz artiq_kasli experiments
+
+clean:
+	rm -rf artiq_kasli
+	rm -rf experiments/device_db*
 
 
 
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 In all variants RTIO clock is 125 MHz and is based on 10 MHz external reference. 
 IP address is set to `192.168.1.70`.
 
-1. `1tc1`: 
+1. `1tc1` - master for demonstration systems: 
    * 2x DIO MCX (32 channels total)
    * Fastino
    * 4x HVAMP_8CH
@@ -21,7 +21,8 @@ IP address is set to `192.168.1.70`.
    * 1x DIO MCX (16 channels total)
    * Fastino
    * 4x HVAMP_8CH
-
+5. `demokit-satellite` - satellite for 1T subsystem
+   * 1x DIO BNC (8 channels total)
 ## Building firmware
 
 1. Install Xilinx Vivado
@@ -35,7 +36,7 @@ IP address is set to `192.168.1.70`.
 
 ## Device DB
 
-* For 1TC1 use `experiments/device_db_1tc1.py`.
+* For 1T use `experiments/device_db_1tc1.py`.
 * For 5T as a two crate system use `experiments/device_db_5t.py`. 
 * For 5TC1 as standalone use `experiments/device_db_5tc1.py`.
 * For 5TC2 as standalone use `experiments/device_db_5tc2-standalone.py`.

diff --git a/dartiq.json b/dartiq.json
@@ -1,5 +1,5 @@
 {
-    "image": "technosystem/dartiq:6.0",
+    "image": "technosystem/dartiq:latest",
     "python_modules": [
         "modules/artiq"
     ]

diff --git a/gw/aegis-1tc1.json b/gw/aegis-1tc1.json
@@ -2,7 +2,7 @@
     "target": "kasli",
     "variant": "kasli-aegis-1tc1",
     "hw_rev": "v2.0",
-    "base": "standalone",
+    "base": "master",
     "core_addr": "192.168.1.70",
     "rtio_frequency": 125e6,
     "ext_ref_frequency": 10e6,

diff --git a/gw/aegis-demokit-satellite.json b/gw/aegis-demokit-satellite.json
@@ -0,0 +1,15 @@
+{
+    "target": "kasli",
+    "variant": "kasli-aegis-demokit-satellite",
+    "hw_rev": "v2.0",
+    "base": "satellite",
+    "peripherals": [
+        {
+            "type": "dio",
+            "ports": [0],
+            "bank_direction_low": "output",
+            "bank_direction_high": "input",
+            "edge_counter": true
+        }
+    ]
+}