5b7a5b2c22
* feat: add Raspberry Pi Pico 2 + W5500 + E22-900M30S variant Adds community variant for Raspberry Pi Pico 2 (RP2350, 4 MB flash) with external WIZnet W5500 Ethernet module and EBYTE E22-900M30S LoRa module (SX1262, 30 dBm PA, 868/915 MHz). Key details: - LoRa on SPI1: GP10/11/12/13 (SCK/MOSI/MISO/CS), RST=GP15, DIO1=GP14, BUSY=GP2, RXEN=GP3 (held HIGH via SX126X_ANT_SW) - W5500 on SPI0: GP16/17/18/19/20 (MISO/CS/SCK/MOSI/RST) - SX126X_DIO2_AS_RF_SWITCH: DIO2→TXEN bridge on module handles PA - SX126X_DIO3_TCXO_VOLTAGE 1.8: TCXO support via EBYTE_E22 flags - DHCP timeout reduced to 10 s to avoid blocking LoRa startup - GPS on UART1/Serial2: GP8 TX, GP9 RX - Reuses WIZNET_5500_EVB_PICO2 code paths for Ethernet init Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * pico2_w5500_e22: rename define and address review feedback Rename WIZNET_5500_EVB_PICO2 to PICO2_W5500_E22 so the variant-specific define matches the variant directory name and isn't confused with an on-board EVB SKU. Review fixes from PR #10135: - Gate the 10 s Ethernet DHCP timeout behind PICO2_W5500_E22 so other Ethernet builds keep the default 60 s behavior; apply the same timeout to reconnectETH() for consistency. - Drop the unused -D EBYTE_E22 flag; EBYTE_E22_900M30S already selects TX_GAIN_LORA / SX126X_MAX_POWER in src/configuration.h. - Rewrite "on-board W5500" comments to describe the external module. - Correct README TX_GAIN_LORA value (7, not 10) and drop the EBYTE_E22 row. * fix(pico2_w5500_e22): drop DEBUG_RP2040_PORT=Serial The arduino-pico framework hooks _write() when DEBUG_RP2040_PORT=Serial is set and dumps raw debug bytes onto USB CDC, corrupting any binary protobuf stream sent through StreamAPI (e.g. `meshtastic --port COMx`). The variant excludes BT and WiFi, so the primary client transport is Ethernet TCP via ethServerAPI — unaffected — but users who configure the node over USB serial would see protobuf decode failures from debug-byte interleaving. Removing the flag restores clean USB CDC. Debug output can still be enabled per-build by adding -D DEBUG_RP2040_PORT=Serial1 to redirect to UART0 instead of USB CDC. * style(pico2_w5500_e22): apply trunk fmt — fixes Trunk Check - variant.h: clang-format 16.0.3 (drop manual #define alignment) - README.md: prettier + add `text` language to fenced code blocks (markdownlint MD040) - wiring.svg: svgo optimization Resolves the Trunk Check Runner failure on this PR (3 unformatted files + 8 markdownlint issues). No functional changes. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * refactor(pico2_w5500_e22): address review — move to rp2350/diy, generic guards Maintainer feedback from NomDeTom on PR #10135: - Move the variant from variants/rp2350/ to variants/rp2350/diy/ to distinguish DIY from prebuilt boards (matches the variants/*/diy/ pattern; still discovered via the existing variants/*/diy/*/platformio.ini glob in the root platformio.ini). - Replace the board-name macro PICO2_W5500_E22 in shared code with a generic capability macro USE_ARDUINO_ETHERNET, defined from variant.h. DebugConfiguration.h / ethServerAPI.h / ethClient.cpp no longer reference a board name. - Drop the architecture.h hook entirely: variant.h now defines PRIVATE_HW, which the existing `#elif defined(PRIVATE_HW)` branch already handles. No functional change. Build verified: pico2_w5500_e22 SUCCESS (RAM 19.2%, Flash 28.1%). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * chore(pico2_w5500_e22): drop unoptimized wiring.svg to fix trunk fmt check --------- Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com> Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
89 lines
2.7 KiB
C
89 lines
2.7 KiB
C
// Raspberry Pi Pico 2 + external W5500 Ethernet module + EBYTE E22-900M30S
|
||
// RP2350 (4 MB flash) — wire modules to the GPIO pins listed below
|
||
//
|
||
// LoRa (SX1262 / E22-900M30S) on SPI1:
|
||
// SCK=GP10 MOSI=GP11 MISO=GP12 CS=GP13
|
||
// RST=GP15 DIO1/IRQ=GP14 BUSY=GP2 RXEN=GP3
|
||
// TXEN: bridge E22_DIO2 → E22_TXEN on the module (no RP2350 GPIO needed)
|
||
//
|
||
// W5500 Ethernet on SPI0:
|
||
// MISO=GP16 CS=GP17 SCK=GP18 MOSI=GP19 RST=GP20
|
||
//
|
||
// See wiring.svg in this directory for a complete connection diagram.
|
||
|
||
// Community/DIY board — no dedicated Meshtastic HardwareModel
|
||
#define PRIVATE_HW
|
||
|
||
#define ARDUINO_ARCH_AVR
|
||
|
||
// Onboard LED (GP25 on Pico 2)
|
||
#define LED_POWER PIN_LED
|
||
|
||
// Power monitoring
|
||
// GP24: VBUS sense – HIGH when USB is present (digital read)
|
||
// GP29: ADC3 measures VSYS/3 (200 kΩ / 100 kΩ divider, same as standard Pico 2)
|
||
#define EXT_PWR_DETECT 24
|
||
#define BATTERY_PIN 29
|
||
#define ADC_MULTIPLIER 3.0
|
||
#define BATTERY_SENSE_RESOLUTION_BITS 12
|
||
// No real battery — suppress false "battery at 100%" while USB powers VSYS
|
||
#define NO_BATTERY_LEVEL_ON_CHARGE
|
||
|
||
// Optional user button — connect a button between GP6 and GND
|
||
// #define BUTTON_PIN 6
|
||
// #define BUTTON_NEED_PULLUP
|
||
|
||
// GPS on UART1 (Serial2) — GP8 TX, GP9 RX
|
||
// GP8/GP9 belong to UART1, so we must use Serial2 (not the default Serial1/UART0).
|
||
// GP0/GP1 (UART0 defaults) are free but the firmware treats pin 0 as "not configured".
|
||
// GP4/GP5 occupied by I2C (SCL/SDA for BMP-280).
|
||
#define HAS_GPS 1
|
||
#define GPS_TX_PIN 8
|
||
#define GPS_RX_PIN 9
|
||
#define GPS_BAUDRATE 38400
|
||
#define GPS_SERIAL_PORT Serial2
|
||
|
||
// ---- EBYTE E22-900M30S on SPI1 -----------------------------------------
|
||
#define USE_SX1262
|
||
|
||
#undef LORA_SCK
|
||
#undef LORA_MISO
|
||
#undef LORA_MOSI
|
||
#undef LORA_CS
|
||
|
||
#define LORA_SCK 10
|
||
#define LORA_MOSI 11
|
||
#define LORA_MISO 12
|
||
#define LORA_CS 13
|
||
|
||
#define LORA_DIO0 RADIOLIB_NC
|
||
#define LORA_RESET 15
|
||
#define LORA_DIO1 14 // IRQ
|
||
#define LORA_DIO2 2 // BUSY
|
||
#define LORA_DIO3 RADIOLIB_NC
|
||
|
||
#ifdef USE_SX1262
|
||
#define SX126X_CS LORA_CS
|
||
#define SX126X_DIO1 LORA_DIO1
|
||
#define SX126X_BUSY LORA_DIO2
|
||
#define SX126X_RESET LORA_RESET
|
||
// GP3 = RXEN: driven HIGH at init and held there (LNA always enabled).
|
||
// SX1262 drives DIO2 HIGH during TX → TXEN via bridge on E22 module.
|
||
#define SX126X_ANT_SW 3
|
||
#define SX126X_DIO2_AS_RF_SWITCH
|
||
#define SX126X_DIO3_TCXO_VOLTAGE 1.8
|
||
#endif
|
||
|
||
// ---- W5500 Ethernet on SPI0 --------------------------------------------
|
||
#define HAS_ETHERNET 1
|
||
// Use the arduino-libraries/Ethernet stack (W5500) instead of RAK13800_W5100S
|
||
#define USE_ARDUINO_ETHERNET 1
|
||
|
||
#define ETH_SPI0_MISO 16
|
||
#define ETH_SPI0_SCK 18
|
||
#define ETH_SPI0_MOSI 19
|
||
|
||
#define PIN_ETHERNET_RESET 20
|
||
#define PIN_ETHERNET_SS 17
|
||
#define ETH_SPI_PORT SPI
|