Update version

Remove unneeded and invalid file changes
The makever script sets up the repo properly, so no need to patch things in the package stage.
2022-06-14 12:34:22 -07:00 · 2022-06-14 12:32:26 -07:00 · 2022-06-14 12:05:48 -07:00 · 2022-06-13 11:54:38 -07:00 · 2022-06-12 13:38:02 -07:00 · 2022-06-10 22:58:23 -07:00
19 changed files with 1172 additions and 241 deletions
@@ -120,49 +120,49 @@ int __USBGetMouseReportID() {
    return __USBInstallKeyboard ? 2 : 1;
 }

+static int      __hid_report_len = 0;
+static uint8_t *__hid_report     = nullptr;
+
 static uint8_t *GetDescHIDReport(int *len) {
-    static uint8_t *report = nullptr;
-    int report_len = 0;
-
-    if (report) {
-        free(report);
-        report = nullptr;
+    if (len) {
+        *len = __hid_report_len;
    }
+    return __hid_report;
+}

+static void __SetupDescHIDReport() {
    if (__USBInstallKeyboard && __USBInstallMouse) {
        uint8_t desc_hid_report[] = {
            TUD_HID_REPORT_DESC_KEYBOARD(HID_REPORT_ID(1)),
            TUD_HID_REPORT_DESC_MOUSE(HID_REPORT_ID(2))
        };
-        report_len = sizeof(desc_hid_report);
-        report = (uint8_t *)malloc(report_len);
-        if (report) {
-            memcpy(report, desc_hid_report, report_len);
+        __hid_report = (uint8_t *)malloc(sizeof(desc_hid_report));
+        if (__hid_report) {
+            __hid_report_len = sizeof(desc_hid_report);
+            memcpy(__hid_report, desc_hid_report, __hid_report_len);
        }
    } else if (__USBInstallKeyboard && ! __USBInstallMouse) {
        uint8_t desc_hid_report[] = {
            TUD_HID_REPORT_DESC_KEYBOARD(HID_REPORT_ID(1))
        };
-        report_len = sizeof(desc_hid_report);
-        report = (uint8_t *)malloc(report_len);
-        if (report) {
-            memcpy(report, desc_hid_report, report_len);
+        __hid_report = (uint8_t *)malloc(sizeof(desc_hid_report));
+        if (__hid_report) {
+            __hid_report_len = sizeof(desc_hid_report);
+            memcpy(__hid_report, desc_hid_report, __hid_report_len);
        }
-    } else { // if (!__USBInstallKeyboard && __USBInstallMouse) {
+    } else if (! __USBInstallKeyboard &&  __USBInstallMouse) {
        uint8_t desc_hid_report[] = {
            TUD_HID_REPORT_DESC_MOUSE(HID_REPORT_ID(1))
        };
-        report_len = sizeof(desc_hid_report);
-        report = (uint8_t *)malloc(report_len);
-        if (report) {
-            memcpy(report, desc_hid_report, report_len);
+        __hid_report = (uint8_t *)malloc(sizeof(desc_hid_report));
+        if (__hid_report) {
+            __hid_report_len = sizeof(desc_hid_report);
+            memcpy(__hid_report, desc_hid_report, __hid_report_len);
        }
+    } else {
+        __hid_report = nullptr;
+        __hid_report_len = 0;
    }
-
-    if (len) {
-        *len = report_len;
-    }
-    return report;
 }

 // Invoked when received GET HID REPORT DESCRIPTOR
@@ -173,11 +173,13 @@ uint8_t const * tud_hid_descriptor_report_cb(uint8_t instance) {
    return GetDescHIDReport(nullptr);
 }

-
+static uint8_t *usbd_desc_cfg = nullptr;
 const uint8_t *tud_descriptor_configuration_cb(uint8_t index) {
    (void)index;
-    static uint8_t *usbd_desc_cfg = nullptr;
+    return usbd_desc_cfg;
+}

+static void __SetupUSBDescriptor() {
    if (!usbd_desc_cfg) {
        bool hasHID = __USBInstallKeyboard || __USBInstallMouse;

@@ -229,7 +231,6 @@ const uint8_t *tud_descriptor_configuration_cb(uint8_t index) {
            }
        }
    }
-    return usbd_desc_cfg;
 }

 const uint16_t *tud_descriptor_string_cb(uint8_t index, uint16_t langid) {
@@ -295,6 +296,9 @@ void __USBStart() {
        return;
    }

+    __SetupDescHIDReport();
+    __SetupUSBDescriptor();
+
    mutex_init(&__usb_mutex);

    tusb_init();
@@ -1,5 +1,5 @@
 #pragma once
 #define ARDUINO_PICO_MAJOR 2
-#define ARDUINO_PICO_MINOR 0
-#define ARDUINO_PICO_REVISION 3
-#define ARDUINO_PICO_VERSION_STR "2.0.3"
+#define ARDUINO_PICO_MINOR 1
+#define ARDUINO_PICO_REVISION 1
+#define ARDUINO_PICO_VERSION_STR "2.1.1"
@@ -1,8 +1,5 @@
 -iwithprefixbefore/cores/rp2040/api/deprecated-avr-comp/
 -iwithprefixbefore/lib/pico_base/
-iwithprefixbefore/pico-extras/src/common/pico_audio/include
-iwithprefixbefore/pico-extras/src/common/pico_util_buffer/include
-iwithprefixbefore/pico-extras/src/rp2_common/pico_audio_i2s/include
 -iwithprefixbefore/pico-sdk/lib/tinyusb/src/
 -iwithprefixbefore/pico-sdk/src/boards/include
 -iwithprefixbefore/pico-sdk/src/common/pico_base/include
@@ -127,6 +127,7 @@
 -Wl,--wrap=powf
 -Wl,--wrap=powint
 -Wl,--wrap=powintf
+-Wl,--wrap=realloc
 -Wl,--wrap=remainder
 -Wl,--wrap=remainderf
 -Wl,--wrap=remquo
@@ -132,7 +132,6 @@ void TwoWire::begin(uint8_t addr) {
    irq_set_exclusive_handler(irqNo, i2c_hw_index(_i2c) == 0 ? _handler0 : _handler1);
    irq_set_enabled(irqNo, true);

-
    gpio_set_function(_sda, GPIO_FUNC_I2C);
    gpio_pull_up(_sda);
    gpio_set_function(_scl, GPIO_FUNC_I2C);
@@ -192,7 +191,15 @@ void TwoWire::end() {
        // ERROR
        return;
    }
+
+    if (_slave) {
+        int irqNo = I2C0_IRQ + i2c_hw_index(_i2c);
+        irq_remove_handler(irqNo, i2c_hw_index(_i2c) == 0 ? _handler0 : _handler1);
+        irq_set_enabled(irqNo, false);
+    }
+
    i2c_deinit(_i2c);
+
    pinMode(_sda, INPUT);
    pinMode(_scl, INPUT);
    _running = false;
@@ -1,6 +1,6 @@
 {
  "name": "framework-arduinopico",
-  "version": "1.20003.0",
+  "version": "1.20101.0",
  "description": "Arduino Wiring-based Framework (RPi Pico RP2040)",
  "keywords": [
    "framework",
@@ -116,16 +116,6 @@ sed "s/version=.*/version=$ver/g" |\
 sed -E "s/name=([a-zA-Z0-9\ -]+).*/name=\1($ver)/g"\
 > $outdir/platform.txt

-# Put core version and short hash of git version into core_version.h
-ver_define=`echo $plain_ver | tr "[:lower:].\055" "[:upper:]_"`
-echo Ver define: $ver_define
-echo \#define ARDUINO_RP2040_GIT_VER 0x`git rev-parse --short=8 HEAD 2>/dev/null` >$outdir/cores/rp2040/core_version.h
-echo \#define ARDUINO_RP2040_GIT_DESC `git describe --tags 2>/dev/null` >>$outdir/cores/rp2040/core_version.h
-echo \#define ARDUINO_RP2040_RELEASE_$ver_define >>$outdir/cores/rp2040/core_version.h
-echo \#define ARDUINO_RP2040_RELEASE \"$ver_define\" >>$outdir/cores/rp2040/core_version.h
-
-sed -i 's/"version": .*/"version": "'$visible_ver'"/' $outdir/package.json
-
 # Zip the package
 pushd package/versions/$visible_ver
 echo "Making $package_name.zip"
@@ -108,22 +108,22 @@
               "toolsDependencies": [
                  {
                     "packager": "rp2040",
-                     "version": "1.3.3-a-ed6d983",
+                     "version": "1.3.4-c-5dd03b9",
                     "name": "pqt-gcc"
                  },
                  {
                     "packager": "rp2040",
-                     "version": "1.3.3-a-ed6d983",
+                     "version": "1.3.4-c-5dd03b9",
                     "name": "pqt-mklittlefs"
                  },
                  {
                     "packager": "rp2040",
-                     "version": "1.3.3-a-ed6d983",
+                     "version": "1.3.4-c-5dd03b9",
                     "name": "pqt-elf2uf2"
                  },
                  {
                     "packager": "rp2040",
-                     "version": "1.3.3-a-ed6d983",
+                     "version": "1.3.4-c-5dd03b9",
                     "name": "pqt-pioasm"
                  },
                  {
@@ -133,7 +133,7 @@
                  },
                  {
                     "packager": "rp2040",
-                     "version": "1.3.3-a-ed6d983",
+                     "version": "1.3.4-c-5dd03b9",
                     "name": "pqt-openocd"
                  }
               ],
@@ -144,56 +144,56 @@
         ],
         "tools": [
            {
-               "version": "1.3.3-a-ed6d983",
+               "version": "1.3.4-c-5dd03b9",
               "name": "pqt-openocd",
               "systems": [
                  {
                     "host": "aarch64-linux-gnu",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.3-a/aarch64-linux-gnu.openocd-e3428fadb.220212.tar.gz",
-                     "archiveFileName": "aarch64-linux-gnu.openocd-e3428fadb.220212.tar.gz",
-                     "checksum": "SHA-256:d1d95978101c69c3bc777e61ba70077bf9dc4b3245aa7dd93171acaec4d29fb1",
-                     "size": "5607214"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/aarch64-linux-gnu.openocd-e3428fadb.220607.tar.gz",
+                     "archiveFileName": "aarch64-linux-gnu.openocd-e3428fadb.220607.tar.gz",
+                     "checksum": "SHA-256:e796e6d2eac20cf90be4e61fc0a5ed16d1d26269cf749ec7829650d2595810b2",
+                     "size": "5607245"
                  },
                  {
                     "host": "arm-linux-gnueabihf",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.3-a/arm-linux-gnueabihf.openocd-e3428fadb.220212.tar.gz",
-                     "archiveFileName": "arm-linux-gnueabihf.openocd-e3428fadb.220212.tar.gz",
-                     "checksum": "SHA-256:81373c1e12a88e382a587688343c2e2f2f1f999d38334b7b6ded174929cc9b88",
-                     "size": "5344032"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/arm-linux-gnueabihf.openocd-e3428fadb.220607.tar.gz",
+                     "archiveFileName": "arm-linux-gnueabihf.openocd-e3428fadb.220607.tar.gz",
+                     "checksum": "SHA-256:bbb9b2b1504555b1804538786074e776ebc4b2dded36f12f85a72ad6ba67f402",
+                     "size": "5344211"
                  },
                  {
                     "host": "i686-pc-linux-gnu",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.3-a/i686-linux-gnu.openocd-e3428fadb.220212.tar.gz",
-                     "archiveFileName": "i686-linux-gnu.openocd-e3428fadb.220212.tar.gz",
-                     "checksum": "SHA-256:6a4dd98422a187c7725fc349b045b55e4742166c65461847d1bd59537242b0be",
-                     "size": "5168258"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/i686-linux-gnu.openocd-e3428fadb.220607.tar.gz",
+                     "archiveFileName": "i686-linux-gnu.openocd-e3428fadb.220607.tar.gz",
+                     "checksum": "SHA-256:7162ff1807748f11bb711b33c64139eae37b05d03458d9b0ac9a8e0d36aeb1a9",
+                     "size": "5168326"
                  },
                  {
                     "host": "i686-mingw32",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.3-a/x86_64-w64-mingw32.openocd-e3428fadb.220212.zip",
-                     "archiveFileName": "x86_64-w64-mingw32.openocd-e3428fadb.220212.zip",
-                     "checksum": "SHA-256:0643903fcd887a8423cb4ba5329565b499c206921f77ad2e59ae32c472a26dd7",
-                     "size": "2156820"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/i686-w64-mingw32.openocd-e3428fadb.220607.zip",
+                     "archiveFileName": "i686-w64-mingw32.openocd-e3428fadb.220607.zip",
+                     "checksum": "SHA-256:3cbdcd63ca2084c9b479c781f8efefdec1481917c1fc3fe33d230ea38464e624",
+                     "size": "2156819"
                  },
                  {
                     "host": "x86_64-apple-darwin",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.3-a/x86_64-apple-darwin14.openocd-e3428fadb.220212.tar.gz",
-                     "archiveFileName": "x86_64-apple-darwin14.openocd-e3428fadb.220212.tar.gz",
-                     "checksum": "SHA-256:913b65baeeef1b60caf202e69cde4cd5a3ba0ed2f75f2600adfb3dcf4b3899ef",
-                     "size": "2002482"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/x86_64-apple-darwin14.openocd-e3428fadb.220607.tar.gz",
+                     "archiveFileName": "x86_64-apple-darwin14.openocd-e3428fadb.220607.tar.gz",
+                     "checksum": "SHA-256:1159ad88b998e040c2f33d8ce83e5e0130c4cf73c05320efe70ffdd1f6a52055",
+                     "size": "2002498"
                  },
                  {
                     "host": "x86_64-pc-linux-gnu",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.3-a/x86_64-linux-gnu.openocd-e3428fadb.220212.tar.gz",
-                     "archiveFileName": "x86_64-linux-gnu.openocd-e3428fadb.220212.tar.gz",
-                     "checksum": "SHA-256:63b2be48c1438d2a09f4ed65d89e555176f18753886555cf48f861e9288d7dc1",
-                     "size": "5540524"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/x86_64-linux-gnu.openocd-e3428fadb.220607.tar.gz",
+                     "archiveFileName": "x86_64-linux-gnu.openocd-e3428fadb.220607.tar.gz",
+                     "checksum": "SHA-256:388d53ab399bbac0c1ed097fc1bfe08788e765ee78faf970c6e06b1eeb88bdac",
+                     "size": "5540543"
                  },
                  {
                     "host": "x86_64-mingw32",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.3-a/x86_64-w64-mingw32.openocd-e3428fadb.220212.zip",
-                     "archiveFileName": "x86_64-w64-mingw32.openocd-e3428fadb.220212.zip",
-                     "checksum": "SHA-256:0643903fcd887a8423cb4ba5329565b499c206921f77ad2e59ae32c472a26dd7",
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/x86_64-w64-mingw32.openocd-e3428fadb.220607.zip",
+                     "archiveFileName": "x86_64-w64-mingw32.openocd-e3428fadb.220607.zip",
+                     "checksum": "SHA-256:df3b5ed63c93f24a49ade6ecd1ec5bf84eb97677b7f3bd66e302b7871f20c2ed",
                     "size": "2156820"
                  }
               ]
@@ -261,226 +261,226 @@
               ]
            },
            {
-               "version": "1.3.3-a-ed6d983",
+               "version": "1.3.4-c-5dd03b9",
               "name": "pqt-gcc",
               "systems": [
                  {
                     "host": "aarch64-linux-gnu",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.3-a/aarch64-linux-gnu.arm-none-eabi-ed6d983.220212.tar.gz",
-                     "archiveFileName": "aarch64-linux-gnu.arm-none-eabi-ed6d983.220212.tar.gz",
-                     "checksum": "SHA-256:7773b43b9c0bf5b7cdb2299e9d1b151df97e0a2ded4428809ec68264ac9818a9",
-                     "size": "102741416"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/aarch64-linux-gnu.arm-none-eabi-5dd03b9.220607.tar.gz",
+                     "archiveFileName": "aarch64-linux-gnu.arm-none-eabi-5dd03b9.220607.tar.gz",
+                     "checksum": "SHA-256:ec0bbb010f8acbcddcb4671a98eada560d6dd9ea2bc8c6a2247198eaa8b15be0",
+                     "size": "78042296"
                  },
                  {
                     "host": "arm-linux-gnueabihf",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.3-a/arm-linux-gnueabihf.arm-none-eabi-ed6d983.220212.tar.gz",
-                     "archiveFileName": "arm-linux-gnueabihf.arm-none-eabi-ed6d983.220212.tar.gz",
-                     "checksum": "SHA-256:c422910ef0e29528939e037ea3c518a532726111604b85b27f3f245820680ccb",
-                     "size": "95383443"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/arm-linux-gnueabihf.arm-none-eabi-5dd03b9.220607.tar.gz",
+                     "archiveFileName": "arm-linux-gnueabihf.arm-none-eabi-5dd03b9.220607.tar.gz",
+                     "checksum": "SHA-256:c18839a74fe1ec1b449d80e6b7de358bd1d9444ff454edaf57d79fe2f734d60e",
+                     "size": "73499374"
                  },
                  {
                     "host": "i686-pc-linux-gnu",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.3-a/i686-linux-gnu.arm-none-eabi-ed6d983.220212.tar.gz",
-                     "archiveFileName": "i686-linux-gnu.arm-none-eabi-ed6d983.220212.tar.gz",
-                     "checksum": "SHA-256:6306791b43de955c4a4d0a1b8972e0f696206591a810eefc16b906b157322bd3",
-                     "size": "105350371"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/i686-linux-gnu.arm-none-eabi-5dd03b9.220607.tar.gz",
+                     "archiveFileName": "i686-linux-gnu.arm-none-eabi-5dd03b9.220607.tar.gz",
+                     "checksum": "SHA-256:e6546899155267e5539889764610439fdbeba38df0e498a9fd643aad13ba49f0",
+                     "size": "79642507"
                  },
                  {
                     "host": "i686-mingw32",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.3-a/i686-w64-mingw32.arm-none-eabi-ed6d983.220212.zip",
-                     "archiveFileName": "i686-w64-mingw32.arm-none-eabi-ed6d983.220212.zip",
-                     "checksum": "SHA-256:b00aa3594d1911bea07c1dbf31b9a63430f4dcb91c7b3b1341f8551d361d405f",
-                     "size": "105568357"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/i686-w64-mingw32.arm-none-eabi-5dd03b9.220607.zip",
+                     "archiveFileName": "i686-w64-mingw32.arm-none-eabi-5dd03b9.220607.zip",
+                     "checksum": "SHA-256:867c4bc810db9388fe0d814fc21ac81479a1e2be1c45f8e150981bb33846e04d",
+                     "size": "82878616"
                  },
                  {
                     "host": "x86_64-apple-darwin",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.3-a/x86_64-apple-darwin14.arm-none-eabi-ed6d983.220212.tar.gz",
-                     "archiveFileName": "x86_64-apple-darwin14.arm-none-eabi-ed6d983.220212.tar.gz",
-                     "checksum": "SHA-256:e93b967d1fb6ed0fc7cf6a5161e22a597dd05080c1353ac74e2a42ddf8dfe98d",
-                     "size": "107429038"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/x86_64-apple-darwin14.arm-none-eabi-5dd03b9.220607.tar.gz",
+                     "archiveFileName": "x86_64-apple-darwin14.arm-none-eabi-5dd03b9.220607.tar.gz",
+                     "checksum": "SHA-256:ef91ab4e0d7a66b3ae683d6d4b5ca8526eab7a7572a3aec60dd6a04795061bbe",
+                     "size": "82271912"
                  },
                  {
                     "host": "x86_64-pc-linux-gnu",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.3-a/x86_64-linux-gnu.arm-none-eabi-ed6d983.220212.tar.gz",
-                     "archiveFileName": "x86_64-linux-gnu.arm-none-eabi-ed6d983.220212.tar.gz",
-                     "checksum": "SHA-256:047c4d482cf77e09bd8069fc9d5b28b1e0c76440ad81583a0fc3a8e809959bb8",
-                     "size": "106740897"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/x86_64-linux-gnu.arm-none-eabi-5dd03b9.220607.tar.gz",
+                     "archiveFileName": "x86_64-linux-gnu.arm-none-eabi-5dd03b9.220607.tar.gz",
+                     "checksum": "SHA-256:59d16d192b8f623261f2c0605164da24e9257b1de210c367ea872131ef4d9f45",
+                     "size": "80508303"
                  },
                  {
                     "host": "x86_64-mingw32",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.3-a/x86_64-w64-mingw32.arm-none-eabi-ed6d983.220212.zip",
-                     "archiveFileName": "x86_64-w64-mingw32.arm-none-eabi-ed6d983.220212.zip",
-                     "checksum": "SHA-256:5c15725628a3dbd47a8fa8f9a9aab7a2221815ec9bf85dc2080ce19166316ae6",
-                     "size": "110420777"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/x86_64-w64-mingw32.arm-none-eabi-5dd03b9.220607.zip",
+                     "archiveFileName": "x86_64-w64-mingw32.arm-none-eabi-5dd03b9.220607.zip",
+                     "checksum": "SHA-256:b140ec4e5986b73249a6350a53d9826ad5d74a8a2af12adf3d6c13bebc720c88",
+                     "size": "86320223"
                  }
               ]
            },
            {
-               "version": "1.3.3-a-ed6d983",
+               "version": "1.3.4-c-5dd03b9",
               "name": "pqt-elf2uf2",
               "systems": [
                  {
                     "host": "aarch64-linux-gnu",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.3-a/aarch64-linux-gnu.elf2uf2-2062372.220212.tar.gz",
-                     "archiveFileName": "aarch64-linux-gnu.elf2uf2-2062372.220212.tar.gz",
-                     "checksum": "SHA-256:8cb7ce703b0fa6f2fce6b124ae6f34ad0b866aa4a58096f22b66b1251c1b11c0",
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/aarch64-linux-gnu.elf2uf2-2062372.220607.tar.gz",
+                     "archiveFileName": "aarch64-linux-gnu.elf2uf2-2062372.220607.tar.gz",
+                     "checksum": "SHA-256:a98b46d71e837927867789810b8577dcbc8f53c618adb9bb4083c1e2fa1cf483",
                     "size": "79853"
                  },
                  {
                     "host": "arm-linux-gnueabihf",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.3-a/arm-linux-gnueabihf.elf2uf2-2062372.220212.tar.gz",
-                     "archiveFileName": "arm-linux-gnueabihf.elf2uf2-2062372.220212.tar.gz",
-                     "checksum": "SHA-256:790d46b411c16a4a210a91436eb4bdc81fb34f0119148a8f9c4b09489489a54d",
-                     "size": "54244"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/arm-linux-gnueabihf.elf2uf2-2062372.220607.tar.gz",
+                     "archiveFileName": "arm-linux-gnueabihf.elf2uf2-2062372.220607.tar.gz",
+                     "checksum": "SHA-256:64df2a9dbc6b5546a07bd15c26c4b6e0310d0b937e5d921f83b0f51ef02f1734",
+                     "size": "54249"
                  },
                  {
                     "host": "i686-pc-linux-gnu",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.3-a/i686-linux-gnu.elf2uf2-2062372.220212.tar.gz",
-                     "archiveFileName": "i686-linux-gnu.elf2uf2-2062372.220212.tar.gz",
-                     "checksum": "SHA-256:7c05c70f761bb6caa986d24ac1065367fe906ff7f0434cf4b0112ace331f74bc",
-                     "size": "87891"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/i686-linux-gnu.elf2uf2-2062372.220607.tar.gz",
+                     "archiveFileName": "i686-linux-gnu.elf2uf2-2062372.220607.tar.gz",
+                     "checksum": "SHA-256:1b877ef797c281b5dd2f4d98409ba83db120e528aac94f4a9a34effa2262eaa7",
+                     "size": "87893"
                  },
                  {
                     "host": "i686-mingw32",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.3-a/i686-w64-mingw32.elf2uf2-2062372.220212.zip",
-                     "archiveFileName": "i686-w64-mingw32.elf2uf2-2062372.220212.zip",
-                     "checksum": "SHA-256:e6f0578ea781b160390994d3e95bedfec01e212d47243b1adb84f910a06bcba4",
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/i686-w64-mingw32.elf2uf2-2062372.220607.zip",
+                     "archiveFileName": "i686-w64-mingw32.elf2uf2-2062372.220607.zip",
+                     "checksum": "SHA-256:eed4693771f27851092d182e8477eee9c393cce7ddffde18d7492e78bd65140c",
                     "size": "70405"
                  },
                  {
                     "host": "x86_64-apple-darwin",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.3-a/x86_64-apple-darwin14.elf2uf2-2062372.220212.tar.gz",
-                     "archiveFileName": "x86_64-apple-darwin14.elf2uf2-2062372.220212.tar.gz",
-                     "checksum": "SHA-256:d65de7218eaf01c9bf58fa22bd9e1e7c10c054213948b4b62f648a058d09b4de",
-                     "size": "81981"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/x86_64-apple-darwin14.elf2uf2-2062372.220607.tar.gz",
+                     "archiveFileName": "x86_64-apple-darwin14.elf2uf2-2062372.220607.tar.gz",
+                     "checksum": "SHA-256:af65feef470ce6b4b48102ea996703890f8d8d9604207f0781022b7912ce2cbd",
+                     "size": "81982"
                  },
                  {
                     "host": "x86_64-pc-linux-gnu",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.3-a/x86_64-linux-gnu.elf2uf2-2062372.220212.tar.gz",
-                     "archiveFileName": "x86_64-linux-gnu.elf2uf2-2062372.220212.tar.gz",
-                     "checksum": "SHA-256:ba7795ed49c54f3f52caee675b0fd078f6fb8498a47bf7e5d7457065271df338",
-                     "size": "79585"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/x86_64-linux-gnu.elf2uf2-2062372.220607.tar.gz",
+                     "archiveFileName": "x86_64-linux-gnu.elf2uf2-2062372.220607.tar.gz",
+                     "checksum": "SHA-256:968240efe170187c4ece497c7abbb81bca274b6484f0df28e2b7a12e1c088f5f",
+                     "size": "79588"
                  },
                  {
                     "host": "x86_64-mingw32",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.3-a/x86_64-w64-mingw32.elf2uf2-2062372.220212.zip",
-                     "archiveFileName": "x86_64-w64-mingw32.elf2uf2-2062372.220212.zip",
-                     "checksum": "SHA-256:02c7684ed1aea4e18216ec6bbbcedeb482c5f23ad7d5eb9dcb942b8ae6cad5ae",
-                     "size": "78279"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/x86_64-w64-mingw32.elf2uf2-2062372.220607.zip",
+                     "archiveFileName": "x86_64-w64-mingw32.elf2uf2-2062372.220607.zip",
+                     "checksum": "SHA-256:04b85b5b515ec620a5b4106fb1025485de0b3d36482aab7024088e618e605e9d",
+                     "size": "78280"
                  }
               ]
            },
            {
-               "version": "1.3.3-a-ed6d983",
+               "version": "1.3.4-c-5dd03b9",
               "name": "pqt-pioasm",
               "systems": [
                  {
                     "host": "aarch64-linux-gnu",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.3-a/aarch64-linux-gnu.pioasm-2062372.220212.tar.gz",
-                     "archiveFileName": "aarch64-linux-gnu.pioasm-2062372.220212.tar.gz",
-                     "checksum": "SHA-256:9ea17ecf0e492bc6a971f6a78780c3b3c6ee644d52e056cba08a708ac225add2",
-                     "size": "453558"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/aarch64-linux-gnu.pioasm-2062372.220607.tar.gz",
+                     "archiveFileName": "aarch64-linux-gnu.pioasm-2062372.220607.tar.gz",
+                     "checksum": "SHA-256:d08d22b2eecbf17a8afd199eb4ce89c0f6fe2ffa90408d7762d4de7f91c88e13",
+                     "size": "453559"
                  },
                  {
                     "host": "arm-linux-gnueabihf",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.3-a/arm-linux-gnueabihf.pioasm-2062372.220212.tar.gz",
-                     "archiveFileName": "arm-linux-gnueabihf.pioasm-2062372.220212.tar.gz",
-                     "checksum": "SHA-256:c7af69227a3b3c54ccf87122b18842460a263bd711abf93336794ce5f905c284",
-                     "size": "360559"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/arm-linux-gnueabihf.pioasm-2062372.220607.tar.gz",
+                     "archiveFileName": "arm-linux-gnueabihf.pioasm-2062372.220607.tar.gz",
+                     "checksum": "SHA-256:7bc20faea8b8d115fec189248b3dd3470128d0f7da855a61cb8a1fb6d4955450",
+                     "size": "360566"
                  },
                  {
                     "host": "i686-pc-linux-gnu",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.3-a/i686-linux-gnu.pioasm-2062372.220212.tar.gz",
-                     "archiveFileName": "i686-linux-gnu.pioasm-2062372.220212.tar.gz",
-                     "checksum": "SHA-256:f66b9bde3d6859d43049b019fb639dd0bfafcd43f1389ffc499d18949bcf1808",
-                     "size": "511397"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/i686-linux-gnu.pioasm-2062372.220607.tar.gz",
+                     "archiveFileName": "i686-linux-gnu.pioasm-2062372.220607.tar.gz",
+                     "checksum": "SHA-256:b8d26abd632e9599bc82c67619debac45fca0e5dd0daabe5a0ecad4cfd11183e",
+                     "size": "511402"
                  },
                  {
                     "host": "i686-mingw32",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.3-a/i686-w64-mingw32.pioasm-2062372.220212.zip",
-                     "archiveFileName": "i686-w64-mingw32.pioasm-2062372.220212.zip",
-                     "checksum": "SHA-256:89cfa44101dade30000cfaa5985de7f0e7aba93d03dc45ba962f97226ae4e41f",
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/i686-w64-mingw32.pioasm-2062372.220607.zip",
+                     "archiveFileName": "i686-w64-mingw32.pioasm-2062372.220607.zip",
+                     "checksum": "SHA-256:ab52ae2fd59fe3093060a238297f88d50645dca02cd12f59e882ce7cb4533b25",
                     "size": "385748"
                  },
                  {
                     "host": "x86_64-apple-darwin",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.3-a/x86_64-apple-darwin14.pioasm-2062372.220212.tar.gz",
-                     "archiveFileName": "x86_64-apple-darwin14.pioasm-2062372.220212.tar.gz",
-                     "checksum": "SHA-256:d531c911e6eba0333379af04dd807917659bd4d34be9f4bd6792aeff55ab15a9",
-                     "size": "480495"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/x86_64-apple-darwin14.pioasm-2062372.220607.tar.gz",
+                     "archiveFileName": "x86_64-apple-darwin14.pioasm-2062372.220607.tar.gz",
+                     "checksum": "SHA-256:fb22e0c5d6b3e681a8518992a8183b277ebeb5a3876b1c98a247dda4e2c495e7",
+                     "size": "480494"
                  },
                  {
                     "host": "x86_64-pc-linux-gnu",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.3-a/x86_64-linux-gnu.pioasm-2062372.220212.tar.gz",
-                     "archiveFileName": "x86_64-linux-gnu.pioasm-2062372.220212.tar.gz",
-                     "checksum": "SHA-256:2cd4aa8af98558461cb7b85b21830ea854a430a3e57668d618c5f1cd5e389809",
-                     "size": "458730"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/x86_64-linux-gnu.pioasm-2062372.220607.tar.gz",
+                     "archiveFileName": "x86_64-linux-gnu.pioasm-2062372.220607.tar.gz",
+                     "checksum": "SHA-256:f5ea7d22357db358c7185896858463d63310391678bf7425f203cc2baf35789d",
+                     "size": "458726"
                  },
                  {
                     "host": "x86_64-mingw32",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.3-a/x86_64-w64-mingw32.pioasm-2062372.220212.zip",
-                     "archiveFileName": "x86_64-w64-mingw32.pioasm-2062372.220212.zip",
-                     "checksum": "SHA-256:ba586e67f4b309690a51fca70fdd26f38b68951b0fee4dc8333183ef6429833a",
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/x86_64-w64-mingw32.pioasm-2062372.220607.zip",
+                     "archiveFileName": "x86_64-w64-mingw32.pioasm-2062372.220607.zip",
+                     "checksum": "SHA-256:5b63d07bb53ec4e25817d3a1195cd03f156c47dc00c5fdaf4921edb1baa9da9c",
                     "size": "408649"
                  }
               ]
            },
            {
-               "version": "1.3.3-a-ed6d983",
+               "version": "1.3.4-c-5dd03b9",
               "name": "pqt-mklittlefs",
               "systems": [
                  {
                     "host": "aarch64-linux-gnu",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.3-a/aarch64-linux-gnu.mklittlefs-affa497.220212.tar.gz",
-                     "archiveFileName": "aarch64-linux-gnu.mklittlefs-affa497.220212.tar.gz",
-                     "checksum": "SHA-256:2455f5ca6cb1f7b73ed1cb55d4d2261d249c1b24915bd4e66e28f037a0a13116",
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/aarch64-linux-gnu.mklittlefs-affa497.220607.tar.gz",
+                     "archiveFileName": "aarch64-linux-gnu.mklittlefs-affa497.220607.tar.gz",
+                     "checksum": "SHA-256:46a2ee723b6dcad3f229aa6f97a8efd55224f7aafea77ac5c232aa5261720589",
                     "size": "47271"
                  },
                  {
                     "host": "arm-linux-gnueabihf",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.3-a/arm-linux-gnueabihf.mklittlefs-affa497.220212.tar.gz",
-                     "archiveFileName": "arm-linux-gnueabihf.mklittlefs-affa497.220212.tar.gz",
-                     "checksum": "SHA-256:f4b71138f1469e4b9ce82b3b21252aca265a88d56a5d48513dbb5c6d58b19841",
-                     "size": "40807"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/arm-linux-gnueabihf.mklittlefs-affa497.220607.tar.gz",
+                     "archiveFileName": "arm-linux-gnueabihf.mklittlefs-affa497.220607.tar.gz",
+                     "checksum": "SHA-256:39462b3b88b614484c9fbfd7617af17440f9de4ddeb17bdb62b7bc615cae3a18",
+                     "size": "40810"
                  },
                  {
                     "host": "i686-pc-linux-gnu",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.3-a/i686-linux-gnu.mklittlefs-affa497.220212.tar.gz",
-                     "archiveFileName": "i686-linux-gnu.mklittlefs-affa497.220212.tar.gz",
-                     "checksum": "SHA-256:ed1011230c75447dad3d912b7b5607ddcc59e093ee7ebd653fb05274bc876f4c",
-                     "size": "50909"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/i686-linux-gnu.mklittlefs-affa497.220607.tar.gz",
+                     "archiveFileName": "i686-linux-gnu.mklittlefs-affa497.220607.tar.gz",
+                     "checksum": "SHA-256:c8eb593e6fc8bdc386566a72dd9a75f970a9a71fd4e069c0dca217cbe4b22060",
+                     "size": "50913"
                  },
                  {
                     "host": "i686-mingw32",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.3-a/i686-w64-mingw32.mklittlefs-affa497.220212.zip",
-                     "archiveFileName": "i686-w64-mingw32.mklittlefs-affa497.220212.zip",
-                     "checksum": "SHA-256:1289f51c674ebdc568843b82c88db21eb4c295f3b15c26398d31266b9da63b4c",
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/i686-w64-mingw32.mklittlefs-affa497.220607.zip",
+                     "archiveFileName": "i686-w64-mingw32.mklittlefs-affa497.220607.zip",
+                     "checksum": "SHA-256:6fc3c989850ab4acf00509b86c77edf1cdd2f38ec95c3614ed633f8131d3f86d",
                     "size": "334050"
                  },
                  {
                     "host": "x86_64-apple-darwin",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.3-a/x86_64-apple-darwin14.mklittlefs-affa497.220212.tar.gz",
-                     "archiveFileName": "x86_64-apple-darwin14.mklittlefs-affa497.220212.tar.gz",
-                     "checksum": "SHA-256:0c0d7d8c80739ed79bc5a41e831d0229b6378e87f4c58f148d884814f1ad46d2",
-                     "size": "365757"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/x86_64-apple-darwin14.mklittlefs-affa497.220607.tar.gz",
+                     "archiveFileName": "x86_64-apple-darwin14.mklittlefs-affa497.220607.tar.gz",
+                     "checksum": "SHA-256:a949b054259cea773779305f60b2748b51e1f40c53fe7c00ae3959d6688ce754",
+                     "size": "365751"
                  },
                  {
                     "host": "x86_64-pc-linux-gnu",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.3-a/x86_64-linux-gnu.mklittlefs-affa497.220212.tar.gz",
-                     "archiveFileName": "x86_64-linux-gnu.mklittlefs-affa497.220212.tar.gz",
-                     "checksum": "SHA-256:c504429c24cfea9bf841cbf0caa29bbe0115e72c94c18f949451ffa540d6cacc",
-                     "size": "49766"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/x86_64-linux-gnu.mklittlefs-affa497.220607.tar.gz",
+                     "archiveFileName": "x86_64-linux-gnu.mklittlefs-affa497.220607.tar.gz",
+                     "checksum": "SHA-256:d1910196398bdeffae320cb69b1df79126ea086688d9e36a078dd0816f88dace",
+                     "size": "49774"
                  },
                  {
                     "host": "x86_64-mingw32",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.3-a/x86_64-w64-mingw32.mklittlefs-affa497.220212.zip",
-                     "archiveFileName": "x86_64-w64-mingw32.mklittlefs-affa497.220212.zip",
-                     "checksum": "SHA-256:4ada867888513596fa51bf78c98d9e970de9b8f1eec4f88d85e6e7621704fb91",
-                     "size": "347602"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/x86_64-w64-mingw32.mklittlefs-affa497.220607.zip",
+                     "archiveFileName": "x86_64-w64-mingw32.mklittlefs-affa497.220607.zip",
+                     "checksum": "SHA-256:8be0f754073e036dc9a144fd3cf62a46fbd6d215cad179c2ba17e598848a1b57",
+                     "size": "347601"
                  }
               ]
            }
         ]
      }
   ]
-}
+}
@@ -20,7 +20,7 @@
 # https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification

 name=Raspberry Pi RP2040 Boards
-version=2.0.3
+version=2.1.1

 runtime.tools.pqt-gcc.path={runtime.platform.path}/system/arm-none-eabi
 runtime.tools.pqt-python3.path={runtime.platform.path}/system/python3
@@ -43,10 +43,9 @@ compiler.warning_flags.all=-Wall -Wextra -Werror=return-type -Wno-ignored-qualif

 compiler.defines={build.led} {build.usbstack_flags} -DCFG_TUSB_MCU=OPT_MCU_RP2040 -DUSB_VID={build.vid} -DUSB_PID={build.pid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}'
 compiler.includes="-iprefix{runtime.platform.path}/" "@{runtime.platform.path}/lib/platform_inc.txt"
-compiler.flags=-march=armv6-m -mcpu=cortex-m0plus -mthumb -ffunction-sections -fdata-sections -fno-exceptions
+compiler.flags=-march=armv6-m -mcpu=cortex-m0plus -mthumb -ffunction-sections -fdata-sections {build.flags.exceptions} {build.flags.stackprotect}
 compiler.wrap="@{runtime.platform.path}/lib/platform_wrap.txt"
 compiler.libpico="{runtime.platform.path}/lib/libpico.a"
-compiler.libstdcpp="-lstdc++"

 compiler.c.cmd=arm-none-eabi-gcc
 compiler.c.flags=-c {compiler.warning_flags} {compiler.defines} {compiler.flags} {compiler.includes} -std=gnu17 -g
@@ -88,6 +87,9 @@ build.flags.rtti=-fno-rtti
 build.fs_start=
 build.fs_end=
 build.usbstack_flags=
+build.flags.libstdcpp=-lstdc++
+build.flags.exceptions=-fno-exceptions
+build.flags.stackprotect=

 build.boot2=boot2_generic_03h_4_padded_checksum

@@ -119,7 +121,7 @@ recipe.hooks.linking.prelink.1.pattern="{runtime.tools.pqt-python3.path}/python3
 recipe.hooks.linking.prelink.2.pattern="{compiler.path}{compiler.S.cmd}" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} -c "{runtime.platform.path}/boot2/{build.boot2}.S" "-I{runtime.platform.path}/pico-sdk/src/rp2040/hardware_regs/include/" "-I{runtime.platform.path}/pico-sdk/src/common/pico_binary_info/include" -o "{build.path}/boot2.o"

 ## Combine gc-sections, archives, and objects
-recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" "-L{build.path}" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} {compiler.ldflags} "-Wl,--script={build.path}/memmap_default.ld" "-Wl,-Map,{build.path}/{build.project_name}.map" -o "{build.path}/{build.project_name}.elf" -Wl,--start-group {object_files} "{build.path}/{archive_file}" "{build.path}/boot2.o" {compiler.libraries.ldflags} {compiler.libpico} -lm -lc {compiler.libstdcpp} -lc -Wl,--end-group
+recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" "-L{build.path}" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} {compiler.ldflags} "-Wl,--script={build.path}/memmap_default.ld" "-Wl,-Map,{build.path}/{build.project_name}.map" -o "{build.path}/{build.project_name}.elf" -Wl,--start-group {object_files} "{build.path}/{archive_file}" "{build.path}/boot2.o" {compiler.libraries.ldflags} {compiler.libpico} -lm -lc {build.flags.libstdcpp} -lc -Wl,--end-group

 ## Create output (UF2 file)
 recipe.objcopy.uf2.pattern="{runtime.tools.pqt-elf2uf2.path}/elf2uf2" "{build.path}/{build.project_name}.elf" "{build.path}/{build.project_name}.uf2"
@@ -212,7 +212,7 @@ function install_ide()
    cat rp2040/platform.local.txt
    echo -e "\n----\n"
    cd rp2040/tools
