Merge branch 'master' into usb_ncm_new

Author: earlephilhower

boards.txt

@@ -276,6 +276,8 @@ extern RP2040 rp2040;
 extern void main1();
 extern "C" char __StackLimit;
 extern "C" char __bss_end__;
+extern "C" uint32_t __scratch_x_start__;
+extern "C" uint32_t __scratch_y_start__;
 extern "C" void setup1() __attribute__((weak));
 extern "C" void loop1() __attribute__((weak));
 extern "C" bool core1_separate_stack;
@@ -477,12 +479,12 @@ class RP2040 {
     */
     inline int getFreeStack() {
         const unsigned int sp = getStackPointer();
-        uint32_t ref = 0x20040000;
+        uint32_t ref = (uint32_t)&__scratch_x_start__;
         if (setup1 || loop1) {
             if (core1_separate_stack) {
-                ref = cpuid() ? (unsigned int)core1_separate_stack_address : 0x20040000;
+                ref = (uint32_t)(cpuid() ? core1_separate_stack_address : &__scratch_x_start__);
             } else {
-                ref = cpuid() ? 0x20040000 : 0x20041000;
+                ref = (uint32_t)(cpuid() ? &__scratch_x_start__ : &__scratch_y_start__);
             }
         }
         return sp - ref;

cores/rp2040/RP2040Support.h

@@ -355,10 +355,10 @@ void SerialPIO::flush() {
         return;
     }
     while (!pio_sm_is_tx_fifo_empty(_txPIO, _txSM)) {
-        delay(1); // Wait for all FIFO to be read
+        /* noop */ // Busy wait for all FIFO to be read
     }
     // Could have 1 byte being transmitted, so wait for bit times
-    delay((1000 * (_txBits + 1)) / _baud);
+    delayMicroseconds((1000000 * (_txBits + 3 /* start + stop + parity */)) / _baud);
 }
 
 size_t SerialPIO::write(uint8_t c) {

cores/rp2040/SerialPIO.cpp

@@ -62,14 +62,4 @@
     HID_INPUT          ( HID_DATA | HID_VARIABLE | HID_ABSOLUTE ) ,\
   HID_COLLECTION_END \
 
-// HID Gamepad Protocol Report.
-typedef struct TU_ATTR_PACKED {
-    int16_t x;         ///< Delta x  movement of left analog-stick
-    int16_t y;         ///< Delta y  movement of left analog-stick
-    int16_t z;         ///< Delta z  movement of right analog-joystick
-    int16_t rz;        ///< Delta Rz movement of right analog-joystick
-    int16_t rx;        ///< Delta Rx movement of analog left trigger
-    int16_t ry;        ///< Delta Ry movement of analog right trigger
-    uint8_t hat;       ///< Buttons mask for currently pressed buttons in the DPad/hat
-    uint32_t buttons;  ///< Buttons mask for currently pressed buttons
-} hid_gamepad16_report_t;
+#include "tusb_gamepad16_report.h"

cores/rp2040/sdkoverride/tusb_gamepad16.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <stdint.h>
+
+// HID Gamepad Protocol Report.
+typedef struct TU_ATTR_PACKED {
+    int16_t x;         ///< Delta x  movement of left analog-stick
+    int16_t y;         ///< Delta y  movement of left analog-stick
+    int16_t z;         ///< Delta z  movement of right analog-joystick
+    int16_t rz;        ///< Delta Rz movement of right analog-joystick
+    int16_t rx;        ///< Delta Rx movement of analog left trigger
+    int16_t ry;        ///< Delta Ry movement of analog right trigger
+    uint8_t hat;       ///< Buttons mask for currently pressed buttons in the DPad/hat
+    uint32_t buttons;  ///< Buttons mask for currently pressed buttons
+} hid_gamepad16_report_t;

cores/rp2040/sdkoverride/tusb_gamepad16_report.h

@@ -27,6 +27,7 @@
 
 #include "tusb.h"
 #include "class/hid/hid_device.h"
+#include <sdkoverride/tusb_gamepad16.h>
 
 static const uint8_t desc_hid_report_joystick[] = { TUD_HID_REPORT_DESC_GAMEPAD16(HID_REPORT_ID(1)) };
 

libraries/HID_Joystick

@@ -25,7 +25,6 @@
 #endif
 
 #include <HID_Joystick.h>
-#include <class/hid/hid.h>
 
 //======================================================================
 class Joystick_ : public HID_Joystick {

libraries/Joystick/src/Joystick.cpp

@@ -365,6 +365,9 @@
                   {
                      "name": "VCC-GND YD RP2040"
                   },
+                  {
+                     "name": "Vicharak Shrike-Lite"
+                  },
                   {
                      "name": "Viyalab Mizu RP2040"
                   },

libraries/Joystick/src/Joystick.h

@@ -0,0 +1,56 @@
+{
+    "build": {
+        "arduino": {
+            "earlephilhower": {
+                "boot2_source": "boot2_generic_03h_4_padded_checksum.S",
+                "usb_vid": "0x2E8A",
+                "usb_pid": "0xF00A"
+            }
+        },
+        "core": "earlephilhower",
+        "cpu": "cortex-m0plus",
+        "extra_flags": "-DARDUINO_VICHARAK_SHRIKELITE -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=500 ",
+        "f_cpu": "133000000L",
+        "hwids": [
+            [
+                "0x2E8A",
+                "0x00C0"
+            ],
+            [
+                "0x2E8A",
+                "0xF00A"
+            ]
+        ],
+        "mcu": "rp2040",
+        "variant": "vicharak_shrike-lite"
+    },
+    "debug": {
+        "jlink_device": "RP2040_M0_0",
+        "openocd_target": "rp2040.cfg",
+        "svd_path": "rp2040.svd"
+    },
+    "frameworks": [
+        "arduino",
+        "picosdk"
+    ],
+    "name": "Shrike-Lite",
+    "upload": {
+        "maximum_ram_size": 262144,
+        "maximum_size": 4194304,
+        "require_upload_port": true,
+        "native_usb": true,
+        "use_1200bps_touch": true,
+        "wait_for_upload_port": false,
+        "protocol": "picotool",
+        "protocols": [
+            "blackmagic",
+            "cmsis-dap",
+            "jlink",
+            "raspberrypi-swd",
+            "picotool",
+            "picoprobe"
+        ]
+    },
+    "url": "https://github.com/vicharak-in/shrike-lite.git",
+    "vendor": "Vicharak"
+}