Add CATWAN Usb Stick rp2040

Author: sabas1080

boards.txt

@@ -107,6 +107,59 @@ bombercat.bootloader.tool.default=openocd
 bombercat.bootloader.config=-f target/rp2040.cfg
 bombercat.bootloader.programmer=-f interface/cmsis-dap.cfg
 ##############################################################
+# CATWAN USB STICK RP2040
+#############################################################
+catwan_usb_stick_2040.name=Electronic Cats CatWAN USB Stick 2040
+catwan_usb_stick_2040.build.core=arduino
+catwan_usb_stick_2040.build.crossprefix=arm-none-eabi-
+catwan_usb_stick_2040.build.compiler_path={runtime.tools.arm-none-eabi-gcc-7-2017q4.path}/bin/
+catwan_usb_stick_2040.build.variant=CATWAN_USB_2040
+catwan_usb_stick_2040.build.mcu=cortex-m0plus
+catwan_usb_stick_2040.build.extra_flags=
+catwan_usb_stick_2040.build.fpu=
+catwan_usb_stick_2040.build.float-abi=
+catwan_usb_stick_2040.build.architecture=cortex-m0plus
+catwan_usb_stick_2040.build.board=CATWAN_USB_2040
+catwan_usb_stick_2040.build.ldscript=linker_script.ld
+catwan_usb_stick_2040.build.postbuild.cmd="{tools.imgtool.path}/{tools.imgtool.cmd}" exit
+catwan_usb_stick_2040.compiler.mbed.arch.define=-DARDUINO_ARCH_RP2040
+catwan_usb_stick_2040.compiler.mbed.defines={build.variant.path}/defines.txt
+catwan_usb_stick_2040.compiler.mbed.ldflags={build.variant.path}/ldflags.txt
+catwan_usb_stick_2040.compiler.mbed.cflags={build.variant.path}/cflags.txt
+catwan_usb_stick_2040.compiler.mbed.cxxflags={build.variant.path}/cxxflags.txt
+catwan_usb_stick_2040.compiler.mbed.includes={build.variant.path}/includes.txt
+catwan_usb_stick_2040.compiler.mbed.extra_ldflags=-lstdc++ -lsupc++ -lm -lc -lgcc -lnosys
+catwan_usb_stick_2040.compiler.mbed="{build.variant.path}/libs/libmbed.a"
+catwan_usb_stick_2040.vid.0=0x1209
+catwan_usb_stick_2040.pid.0=0x005e
+catwan_usb_stick_2040.vid.1=0x1209
+catwan_usb_stick_2040.pid.1=0x805e
+catwan_usb_stick_2040.vid.2=0x1209
+catwan_usb_stick_2040.pid.2=0x015e
+catwan_usb_stick_2040.vid.3=0x1209
+catwan_usb_stick_2040.pid.3=0x025e
+catwan_usb_stick_2040.upload_port.0.vid=0x1209
+catwan_usb_stick_2040.upload_port.0.pid=0x005e
+catwan_usb_stick_2040.upload_port.1.vid=0x1209
+catwan_usb_stick_2040.upload_port.1.pid=0x805e
+catwan_usb_stick_2040.upload_port.2.vid=0x1209
+catwan_usb_stick_2040.upload_port.2.pid=0x015e
+catwan_usb_stick_2040.upload_port.3.vid=0x1209
+catwan_usb_stick_2040.upload_port.3.pid=0x025e
+catwan_usb_stick_2040.upload.tool=picotool
+catwan_usb_stick_2040.upload.tool.default=picotool
+catwan_usb_stick_2040.upload.protocol=
+catwan_usb_stick_2040.upload.transport=
+catwan_usb_stick_2040.upload.use_1200bps_touch=true
+catwan_usb_stick_2040.upload.wait_for_upload_port=false
+catwan_usb_stick_2040.upload.native_usb=true
+catwan_usb_stick_2040.upload.maximum_size=16777216
+catwan_usb_stick_2040.upload.maximum_data_size=270336
+catwan_usb_stick_2040.bootloader.tool=openocd
+catwan_usb_stick_2040.bootloader.tool.default=openocd
+catwan_usb_stick_2040.bootloader.config=-f target/rp2040.cfg
+catwan_usb_stick_2040.bootloader.programmer=-f interface/cmsis-dap.cfg
+##############################################################
 # BAST BLE
 bastble.name=Electronic Cats Bast BLE
 bastble.build.core=arduino

