Merge pull request #2323 from fpistm/Arduino_compatibility

refactor(STM32CubeProgrammer): rework options

Author: fpistm

boards.txt

@@ -106,12 +106,12 @@ compiler.elf2hex.extra_flags=
 # ---------
 build.usb_flags=-DUSBCON {build.usb_speed} -DUSBD_VID={build.vid} -DUSBD_PID={build.pid} -DHAL_PCD_MODULE_ENABLED
 
-# Specify defaults for vid/pid, since an empty value is impossible to
-# detect in the preprocessor, but a 0 can be checked for vid and -1
-# for pid (can be 0).
+# Specify defaults for vid/pid
 # Boards should specify either both, or neither of these.
-build.vid=0
-build.pid=-1
+build.vid={vid.0}
+build.pid={pid.0}
+upload.vid=0x0483
+upload.pid=0xdf11
 
 # To customize the USB manufacturer or product string, must add defines
 # for them, e.g.:
@@ -202,7 +202,7 @@ tools.stm32CubeProg.path={runtime.tools.STM32Tools.path}
 tools.stm32CubeProg.cmd=stm32CubeProg.sh
 tools.stm32CubeProg.upload.params.verbose=
 tools.stm32CubeProg.upload.params.quiet=
-tools.stm32CubeProg.upload.pattern="{busybox}" sh "{path}/{cmd}" {upload.protocol} "{build.path}/{build.project_name}.bin" {build.flash_offset} {upload.options}
+tools.stm32CubeProg.upload.pattern="{busybox}" sh "{path}/{cmd}" -i {upload.protocol} -f "{build.path}/{build.project_name}.bin" -o {build.flash_offset} {upload.options}
 
 # blackmagic upload for generic STM32
 tools.bmp_upload.cmd=arm-none-eabi-gdb
@@ -225,7 +225,7 @@ tools.maple_upload.script=maple_upload.sh
 tools.maple_upload.path={runtime.tools.STM32Tools.path}
 tools.maple_upload.upload.params.verbose=-d
 tools.maple_upload.upload.params.quiet=n
-tools.maple_upload.upload.pattern="{busybox}" sh "{path}/{script}" {serial.port.file} {upload.altID} {upload.usbID} "{build.path}/{build.project_name}.bin"
+tools.maple_upload.upload.pattern="{busybox}" sh "{path}/{script}" {serial.port.file} {upload.altID} {upload.vid} {upload.pid} "{build.path}/{build.project_name}.dfu"
 
 # STM32MP1 self-contained shell script
 tools.remoteproc_gen.path={runtime.tools.STM32Tools.path}