Merge pull request #2403 from Treboada/feat-detect-connected-programmer

Detect connected programmer to download and debug firmware

Author: kasjer

hw/bsp/pinetime/pinetime_debug.sh

@@ -30,7 +30,12 @@
 . $CORE_PATH/hw/scripts/openocd.sh
 
 FILE_NAME=$BIN_BASENAME.elf
-CFG="-f interface/stlink.cfg -f target/nrf52.cfg"
+
+# autodetect or default stlink
+openocd_detect_interface stlink
+
+CFG="-f interface/${OPENOCD_INTERFACE}.cfg -f target/nrf52.cfg"
+
 EXTRA_GDB_CMDS='monitor arm semihosting enable'
 # Exit openocd when gdb detaches.
 EXTRA_JTAG_CMD="$EXTRA_JTAG_CMD; nrf52.cpu configure -event gdb-detach {if {[nrf52.cpu curstate] eq \"halted\"} resume;shutdown}"

hw/bsp/pinetime/pinetime_download.sh

@@ -31,7 +31,10 @@
 
 . $CORE_PATH/hw/scripts/openocd.sh
 
-CFG="-f interface/stlink.cfg -f target/nrf52.cfg"
+# autodetect or default stlink
+openocd_detect_interface stlink
+
+CFG="-f interface/${OPENOCD_INTERFACE}.cfg -f target/nrf52.cfg"
 
 if [ "$MFG_IMAGE" ]; then
     FLASH_OFFSET=0

hw/scripts/common.sh

@@ -76,3 +76,31 @@ parse_extra_jtag_cmd() {
     echo $NEW_EXTRA_JTAG_CMD
     EXTRA_JTAG_CMD=$NEW_EXTRA_JTAG_CMD
 }
+
+# Try to detect connected programmers
+detect_programmer() {
+
+    DETECTED_PROGRAMMER='none'
+    
+    # check if lsusb command is available
+    if [ $(which lsusb) ] ; then
+
+        # extract the VID:PID list for connected USB devices
+        USB_DEV=$(lsusb | cut -f6 -d' ')
+
+        echo "$USB_DEV" | grep -q -i 'c251:f001'
+        [ $? -eq 0 ] && DETECTED_PROGRAMMER='cmsis-dap'
+
+        echo "$USB_DEV" | grep -q -i '0483:3748'
+        [ $? -eq 0 ] && DETECTED_PROGRAMMER='stlink-v2'
+
+        echo "$USB_DEV" | grep -q -i '0483:374b'
+        [ $? -eq 0 ] && DETECTED_PROGRAMMER='stlink-v2-1'
+
+        echo "$USB_DEV" | grep -q -i '1366:1015'
+        [ $? -eq 0 ] && DETECTED_PROGRAMMER='jlink'
+
+    fi
+
+    echo "Detected programmer: $DETECTED_PROGRAMMER"
+}

hw/scripts/openocd.sh

@@ -149,3 +149,18 @@ openocd_reset_run () {
     openocd $CFG -c init -c "reset run" -c shutdown
     return $?
 }
+
+openocd_detect_interface () {
+    detect_programmer
+    case $DETECTED_PROGRAMMER in
+        cmsis-dap)
+            OPENOCD_INTERFACE='cmsis-dap'
+            ;;
+        stlink-v2-1)
+            OPENOCD_INTERFACE='stlink-v2-1'
+            ;;
+        *) # default is passed by argument or 'stlink'
+            OPENOCD_INTERFACE=${1:=stlink}
+            ;;
+    esac
+}