M-Labs/artiq-zynq
10
1
Fork 19
Code Issues 12 Pull Requests 1 Releases Wiki Activity

117_rtio_channels #147

Merged
sb10q merged 10 commits from mwojcik/artiq-zynq:117_rtio_channels into master 2021-10-13 17:20:25 +08:00
Conversation 0 Commits 10 Files Changed 1 +1 -1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d1d1bd2f1a - Show all commits

2
local_run.sh
View File

@ -58,4 +58,4 @@ else
load_bitstream_cmd="-g $result_dir/top.bit" load_bitstream_cmd="-g $result_dir/top.bit"
fi fi
artiq_netboot $load_bitstream_cmd -f $result_dir/$fwtype.bin -b $board_host artiq_netboot $load_bitstream_cmd -f $result_dir/$fwtype.bin -b $board_host
fi fi
sb10q commented 2021-10-13 16:07:26 +08:00
Outdated
Review
Copy Link

weird

weird
mwojcik commented 2021-10-13 16:18:12 +08:00
Outdated
Review
Copy Link

true, not sure where that came from, popped up after updating the branch (merging master in)

true, not sure where that came from, popped up after updating the branch (merging master in)