From f1c231a54297b9d0d921f51dcfcf6bbf3eed1d31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20J=C3=B6rdens?= Date: Tue, 9 Nov 2021 11:35:13 +0100 Subject: [PATCH] npl3, npl6satellite: pair --- npl3.json | 5 ++--- npl6satellite.json | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/npl3.json b/npl3.json index 5dd68cb..52d0c60 100644 --- a/npl3.json +++ b/npl3.json @@ -1,12 +1,11 @@ { - "_description": "NPL Bowden", + "_description": "NPL Hill", "target": "kasli", "min_artiq_version": "6.0", "variant": "npl3", "hw_rev": "v2.0", - "min_artiq_version": "6.0", "ext_ref_frequency": 10e6, - "base": "standalone", + "base": "master", "core_addr": "10.34.16.100", "vendor": "QUARTIQ", "peripherals": [ diff --git a/npl6satellite.json b/npl6satellite.json index 1b1161a..9427b11 100644 --- a/npl6satellite.json +++ b/npl6satellite.json @@ -1,12 +1,11 @@ { - "_description": "NPL Hill", + "_description": "NPL Hill, Master is npl3", "target": "kasli", + "min_artiq_version": "6.0", "variant": "npl6satellite", "hw_rev": "v2.0", - "min_artiq_version": "6.0", "ext_ref_frequency": 10e6, "base": "satellite", - "core_addr": "10.34.16.100", "vendor": "QUARTIQ", "peripherals": [ {