ocd patch update

software/controller/controller.sh

@@ -89,7 +89,7 @@ configure_platformio() {
 }
 
 patch_ocd_stlink() {
-  cp -fr platformio/stlink.cfg "${HOME}/.platformio/packages/tool-openocd/scripts/interface"
+  cp -fr platformio/stlink.cfg "${HOME}/.platformio/packages/tool-openocd/openocd/scripts/interface"
 }
 
 run_checks() {

software/controller/platformio/stlink.cfg

@@ -1,19 +1,21 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
 #
 # STMicroelectronics ST-LINK/V1, ST-LINK/V2, ST-LINK/V2-1, STLINK-V3 in-circuit
 # debugger/programmer
 #
 
-interface hla
+adapter driver hla
 hla_layout stlink
 if { [info exists ::env(CUSTOM_HLA_SERIAL) ] } {
-        hla_serial  "$env(CUSTOM_HLA_SERIAL)"
+         adapter serial "$env(CUSTOM_HLA_SERIAL)"
 }
 hla_device_desc "ST-LINK"
-hla_vid_pid 0x0483 0x3744 0x0483 0x3748 0x0483 0x374b 0x0483 0x374d 0x0483 0x374e 0x0483 0x374f 0x0483 0x3752 0x0483 0x3753
+hla_vid_pid 0x0483 0x3744 0x0483 0x3748 0x0483 0x374b 0x0483 0x374d 0x0483 0x374e 0x0483 0x374f 0x0483 0x3752 0x0483 0x3753 0x0483 0x3754
 
 # Optionally specify the serial number of ST-LINK/V2 usb device.  ST-LINK/V2
 # devices seem to have serial numbers with unreadable characters.  ST-LINK/V2
 # firmware version >= V2.J21.S4 recommended to avoid issues with adapter serial
 # number reset issues.
 # eg.
-#hla_serial "\xaa\xbc\x6e\x06\x50\x75\xff\x55\x17\x42\x19\x3f"
+# adapter serial "\xaa\xbc\x6e\x06\x50\x75\xff\x55\x17\x42\x19\x3f"

software/tools/debug.sh

@@ -23,7 +23,7 @@ MY_PATH="$(dirname "$0")"
 
 pushd $MY_PATH
 
-poetry install --no-root --quiet
+poetry install
 poetry run debug "${@:1}"
 
 popd