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: 8a3be4eca091
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: 07b8e1292f97
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Apr 11, 2015

  1. Copy the full SHA
    8a2b8fc View commit details
  2. Copy the full SHA
    07b8e12 View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 artiq/frontend/artiq_flash.sh
6 changes: 3 additions & 3 deletions artiq/frontend/artiq_flash.sh
Original file line number Diff line number Diff line change
@@ -109,10 +109,10 @@ check_return() {
exit
}

xc3sprog -c $CABLE -R 2&>1 > /dev/null
xc3sprog -c $CABLE -R > /dev/null 2>&1
if [ "$?" != "0" ]
then
echo "Flashing failed because it seems you do not have permission to access the USB device."
echo "Flashing failed. 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"
@@ -139,4 +139,4 @@ then
xc3sprog -v -c $CABLE -I$PROXY_PATH/$PROXY $BIN_PREFIX/runtime.fbi:w:$RUNTIME_ADDR:BIN
fi
echo "Done."
xc3sprog -v -c $CABLE -R 2&>1 > /dev/null
xc3sprog -v -c $CABLE -R > /dev/null 2>&1