Add wiznet_5100s_evb_pico2, wiznet_5500_evb_pico2 (#2575)

earlephilhower · web-flow · commit c4b652184957 · 2024-11-03T09:47:31.000-08:00
Add 2 new WIZNet Pico2 boards, same pinouts as Pico revs. Fixes #2574
diff --git a/README.md b/README.md
@@ -102,7 +102,9 @@ Read the [Contributing Guide](https://github.com/earlephilhower/arduino-pico/blo
 * Waveshare RP2040 Matrix
 * Waveshare RP2040 PiZero
 * WIZnet W5100S-EVB-Pico
+* WIZnet W5100S-EVB-Pico2
 * WIZnet W5500-EVB-Pico
+* WIZnet W5500-EVB-Pico2
 * WIZnet W55RP20-EVB-Pico
 * WIZnet WizFi360-EVB-Pico
 * Generic RP2040 (configurable flash, I/O pins)
diff --git a/boards.txt b/boards.txt
diff --git a/libraries/lwIP_w5100/examples/WiFiClient-W5100/WiFiClient-W5100.ino b/libraries/lwIP_w5100/examples/WiFiClient-W5100/WiFiClient-W5100.ino
@@ -8,15 +8,15 @@
 const char* host = "djxmmx.net";
 const uint16_t port = 17;
 
-#ifdef ARDUINO_WIZNET_5100S_EVB_PICO
+#if defined(ARDUINO_WIZNET_5100S_EVB_PICO) || defined(ARDUINO_WIZNET_5100S_EVB_PICO2)
 // To use Interrupt-driven mode, pass in an SPI object and an IRQ pin like so:
 Wiznet5100lwIP eth(17, SPI, 21);
 #else
 Wiznet5100lwIP eth(1 /* chip select */);
 #endif
 
 void setup() {
-#ifndef ARDUINO_WIZNET_5100S_EVB_PICO
+#if !defined(ARDUINO_WIZNET_5100S_EVB_PICO) && !defined(ARDUINO_WIZNET_5100S_EVB_PICO2)
   // Set up SPI pinout to match your HW
   SPI.setRX(0);
   SPI.setCS(1);
diff --git a/libraries/lwIP_w5500/examples/WiFiClient-W5500/WiFiClient-W5500.ino b/libraries/lwIP_w5500/examples/WiFiClient-W5500/WiFiClient-W5500.ino
@@ -8,14 +8,21 @@
 const char* host = "djxmmx.net";
 const uint16_t port = 17;
 
+#if defined(ARDUINO_WIZNET_5500_EVB_PICO) || defined(ARDUINO_WIZNET_5500_EVB_PICO2)
+// To use Interrupt-driven mode, pass in an SPI object and an IRQ pin like so:
+Wiznet5500lwIP eth(17, SPI, 21);
+#else
 Wiznet5500lwIP eth(1 /* chip select */);
+#endif
 
 void setup() {
+#if !defined(ARDUINO_WIZNET_5500_EVB_PICO) && !defined(ARDUINO_WIZNET_5500_EVB_PICO2)
   // Set up SPI pinout to match your HW
   SPI.setRX(0);
   SPI.setCS(1);
   SPI.setSCK(2);
   SPI.setTX(3);
+#endif
 
   Serial.begin(115200);
   delay(5000);
diff --git a/package/package_pico_index.template.json b/package/package_pico_index.template.json
@@ -326,12 +326,18 @@
                   {
                      "name": "WIZnet W5100S-EVB-Pico"
                   },
+                  {
+                     "name": "WIZnet W5100S-EVB-Pico2"
+                  },
                   {
                      "name": "WIZnet WizFi360-EVB-Pico"
                   },
                   {
                      "name": "WIZnet W5500-EVB-Pico"
                   },
+                  {
+                     "name": "WIZnet W5500-EVB-Pico2"
+                  },
                   {
                      "name": "WIZnet W55RP20-EVB-Pico"
                   },
diff --git a/tools/json/wiznet_5100s_evb_pico2.json b/tools/json/wiznet_5100s_evb_pico2.json
@@ -0,0 +1,55 @@
+{
+    "build": {
+        "arduino": {
+            "earlephilhower": {
+                "boot2_source": "none.S",
+                "usb_vid": "0x2E8A",
+                "usb_pid": "0x1027"
+            }
+        },
+        "core": "earlephilhower",
+        "cpu": "cortex-m33",
+        "extra_flags": "-DARDUINO_WIZNET_5100S_EVB_PICO2 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250 ",
+        "f_cpu": "150000000L",
+        "hwids": [
+            [
+                "0x2E8A",
+                "0x00C0"
+            ],
+            [
+                "0x2E8A",
+                "0x1027"
+            ]
+        ],
+        "mcu": "rp2350",
+        "variant": "wiznet_5100s_evb_pico2"
+    },
+    "debug": {
+        "jlink_device": "RP2350_0",
+        "openocd_target": "rp2350.cfg",
+        "svd_path": "rp2350.svd"
+    },
+    "frameworks": [
+        "arduino"
+    ],
+    "name": "W5100S-EVB-Pico2",
+    "upload": {
+        "maximum_ram_size": 524288,
+        "maximum_size": 2097152,
+        "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://www.raspberrypi.org/products/raspberry-pi-pico/",
+    "vendor": "WIZnet"
+}
diff --git a/tools/json/wiznet_5500_evb_pico2.json b/tools/json/wiznet_5500_evb_pico2.json
@@ -0,0 +1,55 @@
+{
+    "build": {
+        "arduino": {
+            "earlephilhower": {
+                "boot2_source": "none.S",
+                "usb_vid": "0x2E8A",
+                "usb_pid": "0x1029"
+            }
+        },
+        "core": "earlephilhower",
+        "cpu": "cortex-m33",
+        "extra_flags": "-DARDUINO_WIZNET_5500_EVB_PICO2 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250 ",
+        "f_cpu": "150000000L",
+        "hwids": [
+            [
+                "0x2E8A",
+                "0x00C0"
+            ],
+            [
+                "0x2E8A",
+                "0x1029"
+            ]
+        ],
+        "mcu": "rp2350",
+        "variant": "wiznet_5500_evb_pico2"
+    },
+    "debug": {
+        "jlink_device": "RP2350_0",
+        "openocd_target": "rp2350.cfg",
+        "svd_path": "rp2350.svd"
+    },
+    "frameworks": [
+        "arduino"
+    ],
+    "name": "W5500-EVB-Pico2",
+    "upload": {
+        "maximum_ram_size": 524288,
+        "maximum_size": 2097152,
+        "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://www.raspberrypi.org/products/raspberry-pi-pico/",
+    "vendor": "WIZnet"
+}
diff --git a/tools/makeboards.py b/tools/makeboards.py
@@ -657,8 +657,10 @@ def MakeBoardJSON(name, chip, vendor_name, product_name, vid, pid, pwr, boarddef
 
 # WIZnet
 MakeBoard("wiznet_5100s_evb_pico", "rp2040", "WIZnet", "W5100S-EVB-Pico", "0x2e8a", "0x1027", 250, "WIZNET_5100S_EVB_PICO", 2, 0, "boot2_w25q080_2_padded_checksum")
+MakeBoard("wiznet_5100s_evb_pico2", "rp2350", "WIZnet", "W5100S-EVB-Pico2", "0x2e8a", "0x1027", 250, "WIZNET_5100S_EVB_PICO2", 2, 0, "none")
 MakeBoard("wiznet_wizfi360_evb_pico", "rp2040", "WIZnet", "WizFi360-EVB-Pico", "0x2e8a", "0x1028", 250, "WIZNET_WIZFI360_EVB_PICO", 2, 0, "boot2_w25q080_2_padded_checksum")
 MakeBoard("wiznet_5500_evb_pico", "rp2040", "WIZnet", "W5500-EVB-Pico", "0x2e8a", "0x1029", 250, "WIZNET_5500_EVB_PICO", 2, 0, "boot2_w25q080_2_padded_checksum")
+MakeBoard("wiznet_5500_evb_pico2", "rp2350", "WIZnet", "W5500-EVB-Pico2", "0x2e8a", "0x1029", 250, "WIZNET_5500_EVB_PICO2", 2, 0, "none")
 MakeBoard("wiznet_55rp20_evb_pico", "rp2040", "WIZnet", "W55RP20-EVB-Pico", "0x2e8a", "0x1029", 250, "WIZNET_55RP20_EVB_PICO", 2, 0, "boot2_w25q080_2_padded_checksum")
 
 # Generic
diff --git a/variants/wiznet_5100s_evb_pico2/pins_arduino.h b/variants/wiznet_5100s_evb_pico2/pins_arduino.h
@@ -0,0 +1 @@
+#include "../generic/pins_arduino.h"
diff --git a/variants/wiznet_5500_evb_pico2/pins_arduino.h b/variants/wiznet_5500_evb_pico2/pins_arduino.h
@@ -0,0 +1 @@
+#include "../generic/pins_arduino.h"

Original file line number	Diff line number	Diff line change
`@@ -326,12 +326,18 @@`
`326`	`326`	`{`
`327`	`327`	`"name": "WIZnet W5100S-EVB-Pico"`
`328`	`328`	`},`
	`329`	`+ {`
	`330`	`+ "name": "WIZnet W5100S-EVB-Pico2"`
	`331`	`+ },`
`329`	`332`	`{`
`330`	`333`	`"name": "WIZnet WizFi360-EVB-Pico"`
`331`	`334`	`},`
`332`	`335`	`{`
`333`	`336`	`"name": "WIZnet W5500-EVB-Pico"`
`334`	`337`	`},`
	`338`	`+ {`
	`339`	`+ "name": "WIZnet W5500-EVB-Pico2"`
	`340`	`+ },`
`335`	`341`	`{`
`336`	`342`	`"name": "WIZnet W55RP20-EVB-Pico"`
`337`	`343`	`},`