M-Labs
/
sinara-systems-legacy
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'bonn1' 

* bonn1:
  bonn1master: ext ref
  bonn: master/satellite and suservo-one-urukul
  bonn: master
  bonn1satellite: drop stabilizer (independent)
  bonn1: re-enumerate
master
Robert Jördens 2019-12-02 11:31:23 +01:00
parent 5a89a0f69d b52a2e208b
commit 7b0cfb5e0f
2 changed files with 23 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
bonn1master.json
View File

@ -2,14 +2,15 @@
"target": "kasli",
"variant": "bonn1master",
"hw_rev": "v1.1",
"base": "standalone",
"base": "master",
"core_addr": "10.0.16.100",
"vendor": "QUARTIQ",
"ext_ref_frequency": 10e6,
"peripherals": [
{
"type": "dio",
"board": "DIO_BNC",
"hw_rev": "v1.2",
"hw_rev": "v1.3",
"ports": [
0
],
@ -19,7 +20,7 @@
{
"type": "dio",
"board": "DIO_BNC",
"hw_rev": "v1.2",
"hw_rev": "v1.3",
"ports": [
1
],
@ -29,7 +30,7 @@
{
"type": "dio",
"board": "DIO_BNC",
"hw_rev": "v1.2",
"hw_rev": "v1.3",
"ports": [
2
],
@ -39,7 +40,7 @@
{
"type": "dio",
"board": "DIO_BNC",
"hw_rev": "v1.2",
"hw_rev": "v1.3",
"ports": [
3
],
@ -47,21 +48,9 @@
"bank_direction_high": "output"
},
{
"type": "sampler",
"hw_rev": "v2.2",
"ports": [
4,
5
]
},
{
"type": "urukul",
"hw_rev": "v1.3",
"ports": [
6,
7
],
"synchronization": true,
"type": "suservo",
"sampler_ports": [4, 5],
"urukul0_ports": [6, 7],
"clk_sel": 2
},
{
@ -75,26 +64,18 @@
"clk_sel": 2
},
{
"type": "zotino",
"hw_rev": "v1.3",
"type": "grabber",
"hw_rev": "v1.0",
"ports": [
10
]
},
{
"type": "grabber",
"hw_rev": "v1.1",
"type": "zotino",
"hw_rev": "v1.3",
"ports": [
11
]
}
],
"_todo": [
{
"type": "suservo",
"sampler_ports": [4, 5],
"urukul0_ports": [6, 7],
"clk_sel": 2
}
]
}

49
bonn1satellite.json
View File

@ -3,22 +3,23 @@
"variant": "bonn1satellite",
"hw_rev": "v1.1",
"base": "satellite",
"core_addr": "10.0.16.100",
"vendor": "QUARTIQ",
"peripherals": [
{
"type": "dio",
"board": "DIO_BNC",
"hw_rev": "v1.2",
"hw_rev": "v1.3",
"ports": [
0
],
"bank_direction_low": "output",
"bank_direction_low": "input",
"bank_direction_high": "output"
},
{
"type": "dio",
"board": "DIO_BNC",
"hw_rev": "v1.2",
"hw_rev": "v1.3",
"ports": [
1
],
@ -28,7 +29,7 @@
{
"type": "dio",
"board": "DIO_BNC",
"hw_rev": "v1.2",
"hw_rev": "v1.3",
"ports": [
2
],
@ -38,7 +39,7 @@
{
"type": "dio",
"board": "DIO_BNC",
"hw_rev": "v1.2",
"hw_rev": "v1.3",
"ports": [
3
],
@ -46,47 +47,17 @@
"bank_direction_high": "output"
},
{
"type": "sampler",
"hw_rev": "v2.2",
"ports": [
8,
9
]
},
{
"type": "urukul",
"hw_rev": "v1.3",
"ports": [
4,
5
],
"synchronization": true,
"clk_sel": 2
},
{
"type": "urukul",
"hw_rev": "v1.3",
"ports": [
6,
7
],
"synchronization": true,
"type": "suservo",
"sampler_ports": [4, 5],
"urukul0_ports": [6, 7],
"clk_sel": 2
},
{
"type": "zotino",
"hw_rev": "v1.3",
"ports": [
10
9
]
}
],
"_todo": [
{
"type": "suservo",
"sampler_ports": [4, 5],
"urukul0_ports": [6, 7],
"clk_sel": 2
}
]
}