-    python3 get.py -q
+    python3 get.py
    if [ "$WINDOWS" = "1" ]; then
        # Because the symlinks don't work well under Win32, we need to add the path to this copy, not the original...
        relbin=$(realpath $PWD/../system/arm-none-eabi/bin)
@@ -15,8 +15,6 @@ import tarfile
 import zipfile
 import re

-verbose = True
-
 if sys.version_info[0] == 3:
    from urllib.request import urlretrieve
 else:
@@ -40,8 +38,7 @@ def mkdir_p(path):
            raise

 def report_progress(count, blockSize, totalSize):
-    global verbose
-    if verbose:
+    if sys.stdout.isatty():
        percent = int(count*blockSize*100/totalSize)
        percent = min(100, percent)
        sys.stdout.write("\r%d%%" % percent)
@@ -121,14 +118,6 @@ def identify_platform():
    return arduino_platform_names[sys_name][bits]

 def main():
-    global verbose
-    # Support optional "-q" quiet mode simply
-    if len(sys.argv) == 2:
-        if sys.argv[1] == "-q":
-            verbose = False
-    # Remove a symlink generated in 2.6.3 which causes later issues since the tarball can't properly overwrite it
-    if (os.path.exists('python3/python3')):
-        os.unlink('python3/python3')
    print('Platform: {0}'.format(identify_platform()))
    tools_to_download = load_tools_list('../package/package_pico_index.template.json', identify_platform())
    mkdir_p(dist_dir)