variants/RASPBERRY_PI_PICO/cflags.txt renamed to variants/CATWAN_USB_2040/cflags.txt

@@ -20,9 +20,10 @@
 -DDEVICE_USTICKER=1
 -DDEVICE_WATCHDOG=1
 -D__MBED__=1
--DMBED_BUILD_TIMESTAMP=1648633283.9288557
+-DMBED_BUILD_TIMESTAMP=1648633222.737337
 -D__MBED_CMSIS_RTOS_CM
 -DMBED_MPU_CUSTOM
+-DPICO_FLASH_SIZE_BYTES=16*1024*1024
 -DPICO_NO_BINARY_INFO=1
 -DPICO_ON_DEVICE=1
 -DPICO_RP2040_USB_DEVICE_ENUMERATION_FIX=1
@@ -34,9 +35,9 @@
 -DTARGET_LIKE_MBED
 -DTARGET_M0P
 -DTARGET_memmap_default
--DTARGET_NAME=RASPBERRY_PI_PICO
+-DTARGET_NAME=NANO_RP2040_CONNECT
+-DTARGET_NANO_RP2040_CONNECT
 -DTARGET_RASPBERRYPI
--DTARGET_RASPBERRY_PI_PICO
 -DTARGET_RELEASE
 -DTARGET_RP2040
 -DTOOLCHAIN_GCC

variants/RASPBERRY_PI_PICO/conf/.mbedignore renamed to variants/CATWAN_USB_2040/conf/.mbedignore

@@ -6,6 +6,11 @@ extern "C" {
 #include "macros.h"
 #include "pins_arduino.h"
 
+// Allow user override of the LED mask
+#ifndef USB_BOOT_LED_ACTIVITY_MASK
+#define USB_BOOT_LED_ACTIVITY_MASK 1
+#endif
+
 // Doesn't make any sense for a RAM only binary
 #if !PICO_NO_FLASH
 
@@ -23,14 +28,14 @@ static void boot_double_tap_check() {
             for (i = 0; i < count_of(magic_token); i++) {
                 magic_location[i] = magic_token[i];
             }
-            busy_wait_us(100000);
+            busy_wait_us(500000);
             magic_location[0] = 0;
             return;
         }
     }
 
     magic_location[0] = 0;
