kevin/meshtastic_firmware
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

emdashes begone (#10847)

Browse Source
This commit is contained in:
Tom
2026-07-01 19:01:27 -05:00
committed by GitHub
co-authored by GitHub
parent dee94e0758
commit 3becaf2d95
276 changed files with 1795 additions and 1793 deletions
Download Patch File Download Diff File Expand all files Collapse all files
variants/rp2350/diy/pico2_w5500_e22/README.md
+11 -11
View File
@@ -1,4 +1,4 @@
# Raspberry Pi Pico 2 + W5500 + E22-900M30S — Meshtastic Variant
# Raspberry Pi Pico 2 + W5500 + E22-900M30S - Meshtastic Variant
Meshtastic support for a **Raspberry Pi Pico 2** (RP2350, 4 MB flash) with an external **W5500** Ethernet module and an **EBYTE E22-900M30S** LoRa module.
@@ -20,9 +20,9 @@ Meshtastic support for a **Raspberry Pi Pico 2** (RP2350, 4 MB flash) with an ex
| GPIO | Function |
| ---- | --------------------------------------- |
| GP24 | VBUS sense — HIGH when USB is connected |
| GP24 | VBUS sense - HIGH when USB is connected |
| GP25 | User LED (heartbeat) |
| GP29 | ADC3 — VSYS/3, measures supply voltage |
| GP29 | ADC3 - VSYS/3, measures supply voltage |
### W5500 Ethernet (SPI0)
@@ -33,7 +33,7 @@ Meshtastic support for a **Raspberry Pi Pico 2** (RP2350, 4 MB flash) with an ex
| SCK | GP18 |
| MOSI | GP19 |
| RST | GP20 |
| INT | — (nc) |
| INT | - (nc) |
| VCC | 3.3V |
| GND | GND |
@@ -50,10 +50,10 @@ Meshtastic support for a **Raspberry Pi Pico 2** (RP2350, 4 MB flash) with an ex
| RESET | GP15 | Active LOW reset |
| DIO1 | GP14 | IRQ interrupt |
| BUSY | GP2 | Module busy indicator |
| RXEN | GP3 | LNA enable — held HIGH permanently |
| RXEN | GP3 | LNA enable - held HIGH permanently |
| TXEN | ← DIO2 | See wiring note below |
| VCC | 3.3V | Add a 100 µF capacitor close to the module |
| GND | GND | — |
| GND | GND | - |
> See `wiring.svg` in this directory for the full connection diagram.
@@ -81,10 +81,10 @@ With this bridge in place, `SX126X_DIO2_AS_RF_SWITCH` causes the SX1262 to drive
pio run -e pico2_w5500_e22
```
### Flash — BOOTSEL mode
### Flash - BOOTSEL mode
1. Hold the **BOOTSEL** button on the Pico 2.
2. Connect USB to the PC — it appears as a `RPI-RP2` storage drive.
2. Connect USB to the PC - it appears as a `RPI-RP2` storage drive.
3. Copy the `.uf2` file:
```text
@@ -119,7 +119,7 @@ Services available once connected:
## Technical notes
### LoRa — RF control
### LoRa - RF control
| Define | Effect |
| ------------------------------ | ----------------------------------------------------------- |
@@ -128,7 +128,7 @@ Services available once connected:
| `SX126X_DIO3_TCXO_VOLTAGE 1.8` | E22 TCXO controlled by DIO3 |
| `-D EBYTE_E22_900M30S` | Sets `TX_GAIN_LORA=7`, max power 22 dBm |
> RXEN and TXEN may both be HIGH simultaneously during TX — this is safe for the E22 RF switch.
> RXEN and TXEN may both be HIGH simultaneously during TX - this is safe for the E22 RF switch.
### Ethernet
@@ -138,7 +138,7 @@ Services available once connected:
### HW_VENDOR
Mapped to `meshtastic_HardwareModel_PRIVATE_HW` — no dedicated model exists in the Meshtastic protobuf for this hardware combination yet.
Mapped to `meshtastic_HardwareModel_PRIVATE_HW` - no dedicated model exists in the Meshtastic protobuf for this hardware combination yet.
---
variants/rp2350/diy/pico2_w5500_e22/platformio.ini
+1 -1
View File
@@ -22,7 +22,7 @@ lib_deps =
${rp2350_base.lib_deps}
${networking_base.lib_deps}
${networking_extra.lib_deps}
# Standard WIZnet Ethernet library — supports W5100/W5200/W5500 auto-detect
# Standard WIZnet Ethernet library - supports W5100/W5200/W5500 auto-detect
arduino-libraries/Ethernet@^2.0.2
debug_build_flags = ${rp2350_base.build_flags}, -g
variants/rp2350/diy/pico2_w5500_e22/variant.h
+6 -6
View File
@@ -1,5 +1,5 @@
// Raspberry Pi Pico 2 + external W5500 Ethernet module + EBYTE E22-900M30S
// RP2350 (4 MB flash) — wire modules to the GPIO pins listed below
// 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
@@ -11,7 +11,7 @@
//
// See wiring.svg in this directory for a complete connection diagram.
// Community/DIY board — no dedicated Meshtastic HardwareModel
// Community/DIY board - no dedicated Meshtastic HardwareModel
#define PRIVATE_HW
#define ARDUINO_ARCH_AVR
@@ -20,20 +20,20 @@
#define LED_POWER PIN_LED
// Power monitoring
// GP24: VBUS sense – HIGH when USB is present (digital read)
// 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
// 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
// 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
// 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).
variants/rp2350/diy/wiznet_5500_evb_pico2_e22p/README.md
+13 -13
View File
@@ -1,4 +1,4 @@
# WIZnet W5500-EVB-Pico2 + E22P-868M30S — Meshtastic Variant
# WIZnet W5500-EVB-Pico2 + E22P-868M30S - Meshtastic Variant
Meshtastic support for the **WIZnet W5500-EVB-Pico2**, a Raspberry Pi Pico 2 development board with an **integrated W5500 Ethernet PHY** on SPI0, paired with an external **EBYTE E22P-868M30S** LoRa module on SPI1.
@@ -11,7 +11,7 @@ This variant is hardware-twin of [`pico2_w5500_e22`](../diy/pico2_w5500_e22/) (s
> ⚠️ Flashing a W5500-EVB-Pico2 with the `pico2_w5500_e22` env builds for a 4 MB flash target and can silently overflow the 2 MB available on the WIZnet PCB. Use this variant for the WIZnet board.
The LoRa wiring and `variant.h` are shared with `diy/pico2_w5500_e22` via `-I variants/rp2350/diy/pico2_w5500_e22` — there is no duplicated pinout file.
The LoRa wiring and `variant.h` are shared with `diy/pico2_w5500_e22` via `-I variants/rp2350/diy/pico2_w5500_e22` - there is no duplicated pinout file.
---
@@ -32,9 +32,9 @@ The W5500-EVB-Pico2 carries a smaller Q-SPI flash (2 MB) than a stock Pi Pico 2
| GPIO | Function |
| ---- | --------------------------------------- |
| GP24 | VBUS sense — HIGH when USB is connected |
| GP24 | VBUS sense - HIGH when USB is connected |
| GP25 | User LED (heartbeat) |
| GP29 | ADC3 — VSYS/3, measures supply voltage |
| GP29 | ADC3 - VSYS/3, measures supply voltage |
### W5500 Ethernet (SPI0, on-board)
@@ -49,7 +49,7 @@ The W5500-EVB-Pico2 carries a smaller Q-SPI flash (2 MB) than a stock Pi Pico 2
| VCC | 3.3V |
| GND | GND |
> All Ethernet pins are wired by the PCB — nothing to solder. SPI0 is reserved for the W5500.
> All Ethernet pins are wired by the PCB - nothing to solder. SPI0 is reserved for the W5500.
### E22P-868M30S LoRa (SPI1, external)
@@ -62,19 +62,19 @@ The W5500-EVB-Pico2 carries a smaller Q-SPI flash (2 MB) than a stock Pi Pico 2
| RESET | GP15 | Active LOW reset |
| DIO1 | GP14 | IRQ interrupt |
| BUSY | GP2 | Module busy indicator |
| RFEN | GP3 | Combined LNA + PA enable — held HIGH at all times |
| RFEN | GP3 | Combined LNA + PA enable - held HIGH at all times |
| TXEN | ← DIO2 | Bridge on the module (see below) |
| VCC | 3.3V | Add a 100 µF capacitor close to the module |
| GND | GND | — |
| GND | GND | - |
---
## E22**P** vs E22 — what changed
## E22**P** vs E22 - what changed
The E22**P**-868M30**S** is the newer revision of EBYTE's 30 dBm 868 MHz module. The pinout is interchangeable with the E22-900M30S but the RF switch control differs:
- On the older E22-900M30S, **RXEN** enables the LNA and **TXEN** enables the PA (two separate pins).
- On the E22**P**-868M30**S**, both functions are merged into a single **RFEN** pin acting as a global RF enable. RFEN must be held HIGH whenever the radio is active — both during RX and TX.
- On the E22**P**-868M30**S**, both functions are merged into a single **RFEN** pin acting as a global RF enable. RFEN must be held HIGH whenever the radio is active - both during RX and TX.
The firmware drives this with `SX126X_ANT_SW 3`, which sets GP3 (RFEN) HIGH once at boot and leaves it there. TXEN switching during transmit is still handled by the on-module DIO2 → TXEN bridge (see below).
@@ -102,10 +102,10 @@ With this bridge in place, `SX126X_DIO2_AS_RF_SWITCH` causes the SX1262 to drive
pio run -e wiznet_5500_evb_pico2_e22p
```
### Flash — BOOTSEL mode
### Flash - BOOTSEL mode
1. Hold the **BOOTSEL** button on the W5500-EVB-Pico2.
2. Connect USB to the PC — it appears as a `RPI-RP2` storage drive.
2. Connect USB to the PC - it appears as a `RPI-RP2` storage drive.
3. Copy the `.uf2` file:
```text
@@ -140,7 +140,7 @@ Services available once connected:
## Technical notes
### LoRa — RF control
### LoRa - RF control
| Define | Effect |
| ------------------------------ | ----------------------------------------------------------- |
@@ -157,4 +157,4 @@ Services available once connected:
### HW_VENDOR
Mapped to `meshtastic_HardwareModel_PRIVATE_HW` — no dedicated model exists in the Meshtastic protobuf for this hardware combination.
Mapped to `meshtastic_HardwareModel_PRIVATE_HW` - no dedicated model exists in the Meshtastic protobuf for this hardware combination.
variants/rp2350/diy/wiznet_5500_evb_pico2_e22p/platformio.ini
+2 -2
View File
@@ -4,7 +4,7 @@ board = wiznet_5500_evb_pico2
board_level = community
upload_protocol = picotool
# Reuses the variant.h from variants/rp2350/diy/pico2_w5500_e22 — same LoRa
# Reuses the variant.h from variants/rp2350/diy/pico2_w5500_e22 - same LoRa
# pinout, same W5500 pin mapping. The only differences vs pico2_w5500_e22 are
# the board target (this PCB has 2 MB flash instead of 4 MB) and the W5500
# being soldered on-board instead of an external module.
@@ -22,7 +22,7 @@ lib_deps =
${rp2350_base.lib_deps}
${networking_base.lib_deps}
${networking_extra.lib_deps}
# Standard WIZnet Ethernet library — supports W5100/W5200/W5500 auto-detect
# Standard WIZnet Ethernet library - supports W5100/W5200/W5500 auto-detect
arduino-libraries/Ethernet@^2.0.2
debug_build_flags = ${rp2350_base.build_flags}, -g