Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/artiq
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e6b230b71c0e
Choose a base ref
...
head repository: m-labs/artiq
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 58f55fc63060
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Oct 30, 2015

  1. examples/terminate_all: remove debug print

    @sbourdeauducq
    sbourdeauducq committed Oct 30, 2015
    Copy the full SHA
    4154366 View commit details

  2. artiq_flash: check that xc3sprog is found. closes #162

    @sbourdeauducq
    sbourdeauducq committed Oct 30, 2015
    Copy the full SHA
    58f55fc View commit details
Showing with 10 additions and 4 deletions.
  1. +10 −3 artiq/frontend/artiq_flash.sh
  2. +0 −1 examples/master/repository/terminate_all.py
13 changes: 10 additions & 3 deletions artiq/frontend/artiq_flash.sh
View file
Original file line number Diff line number Diff line change
@@ -166,9 +166,17 @@ fi
set +e
xc3sprog -c $CABLE -R > /dev/null 2>&1
if [ "$?" != "0" ]
STATUS=$?
set -e
if [ "$STATUS" == "127" ]
then
echo "Flashing failed. Maybe you do not have permission to access the USB device?"
echo "xc3sprog not found. Please install it or check your PATH."
exit
fi
if [ "$STATUS" != "0" ]
then
echo "Failed to connect to FPGA."
echo "Maybe you do not have permission to access the USB device?"
echo "To fix this you might want to add a udev rule by doing:"
echo "$ sudo cp $ARTIQ_PREFIX/misc/$UDEV_RULES /etc/udev/rules.d"
echo "Then unplug/replug your device and try flashing again"
@@ -177,7 +185,6 @@ then
echo "Please make sure you used the correct -t option (currently: $BOARD)"
exit
fi
set -e
if [ ! -z "$FILENAME" ]
then
1 change: 0 additions & 1 deletion examples/master/repository/terminate_all.py
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,6 @@ def run(self):
else:
terminate = self.scheduler.delete

print("our RID", self.scheduler.rid)
for rid in self.scheduler.get_status().keys():
if rid != self.scheduler.rid:
terminate(rid)