-    reset_usb_boot(1 << LED_BUILTIN, 0);
+    reset_usb_boot(1 << digitalPinToPinName(LED_BUILTIN), 0);
 }
 
 class DoubleTap {

variants/RASPBERRY_PI_PICO/conf/mbed_app.json renamed to variants/CATWAN_USB_2040/conf/mbed_app.json

@@ -203,7 +203,7 @@
 -iwithprefixbefore/mbed/storage/kvstore/tdbstore/include/tdbstore
 -iwithprefixbefore/mbed/targets/TARGET_RASPBERRYPI
 -iwithprefixbefore/mbed/targets/TARGET_RASPBERRYPI/TARGET_RP2040
--iwithprefixbefore/mbed/targets/TARGET_RASPBERRYPI/TARGET_RP2040/TARGET_RASPBERRY_PI_PICO
+-iwithprefixbefore/mbed/targets/TARGET_RASPBERRYPI/TARGET_RP2040/TARGET_NANO_RP2040_CONNECT
 -iwithprefixbefore/mbed/targets/TARGET_RASPBERRYPI/TARGET_RP2040/pico-sdk
 -iwithprefixbefore/mbed/targets/TARGET_RASPBERRYPI/TARGET_RP2040/pico-sdk/boards
 -iwithprefixbefore/mbed/targets/TARGET_RASPBERRYPI/TARGET_RP2040/pico-sdk/boards/include

variants/RASPBERRY_PI_PICO/cxxflags.txt renamed to variants/CATWAN_USB_2040/cxxflags.txt

@@ -1,13 +1,16 @@
 MEMORY
 {
-    FLASH(rx) : ORIGIN = 0x10000000, LENGTH = 2048k
+    FLASH(rx) : ORIGIN = 0x10000000, LENGTH = 16*1024*1024
     RAM(rwx) : ORIGIN = 0x20000000, LENGTH = 256k
     SCRATCH_X(rwx) : ORIGIN = 0x20040000, LENGTH = 4k
     SCRATCH_Y(rwx) : ORIGIN = 0x20041000, LENGTH = 4k
 }
 ENTRY(_entry_point)
 SECTIONS
 {
+    .second_stage_ota : {
+         KEEP (*(.second_stage_ota))
+     } > FLASH
     .flash_begin : {
         __flash_binary_start = .;
     } > FLASH

variants/RASPBERRY_PI_PICO/defines.txt renamed to variants/CATWAN_USB_2040/defines.txt

@@ -12,59 +12,44 @@ extern "C" unsigned int PINCOUNT_fn();
 // Pin count
 // ----
 #define PINS_COUNT           (PINCOUNT_fn())
-#define NUM_DIGITAL_PINS     (30u)
-#define NUM_ANALOG_INPUTS    (4u)
+#define NUM_DIGITAL_PINS     (10u)
+#define NUM_ANALOG_INPUTS    (1u)
 #define NUM_ANALOG_OUTPUTS   (0u)
 
 extern PinName digitalPinToPinName(pin_size_t P);
 
 // LEDs
 // ----
-#define PIN_LED     (25u)
+#define PIN_LED     (4u)
 #define LED_BUILTIN PIN_LED
 
 // Analog pins
 // -----------
-#define PIN_A0 (26u)
-#define PIN_A1 (27u)
-#define PIN_A2 (28u)
-#define PIN_A3 (29u)
+#define PIN_A0 (10u)
 
 static const uint8_t A0  = PIN_A0;
-static const uint8_t A1  = PIN_A1;
-static const uint8_t A2  = PIN_A2;
-static const uint8_t A3  = PIN_A3;
 
 #define ADC_RESOLUTION 12
 
-// Serial
-#define PIN_SERIAL_TX (0ul)
-#define PIN_SERIAL_RX (1ul)
-
 // SPI
-#define PIN_SPI_MISO  (16u)
-#define PIN_SPI_MOSI  (19u)
-#define PIN_SPI_SCK   (18u)
-#define PIN_SPI_SS    (17u)
+#define PIN_SPI_MISO  (6u)
+#define PIN_SPI_MOSI  (8u)
+#define PIN_SPI_SCK   (9u)
+#define PIN_SPI_SS    (7u)
 
 static const uint8_t SS   = PIN_SPI_SS;   // SPI Slave SS not used. Set here only for reference.
 static const uint8_t MOSI = PIN_SPI_MOSI;
 static const uint8_t MISO = PIN_SPI_MISO;
 static const uint8_t SCK  = PIN_SPI_SCK;
 
-// Wire
-#define PIN_WIRE_SDA        (4u)
-#define PIN_WIRE_SCL        (5u)
+#define SERIAL_HOWMANY		0
 
-#define SERIAL_HOWMANY		1
-#define SERIAL1_TX			(digitalPinToPinName(PIN_SERIAL_TX))
-#define SERIAL1_RX			(digitalPinToPinName(PIN_SERIAL_RX))
 
 #define SERIAL_CDC			1
 #define HAS_UNIQUE_ISERIAL_DESCRIPTOR
-#define BOARD_VENDORID		0x2e8a
-#define BOARD_PRODUCTID		0x00c0
-#define BOARD_NAME			"RaspberryPi Pico"
+#define BOARD_VENDORID		0x2341
+#define BOARD_PRODUCTID		0x005e
+#define BOARD_NAME			"CatWan USBStick2040"
 
 uint8_t getUniqueSerialNumber(uint8_t* name);
 void _ontouch1200bps_();
@@ -74,17 +59,17 @@ void _ontouch1200bps_();
 #define SPI_MOSI		(digitalPinToPinName(PIN_SPI_MOSI))
 #define SPI_SCK			(digitalPinToPinName(PIN_SPI_SCK))
 
-#define WIRE_HOWMANY	(1)
-#define I2C_SDA			(digitalPinToPinName(PIN_WIRE_SDA))
-#define I2C_SCL			(digitalPinToPinName(PIN_WIRE_SCL))
+#define WIRE_HOWMANY	(0)
 
 #define digitalPinToPort(P)		(digitalPinToPinName(P)/32)
 
 #define SERIAL_PORT_USBVIRTUAL      SerialUSB
 #define SERIAL_PORT_MONITOR         SerialUSB
-#define SERIAL_PORT_HARDWARE        Serial1
-#define SERIAL_PORT_HARDWARE_OPEN   Serial1
 
 #define USB_MAX_POWER	(500)
 
+#ifdef __cplusplus
+#include "nina_pins.h"
+#endif
+
 #endif //__PINS_ARDUINO__

variants/RASPBERRY_PI_PICO/double_tap_usb_boot.cpp renamed to variants/CATWAN_USB_2040/double_tap_usb_boot.cpp

@@ -0,0 +1,68 @@
+#include "Arduino.h"
+#include "pinDefinitions.h"
+
+AnalogPinDescription g_AAnalogPinDescription[] = {
+  { p26,        NULL }, // ADC Dummy
+};
+
+PinDescription g_APinDescription[] = {
+  // D0 - D4
+  // Internal pins Radio LoRa
+  { p10,        NULL, NULL, NULL },    // D0/DIO0
+  { p11,        NULL, NULL, NULL },    // D1/DIO1
+  { p12,        NULL, NULL, NULL },    // D2/DIO2
+  { p15,        NULL, NULL, NULL },    // D3/DIO5
+  
+  { p25,        NULL, NULL, NULL },    // D4/RX_LED
+
+  { p21,        NULL, NULL, NULL },    // D5/RFM_RESET
+  { p16,         NULL, NULL, NULL },    // D6/SPI_CIPO
+  { p17,         NULL, NULL, NULL },    // D7/SPI_CS
+  { p19,        NULL, NULL, NULL },    // D8/SPI_COPI
+  { p18,        NULL, NULL, NULL },    // D9/SPI_SCK
+
+  { p26,        NULL, NULL, NULL }, // ADC Dummy
+};
+
+extern "C" {
+  unsigned int PINCOUNT_fn() {
+    return (sizeof(g_APinDescription) / sizeof(g_APinDescription[0]));
+  }
+}
+
+#include "drivers/I2C.h"
+
+
+void initVariant() {
+}
+
+#ifdef SERIAL_CDC
+
+static void utox8(uint32_t val, uint8_t* s) {
+  for (int i = 0; i < 16; i=i+2) {
+    int d = val & 0XF;
+    val = (val >> 4);
+
+    s[15 - i -1] = d > 9 ? 'A' + d - 10 : '0' + d;
+    s[15 - i] = '\0';
+  }
+}
+
+extern "C" {
+#include "hardware/flash.h"
+#include "pico/bootrom.h"
+}
+
+uint8_t getUniqueSerialNumber(uint8_t* name) {
+  uint32_t id[2];
+  flash_get_unique_id((uint8_t*)&id[0]);
+  utox8(id[0], &name[0]);
+  utox8(id[1], &name[16]);
+  return 32;
+}
+
+void _ontouch1200bps_() {
+  reset_usb_boot(1 << digitalPinToPinName(LED_BUILTIN), 0);
+}
+
+#endif