@@ -21,6 +21,7 @@ target_compile_definitions(pico PUBLIC

 target_compile_options(pico PUBLIC
 	-fno-exceptions
+	-Os
 	$<$<COMPILE_LANGUAGE:CXX>:-fno-rtti>
 )

@@ -73,7 +73,7 @@
 #define CFG_TUD_HID              (2)
 #define CFG_TUD_CDC              (1)
 #define CFG_TUD_MSC              (0)
-#define CFG_TUD_MIDI             (1)
+#define CFG_TUD_MIDI             (0)
 #define CFG_TUD_VENDOR           (0)

 #define CFG_TUD_CDC_RX_BUFSIZE  (256)
@@ -50,6 +50,20 @@ def BuildRTTI(name):
    print("%s.menu.rtti.Enabled=Enabled" % (name))
    print("%s.menu.rtti.Enabled.build.flags.rtti=" % (name))

+def BuildStackProtect(name):
+    print("%s.menu.stackprotect.Disabled=Disabled" % (name))
+    print("%s.menu.stackprotect.Disabled.build.flags.stackprotect=" % (name))
+    print("%s.menu.stackprotect.Enabled=Enabled" % (name))
+    print("%s.menu.stackprotect.Enabled.build.flags.stackprotect=-fstack-protector" % (name))
+
+def BuildExceptions(name):
+    print("%s.menu.exceptions.Disabled=Disabled" % (name))
+    print("%s.menu.exceptions.Disabled.build.flags.exceptions=-fno-exceptions" % (name))
+    print("%s.menu.exceptions.Disabled.build.flags.libstdcpp=-lstdc++" % (name))
+    print("%s.menu.exceptions.Enabled=Enabled" % (name))
+    print("%s.menu.exceptions.Enabled.build.flags.exceptions=-fexceptions" % (name))
+    print("%s.menu.exceptions.Enabled.build.flags.libstdcpp=-lstdc++-exc" % (name))
+
 def BuildBoot(name):
    for l in [ ("Generic SPI /2", "boot2_generic_03h_2_padded_checksum"),  ("Generic SPI /4", "boot2_generic_03h_4_padded_checksum"),
            ("IS25LP080 QSPI /2", "boot2_is25lp080_2_padded_checksum"), ("IS25LP080 QSPI /4", "boot2_is25lp080_4_padded_checksum"),
@@ -112,6 +126,8 @@ def BuildGlobalMenuList():
    print("menu.freq=CPU Speed")
    print("menu.opt=Optimize")
    print("menu.rtti=RTTI")
+    print("menu.stackprotect=Stack Protector")
+    print("menu.exceptions=C++ Exceptions")
    print("menu.dbgport=Debug Port")
    print("menu.dbglvl=Debug Level")
    print("menu.boot2=Boot Stage 2")
@@ -146,6 +162,8 @@ def MakeBoard(name, vendor_name, product_name, vid, pid, pwr, boarddefine, flash
        BuildFreq(n)
        BuildOptimize(n)
        BuildRTTI(n)
+        BuildStackProtect(n)
+        BuildExceptions(n)
        BuildDebugPort(n)
        BuildDebugLevel(n)
        if a == "picodebug":
@@ -27,6 +27,21 @@ ram_size = 256 * 1024 # not the 264K, which is 256K SRAM + 2*4K SCRATCH(X/Y).
 FRAMEWORK_DIR = platform.get_package_dir("framework-arduinopico")
 assert os.path.isdir(FRAMEWORK_DIR)

+# read includes from this file to add them into CPPPATH later
+includes_file = os.path.join(FRAMEWORK_DIR, "lib", "platform_inc.txt")
+file_lines = []
+includes = []
+with open(includes_file, "r") as fp:
+    file_lines = fp.readlines()
+for l in file_lines:
+    path = l.strip().replace("-iwithprefixbefore/", "").replace("/", os.sep)
+    # emulate -iprefix <framework path>.
+    path = os.path.join(FRAMEWORK_DIR, path)
+    # prevent non-existent paths from being added
+    # looking at you here, pico-extras/src/common/pico_audio and co.
+    if os.path.isdir(path):
+        includes.append(path)
+
 # update progsize expression to also check for bootloader.
 env.Replace(
    SIZEPROGREGEXP=r"^(?:\.boot2|\.text|\.data|\.rodata|\.text.align|\.ARM.exidx)\s+(\d+).*"
@@ -36,14 +51,17 @@ env.Append(
    ASFLAGS=env.get("CCFLAGS", [])[:],

    CCFLAGS=[
+        "-Os", # Optimize for size by default
        "-Werror=return-type",
        "-march=armv6-m",
        "-mcpu=cortex-m0plus",
        "-mthumb",
        "-ffunction-sections",
        "-fdata-sections",
-        "-iprefix" + os.path.join(FRAMEWORK_DIR),
-        "@%s" % os.path.join(FRAMEWORK_DIR, "lib", "platform_inc.txt")
+        # use explicit include (-I) paths, otherwise it's
+        # not visible in the IDE's intellisense.
+        #"-iprefix" + os.path.join(FRAMEWORK_DIR),
+        #"@%s" % os.path.join(FRAMEWORK_DIR, "lib", "platform_inc.txt")
    ],

    CFLAGS=[
@@ -98,7 +116,8 @@ env.Append(
        File(os.path.join(FRAMEWORK_DIR, "lib", "libpico.a")), 
        "m", "c", "stdc++", "c"]
 )
-
+# expand with read includes
+env.Append(CPPPATH=includes)

 def configure_usb_flags(cpp_defines):
    global ram_size
@@ -262,6 +262,21 @@ def get_drives():
        for d in os.listdir(rootpath):
            drives.append(os.path.join(rootpath, d))

+        if (len(drives) == 0) and (sys.platform == "linux"):
+            globexpr = "/dev/disk/by-id/usb-RPI_RP2*-part1"
+            rpidisk = glob.glob(globexpr)
+            if len(rpidisk) > 0:
+                try:
+                    cmd = ["udisksctl", "mount", "--block-device", os.path.realpath(rpidisk[0])]
+                    proc_out = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+                    if proc_out.returncode == 0:
+                        stdoutput = proc_out.stdout.decode("UTF-8")
+                        match = re.search(r'Mounted\s+.*\s+at\s+([^\.\r\n]*)', stdoutput)
+                        if match:
+                            drives = [match.group(1)]
+                except Exception as ex:
+                    print("Exception executing udisksctl. Exception: {}".format(ex))
+                    # If it fails, no problem since it was a heroic attempt

    def has_info(d):
        try:
@@ -335,9 +350,7 @@ def main():
                    ser = serial.Serial(args.serial, 1200)
                    ser.dtr = False
                except:
-                    print("Caught exception during reset!")
-                # Probably should be smart and check for device appearance or something
-                time.sleep(10)
+                    pass # Ignore error in the case it is already in upload mode
            except:
                pass
    if args.list:
@@ -368,33 +381,11 @@ def main():
            if args.output == None:
                args.output = "flash." + ext
        else:
-            drives = get_drives()
-            if (len(drives) == 0) and (sys.platform == "linux"):
-                globexpr = "/dev/disk/by-id/usb-RPI_RP2*-part1"
-                rpidisk = glob.glob(globexpr)
-                if len(rpidisk) == 0:
-                    print("Unable to find disk by ID using expression: {}".format(globexpr))
-                else:
-                    try:
-                        cmd = ["udisksctl", "mount", "--block-device", os.path.realpath(rpidisk[0])]
-                        proc_out = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-                        if proc_out.returncode == 0:
-                            stdoutput = proc_out.stdout.decode("UTF-8")
-                            match = re.search(r'Mounted\s+.*\s+at\s+([^\.\r\n]*)', stdoutput)
-                            if match is None:
-                                print("Warn: {} did not print mount point. Attempting to locate mounted drive in file system. StdOut={}".format(cmd[0], stdoutput))
-                                drives = get_drives()
-                            else:
-                                drives = [match.group(1)]
-                        else:
-                            print("Error executing command {}. Return Code: {} Std Output: {} StdError: {}".format(" ".join(cmd), 
-                                                                                                                   proc_out.returncode,
-                                                                                                                   proc_out.stdout.decode("UTF-8"),
-                                                                                                                   proc_out.stderr.decode("UTF-8")))
-
-                    except Exception as ex:
-                        print("Exception executing udisksctl. Exception: {}".format(ex))
-                        # If it fails, no problem since it was a heroic attempt
+            now = time.time()
+            drives = []
+            while (time.time() - now < 10.0) and (len(drives) == 0):
+                time.sleep(0.5) # Avoid 100% CPU use while waiting for drive to appear
+                drives = get_drives()

        if args.output:
            write_file(args.output, outbuf)
@@ -1 +1,41 @@
-#include "../generic/pins_arduino.h"
+#pragma once
+
+// LEDs
+#define PIN_LED        (25u)
+
+// Serial
+#define PIN_SERIAL1_TX (0u)
+#define PIN_SERIAL1_RX (1u)
+
+// Slight difference to generic RP2040
+// PIN_SERIAL2_TX + PIN_SERIAL2_RX are
+// switched with PIN_WIRE0_SDA + PIN_WIRE0_SCL
+#define PIN_SERIAL2_TX (4u)
+#define PIN_SERIAL2_RX (5u)
+
+// SPI
+#define PIN_SPI0_MISO  (16u)
+#define PIN_SPI0_MOSI  (19u)
+#define PIN_SPI0_SCK   (18u)
+#define PIN_SPI0_SS    (17u)
+
+#define PIN_SPI1_MISO  (12u)
+#define PIN_SPI1_MOSI  (15u)
+#define PIN_SPI1_SCK   (14u)
+#define PIN_SPI1_SS    (13u)
+
+// Wire
+// Slight difference to generic RP2040
+// PIN_SERIAL2_TX + PIN_SERIAL2_RX are
+// switched with PIN_WIRE0_SDA + PIN_WIRE0_SCL
+#define PIN_WIRE0_SDA  (8u)
+#define PIN_WIRE0_SCL  (9u)
+
+#define PIN_WIRE1_SDA  (26u)
+#define PIN_WIRE1_SCL  (27u)
+
+#define SERIAL_HOWMANY (3u)
+#define SPI_HOWMANY    (2u)
+#define WIRE_HOWMANY   (2u)
+
+#include "../generic/common.h"
Author	SHA1	Message	Date
Earle F. Philhower, III	778cf4cb9e	Update version	2022-06-14 12:34:22 -07:00
Earle F. Philhower, III	b6a9e756e4	Remove unneeded and invalid file changes The makever script sets up the repo properly, so no need to patch things in the package stage.	2022-06-14 12:32:26 -07:00
Earle F. Philhower, III	285c964c98	Update version	2022-06-14 12:05:48 -07:00
Earle F. Philhower, III	1d6f66f834	Shrink flash and RAM usage even more (#627 ) Remove MIDI support from the core's main TinyUSB. MIDI is still supported using the Adafruit TinyUSB library, just like before (the core never did use it). Compile the Pico-SDK using `-Os` Remove unneeded warning in UF2 upload Blink.ino shows a savings of 3.5KB flash and 400 bytes of RAM. For comparison, with this PR blink.ino reports: ```` Sketch uses 49908 bytes (3%) of program storage space. Maximum is 1568768 bytes. Global variables use 7024 bytes (2%) of dynamic memory, leaving 255120 bytes for local variables. Maximum is 262144 bytes. ```` As comparison, using the MBED core blink.ino reports: ```` Sketch uses 78882 bytes (0%) of program storage space. Maximum is 16777216 bytes. Global variables use 42780 bytes (15%) of dynamic memory, leaving 227556 bytes for local variables. Maximum is 270336 bytes. ```` So, with this PR we use 37% less flash and and 87% less RAM for simple sketches.	2022-06-13 11:54:38 -07:00
Earle F. Philhower, III	3fb8cbf39f	Temporary fix for muilticore realloc (#625 ) This PR includes a pico-sdk built using the fix in https://github.com/raspberrypi/pico-sdk/pull/864 To properly fix it requires a new pico-sdk release. but until then I am building against my own fork of pico-sdk and including the binary. When 1.3.2 is out (and assuming my PR is approved) I'll update the pico-sdk link. Fixes #614	2022-06-12 13:38:02 -07:00
Earle F. Philhower, III	c352105176	Remove IRQ-level malloc from USB setup Fixes a hang found while debugging #614. Do all memory allocations and USB descriptor setup in main code prior to `tusb_init()`. Avoids potential deadlock in cases where the app is allocating while the USB port is being set up.	2022-06-10 22:58:23 -07:00
Earle F. Philhower, III	c4623f4297	Disable Wire slave interrupt on ::end (#621 ) Fixes #620	2022-06-10 11:42:04 -07:00
Maximilian Gerhardt	1c85a1ca52	Activate default -Os optimization for Platform.IO (#619 )	2022-06-10 09:28:26 -07:00
Earle F. Philhower, III	fdf30febea	Hide get.py download percent when not interactive (#618 ) When get.py is run in a script the percent-update printouts shown while downloading the toolchain end up as 100s to 1000s of lines in log files. When stdout is not a terminal, avoid printing these percentages and shrink logfiles significantly. Errors/etc. are still reported as normal.	2022-06-09 18:00:45 -07:00
Earle F. Philhower, III	7d5e7f5dda	Remove obsolete include paths from build.inc (#616 ) As noted in #615	2022-06-09 15:35:24 -07:00
Maximilian Gerhardt	e3a1debc65	Fix IDE include paths / Intellisense (#615 )	2022-06-09 15:30:22 -07:00
Earle F. Philhower, III	578d3d2a76	Reduce flash, RAM use, reduce download/install (#613 ) Free up 4K of RAM and 6K of flash when no exceptions are enables (default). The original toolchain was including exception code in libstdc++ by default. Reduce installation by ~50MB and download by ~25M by removing unused LTO gcc support.	2022-06-07 16:07:07 -07:00
Earle F. Philhower, III	e3053f69f8	Add GCC stack protector support (#611 )	2022-06-06 20:07:40 -07:00
Earle F. Philhower, III	04ec75e515	Try and upload ASAP instead of hard-waiting 10sec (#610 ) Fixes #609 and a niggling slowness in uploads. Try to find the drive in a loop for 10 seconds, instead of only checking once after 10 seconds. Avoid 100% CPU usage while waiting for Pico drive	2022-06-06 18:21:34 -07:00
Earle F. Philhower, III	420d669a4b	Add C++ exception option to menus (#607 ) Depends on new toolchain from https://github.com/earlephilhower/pico-quick-toolchain/pull/11 Fixes #251	2022-06-06 10:28:54 -07:00
FeuerSturm	9e3f6ade61	Fix WizFi360-EVB-Pico pins_arduino.h (#608 ) Slight difference to generic RP2040 PIN_SERIAL2_TX + PIN_SERIAL2_RX are switched with PIN_WIRE0_SDA + PIN_WIRE0_SCL	2022-06-05 16:59:22 -07:00