occheung
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

reorganize JSON schema files

This commit is contained in:
Sebastien Bourdeauducq 2021-01-16 10:43:14 +08:00
parent de5f9cd49f
commit c675488a99
5 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MANIFEST.in
View File

@ -3,4 +3,4 @@ graft artiq/examples
include artiq/gui/logo*.svg include artiq/gui/logo*.svg
include versioneer.py include versioneer.py
include artiq/_version.py include artiq/_version.py
include artiq/gateware/targets/kasli_generic.schema.json include artiq/coredevice/coredevice_generic.schema.json

0
artiq/gateware/targets/kasli_generic.schema.json → artiq/coredevice/coredevice_generic.schema.json
View File

2
artiq/gateware/jsondesc.py → artiq/coredevice/jsondesc.py
View File

@ -19,7 +19,7 @@ def extend_with_default(validator_class):
validator_class, {"properties" : set_defaults}, validator_class, {"properties" : set_defaults},
) )
schema_path = path.join(path.dirname(__file__), "targets/kasli_generic.schema.json") schema_path = path.join(path.dirname(__file__), "coredevice_generic.schema.json")
with open(schema_path, "r") as f: with open(schema_path, "r") as f:
schema = json.load(f) schema = json.load(f)

2
artiq/frontend/artiq_ddb_template.py
View File

@ -7,7 +7,7 @@ from collections import defaultdict
from itertools import count from itertools import count
from artiq import __version__ as artiq_version from artiq import __version__ as artiq_version
from artiq.gateware import jsondesc from artiq.coredevice import jsondesc
def process_header(output, description): def process_header(output, description):

3
artiq/gateware/targets/kasli_generic.py
View File

@ -5,7 +5,8 @@ import argparse
from misoc.integration.builder import builder_args, builder_argdict from misoc.integration.builder import builder_args, builder_argdict
from misoc.targets.kasli import soc_kasli_args, soc_kasli_argdict from misoc.targets.kasli import soc_kasli_args, soc_kasli_argdict
from artiq.gateware import rtio, eem, jsondesc from artiq.coredevice import jsondesc
from artiq.gateware import rtio, eem
from artiq.gateware.rtio.phy import ttl_simple, ttl_serdes_7series, edge_counter from artiq.gateware.rtio.phy import ttl_simple, ttl_serdes_7series, edge_counter
from artiq.gateware.targets.kasli import StandaloneBase, MasterBase, SatelliteBase from artiq.gateware.targets.kasli import StandaloneBase, MasterBase, SatelliteBase
from artiq.build_soc import * from artiq.build_soc import *