Merge branch 'release/v1.1.0'

Author: valeros

README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://github.com/platformio/platform-raspberrypi/workflows/Examples/badge.svg)](https://github.com/platformio/platform-raspberrypi/actions)
 
-RP2040 is a low-cost, high-performance microcontroller device with with a large on-chip memory, symmetric dual-core processor complex, deterministic bus fabric, and rich peripheral set augmented with a unique Programmable I/O (PIO) subsystem, it provides professional users with unrivalled power and flexibility.
+RP2040 is a low-cost, high-performance microcontroller device with a large on-chip memory, symmetric dual-core processor complex, deterministic bus fabric, and rich peripheral set augmented with a unique Programmable I/O (PIO) subsystem, it provides professional users with unrivalled power and flexibility.
 
 * [Home](http://platformio.org/platforms/raspberrypi) (home page in PlatformIO Platform Registry)
 * [Documentation](http://docs.platformio.org/page/platforms/raspberrypi.html) (advanced usage, packages, boards, frameworks, etc.)

boards/nanorp2040connect.json

@@ -36,6 +36,7 @@
     "protocol": "picotool",
     "protocols": [
       "cmsis-dap",
+      "jlink",
       "raspberrypi-swd",
       "picotool"
     ]

boards/pico.json

@@ -32,6 +32,7 @@
     "protocol": "picotool",
     "protocols": [
       "cmsis-dap",
+      "jlink",
       "raspberrypi-swd",
       "picotool"
     ]

builder/main.py

@@ -197,6 +197,7 @@ def _jlink_cmd_script(env, source):
         UPLOADCMD='$UPLOADER $UPLOADERFLAGS -CommanderScript "${__jlink_cmd_script(__env__, SOURCE)}"'
     )
     upload_actions = [env.VerboseAction("$UPLOADCMD", "Uploading $SOURCE")]
+    upload_source = env.ElfToHex(join("$BUILD_DIR", "${PROGNAME}"), target_elf)
 
 elif upload_protocol in debug_tools:
     openocd_args = [

platform.json

@@ -18,7 +18,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-raspberrypi.git"
   },
-  "version": "1.0.0",
+  "version": "1.1.0",
   "frameworks": {
     "arduino": {
       "package": "framework-arduino-mbed",
@@ -35,11 +35,10 @@
       "type": "framework",
       "optional": true,
       "owner": "platformio",
-      "version": "~2.0.0"
+      "version": "~2.1.0"
     },
     "tool-rp2040tools": {
       "type": "uploader",
-      "optional": true,
       "owner": "platformio",
       "version": "~1.0.2"
     },