diff options
| author | Bdale Garbee <bdale@gag.com> | 2017-12-21 19:05:46 -0700 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2017-12-21 19:05:46 -0700 |
| commit | dbb78c8222c45f4430601deee0194b0c9dc2e79a (patch) | |
| tree | 6805b815727c58ad6c01f9163e42ab3177ee56d5 /ao-bringup | |
| parent | fe38c22595b050435dbacd35f1baae064fb7de75 (diff) | |
| parent | 87aab99521dc44d1d29fbb0b7f227f868f074836 (diff) | |
Merge branch 'master' into branch-1.8
Diffstat (limited to 'ao-bringup')
| -rwxr-xr-x | ao-bringup/test-chaoskey | 4 | ||||
| -rwxr-xr-x | ao-bringup/turnon_easymini | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ao-bringup/test-chaoskey b/ao-bringup/test-chaoskey index f64b1f84..26684875 100755 --- a/ao-bringup/test-chaoskey +++ b/ao-bringup/test-chaoskey @@ -12,8 +12,8 @@ case "$#" in serial="--serial $1" ;; 0) - snum=`sudo dmesg | awk '/usb.*Product:/ { ck = index($0, "ChaosKey"); } - /usb.*SerialNumber:/ { if (ck) print $5; }' | tail -1` + snum=`sudo dmesg -t | awk '/usb.*Product:/ { ck = index($0, "ChaosKey"); } + /usb.*SerialNumber:/ { if (ck) print $4; }' | tail -1` case "$snum" in "") diff --git a/ao-bringup/turnon_easymini b/ao-bringup/turnon_easymini index 9b66dc5e..7db72665 100755 --- a/ao-bringup/turnon_easymini +++ b/ao-bringup/turnon_easymini @@ -54,7 +54,7 @@ ALTOS_FILE=~/altusmetrumllc/Binaries/easymini-v2.0-*.elf echo $DFU_UTIL -a 0 -s 0x08000000:leave -D $FLASH_FILE -#$DFU_UTIL -a 0 -s 0x08000000:leave -D $FLASH_FILE || exit 1 +$DFU_UTIL -a 0 -s 0x08000000:leave -D $FLASH_FILE || exit 1 sleep 2 |