From 250d7e8f0fa7f70591625d19e0ce402e2ee97a38 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Tue, 9 May 2023 14:26:45 +0800 Subject: [PATCH] examples/nac3devices: add almazny --- artiq/examples/nac3devices/nac3devices.json | 5 +++-- artiq/examples/nac3devices/nac3devices.py | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/artiq/examples/nac3devices/nac3devices.json b/artiq/examples/nac3devices/nac3devices.json index ea70bc98f..7fda9ca78 100644 --- a/artiq/examples/nac3devices/nac3devices.json +++ b/artiq/examples/nac3devices/nac3devices.json @@ -1,8 +1,8 @@ { "target": "kasli", - "min_artiq_version": "8.0", + "min_artiq_version": "9.0", "variant": "nac3devices", - "hw_rev": "v1.1", + "hw_rev": "v2.0", "base": "standalone", "core_addr": "192.168.1.70", "peripherals": [ @@ -12,6 +12,7 @@ }, { "type": "mirny", + "almazny": true, "ports": [1], "clk_sel": "mmcx", "refclk": 125e6 diff --git a/artiq/examples/nac3devices/nac3devices.py b/artiq/examples/nac3devices/nac3devices.py index b64efe27b..1f2d54cc7 100644 --- a/artiq/examples/nac3devices/nac3devices.py +++ b/artiq/examples/nac3devices/nac3devices.py @@ -4,6 +4,7 @@ from artiq.coredevice.cache import CoreCache from artiq.coredevice.kasli_i2c import KasliEEPROM from artiq.coredevice.zotino import Zotino from artiq.coredevice.mirny import Mirny as MirnyCPLD +from artiq.coredevice.almazny import AlmaznyChannel from artiq.coredevice.adf5356 import ADF5356 from artiq.coredevice.urukul import CPLD as UrukulCPLD from artiq.coredevice.ad9912 import AD9912 @@ -22,6 +23,7 @@ class NAC3Devices(EnvExperiment): zotino0: KernelInvariant[Zotino] mirny0_cpld: KernelInvariant[MirnyCPLD] mirny0_ch0: KernelInvariant[ADF5356] + mirny0_almazny0: KernelInvariant[AlmaznyChannel] urukul0_cpld: KernelInvariant[UrukulCPLD] eeprom_urukul0: KernelInvariant[KasliEEPROM] urukul0_ch0: KernelInvariant[AD9912] @@ -39,6 +41,7 @@ class NAC3Devices(EnvExperiment): self.setattr_device("zotino0") self.setattr_device("mirny0_cpld") self.setattr_device("mirny0_ch0") + self.setattr_device("mirny0_almazny0") self.setattr_device("urukul0_cpld") self.setattr_device("eeprom_urukul0") self.setattr_device("urukul0_ch0")