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

moonshine: 加充电检测 P0.16 + 整理构建烧录文档

Browse Source 
variant.h: 新增 EXT_CHRG_DETECT (P0.16, 高电平=充电中)，
Power.cpp 据此驱动 isCharging() 和充电状态 LED 行为。

readme: 引脚表加 CHARGE_DET 行；合并 Build/Flash 章节为
'Build & Flash'，分首次烧录(recover+SD+app)和增量烧录(app only)
两个命令块，便于复用。
This commit is contained in:
kevin
2026-07-19 03:10:02 +08:00
parent 30563c90a6
commit 9237cf9012
2 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
variants/nrf52840/diy/moonshine_NRF52/readme.md
+16 -10
View File
@@ -17,6 +17,7 @@ DIY Meshtastic node variant based on the RF-BM-ND05 nRF52840 module.
| Function | Pin | Notes | | Function | Pin | Notes |
| ------------- | ----- | -------------------------------------- | | ------------- | ----- | -------------------------------------- |
| LED | P0.30 | Active high (`LED_STATE_ON = 1`) | | LED | P0.30 | Active high (`LED_STATE_ON = 1`) |
| CHARGE_DET | P0.16 | Active high (charging) |
| BUTTON | P0.27 | User button | | BUTTON | P0.27 | User button |
| BUZZER | P0.26 | PWM buzzer | | BUZZER | P0.26 | PWM buzzer |
| BATTERY_ADC | P0.05 | 0.5 divider | | BATTERY_ADC | P0.05 | 0.5 divider |
@@ -46,7 +47,9 @@ Note: P0.12/P0.13 are physically wired as RTS/CTS, but the Adafruit nRF52 core's
hardware flow control is not enabled by firmware. These pins are unused unless hardware flow control is not enabled by firmware. These pins are unused unless
the core is patched. the core is patched.
## Build ## Build & Flash
### Build
```sh ```sh
pio run -e moonshine_NRF52_node pio run -e moonshine_NRF52_node
@@ -60,7 +63,7 @@ start at `0x27000` and requires the S140 SoftDevice v7.x to be present on the
chip at `0x0`-`0x26FFF`. The build output (`firmware-*.hex` / `.uf2`) contains chip at `0x0`-`0x26FFF`. The build output (`firmware-*.hex` / `.uf2`) contains
**only the application**, not the SoftDevice. **only the application**, not the SoftDevice.
## Flash (first time on a bare RF-BM-ND05) ### Flash (first time on a bare RF-BM-ND05)
A factory-fresh RF-BM-ND05 module has **no SoftDevice and no bootloader**. The A factory-fresh RF-BM-ND05 module has **no SoftDevice and no bootloader**. The
SoftDevice must be flashed once via SWD before the application; otherwise SoftDevice must be flashed once via SWD before the application; otherwise
@@ -74,7 +77,7 @@ the nRF52 CTRL-AP and clears APPROTECT, so it is the recommended first step on a
fresh module (ebyte/Raytac modules ship with APPROTECT engaged). fresh module (ebyte/Raytac modules ship with APPROTECT engaged).
```sh ```sh
# Single-command flow: recover (erase all + unlock) -> SoftDevice -> app -> reset # Full flow: recover (erase all + unlock) -> SoftDevice -> app -> reset
C:/openocd/bin/openocd.exe -s C:/openocd/share/openocd/scripts \ C:/openocd/bin/openocd.exe -s C:/openocd/share/openocd/scripts \
-f interface/cmsis-dap.cfg -f target/nrf52.cfg \ -f interface/cmsis-dap.cfg -f target/nrf52.cfg \
-c "init; nrf52_recover; \ -c "init; nrf52_recover; \
@@ -83,8 +86,11 @@ C:/openocd/bin/openocd.exe -s C:/openocd/share/openocd/scripts \
reset run; exit" reset run; exit"
``` ```
If the chip is already unlocked and you only need to re-flash the application ### Flash (app only, SoftDevice already present)
(SoftDevice already present), skip `nrf52_recover` and the SoftDevice line:
When the SoftDevice is already on the chip and only the application changed
(e.g. after editing the variant and rebuilding), skip `nrf52_recover` and the
SoftDevice line:
```sh ```sh
C:/openocd/bin/openocd.exe -s C:/openocd/share/openocd/scripts \ C:/openocd/bin/openocd.exe -s C:/openocd/share/openocd/scripts \
@@ -94,16 +100,16 @@ C:/openocd/bin/openocd.exe -s C:/openocd/share/openocd/scripts \
reset run; exit" reset run; exit"
``` ```
Notes: ### Notes
- The firmware hex filename contains a commit hash (e.g. `2.8.0.421838f`); use - The firmware hex filename contains a commit hash (e.g. `2.8.0.421838f`); use
the actual file produced by `pio run` or a shell glob. the actual file produced by `pio run` or a shell glob.
- The SoftDevice hex occupies `0x0`-`0x26498` (~156 KB) and does **not** write - The SoftDevice hex occupies `0x0`-`0x26498` (~156 KB) and does **not** write
UICR, so `nrf52_recover` is safe (UICR resets to defaults). UICR, so `nrf52_recover` is safe (UICR resets to defaults).
- Swap `interface/cmsis-dap.cfg` for `interface/jlink.cfg` or - Swap `interface/cmsis-dap.cfg` for `interface/jlink.cfg` or
`interface/stlink.cfg` if using a different SWD probe. `interface/stlink.cfg` if using a different SWD probe.
- No UF2 bootloader is installed in this flow, so subsequent updates must go
No UF2 bootloader is installed in this flow, so subsequent updates must go
through BLE DFU (secure DFU service) or SWD again. To enable UF2 drag-and-drop through BLE DFU (secure DFU service) or SWD again. To enable UF2 drag-and-drop
updates, flash an Adafruit nRF52 UF2 bootloader updates, flash an Adafruit nRF52 UF2 bootloader
(https://github.com/adafruit/Adafruit_nRF52_Bootloader) at `0x0` in place of the (https://github.com/adafruit/Adafruit_nRF52_Bootloader) at `0x0` in place of
bare SoftDevice - the bootloader bundles its own SoftDevice. the bare SoftDevice - the bootloader bundles its own SoftDevice.
variants/nrf52840/diy/moonshine_NRF52/variant.h
+4
View File
@@ -73,6 +73,10 @@ MOONSHINE NRF52 PIN ASSIGNMENT (RF-BM-ND05)
#define LED_BLUE PIN_LED1 #define LED_BLUE PIN_LED1
#define LED_STATE_ON 1 // State when LED is lit (active high) #define LED_STATE_ON 1 // State when LED is lit (active high)
// Charge detection (P0.16, active high = charging)
#define EXT_CHRG_DETECT (0 + 16)
#define EXT_CHRG_DETECT_VALUE HIGH
// Buzzer // Buzzer
#define PIN_BUZZER (0 + 26) // P0.26 #define PIN_BUZZER (0 + 26) // P0.26