Compare commits
No commits in common. "master" and "artiq6" have entirely different histories.
11
README.md
11
README.md
|
|
@ -21,7 +21,7 @@ The output files will be in `book` directory.
|
||||||
|
|
||||||
### Alternative way
|
### Alternative way
|
||||||
|
|
||||||
Since the docs builder depends only on mdBook, you may get it from anywhere you like - `nix-shell -p mdbook`,
|
Since the docs builder depends only on mdBook, you may get it from anywhere you like - `nix-shell -p mdbook`,
|
||||||
`snap install mdbook`, `cargo install mdbook` or any other from your OS.
|
`snap install mdbook`, `cargo install mdbook` or any other from your OS.
|
||||||
After that you will be able to do:
|
After that you will be able to do:
|
||||||
|
|
||||||
|
|
@ -40,7 +40,7 @@ Tips for adding hardware instructions:
|
||||||
|
|
||||||
1. Compose a chapter in a new Markdown file in `src/hw`
|
1. Compose a chapter in a new Markdown file in `src/hw`
|
||||||
2. Add pictures if needed, store them in `src/img`, assure them to be clear, informative and compressed
|
2. Add pictures if needed, store them in `src/img`, assure them to be clear, informative and compressed
|
||||||
(you can use `convert <INPUT IMAGE> -quality 80% -resize <width>x<height> <OUTPUT IMAGE>` for optimizing JPEG image
|
(you can use `convert <INPUT IMAGE> -quality 80% -resize <width>x<height> <OUTPUT IMAGE>` for optimizing JPEG image
|
||||||
or `convert <INPUT IMAGE> -quality 80% -resize <width>x<height> -background white -alpha remove -alpha off <OUTPUT IMAGE>`
|
or `convert <INPUT IMAGE> -quality 80% -resize <width>x<height> -background white -alpha remove -alpha off <OUTPUT IMAGE>`
|
||||||
for images with transparent background)
|
for images with transparent background)
|
||||||
3. Add link to the new chapter to the `src/SUMMARY.md`
|
3. Add link to the new chapter to the `src/SUMMARY.md`
|
||||||
|
|
@ -51,10 +51,3 @@ Tips for adding hardware instructions:
|
||||||
7. Add JSON sample if needed
|
7. Add JSON sample if needed
|
||||||
8. Add hardware setup (e.g. pins, switches) steps if needed
|
8. Add hardware setup (e.g. pins, switches) steps if needed
|
||||||
9. View changed and added pages with `mdbook build` (see building instructions above)
|
9. View changed and added pages with `mdbook build` (see building instructions above)
|
||||||
10. Check your contributions with linter:
|
|
||||||
|
|
||||||
```shell
|
|
||||||
nix-shell -p nodejs
|
|
||||||
npm install
|
|
||||||
npx markdownlint-cli2 "src/**/*.md" --fix
|
|
||||||
```
|
|
||||||
|
|
|
||||||
|
|
@ -2,16 +2,16 @@
|
||||||
"nodes": {
|
"nodes": {
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1728909085,
|
"lastModified": 1710695816,
|
||||||
"narHash": "sha256-WLxED18lodtQiayIPDE5zwAfkPJSjHJ35UhZ8h3cJUg=",
|
"narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "c0b1da36f7c34a7146501f684e9ebdf15d2bebf8",
|
"rev": "614b4613980a522ba49f0d194531beddbb7220d3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"ref": "nixos-24.05",
|
"ref": "nixos-23.11",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
description = "Sinara assembly and test instructions";
|
description = "Sinara assembly and test instructions";
|
||||||
|
|
||||||
inputs.nixpkgs.url = github:NixOS/nixpkgs/nixos-24.05;
|
inputs.nixpkgs.url = github:NixOS/nixpkgs/nixos-23.11;
|
||||||
|
|
||||||
outputs = { self, nixpkgs }:
|
outputs = { self, nixpkgs }:
|
||||||
|
|
||||||
|
|
@ -20,7 +20,7 @@
|
||||||
};
|
};
|
||||||
devShell.x86_64-linux = pkgs.mkShell {
|
devShell.x86_64-linux = pkgs.mkShell {
|
||||||
name = "sinara-assembly-dev-shell";
|
name = "sinara-assembly-dev-shell";
|
||||||
buildInputs = with pkgs; [ pkgs.mdbook pkgs.nodejs ];
|
buildInputs = with pkgs; [pkgs.mdbook];
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,460 +0,0 @@
|
||||||
{
|
|
||||||
"name": "sinara-assembly",
|
|
||||||
"lockfileVersion": 3,
|
|
||||||
"requires": true,
|
|
||||||
"packages": {
|
|
||||||
"": {
|
|
||||||
"devDependencies": {
|
|
||||||
"markdownlint-cli2": "^0.14.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@nodelib/fs.scandir": {
|
|
||||||
"version": "2.1.5",
|
|
||||||
"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
|
|
||||||
"integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
|
|
||||||
"dev": true,
|
|
||||||
"dependencies": {
|
|
||||||
"@nodelib/fs.stat": "2.0.5",
|
|
||||||
"run-parallel": "^1.1.9"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">= 8"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@nodelib/fs.stat": {
|
|
||||||
"version": "2.0.5",
|
|
||||||
"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
|
|
||||||
"integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
|
|
||||||
"dev": true,
|
|
||||||
"engines": {
|
|
||||||
"node": ">= 8"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@nodelib/fs.walk": {
|
|
||||||
"version": "1.2.8",
|
|
||||||
"resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
|
|
||||||
"integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
|
|
||||||
"dev": true,
|
|
||||||
"dependencies": {
|
|
||||||
"@nodelib/fs.scandir": "2.1.5",
|
|
||||||
"fastq": "^1.6.0"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">= 8"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@sindresorhus/merge-streams": {
|
|
||||||
"version": "2.3.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-2.3.0.tgz",
|
|
||||||
"integrity": "sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==",
|
|
||||||
"dev": true,
|
|
||||||
"engines": {
|
|
||||||
"node": ">=18"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/sponsors/sindresorhus"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/argparse": {
|
|
||||||
"version": "2.0.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
|
|
||||||
"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
|
|
||||||
"dev": true
|
|
||||||
},
|
|
||||||
"node_modules/braces": {
|
|
||||||
"version": "3.0.3",
|
|
||||||
"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
|
|
||||||
"integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
|
|
||||||
"dev": true,
|
|
||||||
"dependencies": {
|
|
||||||
"fill-range": "^7.1.1"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=8"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/entities": {
|
|
||||||
"version": "4.5.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
|
|
||||||
"integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
|
|
||||||
"dev": true,
|
|
||||||
"engines": {
|
|
||||||
"node": ">=0.12"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/fb55/entities?sponsor=1"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/fast-glob": {
|
|
||||||
"version": "3.3.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
|
|
||||||
"integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
|
|
||||||
"dev": true,
|
|
||||||
"dependencies": {
|
|
||||||
"@nodelib/fs.stat": "^2.0.2",
|
|
||||||
"@nodelib/fs.walk": "^1.2.3",
|
|
||||||
"glob-parent": "^5.1.2",
|
|
||||||
"merge2": "^1.3.0",
|
|
||||||
"micromatch": "^4.0.4"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=8.6.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/fastq": {
|
|
||||||
"version": "1.17.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
|
|
||||||
"integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
|
|
||||||
"dev": true,
|
|
||||||
"dependencies": {
|
|
||||||
"reusify": "^1.0.4"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/fill-range": {
|
|
||||||
"version": "7.1.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
|
|
||||||
"integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
|
|
||||||
"dev": true,
|
|
||||||
"dependencies": {
|
|
||||||
"to-regex-range": "^5.0.1"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=8"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/glob-parent": {
|
|
||||||
"version": "5.1.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
|
|
||||||
"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
|
|
||||||
"dev": true,
|
|
||||||
"dependencies": {
|
|
||||||
"is-glob": "^4.0.1"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">= 6"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/globby": {
|
|
||||||
"version": "14.0.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/globby/-/globby-14.0.2.tgz",
|
|
||||||
"integrity": "sha512-s3Fq41ZVh7vbbe2PN3nrW7yC7U7MFVc5c98/iTl9c2GawNMKx/J648KQRW6WKkuU8GIbbh2IXfIRQjOZnXcTnw==",
|
|
||||||
"dev": true,
|
|
||||||
"dependencies": {
|
|
||||||
"@sindresorhus/merge-streams": "^2.1.0",
|
|
||||||
"fast-glob": "^3.3.2",
|
|
||||||
"ignore": "^5.2.4",
|
|
||||||
"path-type": "^5.0.0",
|
|
||||||
"slash": "^5.1.0",
|
|
||||||
"unicorn-magic": "^0.1.0"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=18"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/sponsors/sindresorhus"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/ignore": {
|
|
||||||
"version": "5.3.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
|
|
||||||
"integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
|
|
||||||
"dev": true,
|
|
||||||
"engines": {
|
|
||||||
"node": ">= 4"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/is-extglob": {
|
|
||||||
"version": "2.1.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
|
|
||||||
"integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
|
|
||||||
"dev": true,
|
|
||||||
"engines": {
|
|
||||||
"node": ">=0.10.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/is-glob": {
|
|
||||||
"version": "4.0.3",
|
|
||||||
"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
|
|
||||||
"integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
|
|
||||||
"dev": true,
|
|
||||||
"dependencies": {
|
|
||||||
"is-extglob": "^2.1.1"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=0.10.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/is-number": {
|
|
||||||
"version": "7.0.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
|
|
||||||
"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
|
|
||||||
"dev": true,
|
|
||||||
"engines": {
|
|
||||||
"node": ">=0.12.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/js-yaml": {
|
|
||||||
"version": "4.1.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
|
|
||||||
"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
|
|
||||||
"dev": true,
|
|
||||||
"dependencies": {
|
|
||||||
"argparse": "^2.0.1"
|
|
||||||
},
|
|
||||||
"bin": {
|
|
||||||
"js-yaml": "bin/js-yaml.js"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/jsonc-parser": {
|
|
||||||
"version": "3.3.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
|
|
||||||
"integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
|
|
||||||
"dev": true
|
|
||||||
},
|
|
||||||
"node_modules/linkify-it": {
|
|
||||||
"version": "5.0.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.0.tgz",
|
|
||||||
"integrity": "sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==",
|
|
||||||
"dev": true,
|
|
||||||
"dependencies": {
|
|
||||||
"uc.micro": "^2.0.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/markdown-it": {
|
|
||||||
"version": "14.1.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.0.tgz",
|
|
||||||
"integrity": "sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==",
|
|
||||||
"dev": true,
|
|
||||||
"dependencies": {
|
|
||||||
"argparse": "^2.0.1",
|
|
||||||
"entities": "^4.4.0",
|
|
||||||
"linkify-it": "^5.0.0",
|
|
||||||
"mdurl": "^2.0.0",
|
|
||||||
"punycode.js": "^2.3.1",
|
|
||||||
"uc.micro": "^2.1.0"
|
|
||||||
},
|
|
||||||
"bin": {
|
|
||||||
"markdown-it": "bin/markdown-it.mjs"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/markdownlint": {
|
|
||||||
"version": "0.35.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/markdownlint/-/markdownlint-0.35.0.tgz",
|
|
||||||
"integrity": "sha512-wgp8yesWjFBL7bycA3hxwHRdsZGJhjhyP1dSxKVKrza0EPFYtn+mHtkVy6dvP1kGSjovyG5B8yNP6Frj0UFUJg==",
|
|
||||||
"dev": true,
|
|
||||||
"dependencies": {
|
|
||||||
"markdown-it": "14.1.0",
|
|
||||||
"markdownlint-micromark": "0.1.10"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=18"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/sponsors/DavidAnson"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/markdownlint-cli2": {
|
|
||||||
"version": "0.14.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/markdownlint-cli2/-/markdownlint-cli2-0.14.0.tgz",
|
|
||||||
"integrity": "sha512-2cqdWy56frU2FTpbuGb83mEWWYuUIYv6xS8RVEoUAuKNw/hXPar2UYGpuzUhlFMngE8Omaz4RBH52MzfRbGshw==",
|
|
||||||
"dev": true,
|
|
||||||
"dependencies": {
|
|
||||||
"globby": "14.0.2",
|
|
||||||
"js-yaml": "4.1.0",
|
|
||||||
"jsonc-parser": "3.3.1",
|
|
||||||
"markdownlint": "0.35.0",
|
|
||||||
"markdownlint-cli2-formatter-default": "0.0.5",
|
|
||||||
"micromatch": "4.0.8"
|
|
||||||
},
|
|
||||||
"bin": {
|
|
||||||
"markdownlint-cli2": "markdownlint-cli2.js"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=18"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/sponsors/DavidAnson"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/markdownlint-cli2-formatter-default": {
|
|
||||||
"version": "0.0.5",
|
|
||||||
"resolved": "https://registry.npmjs.org/markdownlint-cli2-formatter-default/-/markdownlint-cli2-formatter-default-0.0.5.tgz",
|
|
||||||
"integrity": "sha512-4XKTwQ5m1+Txo2kuQ3Jgpo/KmnG+X90dWt4acufg6HVGadTUG5hzHF/wssp9b5MBYOMCnZ9RMPaU//uHsszF8Q==",
|
|
||||||
"dev": true,
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/sponsors/DavidAnson"
|
|
||||||
},
|
|
||||||
"peerDependencies": {
|
|
||||||
"markdownlint-cli2": ">=0.0.4"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/markdownlint-micromark": {
|
|
||||||
"version": "0.1.10",
|
|
||||||
"resolved": "https://registry.npmjs.org/markdownlint-micromark/-/markdownlint-micromark-0.1.10.tgz",
|
|
||||||
"integrity": "sha512-no5ZfdqAdWGxftCLlySHSgddEjyW4kui4z7amQcGsSKfYC5v/ou+8mIQVyg9KQMeEZLNtz9OPDTj7nnTnoR4FQ==",
|
|
||||||
"dev": true,
|
|
||||||
"engines": {
|
|
||||||
"node": ">=18"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/sponsors/DavidAnson"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/mdurl": {
|
|
||||||
"version": "2.0.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz",
|
|
||||||
"integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==",
|
|
||||||
"dev": true
|
|
||||||
},
|
|
||||||
"node_modules/merge2": {
|
|
||||||
"version": "1.4.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
|
|
||||||
"integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
|
|
||||||
"dev": true,
|
|
||||||
"engines": {
|
|
||||||
"node": ">= 8"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/micromatch": {
|
|
||||||
"version": "4.0.8",
|
|
||||||
"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
|
|
||||||
"integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
|
|
||||||
"dev": true,
|
|
||||||
"dependencies": {
|
|
||||||
"braces": "^3.0.3",
|
|
||||||
"picomatch": "^2.3.1"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=8.6"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/path-type": {
|
|
||||||
"version": "5.0.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/path-type/-/path-type-5.0.0.tgz",
|
|
||||||
"integrity": "sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==",
|
|
||||||
"dev": true,
|
|
||||||
"engines": {
|
|
||||||
"node": ">=12"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/sponsors/sindresorhus"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/picomatch": {
|
|
||||||
"version": "2.3.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
|
|
||||||
"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
|
|
||||||
"dev": true,
|
|
||||||
"engines": {
|
|
||||||
"node": ">=8.6"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/sponsors/jonschlinkert"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/punycode.js": {
|
|
||||||
"version": "2.3.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/punycode.js/-/punycode.js-2.3.1.tgz",
|
|
||||||
"integrity": "sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==",
|
|
||||||
"dev": true,
|
|
||||||
"engines": {
|
|
||||||
"node": ">=6"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/queue-microtask": {
|
|
||||||
"version": "1.2.3",
|
|
||||||
"resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
|
|
||||||
"integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
|
|
||||||
"dev": true,
|
|
||||||
"funding": [
|
|
||||||
{
|
|
||||||
"type": "github",
|
|
||||||
"url": "https://github.com/sponsors/feross"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "patreon",
|
|
||||||
"url": "https://www.patreon.com/feross"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "consulting",
|
|
||||||
"url": "https://feross.org/support"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"node_modules/reusify": {
|
|
||||||
"version": "1.0.4",
|
|
||||||
"resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
|
|
||||||
"integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
|
|
||||||
"dev": true,
|
|
||||||
"engines": {
|
|
||||||
"iojs": ">=1.0.0",
|
|
||||||
"node": ">=0.10.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/run-parallel": {
|
|
||||||
"version": "1.2.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
|
|
||||||
"integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
|
|
||||||
"dev": true,
|
|
||||||
"funding": [
|
|
||||||
{
|
|
||||||
"type": "github",
|
|
||||||
"url": "https://github.com/sponsors/feross"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "patreon",
|
|
||||||
"url": "https://www.patreon.com/feross"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "consulting",
|
|
||||||
"url": "https://feross.org/support"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"dependencies": {
|
|
||||||
"queue-microtask": "^1.2.2"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/slash": {
|
|
||||||
"version": "5.1.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz",
|
|
||||||
"integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==",
|
|
||||||
"dev": true,
|
|
||||||
"engines": {
|
|
||||||
"node": ">=14.16"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/sponsors/sindresorhus"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/to-regex-range": {
|
|
||||||
"version": "5.0.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
|
|
||||||
"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
|
|
||||||
"dev": true,
|
|
||||||
"dependencies": {
|
|
||||||
"is-number": "^7.0.0"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=8.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/uc.micro": {
|
|
||||||
"version": "2.1.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz",
|
|
||||||
"integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==",
|
|
||||||
"dev": true
|
|
||||||
},
|
|
||||||
"node_modules/unicorn-magic": {
|
|
||||||
"version": "0.1.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.1.0.tgz",
|
|
||||||
"integrity": "sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==",
|
|
||||||
"dev": true,
|
|
||||||
"engines": {
|
|
||||||
"node": ">=18"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/sponsors/sindresorhus"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
13
package.json
13
package.json
|
|
@ -1,13 +0,0 @@
|
||||||
{
|
|
||||||
"devDependencies": {
|
|
||||||
"markdownlint-cli2": "^0.14.0"
|
|
||||||
},
|
|
||||||
"markdownlint-cli2": {
|
|
||||||
"config": {
|
|
||||||
"line_length": {
|
|
||||||
"line_length": 120,
|
|
||||||
"code_blocks": false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -31,5 +31,4 @@
|
||||||
- [Clocking](sw_sup/clocking.md)
|
- [Clocking](sw_sup/clocking.md)
|
||||||
- [device_db.py](sw_sup/device_db.md)
|
- [device_db.py](sw_sup/device_db.md)
|
||||||
- [Setup your PC for building ARTIQ firmware](sw_sup/setup_build_pc.md)
|
- [Setup your PC for building ARTIQ firmware](sw_sup/setup_build_pc.md)
|
||||||
- [AFWS client](sw_sup/afws_client.md)
|
- [AFWS client](sw_sup/afws_client.md)
|
||||||
- [Integration with PyCharm](sw_sup/pycharm.md)
|
|
||||||
|
|
@ -5,11 +5,10 @@
|
||||||
* 😡 **Always** use grounding strap during dis/assembly or other cards' physical operation
|
* 😡 **Always** use grounding strap during dis/assembly or other cards' physical operation
|
||||||
* 😡 **Always** power off devices before un/plugging
|
* 😡 **Always** power off devices before un/plugging
|
||||||
* 🧐 If needed to power-cycle the crate, wait at least 30 seconds before turning them on
|
* 🧐 If needed to power-cycle the crate, wait at least 30 seconds before turning them on
|
||||||
* 🙅 Avoid the boards touching conductive materials - wires, metals. Use at
|
* 🙅 Avoid the boards touching conductive materials - wires, metals. Use at
|
||||||
least plastic ESD bags if you need the cards to be put at the desk or any other surface.
|
least plastic ESD bags if you need the cards to be put at the desk or any other surface.
|
||||||
* 💁 Be gentle to the EEM ports and any other connectors. Support them when plugging, hold when unplugging
|
* 💁 Be gentle to the EEM ports and any other connectors. Support them when plugging, hold when unplugging
|
||||||
* 🙆 If you need to take the cards out, take them out one-by-one from the end, unplug EEM and cables
|
* 🙆 If you need to take the cards out, take them out one-by-one from the end, unplug EEM and cables if you feel high tension
|
||||||
if you feel high tension
|
|
||||||
* 🙆 Use dedicated power supplies for each crate, preferably given or equivalent to given by us
|
* 🙆 Use dedicated power supplies for each crate, preferably given or equivalent to given by us
|
||||||
* 🙅 Avoid unnecessary inserts and pullouts, especially of MMCX cables
|
* 🙅 Avoid unnecessary inserts and pullouts, especially of MMCX cables
|
||||||
|
|
||||||
|
|
@ -23,20 +22,19 @@ Failure to comply with this voids the warranty.
|
||||||
* ⚠️ Remove any cables from front panels
|
* ⚠️ Remove any cables from front panels
|
||||||
* ⚠️ Remove SFP adapters and insert caps/stubs
|
* ⚠️ Remove SFP adapters and insert caps/stubs
|
||||||
* 💁 Also advised to put caps on SMA connectors
|
* 💁 Also advised to put caps on SMA connectors
|
||||||
* ✅ Wrap each crate in the bubble wrap individually until you don't feel the edges of the crate
|
* ✅ Wrap each crate in the bubble wrap individually until you don't feel the edges of the crate (usually 10 layers of standard buble wrap)
|
||||||
(usually 10 layers of standard buble wrap)
|
|
||||||
* 🈁 Fill in the space around the crate in the box with foamy stuff
|
* 🈁 Fill in the space around the crate in the box with foamy stuff
|
||||||
|
|
||||||
## Kasli standalone
|
## Kasli standalone
|
||||||
|
|
||||||
### Checklist for Kasli
|
### Checklist
|
||||||
|
|
||||||
1. Build firmware (see commands below)
|
1. Build firmware (see commands below)
|
||||||
2. Flash firmware and settings
|
2. Flash firmware and settings
|
||||||
3. Test hardware with the PSU, which is going to be shipped
|
3. Test hardware with the PSU, which is going to be shipped
|
||||||
4. Create a flash-drive with `device_db.py` file for customers (FAT32)
|
4. Create a flash-drive with `device_db.py` file for customers (FAT32)
|
||||||
|
|
||||||
### CLI commands - build and flash for Kasli
|
### CLI commands - build and flash
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
mkdir <variant>
|
mkdir <variant>
|
||||||
|
|
@ -50,12 +48,11 @@ python -m artiq.gateware.targets.kasli <variant>.json
|
||||||
artiq_flash --srcbuild -d artiq_kasli/<variant>/
|
artiq_flash --srcbuild -d artiq_kasli/<variant>/
|
||||||
artiq_rtiomap dev_map.bin
|
artiq_rtiomap dev_map.bin
|
||||||
artiq_coremgmt config write -f device_map dev_map.bin
|
artiq_coremgmt config write -f device_map dev_map.bin
|
||||||
artiq_coremgmt reboot
|
|
||||||
```
|
```
|
||||||
|
|
||||||
## Kasli-SoC (zynq)
|
## Kasli-SoC (zynq)
|
||||||
|
|
||||||
### Checklist for Kasli-SoC
|
### Checklist
|
||||||
|
|
||||||
1. Build firmware (see commands below) for SD card variant
|
1. Build firmware (see commands below) for SD card variant
|
||||||
2. Copy `results/boot.bin` to the SD card
|
2. Copy `results/boot.bin` to the SD card
|
||||||
|
|
@ -65,7 +62,7 @@ artiq_coremgmt reboot
|
||||||
6. Test hardware with the PSU, which is going to be shipped
|
6. Test hardware with the PSU, which is going to be shipped
|
||||||
7. Create a flash-drive with `device_db.py` file for customers (FAT32)
|
7. Create a flash-drive with `device_db.py` file for customers (FAT32)
|
||||||
|
|
||||||
### CLI commands - build and flash for Kasli-SoC
|
### CLI commands - build and flash
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
mkdir <variant>
|
mkdir <variant>
|
||||||
|
|
@ -76,36 +73,36 @@ nix build -L --impure --expr 'let fl = builtins.getFlake "git+https://git.m-labs
|
||||||
# copy `results/boot.bin` to the SD card
|
# copy `results/boot.bin` to the SD card
|
||||||
# insert SD card to the Kasli-SoC and boot
|
# insert SD card to the Kasli-SoC and boot
|
||||||
artiq_coremgmt -D 192.168.1.56 config write -s ip 192.168.1.75 # or just place extra/CONFIG.TXT near the boot.bin on SD card
|
artiq_coremgmt -D 192.168.1.56 config write -s ip 192.168.1.75 # or just place extra/CONFIG.TXT near the boot.bin on SD card
|
||||||
# update firmware (alternative to copy to SD, if ARTIQ already running and connected)
|
# update firmware (alternative to copy to SD, if ARTIQ already running)
|
||||||
artiq_coremgmt config write -f boot result/boot.bin
|
artiq_coremgmt config write -f boot result/boot.bin
|
||||||
artiq_coremgmt reboot
|
artiq_coremgmt reboot
|
||||||
|
# reboot via power supply
|
||||||
artiq_rtiomap dev_map.bin
|
artiq_rtiomap dev_map.bin
|
||||||
artiq_coremgmt config write -f device_map dev_map.bin
|
artiq_coremgmt config write -f device_map dev_map.bin
|
||||||
```
|
```
|
||||||
|
|
||||||
## Testing (common)
|
## Testing (common)
|
||||||
|
|
||||||
```shell
|
```
|
||||||
artiq_sinara_tester
|
artiq_sinara_tester
|
||||||
```
|
```
|
||||||
|
|
||||||
Follow `artiq_sinara_tester` instructions for testing the hardware. For more detailed information,
|
Follow `artiq_sinara_tester` instructions for testing the hardware. For more detailed information,
|
||||||
you can use this book's pages, or if there is no instruction for testing your hardware, please add them to this book.
|
you can use this book's pages, or if there is no instruction for testing your hardware, please add them to this book.
|
||||||
|
|
||||||
### Known issues
|
### Known issues
|
||||||
|
|
||||||
* ~~[artiq-zynq#197](https://git.m-labs.hk/M-Labs/artiq-zynq/issues/197) - some cards
|
* ~~[artiq-zynq#197](https://git.m-labs.hk/M-Labs/artiq-zynq/issues/197) - some cards (Sampler, Mirny, Zotino and others)
|
||||||
(Sampler, Mirny, Zotino and others) do not work properly with some EEM ports.
|
do not work properly with some EEM ports. You might need to connect the card to the other ports until it gets working.~~
|
||||||
You might need to connect the card to the other ports until it gets working.~~
|
|
||||||
resolved (hopefully)
|
resolved (hopefully)
|
||||||
|
|
||||||
## Master-satellite setups
|
## Master-satellite setups
|
||||||
|
|
||||||
1. Change `base` in JSON to the respective `master` or `satellite`, remove `core_addr` in satellites
|
1. Change `base` in JSON to the respective `master` or `satellite`, add `"enable_sata_drtio": true` if needed to the master,
|
||||||
|
remove `core_addr` in satellites
|
||||||
2. Build and flash firmware for each crate with JSONs (see instructions above)
|
2. Build and flash firmware for each crate with JSONs (see instructions above)
|
||||||
3. Create combined `device_db.py`:
|
3. Create composed `device_db.py`: e.g. `artiq_ddb_template -o device_db.py -s 1 <satellite1>.json -s 2 <satellite2>.json <master>.json`
|
||||||
e.g. `artiq_ddb_template -o device_db.py -s 1 <satellite1>.json -s 2 <satellite2>.json <master>.json`
|
|
||||||
4. Connect satellite crates to the master respective to their numbers via the fiber (see example picture)
|
4. Connect satellite crates to the master respective to their numbers via the fiber (see example picture)
|
||||||
|
|
||||||
5. Ethernet is needed only for master
|
5. Ethernet is needed only for master
|
||||||
6. Test hardware as it would be one crate
|
6. Test hardware as it would be one crate
|
||||||
|
|
|
||||||
|
|
@ -7,8 +7,8 @@ connected to the Zotino/Fastino and not the Kasli. See [Zotino/Fastino page](./z
|
||||||
|
|
||||||
## Setup
|
## Setup
|
||||||
|
|
||||||
BNC/SMA-IDC adapters should be connected to the Zotino/Fastino with 26 pin cable only. Be aware of the order of
|
BNC/SMA-IDC adapters should be connected to the Zotino/Fastino with 26 pin cable only. Be aware of the order of the Zotino/Fastino's ports -
|
||||||
the Zotino/Fastino's ports - see numbers of the channels at the board when connecting.
|
see numbers of the channels at the board when connecting.
|
||||||
|
|
||||||
## Testing
|
## Testing
|
||||||
|
|
||||||
|
|
@ -21,6 +21,6 @@ zotino0/fastino0 0.1 -0.1 0.2 -0.2 0.3 -0.3 0.4 -0.4 0.5 -0.5 0.6 -0.6 0.7 -0.7
|
||||||
Press ENTER when done.
|
Press ENTER when done.
|
||||||
```
|
```
|
||||||
|
|
||||||
Similar to Zotino/Fastino, check output voltages on the BNC/SMA connectors with multimeter, alongside on
|
Similar to Zotino/Fastino, check output voltages on the BNC/SMA connectors with multimeter, alongside on the Zotino/Fastino itself.
|
||||||
the Zotino/Fastino itself. These voltages should be very close to the respective `artiq_sinara_test`'s
|
These voltages should be very close to the respective `artiq_sinara_test`'s suggested voltages.
|
||||||
suggested voltages. See [Zotino/Fastino page](./zotino_fastino.md) for details.
|
See [Zotino/Fastino page](./zotino_fastino.md) for details.
|
||||||
|
|
@ -23,7 +23,7 @@
|
||||||
Switch the direction switches (shown on the picture below) according to customer requests.
|
Switch the direction switches (shown on the picture below) according to customer requests.
|
||||||
Remember, that you can only switch directions in groups of four.
|
Remember, that you can only switch directions in groups of four.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## Test
|
## Test
|
||||||
|
|
||||||
|
|
@ -53,7 +53,6 @@ Connect ttl4 to ttl0. Press ENTER when done.
|
||||||
```
|
```
|
||||||
|
|
||||||
1. Mount a wire with respective connector to the chosen TTL output (any should work, choose most convenient one)
|
1. Mount a wire with respective connector to the chosen TTL output (any should work, choose most convenient one)
|
||||||
2. Connect the end of the wire to the TTL input requested by the `artiq_sinara_test`
|
2. Connect the end of the wire to the TTL input requested by the `artiq_sinara_test` (you may use fast connector for SMA)
|
||||||
(you may use fast connector for SMA)
|
|
||||||
3. Press ENTER and check that `artiq_sinara_test` prints `PASSED`
|
3. Press ENTER and check that `artiq_sinara_test` prints `PASSED`
|
||||||
4. Repeat 2-3 for every connector
|
4. Repeat 2-3 for every connector
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,6 @@
|
||||||
#### Easier way
|
#### Easier way
|
||||||
|
|
||||||
Download and unpack the [booster firmware](../extra/booster/booster0.5.0.tar.xz), and then:
|
Download and unpack the [booster firmware](../extra/booster/booster0.5.0.tar.xz), and then:
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
nix-shell -p dfu-util
|
nix-shell -p dfu-util
|
||||||
dfu-util -a 0 -s 0x08000000:leave --download booster0.5.0.bin
|
dfu-util -a 0 -s 0x08000000:leave --download booster0.5.0.bin
|
||||||
|
|
@ -58,18 +57,15 @@ dfu-util -a 0 -s 0x08000000:leave --download booster.bin
|
||||||
|
|
||||||
1. `nix-shell -p cutecom mosquitto appimage-run`
|
1. `nix-shell -p cutecom mosquitto appimage-run`
|
||||||
2. Create mosquitto config `mosquitto.conf` with your bound address:
|
2. Create mosquitto config `mosquitto.conf` with your bound address:
|
||||||
|
```
|
||||||
```text
|
|
||||||
bind_address 192.168.1.123
|
bind_address 192.168.1.123
|
||||||
allow_anonymous true
|
allow_anonymous true
|
||||||
```
|
```
|
||||||
|
|
||||||
3. `mosquitto -c mosquitto.conf -d`
|
3. `mosquitto -c mosquitto.conf -d`
|
||||||
4. Run `cutecom`
|
4. Run `cutecom`
|
||||||
5. Connect to the Booster via `/dev/ttyACMX` port, baud 9600, switch from LF to CR on newer version
|
5. Connect to the Booster via `/dev/ttyACMX` port, baud 9600, switch from LF to CR on newer version
|
||||||
6. Send `help` command to check if it works
|
6. Send `help` command to check if it works
|
||||||
7. Enter commands (change details if necessary):
|
7. Enter commands (change details if necessary):
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
write broker-address 192.168.1.123
|
write broker-address 192.168.1.123
|
||||||
# only if you need static IP address
|
# only if you need static IP address
|
||||||
|
|
@ -79,16 +75,13 @@ dfu-util -a 0 -s 0x08000000:leave --download booster.bin
|
||||||
# apply changes and wait until it fully rebooted
|
# apply changes and wait until it fully rebooted
|
||||||
reset
|
reset
|
||||||
```
|
```
|
||||||
|
|
||||||
Newer version:
|
Newer version:
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
write broker "192.168.1.123"
|
write broker "192.168.1.123"
|
||||||
write ip "192.168.1.75"
|
write ip "192.168.1.75"
|
||||||
# apply changes and wait until it fully rebooted
|
# apply changes and wait until it fully rebooted
|
||||||
reset
|
reset
|
||||||
```
|
```
|
||||||
|
|
||||||
8. Check the Booster connects to your broker.
|
8. Check the Booster connects to your broker.
|
||||||
9. Download AppImage from [MQTT Explorer](https://mqtt-explorer.com/)
|
9. Download AppImage from [MQTT Explorer](https://mqtt-explorer.com/)
|
||||||
10. Run it with `appimage-run /path/to/MQTT-Explorer-XXX.AppImage`
|
10. Run it with `appimage-run /path/to/MQTT-Explorer-XXX.AppImage`
|
||||||
|
|
@ -99,26 +92,20 @@ dfu-util -a 0 -s 0x08000000:leave --download booster.bin
|
||||||
|
|
||||||
1. Assemble Kasli with one Urukul, build and flash firmware for it with [booster.json](../extra/booster/booster.json)
|
1. Assemble Kasli with one Urukul, build and flash firmware for it with [booster.json](../extra/booster/booster.json)
|
||||||
2. Run [dds_for_booster.py](../extra/booster/dds_for_booster.py) experiment once
|
2. Run [dds_for_booster.py](../extra/booster/dds_for_booster.py) experiment once
|
||||||
3. Attach parallel 50 Ohm load to the oscilloscope, as shown on the picture:
|
3. Attach parallel 50 Ohm load to the oscilloscope, as shown on the picture: ,
|
||||||
,
|
|
||||||
4. Configure oscilloscope for 1M Ohm impedance
|
4. Configure oscilloscope for 1M Ohm impedance
|
||||||
5. Attach attenuator to the Urukul's RF2
|
5. Attach attenuator to the Urukul's RF2
|
||||||
6. `cd py/`
|
6. `cd py/`
|
||||||
7. You may also need to download or install python's `gmqtt` and `miniconf`:
|
7. You may also need to download or install python's `gmqtt` and `miniconf`:
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
python -m venv env
|
python -m venv env
|
||||||
source env/bin/activate.fish
|
source env/bin/activate.fish
|
||||||
pip install git+https://github.com/quartiq/miniconf.git@84cc9046bf504cc2d0d33b84d2f3133f2faf2248#subdirectory=py/miniconf-mqtt
|
pip install git+https://github.com/quartiq/miniconf.git@84cc9046bf504cc2d0d33b84d2f3133f2faf2248#subdirectory=py/miniconf-mqtt
|
||||||
```
|
```
|
||||||
|
8. Enable channels: `python -m booster --broker 192.168.1.123 --prefix dt/sinara/booster/xx-xx-xx-xx-xx-xx --channel N tune=0.1`
|
||||||
8. Enable channels:
|
9. Using [booster_template](../extra/booster/booster_template.ods) fill in `y0`, `y1`, `m`, `c`, values using instructions below
|
||||||
`python -m booster --broker 192.168.1.123 --prefix dt/sinara/booster/xx-xx-xx-xx-xx-xx --channel N tune=0.1`
|
|
||||||
9. Using [booster_template](../extra/booster/booster_template.ods) fill in `y0`, `y1`, `m`, `c`,
|
|
||||||
values using instructions below
|
|
||||||
10. Update settings with the adjusted values
|
10. Update settings with the adjusted values
|
||||||
11. Save settings with
|
11. Save settings with `python -m booster --broker 192.168.1.123 --prefix dt/sinara/booster/xx-xx-xx-xx-xx-xx --channel N save`
|
||||||
`python -m booster --broker 192.168.1.123 --prefix dt/sinara/booster/xx-xx-xx-xx-xx-xx --channel N save`
|
|
||||||
12. Reboot and check settings are applied
|
12. Reboot and check settings are applied
|
||||||
|
|
||||||
### Input power
|
### Input power
|
||||||
|
|
@ -134,6 +121,7 @@ dfu-util -a 0 -s 0x08000000:leave --download booster.bin
|
||||||
_Note: default setting and Urukul's measured values are usually the same across channels, so you can
|
_Note: default setting and Urukul's measured values are usually the same across channels, so you can
|
||||||
extrapolate them for all channels._
|
extrapolate them for all channels._
|
||||||
|
|
||||||
|
|
||||||
### Output and reflected power
|
### Output and reflected power
|
||||||
|
|
||||||
1. Connect Urukul's output (see booster template for exact ports) to the Booster's input
|
1. Connect Urukul's output (see booster template for exact ports) to the Booster's input
|
||||||
|
|
@ -151,3 +139,4 @@ extrapolate them for all channels._
|
||||||
13. Do steps 1-10 for every channel
|
13. Do steps 1-10 for every channel
|
||||||
|
|
||||||
_Note: default setting values are usually the same across channels, so you can extrapolate them for all channels._
|
_Note: default setting values are usually the same across channels, so you can extrapolate them for all channels._
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -15,29 +15,28 @@ You may also need to add `"refclk": <number>` field to the target card.
|
||||||
For tests, you may need an external RF generator, depending on customer needs.
|
For tests, you may need an external RF generator, depending on customer needs.
|
||||||
Here is example setup for SynthNV RF signal generator:
|
Here is example setup for SynthNV RF signal generator:
|
||||||
|
|
||||||
1. Connect SynthNV to the workstation via USB, and
|
1. Connect SynthNV to the workstation via USB, and
|
||||||
2. Install and run `cutecom`: `nix-shell -p cutecom`
|
2. Install and run `cutecom`: `nix-shell -p cutecom`
|
||||||
3. Set settings as on the picture below:
|
3. Set settings as on the picture below:
|
||||||
|
|
||||||
4. Open the device, usually it is `/dev/ttyACM0`
|
4. Open the device, usually it is `/dev/ttyACM0`
|
||||||
5. Put `?` into `Input` field and press `Enter` for current settings and help commands
|
5. Put `?` into `Input` field and press `Enter` for current settings and help commands
|
||||||
6. For changing the frequency, enter `f<freq in MHz>`, e.g. `f125.0` for 125 MHz
|
6. For changing the frequency, enter `f<freq in MHz>`, e.g. `f125.0` for 125 MHz
|
||||||
7. Set RF power so that clocker would recognize the signal with `a<power>` command, e.g. `a63`
|
7. Set RF power so that clocker would recognize the signal with `a<power>` command, e.g. `a63`
|
||||||
8. Check for desired amplitude and frequency at the `RFOut` (see picture below for reference) pin via oscilloscope
|
8. Check for desired amplitude and frequency at the `RFOut` (see picture below for reference) pin via oscilloscope
|
||||||
|
|
||||||
9. If everything is ok, connect `RFOut` to the `CLK IN` on the Clocker (see instructions below for details)
|
9. If everything is ok, connect `RFOut` to the `CLK IN` on the Clocker (see instructions below for details)
|
||||||
|
|
||||||
### Setup the Clocker
|
### Setup the Clocker
|
||||||
|
|
||||||
1. Switch `CLK SEL` pin to `EXT`/`INT` according to customer needs
|
1. Switch `CLK SEL` pin to `EXT`/`INT` according to customer needs
|
||||||
2. Connect MMCx cables according to the customer needs and boards specifications (see image below for reference):
|
2. Connect MMCx cables according to the customer needs and boards specifications (see image below for reference):
|
||||||
if the `INT` source is chosen, connect MMCx cable to `INT CLK`, otherwise connect external clocker to SMA `EXT CLK`
|
if the `INT` source is chosen, connect MMCx cable to `INT CLK`, otherwise connect external clocker to SMA `EXT CLK`
|
||||||
3. Connect the Clocker to the Kasli via 30-pin ports, or via external power supply
|
3. Connect the Clocker to the Kasli via 30-pin ports, or via external power supply
|
||||||
|
|
||||||
4. Connect the Clocker's SMA output to the Kasli's `CLK`/`CLK IN` SMA pin
|
4. Connect the Clocker's SMA output to the Kasli's `CLK`/`CLK IN` SMA pin
|
||||||
5. After assembling the crates and flashing the firmware, start Kasli and set config if needed:
|
5. After assembling the crates and flashing the firmware, start Kasli and set config if needed:
|
||||||
`artiq_coremgmt config write -s rtio_clock ext0_bypass`.
|
`artiq_coremgmt config write -s rtio_clock ext0_bypass`. Please refer to the [official manual](https://m-labs.hk/artiq/manual/installing.html#miscellaneous-configuration-of-the-core-device)
|
||||||
Please refer to the [official manual](https://m-labs.hk/artiq/manual/core_device.html#clocking)
|
|
||||||
for the details and available options. In most cases you may skip this step.
|
for the details and available options. In most cases you may skip this step.
|
||||||
6. Reboot either via `artiq_coremgmt reboot` or via power supply if the board's firmware doesn't have such command
|
6. Reboot either via `artiq_coremgmt reboot` or via power supply if the board's firmware doesn't have such command
|
||||||
|
|
||||||
|
|
@ -46,12 +45,10 @@ Here is example setup for SynthNV RF signal generator:
|
||||||
Run `artiq_sinara_test` and check that it doesn't fail on the connected devices.
|
Run `artiq_sinara_test` and check that it doesn't fail on the connected devices.
|
||||||
|
|
||||||
Alternatively, if it would be shipped standalone:
|
Alternatively, if it would be shipped standalone:
|
||||||
|
|
||||||
1. Switch to external source
|
1. Switch to external source
|
||||||
2. Connect to the external `CLK IN` clock source (frequency generator) via SMA cable
|
2. Connect to the external `CLK IN` clock source (frequency generator) via SMA cable
|
||||||
3. Power up Clocker with power supply or EEM
|
3. Power up Clocker with power supply or EEM
|
||||||
4. Check via oscilloscope all (internal and external) clocker outputs, that they output clock signal
|
4. Check via oscilloscope all (internal and external) clocker outputs, that they output clock signal respective to the input frequency
|
||||||
respective to the input frequency
|
|
||||||
5. Shut down Clocker
|
5. Shut down Clocker
|
||||||
6. Switch to internal source
|
6. Switch to internal source
|
||||||
7. Connect clock source to the internal `CLK IN` via MMCx cable
|
7. Connect clock source to the internal `CLK IN` via MMCx cable
|
||||||
|
|
|
||||||
|
|
@ -17,4 +17,4 @@ Activate the camera's frame grabber output, type 'g', press ENTER, and trigger t
|
||||||
Just press ENTER to skip the test.
|
Just press ENTER to skip the test.
|
||||||
```
|
```
|
||||||
|
|
||||||
## TODO
|
**TODO**
|
||||||
|
|
@ -4,5 +4,4 @@ In this section you will find instructions on testing the hardware.
|
||||||
If you didn't find one for your hardware, feel free to compose and add your instruction.
|
If you didn't find one for your hardware, feel free to compose and add your instruction.
|
||||||
|
|
||||||
Useful links:
|
Useful links:
|
||||||
|
* [Sinara Wiki](https://github.com/sinara-hw/meta/wiki)
|
||||||
* [Sinara Wiki](https://github.com/sinara-hw/meta/wiki)
|
|
||||||
|
|
@ -1,9 +1,7 @@
|
||||||
# Kasli
|
# Kasli
|
||||||
|
|
||||||
## Mounting fan onto heatsink
|
## Mounting fan onto heatsink
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
1. ⚠️ Verify the fan has the **correct polarity (powering on with wrong polarity will burn the MOSFET in series💥)**
|
1. ⚠️ Verify the fan has the **correct polarity (powering on with wrong polarity will burn the MOSFET in series💥)**
|
||||||
2. Place the fan on a heatsink
|
2. Place the fan on a heatsink
|
||||||
3. Tap 3 threads on the heatsink using M2.5 pointy tapping screws (e.g. front panel screws)
|
3. Tap 3 threads on the heatsink using M2.5 pointy tapping screws (e.g. front panel screws)
|
||||||
|
|
|
||||||
|
|
@ -5,12 +5,10 @@
|
||||||
Check the BOOT mode switches - they both should be at SD if the Kasli-SoC going to be shipped to customer.
|
Check the BOOT mode switches - they both should be at SD if the Kasli-SoC going to be shipped to customer.
|
||||||
POR jumper needs only for JTAG mode.
|
POR jumper needs only for JTAG mode.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## Mounting fan onto heatsink
|
## Mounting fan onto heatsink
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
1. ⚠️ Verify the fan has the **correct polarity (powering on with wrong polarity will burn the MOSFET in series💥)**
|
1. ⚠️ Verify the fan has the **correct polarity (powering on with wrong polarity will burn the MOSFET in series💥)**
|
||||||
2. Place the fan on a heatsink
|
2. Place the fan on a heatsink
|
||||||
3. Tap 3 threads on the heatsink using M2.5 pointy tapping screws (e.g. front panel screws)
|
3. Tap 3 threads on the heatsink using M2.5 pointy tapping screws (e.g. front panel screws)
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,7 @@ Be aware of the reversed EEM order on the card:
|
||||||
|
|
||||||
Switch DIPs in required position per each channel individually. Each RJ45 have 4 channels.
|
Switch DIPs in required position per each channel individually. Each RJ45 have 4 channels.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## Testing
|
## Testing
|
||||||
|
|
||||||
|
|
@ -70,12 +70,10 @@ Connect ttl1 to ttl7. Press ENTER when done.
|
||||||
FAILED
|
FAILED
|
||||||
...
|
...
|
||||||
```
|
```
|
||||||
|
|
||||||
1. Connect a RJ45 output port to a input port
|
1. Connect a RJ45 output port to a input port
|
||||||
2. Run `artiq_sinara_tester`
|
2. Run `artiq_sinara_tester`
|
||||||
3. One TTL will pass while other will fail
|
3. One TTL will pass while other will fail
|
||||||
4. Run `artiq_sinara_tester` again and increment the stimulus (e.g. `ttl0->ttl1->ttl2->ttl3`)
|
4. Run `artiq_sinara_tester` again and increment the stimulus (e.g. `ttl0->ttl1->ttl2->ttl3`) until all channels on the input port passed at least once
|
||||||
until all channels on the input port passed at least once
|
|
||||||
5. Plug into to another input port and repeat 2-4 until all input ports are tested
|
5. Plug into to another input port and repeat 2-4 until all input ports are tested
|
||||||
|
|
||||||
It is incompatible with other TTL cards, so you will need to use same or other LVDS card for proper testing.
|
It is incompatible with other TTL cards, so you will need to use same or other LVDS card for proper testing.
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
* [Wiki](https://github.com/sinara-hw/DIO_MCX/wiki)
|
* [Wiki](https://github.com/sinara-hw/DIO_MCX/wiki)
|
||||||
* [Datasheet](https://m-labs.hk/docs/sinara-datasheets/2238.pdf)
|
* [Datasheet](https://m-labs.hk/docs/sinara-datasheets/2238.pdf)
|
||||||
|
|
||||||
## JSON
|
# JSON
|
||||||
|
|
||||||
```json
|
```json
|
||||||
[
|
[
|
||||||
|
|
@ -33,9 +33,9 @@ and 2 entries in the JSON.
|
||||||
Switch the direction switches (shown on the picture below) according to customer requests.
|
Switch the direction switches (shown on the picture below) according to customer requests.
|
||||||
Remember, that you can only switch directions in groups of four.
|
Remember, that you can only switch directions in groups of four.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## Test
|
## Test
|
||||||
|
|
||||||
Refer to the [BNC/SMA TTL instructions](bnc_sma_ttl.md) for testing, but chose appropriate connector,
|
Refer to the [BNC/SMA TTL instructions](bnc_sma_ttl.md) for testing, but chose appropriate connector,
|
||||||
and respect increased number of channels.
|
and respect increased number of channels.
|
||||||
|
|
@ -8,39 +8,32 @@
|
||||||
```json
|
```json
|
||||||
{
|
{
|
||||||
"type": "mirny",
|
"type": "mirny",
|
||||||
"almazny": true, // for mirny with almazny only
|
"almazny": true, // for mirny with almazny only
|
||||||
"almazny_hw_rev": "v1.2", // optional, must be provided for legacy (<=v1.1) Almazny
|
|
||||||
"ports": [<port num>],
|
"ports": [<port num>],
|
||||||
"clk_sel": "mmcx", // optional
|
"clk_sel": 2, // optional
|
||||||
"refclk": 125e6 // optional
|
"refclk": 125e6 // optional
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
## Getting the firmware
|
## Getting the firmware
|
||||||
|
|
||||||
On Hydra you can find [Mirny 0.3.1 firmware](https://nixbld.m-labs.hk/job/artiq/gluelogic/mirny-cpld-release).
|
On Hydra you can find [Mirny 0.3.1 firmware](https://nixbld.m-labs.hk/job/artiq/gluelogic/mirny-cpld-almazny). It contains a single ``.jed`` file that can be flashed following [flashing instructions](#flashing). This firmware supports Almazny v1.2+.
|
||||||
It contains a single `.jed` file that can be flashed following [flashing instructions](#flashing).
|
|
||||||
This firmware supports Almazny v1.2+.
|
|
||||||
|
|
||||||
If you are using a legacy Almazny (v1.0-1.1), due to different signals routed, you need to flash the older
|
If you are using a legacy Almazny (v1.0-1.1), due to different signals routed, you need to flash the older [0.2.4 firmware with Almazny support](https://nixbld.m-labs.hk/job/artiq/gluelogic/mirny-cpld-legacy-almazny).
|
||||||
[0.2.4 firmware with Almazny support](https://nixbld.m-labs.hk/job/artiq/gluelogic/mirny-cpld-legacy-almazny).
|
|
||||||
|
|
||||||
### Building firmware (optional)
|
### Building firmware (optional)
|
||||||
|
|
||||||
However, if you need to make chances or build from source, follow these instructions.
|
However, if you need to make chances or build from source, follow these instructions.
|
||||||
|
|
||||||
Once you get your hands on the firmware source code, you will need to work around few shortcomings of Nix, mainly
|
Once you get your hands on the firmware source code, you will need to work around few shortcomings of Nix, mainly not being able to run dynamically linked executables.
|
||||||
not being able to run dynamically linked executables.
|
|
||||||
|
|
||||||
You will need:
|
You will need:
|
||||||
|
- Xilinx ISE 14.7 installed on your system (this guide is assuming ``/opt/Xilinx`` path),
|
||||||
|
- an environment with Migen.
|
||||||
|
|
||||||
* Xilinx ISE 14.7 installed on your system (this guide is assuming `/opt/Xilinx` path),
|
One way to do it is to create an FHS environment, like ARTIQ does for Vivado, within ARTIQ's ``flake.nix`` (to leverage Migen already being there), by adding these lines:
|
||||||
* an environment with Migen.
|
|
||||||
|
|
||||||
One way to do it is to create an FHS environment, like ARTIQ does for Vivado, within ARTIQ's `flake.nix`
|
```
|
||||||
(to leverage Migen already being there), by adding these lines:
|
|
||||||
|
|
||||||
```nix
|
|
||||||
iseEnv = pkgs.buildFHSEnv {
|
iseEnv = pkgs.buildFHSEnv {
|
||||||
name = "ise-env";
|
name = "ise-env";
|
||||||
targetPkgs = vivadoDeps;
|
targetPkgs = vivadoDeps;
|
||||||
|
|
@ -54,7 +47,7 @@ ise = pkgs.buildFHSEnv {
|
||||||
};
|
};
|
||||||
```
|
```
|
||||||
|
|
||||||
Add them below `vivadoEnv`. Then add `iseEnv` and `ise` to the dev shell's build inputs. Call `nix develop` on that.
|
Add them below ``vivadoEnv``. Then add ``iseEnv`` and ``ise`` to the dev shell's build inputs. Call ``nix develop`` on that.
|
||||||
|
|
||||||
Then you can build Mirny:
|
Then you can build Mirny:
|
||||||
|
|
||||||
|
|
@ -68,8 +61,7 @@ python mirny_impl.py
|
||||||
|
|
||||||
### Flashing
|
### Flashing
|
||||||
|
|
||||||
For flashing, you will need Xilinx ISE 14.7 installed on your system (here assuming `/opt/Xilinx` path), and `xc3sprog`
|
For flashing, you will need Xilinx ISE 14.7 installed on your system (here assuming ``/opt/Xilinx`` path), and ``xc3sprog`` with the appropriate HS2 JTAG adapter.
|
||||||
with the appropriate HS2 JTAG adapter.
|
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
nix-shell -p xc3sprog
|
nix-shell -p xc3sprog
|
||||||
|
|
@ -87,13 +79,13 @@ mirny0_cpld...
|
||||||
...done
|
...done
|
||||||
All mirny channels active.
|
All mirny channels active.
|
||||||
Frequencies:
|
Frequencies:
|
||||||
mirny0_ch0 1000MHz
|
mirny0_ch0 1000MHz
|
||||||
mirny0_ch0 info: {'f_outA': 1000000000.0, 'f_outB': 8000000000, 'output_divider': 4, 'f_vco': 4000000000, 'pll_n': 40, 'pll_frac1': 0, 'pll_frac2': 0, 'pll_mod2': 1, 'prescaler': '4/5', 'sysclk': 100000000.0, 'ref_doubler': False, 'ref_divider': False, 'ref_counter': 1, 'f_pfd': 100000000}
|
mirny0_ch0 info: {'f_outA': 1000000000.0, 'f_outB': 8000000000, 'output_divider': 4, 'f_vco': 4000000000, 'pll_n': 40, 'pll_frac1': 0, 'pll_frac2': 0, 'pll_mod2': 1, 'prescaler': '4/5', 'sysclk': 100000000.0, 'ref_doubler': False, 'ref_divider': False, 'ref_counter': 1, 'f_pfd': 100000000}
|
||||||
mirny0_ch1 1100MHz
|
mirny0_ch1 1100MHz
|
||||||
mirny0_ch1 info: {'f_outA': 1100000000.0, 'f_outB': 8800000000, 'output_divider': 4, 'f_vco': 4400000000, 'pll_n': 44, 'pll_frac1': 0, 'pll_frac2': 0, 'pll_mod2': 1, 'prescaler': '4/5', 'sysclk': 100000000.0, 'ref_doubler': False, 'ref_divider': False, 'ref_counter': 1, 'f_pfd': 100000000}
|
mirny0_ch1 info: {'f_outA': 1100000000.0, 'f_outB': 8800000000, 'output_divider': 4, 'f_vco': 4400000000, 'pll_n': 44, 'pll_frac1': 0, 'pll_frac2': 0, 'pll_mod2': 1, 'prescaler': '4/5', 'sysclk': 100000000.0, 'ref_doubler': False, 'ref_divider': False, 'ref_counter': 1, 'f_pfd': 100000000}
|
||||||
mirny0_ch2 1200MHz
|
mirny0_ch2 1200MHz
|
||||||
mirny0_ch2 info: {'f_outA': 1200000000.0, 'f_outB': 9600000000, 'output_divider': 4, 'f_vco': 4800000000, 'pll_n': 48, 'pll_frac1': 0, 'pll_frac2': 0, 'pll_mod2': 1, 'prescaler': '4/5', 'sysclk': 100000000.0, 'ref_doubler': False, 'ref_divider': False, 'ref_counter': 1, 'f_pfd': 100000000}
|
mirny0_ch2 info: {'f_outA': 1200000000.0, 'f_outB': 9600000000, 'output_divider': 4, 'f_vco': 4800000000, 'pll_n': 48, 'pll_frac1': 0, 'pll_frac2': 0, 'pll_mod2': 1, 'prescaler': '4/5', 'sysclk': 100000000.0, 'ref_doubler': False, 'ref_divider': False, 'ref_counter': 1, 'f_pfd': 100000000}
|
||||||
mirny0_ch3 1300MHz
|
mirny0_ch3 1300MHz
|
||||||
mirny0_ch3 info: {'f_outA': 1300000000.0, 'f_outB': 10400000000, 'output_divider': 4, 'f_vco': 5200000000, 'pll_n': 52, 'pll_frac1': 0, 'pll_frac2': 0, 'pll_mod2': 1, 'prescaler': '4/5', 'sysclk': 100000000.0, 'ref_doubler': False, 'ref_divider': False, 'ref_counter': 1, 'f_pfd': 100000000}
|
mirny0_ch3 info: {'f_outA': 1300000000.0, 'f_outB': 10400000000, 'output_divider': 4, 'f_vco': 5200000000, 'pll_n': 52, 'pll_frac1': 0, 'pll_frac2': 0, 'pll_mod2': 1, 'prescaler': '4/5', 'sysclk': 100000000.0, 'ref_doubler': False, 'ref_divider': False, 'ref_counter': 1, 'f_pfd': 100000000}
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
@ -108,7 +100,7 @@ After running `artiq_sinara_test`:
|
||||||
7. You should see significant signal emission on choosen freq compared to nearby freqs (see image below)
|
7. You should see significant signal emission on choosen freq compared to nearby freqs (see image below)
|
||||||
8. Repeat 5-7 for every channel
|
8. Repeat 5-7 for every channel
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
### With Almazny (ARTIQ 7)
|
### With Almazny (ARTIQ 7)
|
||||||
|
|
||||||
|
|
@ -123,21 +115,21 @@ mirny0_cpld...
|
||||||
mirny1_cpld...
|
mirny1_cpld...
|
||||||
...done
|
...done
|
||||||
Testing attenuators. Frequencies:
|
Testing attenuators. Frequencies:
|
||||||
mirny0_ch0 4000MHz
|
mirny0_ch0 4000MHz
|
||||||
mirny0_ch0 info: {'f_outA': 2000000000.0, 'f_outB': 8000000000, 'output_divider': 2, 'f_vco': 4000000000, 'pll_n': 40, 'pll_frac1': 0, 'pll_frac2': 0, 'pll_mod2': 1, 'prescaler': '4/5', 'sysclk': 100000000.0, 'ref_doubler': False, 'ref_divider': False, 'ref_counter': 1, 'f_pfd': 100000000}
|
mirny0_ch0 info: {'f_outA': 2000000000.0, 'f_outB': 8000000000, 'output_divider': 2, 'f_vco': 4000000000, 'pll_n': 40, 'pll_frac1': 0, 'pll_frac2': 0, 'pll_mod2': 1, 'prescaler': '4/5', 'sysclk': 100000000.0, 'ref_doubler': False, 'ref_divider': False, 'ref_counter': 1, 'f_pfd': 100000000}
|
||||||
mirny0_ch1 4100MHz
|
mirny0_ch1 4100MHz
|
||||||
mirny0_ch1 info: {'f_outA': 2050000000.0, 'f_outB': 8200000000, 'output_divider': 2, 'f_vco': 4100000000, 'pll_n': 41, 'pll_frac1': 0, 'pll_frac2': 0, 'pll_mod2': 1, 'prescaler': '4/5', 'sysclk': 100000000.0, 'ref_doubler': False, 'ref_divider': False, 'ref_counter': 1, 'f_pfd': 100000000}
|
mirny0_ch1 info: {'f_outA': 2050000000.0, 'f_outB': 8200000000, 'output_divider': 2, 'f_vco': 4100000000, 'pll_n': 41, 'pll_frac1': 0, 'pll_frac2': 0, 'pll_mod2': 1, 'prescaler': '4/5', 'sysclk': 100000000.0, 'ref_doubler': False, 'ref_divider': False, 'ref_counter': 1, 'f_pfd': 100000000}
|
||||||
mirny0_ch2 4200MHz
|
mirny0_ch2 4200MHz
|
||||||
mirny0_ch2 info: {'f_outA': 2100000000.0, 'f_outB': 8400000000, 'output_divider': 2, 'f_vco': 4200000000, 'pll_n': 42, 'pll_frac1': 0, 'pll_frac2': 0, 'pll_mod2': 1, 'prescaler': '4/5', 'sysclk': 100000000.0, 'ref_doubler': False, 'ref_divider': False, 'ref_counter': 1, 'f_pfd': 100000000}
|
mirny0_ch2 info: {'f_outA': 2100000000.0, 'f_outB': 8400000000, 'output_divider': 2, 'f_vco': 4200000000, 'pll_n': 42, 'pll_frac1': 0, 'pll_frac2': 0, 'pll_mod2': 1, 'prescaler': '4/5', 'sysclk': 100000000.0, 'ref_doubler': False, 'ref_divider': False, 'ref_counter': 1, 'f_pfd': 100000000}
|
||||||
mirny0_ch3 4300MHz
|
mirny0_ch3 4300MHz
|
||||||
mirny0_ch3 info: {'f_outA': 2150000000.0, 'f_outB': 8600000000, 'output_divider': 2, 'f_vco': 4300000000, 'pll_n': 43, 'pll_frac1': 0, 'pll_frac2': 0, 'pll_mod2': 1, 'prescaler': '4/5', 'sysclk': 100000000.0, 'ref_doubler': False, 'ref_divider': False, 'ref_counter': 1, 'f_pfd': 100000000}
|
mirny0_ch3 info: {'f_outA': 2150000000.0, 'f_outB': 8600000000, 'output_divider': 2, 'f_vco': 4300000000, 'pll_n': 43, 'pll_frac1': 0, 'pll_frac2': 0, 'pll_mod2': 1, 'prescaler': '4/5', 'sysclk': 100000000.0, 'ref_doubler': False, 'ref_divider': False, 'ref_counter': 1, 'f_pfd': 100000000}
|
||||||
mirny1_ch0 4500MHz
|
mirny1_ch0 4500MHz
|
||||||
mirny1_ch0 info: {'f_outA': 2250000000.0, 'f_outB': 9000000000, 'output_divider': 2, 'f_vco': 4500000000, 'pll_n': 45, 'pll_frac1': 0, 'pll_frac2': 0, 'pll_mod2': 1, 'prescaler': '4/5', 'sysclk': 100000000.0, 'ref_doubler': False, 'ref_divider': False, 'ref_counter': 1, 'f_pfd': 100000000}
|
mirny1_ch0 info: {'f_outA': 2250000000.0, 'f_outB': 9000000000, 'output_divider': 2, 'f_vco': 4500000000, 'pll_n': 45, 'pll_frac1': 0, 'pll_frac2': 0, 'pll_mod2': 1, 'prescaler': '4/5', 'sysclk': 100000000.0, 'ref_doubler': False, 'ref_divider': False, 'ref_counter': 1, 'f_pfd': 100000000}
|
||||||
mirny1_ch1 4600MHz
|
mirny1_ch1 4600MHz
|
||||||
mirny1_ch1 info: {'f_outA': 2300000000.0, 'f_outB': 9200000000, 'output_divider': 2, 'f_vco': 4600000000, 'pll_n': 46, 'pll_frac1': 0, 'pll_frac2': 0, 'pll_mod2': 1, 'prescaler': '4/5', 'sysclk': 100000000.0, 'ref_doubler': False, 'ref_divider': False, 'ref_counter': 1, 'f_pfd': 100000000}
|
mirny1_ch1 info: {'f_outA': 2300000000.0, 'f_outB': 9200000000, 'output_divider': 2, 'f_vco': 4600000000, 'pll_n': 46, 'pll_frac1': 0, 'pll_frac2': 0, 'pll_mod2': 1, 'prescaler': '4/5', 'sysclk': 100000000.0, 'ref_doubler': False, 'ref_divider': False, 'ref_counter': 1, 'f_pfd': 100000000}
|
||||||
mirny1_ch2 4700MHz
|
mirny1_ch2 4700MHz
|
||||||
mirny1_ch2 info: {'f_outA': 2350000000.0, 'f_outB': 9400000000, 'output_divider': 2, 'f_vco': 4700000000, 'pll_n': 47, 'pll_frac1': 0, 'pll_frac2': 0, 'pll_mod2': 1, 'prescaler': '4/5', 'sysclk': 100000000.0, 'ref_doubler': False, 'ref_divider': False, 'ref_counter': 1, 'f_pfd': 100000000}
|
mirny1_ch2 info: {'f_outA': 2350000000.0, 'f_outB': 9400000000, 'output_divider': 2, 'f_vco': 4700000000, 'pll_n': 47, 'pll_frac1': 0, 'pll_frac2': 0, 'pll_mod2': 1, 'prescaler': '4/5', 'sysclk': 100000000.0, 'ref_doubler': False, 'ref_divider': False, 'ref_counter': 1, 'f_pfd': 100000000}
|
||||||
mirny1_ch3 4800MHz
|
mirny1_ch3 4800MHz
|
||||||
mirny1_ch3 info: {'f_outA': 2400000000.0, 'f_outB': 9600000000, 'output_divider': 2, 'f_vco': 4800000000, 'pll_n': 48, 'pll_frac1': 0, 'pll_frac2': 0, 'pll_mod2': 1, 'prescaler': '4/5', 'sysclk': 100000000.0, 'ref_doubler': False, 'ref_divider': False, 'ref_counter': 1, 'f_pfd': 100000000}
|
mirny1_ch3 info: {'f_outA': 2400000000.0, 'f_outB': 9600000000, 'output_divider': 2, 'f_vco': 4800000000, 'pll_n': 48, 'pll_frac1': 0, 'pll_frac2': 0, 'pll_mod2': 1, 'prescaler': '4/5', 'sysclk': 100000000.0, 'ref_doubler': False, 'ref_divider': False, 'ref_counter': 1, 'f_pfd': 100000000}
|
||||||
RF ON, all attenuators ON. Press ENTER when done.
|
RF ON, all attenuators ON. Press ENTER when done.
|
||||||
|
|
||||||
|
|
@ -155,11 +147,11 @@ RF OFF. Press ENTER when done.
|
||||||
Similar to _Without Almazny_, check mirnies' channels emissions on defined frequencies.
|
Similar to _Without Almazny_, check mirnies' channels emissions on defined frequencies.
|
||||||
You should also see differences in various modes, but that may require disabling the gain.
|
You should also see differences in various modes, but that may require disabling the gain.
|
||||||
|
|
||||||
|
|
||||||
### Tips
|
### Tips
|
||||||
|
|
||||||
~~Mirnies often fail `ValueError: MUXOUT not high`, in that case restart the tests or reboot the board(s).~~ - fixed
|
~~Mirnies often fail `ValueError: MUXOUT not high`, in that case restart the tests or reboot the board(s).~~ - fixed in [9569cfb](https://github.com/m-labs/artiq/commit/9569cfb26329c0acdc1705d3256d2506b7bccce5)
|
||||||
in [9569cfb](https://github.com/m-labs/artiq/commit/9569cfb26329c0acdc1705d3256d2506b7bccce5)
|
|
||||||
|
|
||||||
For Almazny v1.0 and 1.1 support, CPLD firmware 0.2.4 (linked above) must be flashed onto Mirny.
|
For Almazny v1.0 and 1.1 support, CPLD firmware 0.2.4 (linked above) must be flashed onto Mirny.
|
||||||
|
|
||||||
For Almazny v1.2+ support, CPLD firmware 0.3.1+ (with fixes) must be flashed onto Mirny.
|
For Almazny v1.2+ support, CPLD firmware 0.3.1+ (with fixes) must be flashed onto Mirny.
|
||||||
|
|
@ -33,8 +33,9 @@ phaser0 10+0 10+1 10+2 10+3 10+4 MHz
|
||||||
in `Receiver Options`
|
in `Receiver Options`
|
||||||
7. Connect the probe through attenuator to the Phaser's RF ports
|
7. Connect the probe through attenuator to the Phaser's RF ports
|
||||||
8. You should see 5 tones on `artiq_sinara_test`'s frequencies, like on the pictures below for RF0 and RF1 respectively:
|
8. You should see 5 tones on `artiq_sinara_test`'s frequencies, like on the pictures below for RF0 and RF1 respectively:
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
### Baseband
|
### Baseband
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -33,4 +33,4 @@ PASSED
|
||||||
1. Apply 1.5V (connect the AA-battery) to the `samplerX`'s requested channel
|
1. Apply 1.5V (connect the AA-battery) to the `samplerX`'s requested channel
|
||||||
2. Press `Enter`, the `artiq_sinara_test` should output `PASSED`
|
2. Press `Enter`, the `artiq_sinara_test` should output `PASSED`
|
||||||
3. Repeat steps 1-2 for every available channel.
|
3. Repeat steps 1-2 for every available channel.
|
||||||
4. Disassemble AA-battery tool as it risks getting corrosion
|
4. Disassemble AA-battery tool as it risks getting corrosion
|
||||||
|
|
@ -1,12 +1,8 @@
|
||||||
# Sinara 5716 DAC Shuttler
|
# Sinara 5716 DAC Shuttler
|
||||||
|
|
||||||
The Sinara 5716 DAC Shuttler consists of the [Shuttler](https://github.com/sinara-hw/Shuttler),
|
The Sinara 5716 DAC Shuttler consists of the [Shuttler](https://github.com/sinara-hw/Shuttler), [Remote AFE-Board](https://github.com/sinara-hw/Shuttler), and [EEM FMC Carrier](https://github.com/sinara-hw/EEM_FMC_Carrier) (EFC) Board.
|
||||||
[Remote AFE-Board](https://github.com/sinara-hw/Shuttler), and
|
|
||||||
[EEM FMC Carrier](https://github.com/sinara-hw/EEM_FMC_Carrier) (EFC) Board.
|
|
||||||
|
|
||||||
The EFC Board has an FPGA running Kasli Satellite. DRTIO communication is established through the EEM Cable.
|
The EFC Board has an FPGA running Kasli Satellite. DRTIO communication is established through the EEM Cable. At first power up, EFC Board and connected Kasli/Kasli-soc calibrate the clock skews on their own EEM transceiver and then store the value into the flash memory/SD Card.
|
||||||
At first power up, EFC Board and connected Kasli/Kasli-soc calibrate the clock skews on their own EEM transceiver
|
|
||||||
and then store the value into the flash memory/SD Card.
|
|
||||||
|
|
||||||
## JSON
|
## JSON
|
||||||
|
|
||||||
|
|
@ -18,11 +14,9 @@ and then store the value into the flash memory/SD Card.
|
||||||
```
|
```
|
||||||
|
|
||||||
## Hardware Configurations and Connections
|
## Hardware Configurations and Connections
|
||||||
|
### EEM Cable Connection
|
||||||
|
|
||||||
### EEM Cable Connection
|
Only the EEM0 port on the EFC board is used. The EEM Cable provides power. You can ignore the barrel jack at the back of the board if it is placed.
|
||||||
|
|
||||||
Only the EEM0 port on the EFC board is used. The EEM Cable provides power. You can ignore the barrel jack at
|
|
||||||
the back of the board if it is placed.
|
|
||||||
|
|
||||||
### CLK Input
|
### CLK Input
|
||||||
|
|
||||||
|
|
@ -42,55 +36,44 @@ For the EFC Board v1.1 (or later), there is a DIP switch to select the clock sou
|
||||||
|
|
||||||
### VADJ Power
|
### VADJ Power
|
||||||
|
|
||||||
The EFC Board has configurable Digital IO Voltage Level/PSU called VADJ. You should configure VADJ to 1.8V by
|
The EFC Board has configurable Digital IO Voltage Level/PSU called VADJ. You should configure VADJ to 1.8V by fitting W1/W2 jumper accordingly.
|
||||||
fitting W1/W2 jumper accordingly.
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
### Remote AFE Board Connections
|
### Remote AFE Board Connections
|
||||||
|
|
||||||
The Remote AFE Board is not installed in the crate and should be shipped separately. When you test the EFC Board,
|
The Remote AFE Board is not installed in the crate and should be shipped separately. When you test the EFC Board, please connect the Mini SAS Cables in this orientation.
|
||||||
please connect the Mini SAS Cables in this orientation.
|
|
||||||
|
|
||||||
|
|
||||||
There is no PSU for the Remote AFE Board at this moment. For testing purposes, you should connect the Remote AFE
|
There is no PSU for the Remote AFE Board at this moment. For testing purposes, you should connect the Remote AFE Board to a lab PSU supplying +15V, -15V, and +5V. Please make sure all voltages share a common GND and check the pinouts carefully. Incorrect power connections can damage the Remote AFE Board.
|
||||||
Board to a lab PSU supplying +15V, -15V, and +5V. Please make sure all voltages share a common GND and check the
|
|
||||||
pinouts carefully. Incorrect power connections can damage the Remote AFE Board.
|
|
||||||
|
|
||||||
## Building EFC Board Gateware and Firmware
|
## Building EFC Board Gateware and Firmware
|
||||||
|
|
||||||
The EFC Board gateware and firmware are on the [Artiq](https://github.com/m-labs/artiq) repo.
|
The EFC Board gateware and firmware are on the [Artiq](https://github.com/m-labs/artiq) repo.
|
||||||
|
|
||||||
To build the gateware and firmware,
|
To build the gateware and firmware,
|
||||||
|
```
|
||||||
```shell
|
|
||||||
python -m artiq.gateware.targets.efc --hw-rev [v1.0, v1.1]
|
python -m artiq.gateware.targets.efc --hw-rev [v1.0, v1.1]
|
||||||
```
|
```
|
||||||
|
|
||||||
## Routing Table Configuration if Shuttler is Connected to Kasli Satellite
|
## Routing Table Configuration if Shuttler is Connected to Kasli Satellite
|
||||||
|
|
||||||
When Kasli Satellite is compiled with Shuttler, Shuttler is connected to the Satellite Repeater instance. Therefore,
|
When Kasli Satellite is compiled with Shuttler, Shuttler is connected to the Satellite Repeater instance. Therefore, you will need to specify the routing table on the Kasli/Kasli-soc master in order to access the Shuttler hardware. Shuttler locates at DEST 4 connecting to Repeater ID #3. The ID number goes up accordingly if more than one Shuttler is connected.
|
||||||
you will need to specify the routing table on the Kasli/Kasli-soc master in order to access the Shuttler hardware.
|
|
||||||
Shuttler locates at DEST 4 connecting to Repeater ID #3. The ID number goes up accordingly if more than one
|
|
||||||
Shuttler is connected.
|
|
||||||
|
|
||||||
Here provides an example to configure the routing table.
|
Here provides an example to configure the routing table.
|
||||||
You have 1 Kasli Master and 1 Kasli Satellite. Kasli Master (SFP1)(DEST1) port is connected to
|
You have 1 Kasli Master and 1 Kasli Satellite. Kasli Master (SFP1)(DEST1) port is connected to Kasli Satellite(SFP0)(DEST0). Shuttler is connected to Kasli Satellite with DRTIO over EEM Cable(DEST4).
|
||||||
Kasli Satellite(SFP0)(DEST0). Shuttler is connected to Kasli Satellite with DRTIO over EEM Cable(DEST4).
|
|
||||||
|
|
||||||
1. Initialize the Routing Table: `artiq_route rt.bin init`
|
1. Initialize the Routing Table: ``` artiq_route rt.bin init```
|
||||||
2. Add the routing table entry for Kasli Master's Peripherals: `artiq_route rt.bin set 0 0`
|
2. Add the routing table entry for Kasli Master's Peripherals: ```artiq_route rt.bin set 0 0```
|
||||||
3. Add the routing table entry for Kasli Satellite's Peripherals: `artiq_route rt.bin set 1 1 0`
|
3. Add the routing table entry for Kasli Satellite's Peripherals: ```artiq_route rt.bin set 1 1 0```
|
||||||
4. Add the routing table entry for Shuttler: `artiq_route rt.bin set 4 1 4 0`
|
4. Add the routing table entry for Shuttler: ```artiq_route rt.bin set 4 1 4 0```
|
||||||
5. Flash the routing table on Kasli Master: `artiq_coremgmt config write -f routing_table rt.bin`
|
5. Flash the routing table on Kasli Master: ```artiq_coremgmt config write -f routing_table rt.bin```
|
||||||
|
|
||||||
## Flashing
|
## Flashing
|
||||||
|
|
||||||
When you are building a crate with shuttler(s), you should erase the flash/sd card config on both the EFC and
|
When you are building a crate with shuttler(s), you should erase the flash/sd card config on both the EFC and Kasli/Kasli-soc. Always flash the EFC Board first before flashing the Kasli/Kasli-soc.
|
||||||
Kasli/Kasli-SoC. Always flash the EFC Board first before flashing the Kasli/Kasli-soc.
|
|
||||||
|
|
||||||
If either of the following elements is changed, you will need to **ERASE** the stored calibrated values on both
|
|
||||||
the EFC and Kasli Master, or the communication between the boards cannot be established:
|
|
||||||
|
|
||||||
|
If either of the following elements is changed, you will need to **ERASE** the stored calibrated values on both the EFC and Kasli Master, or the communication between the boards cannot be established:
|
||||||
1. EEM Cable
|
1. EEM Cable
|
||||||
2. Clock-Related Cable
|
2. Clock-Related Cable
|
||||||
3. EFC Board Gateware
|
3. EFC Board Gateware
|
||||||
|
|
@ -98,14 +81,12 @@ the EFC and Kasli Master, or the communication between the boards cannot be esta
|
||||||
5. EFC Board/Kasli/Kasli-Soc PCB
|
5. EFC Board/Kasli/Kasli-Soc PCB
|
||||||
|
|
||||||
To erase the flash on the EFC board,
|
To erase the flash on the EFC board,
|
||||||
|
```
|
||||||
```shell
|
|
||||||
artiq_flash -t efc erase
|
artiq_flash -t efc erase
|
||||||
```
|
```
|
||||||
|
|
||||||
To flash the gateware and firmware onto the EFC board,
|
To flash the gateware and firmware onto the EFC board,
|
||||||
|
```
|
||||||
```shell
|
|
||||||
artiq_flash --srcbuild -t [efc1v0, efc1v1] -d artiq_efc/shuttler
|
artiq_flash --srcbuild -t [efc1v0, efc1v1] -d artiq_efc/shuttler
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
@ -114,9 +95,10 @@ artiq_flash --srcbuild -t [efc1v0, efc1v1] -d artiq_efc/shuttler
|
||||||
1. Connect the Remote AFE Card to the Shuttler
|
1. Connect the Remote AFE Card to the Shuttler
|
||||||
2. Power up the Remote AFE Board and the Kasli/Kasli-Soc with the connected Shuttler.
|
2. Power up the Remote AFE Board and the Kasli/Kasli-Soc with the connected Shuttler.
|
||||||
3. Check all Remote AFE Board Power Indicator LEDs.
|
3. Check all Remote AFE Board Power Indicator LEDs.
|
||||||
4. Run the `artiq_sinara_test`.
|
4. Run the `artiq_sinara_test`.
|
||||||
|
|
||||||
```text
|
|
||||||
|
```
|
||||||
*** Testing LEDs.
|
*** Testing LEDs.
|
||||||
Check for blinking. Press ENTER when done.
|
Check for blinking. Press ENTER when done.
|
||||||
...
|
...
|
||||||
|
|
|
||||||
|
|
@ -14,28 +14,25 @@ Not present in the JSON.
|
||||||
|
|
||||||
You can get the firmware from [Hydra](https://nixbld.m-labs.hk/jobset/mcu/mcu-contrib).
|
You can get the firmware from [Hydra](https://nixbld.m-labs.hk/jobset/mcu/mcu-contrib).
|
||||||
|
|
||||||
* `stabilizer-dual-iir` supports Pounder v1.2 - probably you should flash this one,
|
* ``stabilizer-dual-iir`` supports Pounder v1.2 - probably you should flash this one,
|
||||||
* `stabilizer-dual-iir-pounder_v1_0` supports Pounder 1.0 and 1.1 (legacy),
|
* ``stabilizer-dual-iir-pounder_v1_0`` supports Pounder 1.0 and 1.1 (legacy),
|
||||||
* `stabilizer-lockin` is a different application which we do not usually flash.
|
* ``stabilizer-lockin`` is a different application which we do not usually flash.
|
||||||
|
|
||||||
These all include changes to the mainline code to include Pounder telemetry.
|
These all include changes to the mainline code to include Pounder telemetry.
|
||||||
|
|
||||||
### Building (optional)
|
### Building (optional)
|
||||||
|
|
||||||
Please keep in mind that the firmware from the official Quartiq repository does not include support for Pounder in MQTT,
|
Please keep in mind that the firmware from the official Quartiq repository does not include support for Pounder in MQTT, you may need to use a fork for that. But if the stabilizer is without a Pounder, it's also a valid option.
|
||||||
you may need to use a fork for that. But if the stabilizer is without a Pounder, it's also a valid option.
|
|
||||||
|
|
||||||
There is no Nix Flake support to make things easier, so you need to set up rust and cargo manually.
|
There is no Nix Flake support to make things easier, so you need to set up rust and cargo manually. Start with cloning the stabilizer repository and opening a new shell with dfu-util (for flashing) and rustup (for building).
|
||||||
Start with cloning the stabilizer repository and opening a new shell with dfu-util (for flashing) and rustup
|
|
||||||
(for building).
|
|
||||||
|
|
||||||
```shell
|
```
|
||||||
nix-shell -p dfu-util rustup
|
nix-shell -p dfu-util rustup
|
||||||
```
|
```
|
||||||
|
|
||||||
Set up the toolchain, this should be done only once:
|
Set up the toolchain, this should be done only once:
|
||||||
|
|
||||||
```shell
|
```
|
||||||
rustup target add thumbv7em-none-eabihf
|
rustup target add thumbv7em-none-eabihf
|
||||||
cargo install cargo-binutils
|
cargo install cargo-binutils
|
||||||
rustup component add llvm-tools-preview
|
rustup component add llvm-tools-preview
|
||||||
|
|
@ -45,7 +42,7 @@ rustup default stable
|
||||||
|
|
||||||
Building:
|
Building:
|
||||||
|
|
||||||
```shell
|
```
|
||||||
cargo build --release
|
cargo build --release
|
||||||
cargo objcopy --release --bin dual-iir -- -O binary dual-iir.bin
|
cargo objcopy --release --bin dual-iir -- -O binary dual-iir.bin
|
||||||
```
|
```
|
||||||
|
|
@ -54,42 +51,43 @@ cargo objcopy --release --bin dual-iir -- -O binary dual-iir.bin
|
||||||
|
|
||||||
Once you have the binary, you can now flash it.
|
Once you have the binary, you can now flash it.
|
||||||
|
|
||||||
1. Without firmware on the device or with older firmware (without USB serial console),
|
Without firmware on the device or with older firmware (without USB serial console), you need to use the jumper method:
|
||||||
you need to use the jumper method:
|
|
||||||
1. Have the Stabilizer disconnected from power.
|
|
||||||
2. Use a jumper of some sort to short BOOT pins on the board.
|
|
||||||
3. Turn on the power.
|
|
||||||
4. You can remove the jumper after few seconds.
|
|
||||||
2. With newer firmware with USB serial console:
|
|
||||||
1. Connect the Stabilizer to power.
|
|
||||||
2. Connect USB cable to the Stabilizer.
|
|
||||||
3. Ensure you have `pyserial` module either with `nix-shell -p python312Packages.pyserial` for NixOS users
|
|
||||||
or using `pip install pyserial` if you are using venv.
|
|
||||||
4. Run `python -m serial /dev/ttyACM0` to connect the serial port using `pyserial`.
|
|
||||||
5. Input `platform dfu` in the console.
|
|
||||||
3. Once the device is now in DFU mode, flash the device with the following command (needs `nix-shell -p dfu-util`):
|
|
||||||
|
|
||||||
```shell
|
1. Have the Stabilizer disconnected from power.
|
||||||
dfu-util -a 0 -s 0x08000000:leave -R -D stabilizer-dual-iir.bin
|
2. Use a jumper of some sort to short BOOT pins on the board.
|
||||||
```
|
3. Turn on the power.
|
||||||
|
4. You can remove the jumper after few seconds.
|
||||||
|
|
||||||
4. Look for "File downloaded successfully".
|
With newer firmware with USB serial console:
|
||||||
|
|
||||||
For normal usage, the stabilizer must be configured with USB console later (try `help` command first),
|
1. Connect the Stabilizer to power.
|
||||||
to set its IP address and MQTT broker address. However, for general testing (like the one below), you don't need to
|
2. Connect USB cable to the Stabilizer.
|
||||||
configure it any further.
|
3. Connect with a serial console emulator, usually at ``/dev/ttyACM0``.
|
||||||
|
4. Input ``platform dfu`` in the console.
|
||||||
|
|
||||||
|
And for both:
|
||||||
|
|
||||||
|
5. The device is now in DFU mode.
|
||||||
|
6. Flash the device with the following command:
|
||||||
|
|
||||||
|
```
|
||||||
|
dfu-util -a 0 -s 0x08000000:leave -R -D dual-iir.bin
|
||||||
|
```
|
||||||
|
|
||||||
|
7. Look for "File downloaded successfully".
|
||||||
|
|
||||||
|
For normal usage, the stabilizer must be configured with USB console later (try ``help`` command first), to set its IP address and MQTT broker address. However, for general testing (like the one below), you don't need to configure it any further.
|
||||||
|
|
||||||
### Clearing settings
|
### Clearing settings
|
||||||
|
|
||||||
In case someone sets some setting wrongly, or updates the firmware and suddenly there's an incompatibility,
|
In case someone sets some setting wrongly, or updates the firmware and suddenly there's an incompatibility, you may find (firmware, not yourself) in a state of panic, where it will not allow you to change the settings back.
|
||||||
you may find (firmware, not yourself) in a state of panic, where it will not allow you to change the settings back.
|
|
||||||
|
|
||||||
1. Get into DFU mode (described above), probably with jumper method.
|
1. Get into DFU mode (described above), probably with jumper method.
|
||||||
2. Use dfu-util to clear the flash completely:
|
2. Use dfu-util to clear the flash completely:
|
||||||
|
|
||||||
```shell
|
```
|
||||||
dfu-util -a 0 -s 0x08000000:mass-erase:force:leave
|
dfu-util -a 0 -s 0x08000000:mass-erase:force:leave
|
||||||
```
|
```
|
||||||
|
|
||||||
3. Reflash the target firmware.
|
3. Reflash the target firmware.
|
||||||
|
|
||||||
|
|
@ -99,37 +97,9 @@ you may find (firmware, not yourself) in a state of panic, where it will not all
|
||||||
2. Turn on the crate/Stabilizer via EEM cable or power supply
|
2. Turn on the crate/Stabilizer via EEM cable or power supply
|
||||||
3. Set up the signal generator for an amplitude of 1V, frequency of 10kHz, and a sine wave
|
3. Set up the signal generator for an amplitude of 1V, frequency of 10kHz, and a sine wave
|
||||||
4. Use the splitter to connect the generator's output to ADC0 and to the oscilloscope (refer to the picture below)
|
4. Use the splitter to connect the generator's output to ADC0 and to the oscilloscope (refer to the picture below)
|
||||||
|
|
||||||
5. Configure the oscilloscope so that the sine wave is clearly visible
|
5. Configure the oscilloscope so that the sine wave is clearly visible
|
||||||
6. Connect the second channel of the oscilloscope to the Stabilizer's DAC0
|
6. Connect the second channel of the oscilloscope to the Stabilizer's DAC0
|
||||||
7. Ensure that there is the same wave on the second channel, with a small delay, as on the first channel
|
7. Ensure that there is the same wave on the second channel, with a small delay, as on the first channel
|
||||||
8. Repeat steps 4-7 for ADC/DAC1 (refer to the picture below for connection reference)
|
8. Repeat steps 4-7 for ADC/DAC1 (refer to the picture below for connection reference)
|
||||||
|
|
||||||
|
|
||||||
## Setting up MQTT
|
|
||||||
|
|
||||||
For testing the Stabilizer, it's usually enough to do the settings above, as signal is filtered by the firmware.
|
|
||||||
However, if you need to test the network connectivity or Pounder telemetry, MQTT may come useful.
|
|
||||||
|
|
||||||
On PC side:
|
|
||||||
|
|
||||||
1. Get IP address of your machine, e.g. with ``ip a``. Make note of it, that's the broker address.
|
|
||||||
2. Get mosquitto, e.g. with ``nix-shell -p mosquitto``.
|
|
||||||
3. Run mosquitto with the config from Stabilizer repository: ``mosquitto -c mosquitto.conf``
|
|
||||||
4. If you don't have it yet, download [MQTT Explorer](https://github.com/thomasnordquist/MQTT-Explorer/releases).
|
|
||||||
5. Call ``nix-shell -p appimage-run``, then ``appimage-run MQTT-Explorer-0.4.0-beta6.AppImage``.
|
|
||||||
6. Connect to the MQTT broker under your own IP address.
|
|
||||||
|
|
||||||
Configure Stabilizer:
|
|
||||||
|
|
||||||
1. Connect the Stabilizer to power.
|
|
||||||
2. Connect USB cable to the Stabilizer.
|
|
||||||
3. Run ``cutecom`` or your favorite terminal emulator, connect to ``/dev/ttyACM0``.
|
|
||||||
4. Change the broker setting with: ``set /net/broker "<ip of your machine>"``.
|
|
||||||
5. Store the setting with ``store /net/broker``.
|
|
||||||
6. (Optional) Set the IP address of the stabilizer by following steps 4 and 5, but with ``/net/ip`` setting instead.
|
|
||||||
7. Reboot with ``platform reboot``.
|
|
||||||
|
|
||||||
Now, disconnect the USB and connect the Ethernet cable to the Stabilizer, as both won't fit at the same time.
|
|
||||||
Stabilizer should connect to moquitto automatically, and you should see the MQTT settings pop up in the MQTT Explorer.
|
|
||||||
If the IP address is not set, Stabilizer will try to use DHCP to get an address.
|
|
||||||
|
|
|
||||||
|
|
@ -17,18 +17,17 @@ With enabled SUServo mode, you only need to add `suservo` to JSON file, with its
|
||||||
## Setup
|
## Setup
|
||||||
|
|
||||||
To enable, on bottoms of each Urukul, switch first switches 1 and 2 to `ON`, as on the picture:
|
To enable, on bottoms of each Urukul, switch first switches 1 and 2 to `ON`, as on the picture:
|
||||||
|
|
||||||
|
|
||||||
### Easier access to the switches (for big racks)
|
### Easier access to the switches (for big racks)
|
||||||
|
|
||||||
When the crate is assembled, it may be difficult to pull out the cards to access the switches.
|
When the crate is assembled, it may be difficult to pull out the cards to access the switches.
|
||||||
Hence for big racks it may be easier to remove the upper perforated panel. For this:
|
Hence for big racks it may be easier to remove the upper perforated panel. For this:
|
||||||
|
|
||||||
1. Unscrew from both sides:
|
1. Unscrew from both sides:
|
||||||
|
|
||||||
2. Remove empty front panels
|
2. Remove empty front panels
|
||||||
3. Gently push out the perforated panel, applying the force from rack's back and front
|
3. Gently push out the perforated panel, applying the force from rack's back and front
|
||||||
4. With tweezers and following the [basic operating hints](../build_test_firmware.md#operating-hints-and-warnings)
|
4. With tweezers and following the [basic operating hints](../build_test_firmware.md#operating-hints-and-warnings)
|
||||||
switch the switches in desired direction
|
switch the switches in desired direction
|
||||||
5. Install the perforated and front panels back, screw the screws
|
5. Install the perforated and front panels back, screw the screws
|
||||||
|
|
||||||
|
|
@ -62,12 +61,10 @@ Verify frequency and power behavior.
|
||||||
```
|
```
|
||||||
|
|
||||||
1. Connect oscilloscope to the `urukul0` port and configure with time and voltage scale and trigger threshold
|
1. Connect oscilloscope to the `urukul0` port and configure with time and voltage scale and trigger threshold
|
||||||
so that you'll see sine wave, like on the picture:
|
so that you'll see sine wave, like on the picture: 
|
||||||
|
|
||||||
2. Verify amplitude and frequency
|
2. Verify amplitude and frequency
|
||||||
3. Apply 1.5V (connect the AA-battery) to the `sampler0` port, as on the
|
3. Apply 1.5V (connect the AA-battery) to the `sampler0` port, as on the
|
||||||
picture: 
|
picture: 
|
||||||
4. You should see significant amplitude decrease, as in the picture:
|
4. You should see significant amplitude decrease, as in the picture: 
|
||||||
|
|
||||||
5. Verify amplitude difference, and the frequency to be unchanged
|
5. Verify amplitude difference, and the frequency to be unchanged
|
||||||
6. Repeat steps 1-5 for every available channel.
|
6. Repeat steps 1-5 for every available channel.
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,6 @@ You may also check fan controls via `fan` commands (see the firmware documentati
|
||||||
2. General TEC: connect external connector to the TEC
|
2. General TEC: connect external connector to the TEC
|
||||||
3. Connect Ethernet and PSU
|
3. Connect Ethernet and PSU
|
||||||
4. Run:
|
4. Run:
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
git clone gitea@git.m-labs.hk:esavkin/thermostat.git
|
git clone gitea@git.m-labs.hk:esavkin/thermostat.git
|
||||||
cd thermostat
|
cd thermostat
|
||||||
|
|
@ -37,22 +36,18 @@ You may also check fan controls via `fan` commands (see the firmware documentati
|
||||||
nix develop
|
nix develop
|
||||||
python pytec/tec_qt.py
|
python pytec/tec_qt.py
|
||||||
```
|
```
|
||||||
|
5. In `Output Config`, set limits:
|
||||||
5. In `Output Config`, set limits:
|
|
||||||
* `Max Cooling Current` - 400 mA
|
* `Max Cooling Current` - 400 mA
|
||||||
* `Max Heating Current` - 400 mA
|
* `Max Heating Current` - 400 mA
|
||||||
* `Max Voltage Difference` - 1 V
|
* `Max Voltage Difference` - 1 V
|
||||||
6. `PID Config` -> `PID Auto Tune` set desired target temperature,
|
6. `PID Config` -> `PID Auto Tune` set desired target temperature, which should be slightly above your room temperature (+10C)
|
||||||
which should be slightly above your room temperature (+10C)
|
7. Set `Thermistor Config` -> `B` and other values, according to the datasheet of the TEC module, for example for Zotino `B` is `3455 K`
|
||||||
7. Set `Thermistor Config` -> `B` and other values, according to the datasheet of the TEC module,
|
8. Run `PID Config` -> `PID Auto Tune` -> `Run` and check graphs that the measured temperature goes to the target temperature,
|
||||||
for example for Zotino `B` is `3455 K`
|
and eventually stabilizes at +- 0.01 of the target
|
||||||
8. Run `PID Config` -> `PID Auto Tune` -> `Run` and check graphs that the measured temperature
|
|
||||||
goes to the target temperature, and eventually stabilizes at +- 0.01 of the target
|
|
||||||
|
|
||||||
## Common problems
|
## Common problems
|
||||||
|
|
||||||
### Thermostat doesn't connect or doesn't enter DFU mode
|
### Thermostat doesn't connect or doesn't enter DFU mode
|
||||||
|
|
||||||
Carefully take out Thermostat from its protective box, unscrewed all screws before.
|
Carefully take out Thermostat from its protective box, unscrewed all screws before. Apply jumper and power on the Thermostat.
|
||||||
Apply jumper and power on the Thermostat.
|
Now it should be in DFU mode.
|
||||||
Now it should be in DFU mode.
|
|
||||||
|
|
@ -20,36 +20,32 @@
|
||||||
|
|
||||||
## Setup
|
## Setup
|
||||||
|
|
||||||
Check if [SUServo](./suservo.md) is enabled/disabled respective to customer needs.
|
Check if [SUServo](./suservo.md) is enabled/disabled respective to customer needs. Connect to the clock source - either Clocker,
|
||||||
Connect to the clock source - either Clocker, Kasli or external via SMA.
|
Kasli or external via SMA.
|
||||||
|
|
||||||
### Synchronization
|
### Synchronization
|
||||||
|
|
||||||
Phase synchronization enables phase control from Kasli/Kasli-SoC with an absolute phase reference,
|
Phase synchronization enables phase control from Kasli/Kasli-SoC with an absolute phase reference, i.e. you can use the phase control API in the coredevice driver.
|
||||||
i.e. you can use the phase control API in the coredevice driver. Without synchronization the phase between Urukuls
|
Without synchronization the phase between Urukuls will not drift, but it can change across reboots, and the phase control API cannot be used.
|
||||||
will not drift, but it can change across reboots, and the phase control API cannot be used. Synchronization requires
|
Synchronization requires Kasli and Urukul to be clocked from the same oscillator with <<1ns noise, otherwise the synchronization may fail, and that's
|
||||||
Kasli and Urukul to be clocked from the same oscillator with <<1ns noise, otherwise the synchronization may fail,
|
why this feature is disabled by default.
|
||||||
and that's why this feature is disabled by default. There is no intrinsic impact on Urukul output phase noise and
|
There is no intrinsic impact on Urukul output phase noise and the synchronization process is quick and reliable when done correctly.
|
||||||
the synchronization process is quick and reliable when done correctly.
|
|
||||||
|
|
||||||
### One-EEM mode
|
### One-EEM mode
|
||||||
|
|
||||||
Users may choose to use only one EEM port, if they want more cards to be in their crate. However following features
|
Users may choose to use only one EEM port, if they want more cards to be in their crate. However following features
|
||||||
will become unavailable:
|
will become unavailable:
|
||||||
|
* SU-Servo
|
||||||
|
* Low-latency RF switch control
|
||||||
|
* Synchronization
|
||||||
|
|
||||||
* SU-Servo
|
RF switches are still available but the commands need to go over the SPI bus so it's higher-latency and lower-resolution.
|
||||||
* Low-latency RF switch control
|
|
||||||
* Synchronization
|
|
||||||
|
|
||||||
RF switches are still available but the commands need to go over the SPI bus so it's higher-latency
|
|
||||||
and lower-resolution.
|
|
||||||
|
|
||||||
### Urukul 4412
|
### Urukul 4412
|
||||||
|
|
||||||
Urukul 4412 has higher frequency resolution (47 bit against 32 at Urukul 4410), however lacks such features:
|
Urukul 4412 has higher frequency resolution (47 bit against 32 at Urukul 4410), however lacks such features:
|
||||||
|
* SU-Servo
|
||||||
* SU-Servo
|
* Synchronization
|
||||||
* Synchronization
|
|
||||||
|
|
||||||
## Testing
|
## Testing
|
||||||
|
|
||||||
|
|
@ -61,18 +57,18 @@ urukul0_cpld: initializing CPLD...
|
||||||
urukul0_cpld: testing attenuator digital control...
|
urukul0_cpld: testing attenuator digital control...
|
||||||
urukul0_cpld: done
|
urukul0_cpld: done
|
||||||
Calibrating inter-device synchronization...
|
Calibrating inter-device synchronization...
|
||||||
urukul0_ch0 no EEPROM synchronization
|
urukul0_ch0 no EEPROM synchronization
|
||||||
urukul0_ch1 no EEPROM synchronization
|
urukul0_ch1 no EEPROM synchronization
|
||||||
urukul0_ch2 no EEPROM synchronization
|
urukul0_ch2 no EEPROM synchronization
|
||||||
urukul0_ch3 no EEPROM synchronization
|
urukul0_ch3 no EEPROM synchronization
|
||||||
...done
|
...done
|
||||||
All urukul channels active.
|
All urukul channels active.
|
||||||
Check each channel amplitude (~1.6Vpp/8dbm at 50ohm) and frequency.
|
Check each channel amplitude (~1.6Vpp/8dbm at 50ohm) and frequency.
|
||||||
Frequencies:
|
Frequencies:
|
||||||
urukul0_ch0 10MHz
|
urukul0_ch0 10MHz
|
||||||
urukul0_ch1 11MHz
|
urukul0_ch1 11MHz
|
||||||
urukul0_ch2 12MHz
|
urukul0_ch2 12MHz
|
||||||
urukul0_ch3 13MHz
|
urukul0_ch3 13MHz
|
||||||
Press ENTER when done.
|
Press ENTER when done.
|
||||||
|
|
||||||
Testing RF switch control. Check LEDs at urukul RF ports.
|
Testing RF switch control. Check LEDs at urukul RF ports.
|
||||||
|
|
@ -84,6 +80,7 @@ Press ENTER when done.
|
||||||
3. Measure frequencies and amplitudes on each connector, check with `artiq_sinara_test`'s respective values
|
3. Measure frequencies and amplitudes on each connector, check with `artiq_sinara_test`'s respective values
|
||||||
4. When done, proceed with `artiq_sinara_test` and check LEDs are lighting up one after another
|
4. When done, proceed with `artiq_sinara_test` and check LEDs are lighting up one after another
|
||||||
|
|
||||||
|
|
||||||
## Common problems
|
## Common problems
|
||||||
|
|
||||||
### Urukul AD9912 product id mismatch or missing LEDs
|
### Urukul AD9912 product id mismatch or missing LEDs
|
||||||
|
|
@ -92,27 +89,22 @@ Press ENTER when done.
|
||||||
ValueError: Urukul AD9912 product id mismatch
|
ValueError: Urukul AD9912 product id mismatch
|
||||||
```
|
```
|
||||||
|
|
||||||
Some Urukuls may fail with this error during testing, usually meaning that the Urukul has not been flashed with the
|
Some Urukuls may fail with this error during testing, usually meaning that the Urukul has not been flashed with the
|
||||||
firmware, especially if the ID is `65535` (you will need to edit the code to check this).
|
firmware, especially if the ID is `65535` (you will need to edit the code to check this).
|
||||||
|
|
||||||
Another common symptom of no firmware is that no LEDs are lit up, besides Power Good - whereas if the firmware has been
|
Another common symptom of no firmware is that no LEDs are lit up, besides Power Good - whereas if the firmware has been flashed, the RF channels will be lit red.
|
||||||
flashed, the RF channels will be lit red.
|
|
||||||
|
|
||||||
You can flash the firmware yourself with a JTAG adapter:
|
You can flash the firmware yourself with a JTAG adapter:
|
||||||
|
|
||||||
1. Download the latest binary release from [quartiq/urukul](https://github.com/quartiq/urukul) and extract the
|
1. Download the latest binary release from [quartiq/urukul](https://github.com/quartiq/urukul) and extract the `urukul.jed` file.
|
||||||
`urukul.jed` file.
|
2. Connect the Urukul with the JTAG adapter to the PC and connect its EEM0 to any available Kasli/Kasli-SoC (**do not hot-plug**), then power on the Kasli/Kasli-SoC.
|
||||||
2. Connect the Urukul with the JTAG adapter to the PC and connect its EEM0 to any available Kasli/Kasli-SoC
|
|
||||||
(**do not hot-plug**), then power on the Kasli/Kasli-SoC.
|
|
||||||
3. Run `nix-shell -p xc3sprog`.
|
3. Run `nix-shell -p xc3sprog`.
|
||||||
4. Run `xc3sprog -c jtaghs2 urukul.jed -m /opt/Xilinx/Vivado/<available version>/data/xicom/cable_data/digilent/lnx64/xbr/`.
|
4. Run `xc3sprog -c jtaghs2 urukul.jed -m /opt/Xilinx/Vivado/<available version>/data/xicom/cable_data/digilent/lnx64/xbr/`.
|
||||||
5. If the last command outputs Verify: Success, then your Urukul is ready. It can also output the message
|
5. If the last command outputs Verify: Success, then your Urukul is ready. It can also output the message
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
*** buffer overflow detected ***: terminated
|
*** buffer overflow detected ***: terminated
|
||||||
Aborted (core dumped)
|
Aborted (core dumped)
|
||||||
```
|
```
|
||||||
|
|
||||||
, which is okay if `Verify: Success` was also emitted.
|
, which is okay if `Verify: Success` was also emitted.
|
||||||
|
|
||||||
### no valid window/delay
|
### no valid window/delay
|
||||||
|
|
@ -121,7 +113,7 @@ You can flash the firmware yourself with a JTAG adapter:
|
||||||
ValueError: no valid window/delay
|
ValueError: no valid window/delay
|
||||||
```
|
```
|
||||||
|
|
||||||
Check with the customer to see if synchronization is necessary, and disable it if it is not.
|
Check with the customer to see if synchronization is necessary, and disable it if it is not.
|
||||||
In any case, simply restart the test.
|
In any case, simply restart the test.
|
||||||
|
|
||||||
### Noise instead of signal
|
### Noise instead of signal
|
||||||
|
|
@ -130,8 +122,8 @@ It may be due to misconfiguration of SUServo. Check that both firmware and pins
|
||||||
|
|
||||||
### Improper frequency
|
### Improper frequency
|
||||||
|
|
||||||
This can happen due to lack/bad clock source connection. Check that clock source is connected respective to the
|
This can happen due to lack/bad clock source connection. Check that clock source is connected respective to the customer needs,
|
||||||
customer needs, and if it is connected to the [Clocker](clocker.md), check that clocker receives clock signal properly.
|
and if it is connected to the [Clocker](clocker.md), check that clocker receives clock signal properly.
|
||||||
|
|
||||||
### Urukul proto_rev mismatch
|
### Urukul proto_rev mismatch
|
||||||
|
|
||||||
|
|
@ -147,9 +139,9 @@ Check the ports are connected respectively to the JSON description.
|
||||||
ValueError: PLL lock timeout
|
ValueError: PLL lock timeout
|
||||||
```
|
```
|
||||||
|
|
||||||
This can happen due to lack/bad clock source connection. Check that clock source is connected respective
|
This can happen due to lack/bad clock source connection. Check that clock source is connected respective to the customer needs,
|
||||||
to the customer needs, and if it is connected to the [Clocker](clocker.md), check that clocker receives clock signal
|
and if it is connected to the [Clocker](clocker.md), check that clocker receives clock signal properly and `EXT`/`INT` pin
|
||||||
properly and `EXT`/`INT` pin matches real clocker source.
|
matches real clocker source.
|
||||||
|
|
||||||
### Urukul AD9910 AUX_DAC mismatch
|
### Urukul AD9910 AUX_DAC mismatch
|
||||||
|
|
||||||
|
|
@ -162,7 +154,7 @@ Ensure it is the AD9910 and not the AD9912. Also check SUServo pins are set up r
|
||||||
### Jagged signal with 1GHz external clock on AD9910
|
### Jagged signal with 1GHz external clock on AD9910
|
||||||
|
|
||||||
By default, on AD9910 external clock signal is divided by 4, while it should be not divided at all with PLL disabled.
|
By default, on AD9910 external clock signal is divided by 4, while it should be not divided at all with PLL disabled.
|
||||||
Change the `clk_div` parameter to the CPLD in the device_db file:
|
Change the ``clk_div`` parameter to the CPLD in the device_db file:
|
||||||
|
|
||||||
```python
|
```python
|
||||||
device_db["urukulX_cpld"] = {
|
device_db["urukulX_cpld"] = {
|
||||||
|
|
@ -178,4 +170,4 @@ device_db["urukulX_cpld"] = {
|
||||||
"clk_div" : 1 # <--- add this line
|
"clk_div" : 1 # <--- add this line
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
@ -12,12 +12,10 @@
|
||||||
"ports": [<port num>]
|
"ports": [<port num>]
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
```json
|
```json
|
||||||
{
|
{
|
||||||
"type": "fastino",
|
"type": "fastino",
|
||||||
"hw_rev": "v1.2", // optional
|
"hw_rev": "v1.2", // optional
|
||||||
"log2_width": <0 to 5, default 0>, // pack multiple (in powers of 2) DAC channels into one RTIO write
|
|
||||||
"ports": [<port num>]
|
"ports": [<port num>]
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
@ -26,8 +24,8 @@ Fastino uses one physical EEM channel, despite having two EEM ports.
|
||||||
|
|
||||||
## Setup
|
## Setup
|
||||||
|
|
||||||
Connect the BNC/SMA-IDC adapters to the Zotino/Fastino with 26-pin cable if needed by customer.
|
Connect the BNC/SMA-IDC adapters to the Zotino/Fastino with 26-pin cable if needed by customer. Be aware of the ports order -
|
||||||
Be aware of the ports order - see reference numbers on the board.
|
see reference numbers on the board.
|
||||||
|
|
||||||
## Testing
|
## Testing
|
||||||
|
|
||||||
|
|
@ -50,6 +48,7 @@ Press ENTER when done.
|
||||||
3. If there are [BNC/SMA-IDC adapters](./bnc_sma_idc_adapter.md), also check their voltages - they should be the same
|
3. If there are [BNC/SMA-IDC adapters](./bnc_sma_idc_adapter.md), also check their voltages - they should be the same
|
||||||
4. Check LEDs are on
|
4. Check LEDs are on
|
||||||
|
|
||||||
|
|
||||||
## Common problems
|
## Common problems
|
||||||
|
|
||||||
### High-freq audible noise and output values all near -0.1 on Zotino v1.4.2
|
### High-freq audible noise and output values all near -0.1 on Zotino v1.4.2
|
||||||
|
|
@ -61,24 +60,19 @@ This may happen when power-cycle is too short. Power down the crate, wait at lea
|
||||||
|
|
||||||
Some Fastino may not output any meaningful voltage during testing, usually that means it has no gateware flashed.
|
Some Fastino may not output any meaningful voltage during testing, usually that means it has no gateware flashed.
|
||||||
|
|
||||||
Another common symptom of no gateware is that no LEDs are lit up. Whereas if the gateware has been flashed,
|
Another common symptom of no gateware is that no LEDs are lit up. Whereas if the gateware has been flashed, the PG and FD LEDs will be lit green.
|
||||||
the PG and FD LEDs will be lit green.
|
|
||||||
|
|
||||||
You can flash the gateware with a Kasli/Kasli-SoC, be it in the crate or standalone
|
You can flash the gateware with a Kasli/Kasli-SoC, be it in the crate or standalone (no specific gateware needed for Kasli/SoC):
|
||||||
(no specific gateware needed for Kasli/SoC):
|
|
||||||
|
|
||||||
1. Download the latest `fastino.bin` release from [quartiq/fastino](https://github.com/quartiq/fastino/releases).
|
1. Download the latest `fastino.bin` release from [quartiq/fastino](https://github.com/quartiq/fastino/releases).
|
||||||
2. Run `git clone https://github.com/quartiq/kasli-i2c.git` and place `fastino.bin` in the kasli-i2c directory.
|
2. Run `git clone https://github.com/quartiq/kasli-i2c.git` and place `fastino.bin` in the kasli-i2c directory.
|
||||||
3. Connect the Fastino's EEM0 to any available Kasli/Kasli-SoC EEM port
|
3. Connect the Fastino's EEM0 to any available Kasli/Kasli-SoC EEM port ([**do not hot-plug**](../build_test_firmware.md#operating-hints-and-warnings)).
|
||||||
([**do not hot-plug**](../build_test_firmware.md#operating-hints-and-warnings)).
|
|
||||||
You may skip this step if Fastino is connected within a crate.
|
You may skip this step if Fastino is connected within a crate.
|
||||||
4. Power on the standalone Kasli/Kasli-SoC and connect it to the PC via data micro-USB.
|
4. Power on the standalone Kasli/Kasli-SoC and connect it to the PC via data micro-USB.
|
||||||
5. Run `nix-shell -p python311Packages.pyftdi`.
|
5. Run `nix-shell -p python311Packages.pyftdi`.
|
||||||
6. Run `cd kasli-i2c; python flash_fastino.py 0 EEM<number> write fastino.bin` where `<number>`
|
6. Run `cd kasli-i2c; python flash_fastino.py 0 EEM<number> write fastino.bin` where `<number>` is the EEM port number on the Kasli/Kasli-SoC side.
|
||||||
is the EEM port number on the Kasli/Kasli-SoC side.
|
|
||||||
7. If PG and FD LEDs are lit green, the Fastino is ready.
|
7. If PG and FD LEDs are lit green, the Fastino is ready.
|
||||||
|
|
||||||
### Fastino output is 10V
|
### Fastino output is 10V
|
||||||
|
|
||||||
Fastinos by default after power up output 10V on all channels if not driven by the test otherwise.
|
Fastinos by default after power up output 10V on all channels if not driven by the test otherwise. Make sure the EEM ports are specified correctly in the JSON and the EEM cable is connected to EEM0 on the Fastino.
|
||||||
Make sure the EEM ports are specified correctly in the JSON and the EEM cable is connected to EEM0 on the Fastino.
|
|
||||||
|
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 36 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 114 KiB |
|
|
@ -6,49 +6,46 @@ This article is intended to help with using the `afws_client` command properly.
|
||||||
|
|
||||||
### What is AFWS
|
### What is AFWS
|
||||||
|
|
||||||
AFWS (ARTIQ FirmWare Service) - a service, that allows building customer tailored firmware and gateware (binaries)
|
AFWS (ARTIQ FirmWare Service) - a service, that allows building customer tailored firmware and gateware (binaries) on M-Labs's servers,
|
||||||
on M-Labs's servers, and receive these binaries in ready-to-flash format. Subscription to this service also includes
|
and receive these binaries in ready-to-flash format. Subscription to this service also includes helpdesk support,
|
||||||
helpdesk support, and thus is paid on yearly basis (contact sales for prices). It is also typically included when
|
and thus is paid on yearly basis (contact sales for prices). It is also typically included when purchasing Carrier (Kasli/Kasli-SoC) for a year,
|
||||||
purchasing Carrier (Kasli/Kasli-SoC) for a year, or one-time when purchasing standalone cards for existing crate.
|
or one-time when purchasing standalone cards for existing crate. Each variant/carrier requires its own subscription.
|
||||||
Each variant/carrier requires its own subscription.
|
|
||||||
|
|
||||||
### What do I need for obtaining binaries
|
### What do I need for obtaining binaries
|
||||||
|
|
||||||
You'll need to have credentials - username and password, which you can obtain from helpdesk, if you haven't yet.
|
You'll need to have credentials - username and password, which you can obtain from helpdesk, if you haven't yet.
|
||||||
Don't forget to specify variant (sticker on top of the crate) that you need to obtain binaries for.
|
Don't forget to specify variant (sticker on top of the crate) that you need to obtain binaries for.
|
||||||
|
|
||||||
### When do I need to update
|
### When do I need to update
|
||||||
|
|
||||||
In most cases there is no need to update the firmware, unless you encountered a bug and the fix was backported
|
In most cases there is no need to update the firmware, unless you encountered a bug and the fix was backported to your version.
|
||||||
to your version. However, if you: changed the layout of the cards - either moved EEM connections, added or
|
However, if you: changed the layout of the cards - either moved EEM connections, added or deleted cards;
|
||||||
deleted cards; changed modes/configurations of the cards (e.g. enable/disable SUServo, synchronization, edge counter,
|
changed modes/configurations of the cards (e.g. enable/disable SUServo, synchronization, edge counter, SED lanes etc.).
|
||||||
SED lanes etc.). In such cases, these changes need to be authorized through helpdesk.
|
In such cases, these changes need to be authorized through helpdesk.
|
||||||
|
|
||||||
### How to
|
### How to
|
||||||
|
|
||||||
The base command looks like this:
|
The base command looks like this:
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
afws_client <username> build <afws_directory> <variant>
|
afws_client <username> build <afws_directory> <variant>
|
||||||
```
|
```
|
||||||
|
|
||||||
Where (remove `<` and `>`):
|
Where (remove `<` and `>`):
|
||||||
|
|
||||||
* `<username>` - your username from credentials
|
* `<username>` - your username from credentials
|
||||||
* `<afws_directory>` - the directory/folder, into which you wish to save the binaries
|
* `<afws_directory>` - the directory/folder, into which you wish to save the binaries
|
||||||
* `<variant>` - name of the crate/variant. It's optional if you have only one variant in the account
|
* `<variant>` - name of the crate/variant. It's optional if you have only one variant in the account
|
||||||
|
|
||||||
After running this command, it will ask you for the password (the line will remain blank for security reasons).
|
After running this command, it will ask you for the password (the line will remain blank for security reasons).
|
||||||
If everything matches (username and password are correct, specified variant is in your account and not expired),
|
If everything matches (username and password are correct, specified variant is in your account and not expired),
|
||||||
AFWS will start building the firmware, which takes 10-15 minutes. Sometimes there might be some problems, in which
|
AFWS will start building the firmware, which takes 10-15 minutes. Sometimes there might be some problems, in which
|
||||||
case don't hesitate to contact helpdesk.
|
case don't hesitate to contact helpdesk.
|
||||||
|
|
||||||
After the build done, the AFWS client will automatically download the binaries into `<afws_directory>`, from which
|
After the build done, the AFWS client will automatically download the binaries into `<afws_directory>`, from which
|
||||||
you can flash them into your Carrier.
|
you can flash them into your Carrier.
|
||||||
|
|
||||||
#### View build logs
|
#### View build logs
|
||||||
|
|
||||||
You may want to view the build logs (for example, in case of problems with configuration).
|
You may want to view the build logs (for example, in case of problems with configuration).
|
||||||
For this, add `--log` option after build:
|
For this, add `--log` option after build:
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
|
|
@ -57,31 +54,28 @@ afws_client <username> build --log <afws_directory> <variant>
|
||||||
|
|
||||||
#### Specify version
|
#### Specify version
|
||||||
|
|
||||||
By default, AFWS client tries to figure out the installed ARTIQ version. However it works only for Kasli, and
|
By default, AFWS client tries to figure out the installed ARTIQ version. However it works only for Kasli, and not Kasli-SoC.
|
||||||
not Kasli-SoC. It also may fail to determine ARTIQ version if you are using AFWS client without ARTIQ installation.
|
It also may fail to determine ARTIQ version if you are using AFWS client without ARTIQ installation.
|
||||||
Additionally, you may want to specify version regardless of installed version.
|
Additionally, you may want to specify version regardless of installed version.
|
||||||
In all these cases, you'll need to specify **both** `--major-ver` and `--rev` arguments, so your command
|
In all these cases, you'll need to specify **both** `--major-ver` and `--rev` arguments, so your command will look like this:
|
||||||
will look like this:
|
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
afws_client <username> build --major-ver <MAJOR_VER> --rev <REV> <afws_directory> <variant>
|
afws_client <username> build --major-ver <MAJOR_VER> --rev <REV> <afws_directory> <variant>
|
||||||
```
|
```
|
||||||
|
|
||||||
Where:
|
Where:
|
||||||
|
* `MAJOR_VER` - ARTIQ major version, either `7` (legacy), `8` (current stable),
|
||||||
* `MAJOR_VER` - ARTIQ major version, either `7` (legacy), `8` (current stable),
|
|
||||||
`9` (current beta) or `10` (experimental with `nac3` compiler)
|
`9` (current beta) or `10` (experimental with `nac3` compiler)
|
||||||
* `REV` - revision from respective branch and repository - i.e. commit hash. You may obtain it either from:
|
* `REV` - revision from respective branch and repository - i.e. commit hash. You may obtain it either from:
|
||||||
* [ARTIQ repository](https://github.com/m-labs/artiq) (for Kasli 2.0 and earlier) by
|
* [ARTIQ repository](https://github.com/m-labs/artiq) (for Kasli 2.0 and earlier) by
|
||||||
[selecting branch](https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/managing-branches-in-your-repository/viewing-branches-in-your-repository)
|
[selecting branch](https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/managing-branches-in-your-repository/viewing-branches-in-your-repository)
|
||||||
and selecting `XXX commits` above list of files. From here, the list of commits in specified branch will appear
|
and selecting `XXX commits` above list of files. From here, the list of commits in specified branch will appear
|
||||||
and you will be able to choose the commit and press ["Copy full SHA for YYY"](https://docs.github.com/en/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/about-commits#using-the-file-tree)
|
and you will be able to choose the commit and press ["Copy full SHA for YYY"](https://docs.github.com/en/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/about-commits#using-the-file-tree)
|
||||||
button in the right side.
|
button in the right side.
|
||||||
* [ARTIQ on Zynq repository](https://git.m-labs.hk/M-Labs/artiq-zynq) (for Kasli-SoC). In similar way to GitHub,
|
* [ARTIQ on Zynq repository](https://git.m-labs.hk/M-Labs/artiq-zynq) (for Kasli-SoC). In similar way to GitHub,
|
||||||
you can choose branch, commit history and copy SHA1 of the commit.
|
you can choose branch, commit history and copy SHA1 of the commit.
|
||||||
|
|
||||||
The branches currently map as following:
|
The branches currently map as following:
|
||||||
|
|
||||||
* ARTIQ-7 - release-7
|
* ARTIQ-7 - release-7
|
||||||
* ARTIQ-8 - release-8
|
* ARTIQ-8 - release-8
|
||||||
* ARTIQ-9 - master
|
* ARTIQ-9 - master
|
||||||
|
|
@ -93,17 +87,17 @@ cache (i.e. not rebuilt).
|
||||||
|
|
||||||
#### Change password
|
#### Change password
|
||||||
|
|
||||||
After you received credentials from us, we strongly recommend changing the password as soon as possible via
|
After you received credentials from us, we strongly recommend changing the password as soon as possible via
|
||||||
`afws_client <username> passwd` command. This command will ask you for existing password and new desired password.
|
`afws_client <username> passwd` command. This command will ask you for existing password and new desired password.
|
||||||
|
|
||||||
The passwords are stored in a hashed way (i.e. cannot be decrypted back), however it's your responsibility to
|
The passwords are stored in a hashed way (i.e. cannot be decrypted back), however it's your responsibility to choose good passwords.
|
||||||
choose good passwords. Just keep in mind, that password may contain only alpha-numeric symbols and underscore
|
Just keep in mind, that password may contain only alpha-numeric symbols and underscore `[a-zA-Z0-9_]`. If it contains other symbols,
|
||||||
`[a-zA-Z0-9_]`. If you cannot login, we may reset your password if you email us at helpdesk.
|
they may be silently ignored and you will not be able to log in.
|
||||||
|
If you cannot login, we may reset your password if you email us at helpdesk.
|
||||||
|
|
||||||
#### Get variants
|
#### Get variants
|
||||||
|
|
||||||
You may get variants, which are tied to your account by using `get_variants` command:
|
You may get variants, which are tied to your account by using `get_variants` command:
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
afws_client <username> get_variants
|
afws_client <username> get_variants
|
||||||
```
|
```
|
||||||
|
|
@ -122,17 +116,18 @@ It will ask for password and output the variants and their respective expiry dat
|
||||||
#### Get JSONs
|
#### Get JSONs
|
||||||
|
|
||||||
Sometimes you may want to view the JSON description, from which AFWS is building the variant. With the JSON, you can
|
Sometimes you may want to view the JSON description, from which AFWS is building the variant. With the JSON, you can
|
||||||
later build the firmware by yourself and/or generate device_db file. The command looks like this (variant
|
later build the firmware by yourself and/or generate device_db file. The command looks like this (variant
|
||||||
needs to be valid, i.e. not expired and authorized in your account):
|
needs to be valid, i.e. not expired and authorized in your account):
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
afws_client <username> get_json [-o <OUT>] [-f] <variant>
|
afws_client <username> get_json [-o <OUT>] [-f] <variant>
|
||||||
```
|
```
|
||||||
|
|
||||||
Specify output file `-o <OUT>`, if you want to save it directly to file `<OUT>`, use `-f` if you want to force
|
Specify output file `-o <OUT>`, if you want to save it directly to file `<OUT>`, use `-f` if you want to force
|
||||||
overwrite. If you do not specify any of these options, you'll get the JSON description directly in stdin (i.e. in your
|
overwrite. If you do not specify any of these options, you'll get the JSON description directly in stdin (i.e. in your
|
||||||
console/terminal).
|
console/terminal).
|
||||||
|
|
||||||
|
|
||||||
#### Miscellaneous
|
#### Miscellaneous
|
||||||
|
|
||||||
You may also specify custom AFWS provider with these options (put them before username):
|
You may also specify custom AFWS provider with these options (put them before username):
|
||||||
|
|
@ -140,3 +135,4 @@ You may also specify custom AFWS provider with these options (put them before us
|
||||||
* `--server SERVER` - server to connect to (default: afws.m-labs.hk)
|
* `--server SERVER` - server to connect to (default: afws.m-labs.hk)
|
||||||
* `--port PORT` - port to connect to (default: 80)
|
* `--port PORT` - port to connect to (default: 80)
|
||||||
* `--cert CERT` - SSL certificate file used to authenticate server (default: use system certificates)
|
* `--cert CERT` - SSL certificate file used to authenticate server (default: use system certificates)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -14,14 +14,13 @@ If there are any `nixpkgs` present already, comment them out with `#`.
|
||||||
|
|
||||||
Then add the following line:
|
Then add the following line:
|
||||||
|
|
||||||
```text
|
```
|
||||||
https://nixos.org/channels/nixos-21.05 nixpkgs
|
https://nixos.org/channels/nixos-21.05 nixpkgs
|
||||||
```
|
```
|
||||||
|
|
||||||
Save and exit.
|
Save and exit.
|
||||||
|
|
||||||
Now, we need special `nix-scripts` to configure building environment, and a local copy of the artiq repository,
|
Now, we need special `nix-scripts` to configure building environment, and a local copy of the artiq repository, in legacy release.
|
||||||
in legacy release.
|
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
mkdir artiq-legacy
|
mkdir artiq-legacy
|
||||||
|
|
@ -33,8 +32,7 @@ git checkout release-6 # or release-5...
|
||||||
cd ..
|
cd ..
|
||||||
```
|
```
|
||||||
|
|
||||||
Keep in mind that ARTIQ-6 scripts have been removed in `nix-scripts`, so you may need to checkout the last commit
|
Keep in mind that ARTIQ-6 scripts have been removed in `nix-scripts`, so you may need to checkout the last commit that still has them.
|
||||||
that still has them.
|
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
cd nix-scripts
|
cd nix-scripts
|
||||||
|
|
@ -42,18 +40,6 @@ git checkout c590df48e0553a670e18ebf9d02047bfcfddb40d
|
||||||
cd ..
|
cd ..
|
||||||
```
|
```
|
||||||
|
|
||||||
### If you need ARTIQ-6 on Kasli 2.0.2
|
|
||||||
|
|
||||||
Due to a different I2C IO expander chip, ARTIQ-6 firmware may boot on a Kasli 2.0.2, but will not allow Ethernet connection (and possibly DRTIO as well).
|
|
||||||
|
|
||||||
For that, before starting the development shell, patch the ARTIQ-6 with the [commit from ARTIQ-7 that added support for it](https://github.com/m-labs/artiq/commit/ce57d6c34680360da95465295044b1c4a51a4864):
|
|
||||||
|
|
||||||
```shell
|
|
||||||
cd artiq
|
|
||||||
git cherry-pick ce57d6c34680360da95465295044b1c4a51a4864
|
|
||||||
cd ..
|
|
||||||
```
|
|
||||||
|
|
||||||
## Setting up the environment and building firmware
|
## Setting up the environment and building firmware
|
||||||
|
|
||||||
Within ``fish`` shell (others may not work correctly), set up the ARTIQ build environment:
|
Within ``fish`` shell (others may not work correctly), set up the ARTIQ build environment:
|
||||||
|
|
@ -69,17 +55,14 @@ python -m artiq.gateware.targets.kasli_generic <variant>.json
|
||||||
```
|
```
|
||||||
|
|
||||||
If you are building legacy ARTIQ for local use and you want to flash it, use:
|
If you are building legacy ARTIQ for local use and you want to flash it, use:
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
artiq_flash -V <variant> -d artiq_kasli --srcbuild
|
artiq_flash -V <variant> -d artiq_kasli --srcbuild
|
||||||
```
|
```
|
||||||
|
|
||||||
There's a slight discrepancy from usual command - ``-V <variant>`` option is not present in ARTIQ-7+,
|
There's a slight discrepancy from usual command - ``-V <variant>`` option is not present in ARTIQ-7+, but it is necessary here.
|
||||||
but it is necessary here.
|
|
||||||
|
|
||||||
If you want to send the binaries to a customer, there's no need packing up the whole build directory - only `top.bit`,
|
If you want to send the binaries to a customer, there's no need packing up the whole build directory - only `top.bit`, `bootloader.bin`
|
||||||
`bootloader.bin` and `runtime.elf/fbi` or `satman.elf/fbi` are necessary. You can use the `prep_pkg.py` script from
|
and `runtime.elf/fbi` or `satman.elf/fbi` are necessary. You can use the `prep_pkg.py` script from extras to package them up neatly into a zip file for distributions:
|
||||||
extras to package them up neatly into a zip file for distributions:
|
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
python prep_pkg.py -v <variant> -d artiq_kasli/
|
python prep_pkg.py -v <variant> -d artiq_kasli/
|
||||||
|
|
@ -93,9 +76,8 @@ artiq_flash -V <variant> -d .
|
||||||
|
|
||||||
## ARTIQ-7
|
## ARTIQ-7
|
||||||
|
|
||||||
The process of building firmware for ARTIQ-7 is mostly similar to ARTIQ-8, except there are no named RTIO channels
|
The process of building firmware for ARTIQ-7 is mostly similar to ARTIQ-8, except there are no named RTIO channels
|
||||||
and no remote reboot functionality on Kasli-SoC. DRTIO set ups are also similar to ARTIQ-8.
|
and no remote reboot functionality on Kasli-SoC. DRTIO set ups are also similar to ARTIQ-8. [See reference](../build_test_firmware.md).
|
||||||
[See reference](../build_test_firmware.md).
|
|
||||||
|
|
||||||
### Kasli, Kasli 2.0
|
### Kasli, Kasli 2.0
|
||||||
|
|
||||||
|
|
@ -126,3 +108,4 @@ artiq_coremgmt -D 192.168.1.56 config write -s ip 192.168.1.75 # or just place e
|
||||||
artiq_coremgmt config write -f boot result/boot.bin
|
artiq_coremgmt config write -f boot result/boot.bin
|
||||||
# reboot via power supply
|
# reboot via power supply
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,31 +4,26 @@ This page describes how to start with ARTIQ system for novice users.
|
||||||
|
|
||||||
## Connecting wires
|
## Connecting wires
|
||||||
|
|
||||||
In most cases the system is shipped with power bricks (PSU), DC splitters and SFPs enough to power and control the
|
In most cases the system is shipped with power bricks (PSU), DC splitters and SFPs enough to power and control the whole system.
|
||||||
whole system. Connect them in following order:
|
Connect them in following order:
|
||||||
|
|
||||||
1. Insert Ethernet SFP into the SFP0 of the master or standalone Kasli/Kasli-SoC (Carrier)
|
1. Insert Ethernet SFP into the SFP0 of the master or standalone Kasli/Kasli-SoC (Carrier)
|
||||||
2. Connect these SFPs to the router or PC via Ethernet cable (in some cases, optical cable)
|
2. Connect these SFPs to the router or PC via Ethernet cable (in some cases, optical cable)
|
||||||
3. Insert optic/direct attach SFPs into the master and satellite Carriers, respective to the numeration,
|
3. Insert optic/direct attach SFPs into the master and satellite Carriers, respective to the numeration, [more info in DRTIO page](drtio.md)
|
||||||
[more info in DRTIO page](drtio.md)
|
|
||||||
4. Power on PSU or EEM power module, by inserting C14 cable, attach DC splitters if available
|
4. Power on PSU or EEM power module, by inserting C14 cable, attach DC splitters if available
|
||||||
5. Some cards may have "External power" setting (check the quotation), in this case, insert DC connector into the port
|
5. Some cards may have "External power" setting (check the quotation), in this case, insert DC connector into the port
|
||||||
6. Insert remaining cables into the Carriers (not applicable in case of EEM Power Module).
|
6. Insert remaining cables into the Carriers (not applicable in case of EEM Power Module).
|
||||||
|
|
||||||
## Set the network
|
## Set the network
|
||||||
|
|
||||||
By default standalone/master Carriers arrive with 192.168.1.75/24 set as their static address.
|
By default standalone/master Carriers arrive with 192.168.1.75/24 set as their static address. Carrier will try to acquire this address
|
||||||
Carrier will try to acquire this address from your router, and in case of failure, they will be just unavailable
|
from your router, and in case of failure, they will be just unavailable from the network. Check the following articles for troubleshooting network issues:
|
||||||
from the network. Check the following articles for troubleshooting network issues:
|
|
||||||
|
|
||||||
* [Networking](networking.md)
|
* [Networking](networking.md)
|
||||||
* [Official docs](https://m-labs.hk/artiq/manual/configuring.html)
|
* [Official docs](https://m-labs.hk/artiq/manual/installing.html#setting-up-the-core-device-ip-networking)
|
||||||
|
|
||||||
## Run first experiment via artiq_run
|
## Run first experiment via artiq_run
|
||||||
|
|
||||||
Before diving in to the repository experiments management and scheduling, it is essential to try run your first
|
Before diving in to the repository experiments management and scheduling, it is essential to try run your first experiment
|
||||||
experiment via most basic way - `artiq_run`. For this you need to enter your ARTIQ environment (console) and run:
|
via most basic way - `artiq_run`. For this you need to enter your ARTIQ environment (console) and run:
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
artiq_run --device-db path/to/device_db.py path/to/experiment.py
|
artiq_run --device-db path/to/device_db.py path/to/experiment.py
|
||||||
```
|
```
|
||||||
|
|
@ -37,8 +32,7 @@ In case your directory contains relevant `device_db` file, you may omit the `--d
|
||||||
To check this, you may run `ls .` and check if it is in the list.
|
To check this, you may run `ls .` and check if it is in the list.
|
||||||
|
|
||||||
On pre-installed NUCs, the ARTIQ commands are available everywhere, and you just need to run them.
|
On pre-installed NUCs, the ARTIQ commands are available everywhere, and you just need to run them.
|
||||||
If you have Nix package manager or NixOS, you will just need to enter the shell with
|
If you have Nix package manager or NixOS, you will just need to enter the shell with `nix develop github:m-labs/artiq\?ref=release-7`.
|
||||||
`nix develop github:m-labs/artiq\?ref=release-8`. If you have installed ARTIQ with Conda, you will need to activate
|
If you have installed ARTIQ with Conda, you will need to activate the environment with `conda activate <name of the environment with ARTIQ>`.
|
||||||
the environment with `conda activate <name of the environment with ARTIQ>`.
|
|
||||||
|
|
||||||
You may check for experiments in the [official docs](https://m-labs.hk/artiq/manual/getting_started_core.html).
|
You may check for experiments in the [official docs](https://m-labs.hk/artiq/manual/getting_started_core.html).
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
This page describes ways to set up clocking. Official documentation references:
|
This page describes ways to set up clocking. Official documentation references:
|
||||||
|
|
||||||
* [Carrier configuration](https://m-labs.hk/artiq/manual/core_device.html#clocking)
|
* [Carrier configuration](https://m-labs.hk/artiq/manual/installing.html#miscellaneous-configuration-of-the-core-device)
|
||||||
* Devices' [available options](https://m-labs.hk/artiq/manual/core_drivers_reference.html), [Urukul example](https://m-labs.hk/artiq/manual/core_drivers_reference.html#artiq.coredevice.urukul.CPLD)
|
* Devices' [available options](https://m-labs.hk/artiq/manual/core_drivers_reference.html), [Urukul example](https://m-labs.hk/artiq/manual/core_drivers_reference.html#artiq.coredevice.urukul.CPLD)
|
||||||
|
|
||||||
In general, any RF card and Carriers require some clock source. Most of them have both internal clock signal generator
|
In general, any RF card and Carriers require some clock source. Most of them have both internal clock signal generator
|
||||||
|
|
@ -81,4 +81,4 @@ Main page: [clocker.md](../hw/clocker.md)
|
||||||
Clocker card allows to distribute clock signal up to 1 GHz without additional software setup. Therefore, there is no way
|
Clocker card allows to distribute clock signal up to 1 GHz without additional software setup. Therefore, there is no way
|
||||||
to set it to generate signal, which would be different from input. The only setup allowed is to set to accept signal
|
to set it to generate signal, which would be different from input. The only setup allowed is to set to accept signal
|
||||||
from `EXT`/`INT` ports, front-panel SMA or card's MMCX ports respectively, by switching the `CLK SEL` switch on the
|
from `EXT`/`INT` ports, front-panel SMA or card's MMCX ports respectively, by switching the `CLK SEL` switch on the
|
||||||
card .
|
card .
|
||||||
|
|
@ -7,7 +7,7 @@ It is generated from JSON description file and tied with the configuration and t
|
||||||
|
|
||||||
In some cases you may need to regenerate `device_db.py`, like switching clock source or changing the configuration.
|
In some cases you may need to regenerate `device_db.py`, like switching clock source or changing the configuration.
|
||||||
Also it is must-do in most cases once firmware/gateware is being updated (for example, when you add, move or remove EEM
|
Also it is must-do in most cases once firmware/gateware is being updated (for example, when you add, move or remove EEM
|
||||||
cards), and in case DRTIO layout changed.
|
cards).
|
||||||
Luckily, it is fairly easy to do. For standalone systems:
|
Luckily, it is fairly easy to do. For standalone systems:
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
|
|
@ -19,20 +19,3 @@ For DRTIO systems:
|
||||||
```shell
|
```shell
|
||||||
artiq_ddb_template -o device_db.py -s 1 <satellite1>.json -s 2 <satellite2>.json <...> -s N <satelliteN>.json <master>.json
|
artiq_ddb_template -o device_db.py -s 1 <satellite1>.json -s 2 <satellite2>.json <...> -s N <satelliteN>.json <master>.json
|
||||||
```
|
```
|
||||||
|
|
||||||
Keep in mind, that for DRTIO systems the real SFP connections at master should match the numbers at
|
|
||||||
the `artiq_ddb_template` command, or routing table if specified.
|
|
||||||
|
|
||||||
Here is mapping for master Kasli 2.0 (without routing table):
|
|
||||||
|
|
||||||
* SFP0 - Ethernet
|
|
||||||
* SFP1 - Satellite 1
|
|
||||||
* SFP2 - Satellite 2
|
|
||||||
* SFP3 - Satellite 3
|
|
||||||
|
|
||||||
For master Kasli-SoC (without routing table):
|
|
||||||
|
|
||||||
* SFP0 - Satellite 1
|
|
||||||
* SFP1 - Satellite 2
|
|
||||||
* SFP2 - Satellite 3
|
|
||||||
* SFP3 - Satellite 4
|
|
||||||
|
|
|
||||||
|
|
@ -4,21 +4,19 @@ This page intends to help users solve problems with their DRTIO systems.
|
||||||
|
|
||||||
## Description (from user experience)
|
## Description (from user experience)
|
||||||
|
|
||||||
[Distributed Real Time Input/Output](https://m-labs.hk/artiq/manual/drtio.html) - allows almost seamlessly connecting
|
[Distributed Real Time Input/Output](https://m-labs.hk/artiq/manual/drtio.html) - allows almost seamlessly connecting several satellites to one master crate,
|
||||||
several satellites to one master crate, so that all the crates can be controlled as one whole crate.
|
so that all the crates can be controlled as one whole crate. The connection between the crates is done either by passive copper
|
||||||
The connection between the crates is done either by passive copper direct attach cables (suitable for one-crate setups)
|
direct attach cables (suitable for one-crate setups) or optical fibers SFP+ adapters (suitable for multiple crates that
|
||||||
or optical fibers SFP+ adapters (suitable for multiple crates that can be distributed up to
|
can be distributed up to [several kilometers](https://github.com/m-labs/artiq/issues/2022)). The DRTIO protocol is not
|
||||||
[several kilometers](https://github.com/m-labs/artiq/issues/2022)). The DRTIO protocol is not compatible with Ethernet,
|
compatible with Ethernet, and moreover, satellites do not have any network access and can be controlled only by master.
|
||||||
and moreover, satellites do not have any network access and can be controlled only by master. However,
|
However, both star (2 levels) and tree topologies are supported as well,
|
||||||
both star (2 levels) and tree topologies are supported as well, with default one being the star (one master and up to
|
with default one being the star (one master and up to 3-4 directly connected satellites), and if any chaining is needed, the
|
||||||
3-4 directly connected satellites), and if any chaining is needed, the
|
routing table setup is needed.
|
||||||
[routing table setup](https://m-labs.hk/artiq/manual/using_drtio_subkernels.html#configuring-the-routing-table)
|
To switch between satellite/master/standalone variants you just need to flash appropriate firmware, and set the respective `base`
|
||||||
is needed. To switch between satellite/master/standalone variants you just need to flash appropriate firmware,
|
field in the JSON description.
|
||||||
and set the respective `base` field in the JSON description.
|
|
||||||
|
|
||||||
The master will attempt to connect the satellite whenever it sees that there are SFPs plugged in. For this purpose,
|
The master will attempt to connect the satellite whenever it sees that there are SFPs plugged in. For this purpose,
|
||||||
it will _ping_ the satellite until it establishes the connection. This connection process can be observed from the logs:
|
it will _ping_ the satellite until it establishes the connection. This connection process can be observed from the logs:
|
||||||
|
|
||||||
```rust
|
```rust
|
||||||
// successful connection
|
// successful connection
|
||||||
[ 5385.011286s] INFO(runtime::rtio_mgt::drtio): [LINK#1] link RX became up, pinging
|
[ 5385.011286s] INFO(runtime::rtio_mgt::drtio): [LINK#1] link RX became up, pinging
|
||||||
|
|
@ -32,34 +30,24 @@ it will _ping_ the satellite until it establishes the connection. This connectio
|
||||||
[ 115.076772s] ERROR(runtime::rtio_mgt::drtio): [LINK#1] ping failed
|
[ 115.076772s] ERROR(runtime::rtio_mgt::drtio): [LINK#1] ping failed
|
||||||
```
|
```
|
||||||
|
|
||||||
During the connection, the clock signal is being distributed, effectively making the clocks across
|
During the connection, the clock signal is being distributed, effectively making the clocks across crates to be synchronized.
|
||||||
crates to be synchronized.
|
|
||||||
|
|
||||||
## Common problems
|
## Common problems
|
||||||
|
|
||||||
### Master and satellite do not connect with each other
|
### Master and satellite do not connect with each other
|
||||||
|
|
||||||
During execution of experiments, may result in following error:
|
* Shady cables and SFP adapters are often the cause, use the adapters from reputable sources, or better, use the one we ship.
|
||||||
|
You may also contact our helpdesk to get help in choosing the right adapters if needed.
|
||||||
```pycon
|
* The adapter is not pushed until the end. You shouldn't be able to pull out the adapters without pulling the petals/handles.
|
||||||
artiq.coredevice.exceptions.RTIODestinationUnreachable: RTIO destination unreachable, output, at XXXXX mu, channel 0xXXX:DEV0
|
* The fiber is not properly connected - you shouldn't be able to pull it out without squeezing the handle. Also the optics
|
||||||
```
|
may be dirty or damaged.
|
||||||
|
|
||||||
* Shady cables and SFP adapters are often the cause, use the adapters from reputable sources, or better,
|
|
||||||
use the one we ship. You may also contact our helpdesk to get help in choosing the right adapters if needed.
|
|
||||||
* The adapter is not pushed until the end. You shouldn't be able to pull out the adapters without
|
|
||||||
pulling the petals/handles.
|
|
||||||
* The fiber is not properly connected - you shouldn't be able to pull it out without squeezing the handle.
|
|
||||||
Also the optics may be dirty or damaged.
|
|
||||||
* Wrong setups - master to master, standalone to standalone. Messing up with SFP ports generally makes it unusable,
|
* Wrong setups - master to master, standalone to standalone. Messing up with SFP ports generally makes it unusable,
|
||||||
but the connection should be established in most cases.
|
but the connection should be established in most cases.
|
||||||
* The fiber adapters are not symmetrical - if one end has 1270/1330 label, another one should be 1330/1270.
|
* The fiber adapters are not symmetrical - if one end has 1270/1330 label, another one should be 1330/1270.
|
||||||
* Connection race condition - rebooting one or both master and satellite may help.
|
|
||||||
* Mismatch with real SFP port and the one, specified during device_db generation: re-attach the SFP ports according to
|
|
||||||
device_db or regenerate device_db according to SFP port attachment.
|
|
||||||
[More info at the device_db article.](device_db.md)
|
|
||||||
|
|
||||||
### Master-satellite interrupted/unstable connection
|
### Master-satellite interrupted/unstable connection
|
||||||
|
|
||||||
This often happens due to overheating issues. Check if the Kasli/SoC fans are working properly and
|
This often happens due to overheating issues. Check if the Kasli/SoC fans are working properly and
|
||||||
try installing rack fans to increase the air flow.
|
try installing rack fans to increase the air flow.
|
||||||
|
|
@ -6,18 +6,15 @@ Here are some extra steps needed for flashing the firmware.
|
||||||
|
|
||||||
### Windows
|
### Windows
|
||||||
|
|
||||||
From the [official manual](https://m-labs.hk/artiq/manual/flashing.html#installing-and-configuring-openocd):
|
From the [official manual](https://m-labs.hk/artiq/manual/installing.html#configuring-openocd):
|
||||||
|
|
||||||
On Windows, a third-party tool, Zadig, is necessary. Use it as follows:
|
On Windows, a third-party tool, Zadig, is necessary. Use it as follows:
|
||||||
|
|
||||||
1. Make sure the FPGA board’s JTAG USB port is connected to your computer.
|
1. Make sure the FPGA board’s JTAG USB port is connected to your computer.
|
||||||
2. Activate Options → List All Devices.
|
2. Activate Options → List All Devices.
|
||||||
3. Select the “Digilent Adept USB Device (Interface 0)” or “FTDI Quad-RS232 HS” (or similar)
|
3. Select the “Digilent Adept USB Device (Interface 0)” or “FTDI Quad-RS232 HS” (or similar) device from the drop-down list.
|
||||||
device from the drop-down list.
|
|
||||||
4. Select WinUSB from the spinner list.
|
4. Select WinUSB from the spinner list.
|
||||||
5. Click “Install Driver” or “Replace Driver”.
|
5. Click “Install Driver” or “Replace Driver”.
|
||||||
6. After above steps done, you may see the devices in the Device Manager:
|
6. After above steps done, you may see the devices in the Device Manager:
|
||||||
|
|
||||||
|
|
||||||
You may need to repeat these steps every time you plug the FPGA board into a port where it has not been
|
You may need to repeat these steps every time you plug the FPGA board into a port where it has not been plugged into previously on the same system.
|
||||||
plugged into previously on the same system.
|
|
||||||
|
|
@ -3,8 +3,9 @@
|
||||||
The official documentation lacks the description of MONitor/INJector, but it is a common mistake when running the ARTIQ-7.
|
The official documentation lacks the description of MONitor/INJector, but it is a common mistake when running the ARTIQ-7.
|
||||||
Basically it is a service that consists of two parts - one runs on the host PC, another on the Kasli.
|
Basically it is a service that consists of two parts - one runs on the host PC, another on the Kasli.
|
||||||
It allows to watch and control the state of the devices, so you can see it on the dashboard.
|
It allows to watch and control the state of the devices, so you can see it on the dashboard.
|
||||||
That's why the dashboard may emit errors about not working moninj. To fix this, you just need [to run it with Kasli's IP](https://m-labs.hk/artiq/manual/utilities.html#module-artiq.frontend.aqctl_moninj_proxy):
|
That's why the dashboard may emit errors about not working moninj. To fix this, you just need [to run it with Kasli's IP](https://m-labs.hk/artiq/manual/utilities.html#moninj-proxy):
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
aqctl_moninj_proxy CORE_ADDRESS
|
aqctl_moninj_proxy CORE_ADDRESS
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -6,49 +6,40 @@ a-la `I can't connect, please help`.
|
||||||
## Common problems
|
## Common problems
|
||||||
|
|
||||||
1. `device_db.py` has misleading `core_addr` address.
|
1. `device_db.py` has misleading `core_addr` address.
|
||||||
2. PC and the crate are in different subnets. They should be in the same network. Also you may want to directly
|
2. PC and the crate are in different subnets. They should be in the same network. Also you may want to directly attach the Kasli to the PC.
|
||||||
attach the Kasli to the PC.
|
|
||||||
3. Network restrictions/problems on your router, either by IP, MAC, protocols or anything else.
|
3. Network restrictions/problems on your router, either by IP, MAC, protocols or anything else.
|
||||||
4. Wrong configuration of the Kasli. Change IP or MAC address to correspond your network. For ARTIQ-8 and later, add
|
4. Wrong configuration of the Kasli. Change IP or MAC address to correspond your network. For ARTIQ-8 and later, add
|
||||||
network mask to the `ip` setting on Kasli (not applicable for Kasli-SoC), like `192.168.1.75/24`.
|
network mask to the `ip` setting on Kasli (not applicable for Kasli-SoC), like `192.168.1.75/24`.
|
||||||
5. Incompatible Ethernet cables/SFP RJ45. Try different cables and SFP adapters.
|
5. Incompatible Ethernet cables/SFP RJ45. Try different cables and SFP adapters.
|
||||||
We usually test them with CAT6 cables, but lower categories should be supported too.
|
We usually test them with CAT6 cables, but lower categories should be supported too.
|
||||||
6. SFP or Ethernet are not pushed til the end.
|
6. SFP or Ethernet are not pushed til the end.
|
||||||
7. Some weird bugs in Vivado, leading to not working SFP on certain combinations of builds and Kaslis (very rare)
|
7. Some weird bugs in Vivado, leading to not working SFP on certain combinations of builds and Kaslis (very rare)
|
||||||
8. Running configured for external reference Kasli without external reference clock signal
|
8. Running configured for external reference Kasli without external reference clock signal
|
||||||
9. Using legacy firmware with newer hardware. ARTIQ-6 doesn't support Kasli v2.0.2 (at least without the patch mentioned in the [legacy](artiq_legacy.md) article)
|
9. Using legacy firmware with newer hardware. ARTIQ-6 doesn't support Kasli v2.0.2
|
||||||
10. Some other device in your network already reserved the configured IP address.
|
|
||||||
|
|
||||||
## Ways to diagnose
|
## Ways to diagnose
|
||||||
|
|
||||||
1. `ping` the device. If destination is unreachable, than it is either didn't connect to the network
|
1. `ping` the device. If destination is unreachable, than it is either didn't connect to the network
|
||||||
or connected to different address. If the packets just do not respond then it is not as clear,
|
or connected to different address. If the packets just do not respond then it is not as clear, we cannot know all the truth.
|
||||||
we cannot know all the truth.
|
|
||||||
2. See the SFP0 LED
|
2. See the SFP0 LED
|
||||||
3. See the ERR LED
|
3. See the ERR LED
|
||||||
4. [UART logs](uart_logs.md)
|
4. [UART logs](uart_logs.md)
|
||||||
5. `nmap` and `arp` to scan your network to help your Kasli get discovered. May be restricted in your network.
|
5. `nmap` and `arp` to scan your network to help your Kasli get discovered. May be restricted in your network.
|
||||||
6. Directly connect your Kasli to the PC via Ethernet and set up networking on the PC:
|
6. Directly connect your Kasli to the PC via Ethernet and set up networking on the PC: `ip addr change 192.168.1.0/24 dev eth0`
|
||||||
`ip addr change 192.168.1.0/24 dev eth0`
|
|
||||||
7. Become a router and capture all the packets when your Kasli tries to connect to the network.
|
7. Become a router and capture all the packets when your Kasli tries to connect to the network.
|
||||||
8. Turn off the Carrier/Kasli and `ping` the configured IP address. If it pings, then you'll need either set different
|
|
||||||
IP address on your Carrier or somehow deal with that other device - remove,
|
|
||||||
assign different address, move to other network etc.
|
|
||||||
|
|
||||||
## Direct connection
|
## Direct connection
|
||||||
|
|
||||||
Sometimes it is neccessary to connect your Kasli/Kasli-SoC (Carrier) directly to the PC/NUC. For example, your Kasli-SoC
|
Sometimes it is neccessary to connect your Kasli/Kasli-SoC (Carrier) directly to the PC/NUC. For example, your Kasli-SoC
|
||||||
may be configured for the wrong network. In order to do this, you will just need to:
|
may be configured for the wrong network. In order to do this, you will just need to:
|
||||||
|
|
||||||
1. Connect Carrier via Ethernet directly to the NUC/PC
|
1. Connect Carrier via Ethernet directly to the NUC/PC
|
||||||
2. Set the network settings (example for default 192.168.1.75 Carrier setting):
|
2. Set the network settings (example for default 192.168.1.75 Carrier setting):
|
||||||
|
```
|
||||||
```text
|
|
||||||
IPv4 method: Manual
|
IPv4 method: Manual
|
||||||
Address: 192.168.1.0
|
Address: 192.168.1.0
|
||||||
Netmask: 255.255.255.0
|
Netmask: 255.255.255.0
|
||||||
Gateway: 192.168.1.0
|
Gateway: 192.168.1.0
|
||||||
DNS, Routes - Auto
|
DNS, Routes - Auto
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -1,17 +0,0 @@
|
||||||
# Integration with PyCharm®
|
|
||||||
|
|
||||||
It's fairly possible to integrate PyCharm with ARTIQ on Windows.
|
|
||||||
|
|
||||||
## MSYS2
|
|
||||||
|
|
||||||
Below is an example configuration, change it according your installation.
|
|
||||||
|
|
||||||
1. Set System Interpreter to MSYS2 CLANG64 one (pip packages are not supported):
|
|
||||||
|
|
||||||
2. Set Terminal to use MSYS2 CLANG64 one:
|
|
||||||
|
|
||||||
|
|
||||||
After this you will be able to look up definitions from ARTIQ and use convenient integrated Terminal to run `artiq_run`.
|
|
||||||
|
|
||||||
_PyCharm is a registered trademark of JetBrains s.r.o.. For license information, please refer to the
|
|
||||||
JetBrains website or the product documentation._
|
|
||||||
|
|
@ -1,29 +1,25 @@
|
||||||
# Setup your PC for building ARTIQ firmware
|
# Setup your PC for building ARTIQ firmware
|
||||||
|
|
||||||
This page should guide you through building the firmware on your own PC.
|
This page should guide you through building the firmware on your own PC.
|
||||||
Unfortunately, the building process is not possible on Windows natively (nor MSYS2),
|
Unfortunately, the building process is not possible on Windows natively (nor MSYS2),
|
||||||
but you can use [WSL](https://learn.microsoft.com/en-us/windows/wsl/install).
|
but you can use [WSL](https://learn.microsoft.com/en-us/windows/wsl/install).
|
||||||
|
|
||||||
## Prerequisites
|
## Prerequisites
|
||||||
|
|
||||||
You should have a Linux with `nix` and `git` installed. For this purpose you may want to consider NixOS,
|
You should have a Linux with `nix` and `git` installed. For this purpose you may want to consider NixOS, though it is hard way for everything else.
|
||||||
though it is hard way for everything else. You should have at least 70+ GB of free space (better 100+ GB) on
|
You should have at least 70+ GB of free space (better 100+ GB) on your `/opt` or `/` - most of this space will be taken
|
||||||
your `/opt` or `/` - most of this space will be taken by Vivado.
|
by Vivado.
|
||||||
|
|
||||||
## Installation
|
## Installation
|
||||||
|
|
||||||
1. Install Vivado 2022.2 from [Vivado archive](https://www.xilinx.com/support/download/index.html/content/xilinx/en/downloadNav/vivado-design-tools/archive.html)
|
1. Install Vivado 2022.2 from [Vivado archive](https://www.xilinx.com/support/download/index.html/content/xilinx/en/downloadNav/vivado-design-tools/archive.html) into `/opt`.
|
||||||
into `/opt`.
|
|
||||||
2. Check that `ls -al /opt/Xilinx/Vivado/2022.2/settings64.sh` exists and has read and execute permissions for all:
|
2. Check that `ls -al /opt/Xilinx/Vivado/2022.2/settings64.sh` exists and has read and execute permissions for all:
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
$ ls -al /opt/Xilinx/Vivado/2022.2/settings64.sh
|
$ ls -al /opt/Xilinx/Vivado/2022.2/settings64.sh
|
||||||
-rwxr-xr-x 1 nobody nogroup 245 Dec 17 2022 /opt/Xilinx/Vivado/2022.2/settings64.sh
|
-rwxr-xr-x 1 nobody nogroup 245 Dec 17 2022 /opt/Xilinx/Vivado/2022.2/settings64.sh
|
||||||
```
|
```
|
||||||
|
3. Add following into the `~/.local/share/nix/trusted-settings.json`, by `mkdir -p ~/.local/share/nix/ && nano ~/.local/share/nix/trusted-settings.json`
|
||||||
3. Add following into the `~/.local/share/nix/trusted-settings.json`, by `mkdir -p ~/.local/share/nix/ && nano ~/.local/share/nix/trusted-settings.json`
|
|
||||||
or with your favorite way (don't forget to save - Ctrl+O in `nano`):
|
or with your favorite way (don't forget to save - Ctrl+O in `nano`):
|
||||||
|
|
||||||
```json
|
```json
|
||||||
{
|
{
|
||||||
"extra-sandbox-paths":{
|
"extra-sandbox-paths":{
|
||||||
|
|
@ -37,16 +33,12 @@ your `/opt` or `/` - most of this space will be taken by Vivado.
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
4. Enable flakes in Nix and add `/opt` to sandbox e.g. adding following to the `nix.conf` (for example `~/.config/nix/nix.conf` or `/etc/nix/nix.conf`):
|
||||||
4. Enable flakes in Nix and add `/opt` to sandbox e.g. adding following to the `nix.conf`
|
```
|
||||||
(for example `~/.config/nix/nix.conf` or `/etc/nix/nix.conf`):
|
|
||||||
|
|
||||||
```text
|
|
||||||
experimental-features = nix-command flakes
|
experimental-features = nix-command flakes
|
||||||
extra-sandbox-paths = /opt
|
extra-sandbox-paths = /opt
|
||||||
```
|
```
|
||||||
|
5. On Ubuntu, the Nix will conflict with Apparmor. You'll need to disable Apparmor for Nix,
|
||||||
5. On Ubuntu, the Nix will conflict with Apparmor. You'll need to disable Apparmor for Nix,
|
|
||||||
or for the whole system (you can also delete Apparmor completely, but be careful with it).
|
or for the whole system (you can also delete Apparmor completely, but be careful with it).
|
||||||
|
|
||||||
From here, you should be able to enter ARTIQ development shell directly from URL, or by cloning the repository.
|
From here, you should be able to enter ARTIQ development shell directly from URL, or by cloning the repository.
|
||||||
|
|
@ -61,7 +53,6 @@ nix develop #boards
|
||||||
```
|
```
|
||||||
|
|
||||||
For Kasli-SoC:
|
For Kasli-SoC:
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
git clone https://git.m-labs.hk/M-Labs/artiq-zynq.git
|
git clone https://git.m-labs.hk/M-Labs/artiq-zynq.git
|
||||||
cd artiq-zynq
|
cd artiq-zynq
|
||||||
|
|
@ -72,7 +63,6 @@ For building instructions for your JSON, please refer to the [build and test ins
|
||||||
The reference uses commands like `nix develop github:m-labs/artiq\?ref=release-8#boards` and `nix develop git+https://git.m-labs.hk/m-labs/artiq-zynq\?ref=release-8`.
|
The reference uses commands like `nix develop github:m-labs/artiq\?ref=release-8#boards` and `nix develop git+https://git.m-labs.hk/m-labs/artiq-zynq\?ref=release-8`.
|
||||||
You may safely skip such commands if you entered the development shell (`nix develop`) from cloned git repository.
|
You may safely skip such commands if you entered the development shell (`nix develop`) from cloned git repository.
|
||||||
|
|
||||||
If you want to update the source files, you may use `git pull origin master --rebase`.
|
If you want to update the source files, you may use `git pull origin master --rebase`.
|
||||||
Please refer to the [git documentation](https://www.git-scm.com/docs) or other resources of your choice
|
Please refer to the [git documentation](https://www.git-scm.com/docs) or other resources of your choice if you are unfamiliar with `git`.
|
||||||
if you are unfamiliar with `git`. You may also use GUI git tools, like the one integrated into JetBrains IDEs
|
You may also use GUI git tools, like the one integrated into JetBrains IDEs (PyCharm, Intellij and others), VS Code, Sublime Merge or others.
|
||||||
(PyCharm, Intellij and others), VS Code, Sublime Merge or others.
|
|
||||||
|
|
|
||||||
|
|
@ -7,4 +7,4 @@ In the future, it may be revised and added to the official ARTIQ manual.
|
||||||
|
|
||||||
I hope that helps!
|
I hope that helps!
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -4,8 +4,8 @@ Used for network, booting, and most other issues debugging.
|
||||||
|
|
||||||
## How to get them
|
## How to get them
|
||||||
|
|
||||||
First, connect your Kasli/SoC to the PC with a data micro-USB cable. Once you turn on the device,
|
First, connect your Kasli/SoC to the PC with a data micro-USB cable. Once you turn on the device, wait at least 15 seconds
|
||||||
wait at least 15 seconds until its fully loaded.
|
until its fully loaded.
|
||||||
|
|
||||||
### Development shell
|
### Development shell
|
||||||
|
|
||||||
|
|
@ -30,7 +30,7 @@ manipulations, as shown below.
|
||||||
#### Drivers
|
#### Drivers
|
||||||
|
|
||||||
Use following instructions to set correct drivers for the COM ports.
|
Use following instructions to set correct drivers for the COM ports.
|
||||||
At choosing FTDI drivers stage you may have longer list of drivers.
|
At choosing FTDI drivers stage you may have longer list of drivers.
|
||||||
In that case, choose respective `USB Serial Converter X` (A for 0, B for 1, C for 2, D for 3) driver. In case you cannot
|
In that case, choose respective `USB Serial Converter X` (A for 0, B for 1, C for 2, D for 3) driver. In case you cannot
|
||||||
locate the devices, they may appear in the _Other devices_ section:
|
locate the devices, they may appear in the _Other devices_ section:
|
||||||
|
|
||||||
|
|
@ -44,9 +44,9 @@ You may also need to reboot your PC after doing this.
|
||||||
6. 
|
6. 
|
||||||
7. 
|
7. 
|
||||||
|
|
||||||
If you are here after [flashing firmware](flashing_firmware.md) stage, you may fail to see the devices in the described
|
If you are here after [flashing firmware](flashing_firmware.md) stage, you may fail to see the devices in the described locations.
|
||||||
locations. If you see them in the `Universal Serial Bus devices` section, you may need just to uninstall
|
If you see them in the `Universal Serial Bus devices` section, you may need just to uninstall the third _Quad_ device and reconnect the
|
||||||
the third _Quad_ device and reconnect the Kasli/Kasli-SoC to the PC.
|
Kasli/Kasli-SoC to the PC.
|
||||||
|
|
||||||
#### Connecting with PuTTY
|
#### Connecting with PuTTY
|
||||||
|
|
||||||
|
|
@ -56,4 +56,4 @@ the third _Quad_ device and reconnect the Kasli/Kasli-SoC to the PC.
|
||||||
|
|
||||||
3. Connect to every COM port you find on connecting the device (usually connecting the the third port is enough)
|
3. Connect to every COM port you find on connecting the device (usually connecting the the third port is enough)
|
||||||
4. Restart the device with `artiq_flash start`, or by power-cycling it (wait 30 seconds before turning on)
|
4. Restart the device with `artiq_flash start`, or by power-cycling it (wait 30 seconds before turning on)
|
||||||
5. See which COM port produces meaningful output and close others :)
|
5. See which COM port produces meaningful output and close others :)
|
||||||
Loading…
Reference in New Issue