Merge branch 'dev' of https://github.com/meshcore-dev/MeshCore into muzi-base-duo

This commit is contained in:
Ev Lbibass 2026-04-03 13:42:58 -04:00
commit 07c7f80241
18 changed files with 1553 additions and 13 deletions

View file

@ -35,7 +35,7 @@ public:
void powerOff() override {
uint32_t button_pin = PIN_BUTTON2;
uint32_t button_pin = PIN_BUTTON1;
nrf_gpio_cfg_input(button_pin, NRF_GPIO_PIN_PULLUP);
nrf_gpio_cfg_sense_set(button_pin, NRF_GPIO_PIN_SENSE_LOW);
sd_power_system_off();

View file

@ -11,8 +11,7 @@ GAT56MeshWatch13Board board;
#ifdef DISPLAY_CLASS
DISPLAY_CLASS display;
MomentaryButton user_btn(PIN_USER_BTN, 1000, true, false, false);
MomentaryButton back_btn(PIN_BACK_BTN, 1000, true, false, true);
MomentaryButton user_btn(PIN_USER_BTN, 1000, true, false, true);
#endif

View file

@ -13,7 +13,6 @@
extern DISPLAY_CLASS display;
#include <helpers/ui/MomentaryButton.h>
extern MomentaryButton user_btn;
extern MomentaryButton back_btn;
#endif
#ifdef PIN_VIBRATION

View file

@ -0,0 +1,66 @@
#include <Arduino.h>
#include <Wire.h>
#include "R1NeoBoard.h"
#ifdef NRF52_POWER_MANAGEMENT
// Static configuration for power management
// Values set in variant.h defines
const PowerMgtConfig power_config = {
.lpcomp_ain_channel = PWRMGT_LPCOMP_AIN,
.lpcomp_refsel = PWRMGT_LPCOMP_REFSEL,
.voltage_bootlock = PWRMGT_VOLTAGE_BOOTLOCK
};
void R1NeoBoard::initiateShutdown(uint8_t reason) {
// Disable LoRa module power before shutdown
MESH_DEBUG_PRINTLN("R1Neo: shutting down");
digitalWrite(SX126X_POWER_EN, LOW);
if (reason == SHUTDOWN_REASON_LOW_VOLTAGE ||
reason == SHUTDOWN_REASON_BOOT_PROTECT) {
configureVoltageWake(power_config.lpcomp_ain_channel, power_config.lpcomp_refsel);
}
enterSystemOff(reason);
}
#endif // NRF52_POWER_MANAGEMENT
void R1NeoBoard::begin() {
// R1 Neo peculiarity: tell DCDC converter to stay powered.
// Must be done as soon as practical during boot.
pinMode(PIN_DCDC_EN_MCU_HOLD, OUTPUT);
digitalWrite(PIN_DCDC_EN_MCU_HOLD, HIGH);
// R1 Neo peculiarity: Tell I/O Controller device is on
// Enables passthrough of buttons and LEDs
pinMode(PIN_SOFT_SHUTDOWN, OUTPUT);
digitalWrite(PIN_SOFT_SHUTDOWN, HIGH);
NRF52BoardDCDC::begin();
// button is active high and passed through from I/O controller
pinMode(PIN_USER_BTN, INPUT);
pinMode(PIN_BUZZER, OUTPUT);
digitalWrite(PIN_BUZZER, LOW);
// battery pins
pinMode(PIN_BAT_CHG, INPUT);
pinMode(PIN_VBAT_READ, INPUT);
Wire.setPins(PIN_WIRE_SDA, PIN_WIRE_SCL);
Wire.begin();
pinMode(SX126X_POWER_EN, OUTPUT);
#ifdef NRF52_POWER_MANAGEMENT
// Boot voltage protection check (may not return if voltage too low)
// We need to call this after we configure SX126X_POWER_EN as output but before we pull high
checkBootVoltage(&power_config);
#endif
digitalWrite(SX126X_POWER_EN, HIGH);
delay(10); // give sx1262 some time to power up
}

View file

@ -0,0 +1,56 @@
#pragma once
#include <MeshCore.h>
#include <Arduino.h>
#include <helpers/NRF52Board.h>
#include "NullDisplayDriver.h"
#include "MomentaryButton.h"
#define DISPLAY_CLASS NullDisplayDriver
class R1NeoBoard : public NRF52BoardDCDC {
protected:
#ifdef NRF52_POWER_MANAGEMENT
void initiateShutdown(uint8_t reason) override;
#endif
public:
R1NeoBoard() : NRF52Board("R1NEO_OTA") {}
void begin();
#if defined(P_LORA_TX_LED)
void onBeforeTransmit() override {
digitalWrite(P_LORA_TX_LED, HIGH); // turn TX LED on
#if defined(LED_BLUE)
// turn off that annoying blue LED before transmitting
digitalWrite(LED_BLUE, LOW);
#endif
}
void onAfterTransmit() override {
digitalWrite(P_LORA_TX_LED, LOW); // turn TX LED off
#if defined(LED_BLUE)
// do it after transmitting too, just in case
digitalWrite(LED_BLUE, LOW);
#endif
}
#endif
#define BATTERY_SAMPLES 8
uint16_t getBattMilliVolts() override {
MESH_DEBUG_PRINTLN("R1Neo: Sampling battery");
analogReadResolution(12);
uint32_t raw = 0;
for (int i = 0; i < BATTERY_SAMPLES; i++) {
raw += analogRead(PIN_VBAT_READ);
}
raw = raw / BATTERY_SAMPLES;
return (ADC_MULTIPLIER * raw) / 4096;
}
const char* getManufacturerName() const override {
return "muzi works R1 Neo";
}
};

View file

@ -0,0 +1,132 @@
[R1Neo]
extends = nrf52_base
board = rak4631
board_check = true
build_flags = ${nrf52_base.build_flags}
${sensor_base.build_flags}
-I variants/muziworks_r1_neo
-I src/helpers/ui
-D R1Neo
-D NRF52_POWER_MANAGEMENT
-D RADIO_CLASS=CustomSX1262
-D WRAPPER_CLASS=CustomSX1262Wrapper
-D LORA_TX_POWER=22
-D SX126X_CURRENT_LIMIT=140
-D SX126X_RX_BOOSTED_GAIN=1
-D PIN_BUZZER=3
-D PIN_USER_BTN=26
-D USER_BTN_PRESSED=HIGH
-D PIN_GPS_TX=25
-D PIN_GPS_RX=24
-D PIN_GPS_EN=33
build_src_filter = ${nrf52_base.build_src_filter}
+<../variants/muziworks_r1_neo>
+<helpers/ui/MomentaryButton.cpp>
+<helpers/ui/NullDisplayDriver.cpp>
+<helpers/sensors>
lib_deps =
${nrf52_base.lib_deps}
${sensor_base.lib_deps}
sparkfun/SparkFun u-blox GNSS Arduino Library@^2.2.27
[env:R1Neo_repeater]
extends = R1Neo
build_flags =
${R1Neo.build_flags}
-D ADVERT_NAME='"R1 Neo Repeater"'
-D ADVERT_LAT=0.0
-D ADVERT_LON=0.0
-D ADMIN_PASSWORD='"password"'
-D MAX_NEIGHBOURS=50
; -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1
build_src_filter = ${R1Neo.build_src_filter}
+<../examples/simple_repeater>
[env:R1Neo_room_server]
extends = R1Neo
build_flags =
${R1Neo.build_flags}
-D ADVERT_NAME='"R1 Neo Test Room"'
-D ADVERT_LAT=0.0
-D ADVERT_LON=0.0
-D ADMIN_PASSWORD='"password"'
-D ROOM_PASSWORD='"hello"'
; -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1
build_src_filter = ${R1Neo.build_src_filter}
+<../examples/simple_room_server>
[env:R1Neo_companion_radio_usb]
extends = R1Neo
board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld
board_upload.maximum_size = 712704
build_flags =
${R1Neo.build_flags}
-I examples/companion_radio/ui-orig
-D MAX_CONTACTS=350
-D MAX_GROUP_CHANNELS=40
; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1
; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1
build_src_filter = ${R1Neo.build_src_filter}
+<helpers/ui/buzzer.cpp>
+<../examples/companion_radio/*.cpp>
+<../examples/companion_radio/ui-orig/*.cpp>
lib_deps =
${R1Neo.lib_deps}
densaugeo/base64 @ ~1.4.0
end2endzone/NonBlockingRTTTL@^1.3.0
[env:R1Neo_companion_radio_ble]
extends = R1Neo
board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld
board_upload.maximum_size = 712704
build_flags =
${R1Neo.build_flags}
-I examples/companion_radio/ui-orig
-D ENV_INCLUDE_GPS=1
-D MAX_CONTACTS=350
-D MAX_GROUP_CHANNELS=40
-D BLE_PIN_CODE=123456
-D BLE_DEBUG_LOGGING=1
-D OFFLINE_QUEUE_SIZE=256
; -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1
build_src_filter = ${R1Neo.build_src_filter}
+<helpers/ui/buzzer.cpp>
+<helpers/nrf52/SerialBLEInterface.cpp>
+<../examples/companion_radio/*.cpp>
+<../examples/companion_radio/ui-orig/*.cpp>
lib_deps =
${R1Neo.lib_deps}
${rak4631.lib_deps}
densaugeo/base64 @ ~1.4.0
end2endzone/NonBlockingRTTTL@^1.3.0
[env:R1Neo_terminal_chat]
extends = R1Neo
build_flags =
${R1Neo.build_flags}
-D MAX_CONTACTS=100
-D MAX_GROUP_CHANNELS=1
; -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1
build_src_filter = ${R1Neo.build_src_filter}
+<../examples/simple_secure_chat/main.cpp>
lib_deps =
${R1Neo.lib_deps}
densaugeo/base64 @ ~1.4.0
[env:R1Neo_sensor]
extends = R1Neo
build_flags =
${R1Neo.build_flags}
-D DISPLAY_CLASS=SSD1306Display
-D ADVERT_NAME='"R1 Neo Sensor"'
-D ADVERT_LAT=0.0
-D ADVERT_LON=0.0
-D ADMIN_PASSWORD='"password"'
; -D MESH_PACKET_LOGGING=1
-D MESH_DEBUG=1
build_src_filter = ${R1Neo.build_src_filter}
+<../examples/simple_sensor>

View file

@ -0,0 +1,47 @@
#include <Arduino.h>
#include "target.h"
#include <helpers/ArduinoHelpers.h>
R1NeoBoard board;
DISPLAY_CLASS display;
RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BUSY, SPI);
WRAPPER_CLASS radio_driver(radio, board);
VolatileRTCClock fallback_clock;
AutoDiscoverRTCClock rtc_clock(fallback_clock);
#if ENV_INCLUDE_GPS
#include <helpers/sensors/MicroNMEALocationProvider.h>
MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock);
EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea);
#else
EnvironmentSensorManager sensors;
#endif
bool radio_init() {
rtc_clock.begin(Wire);
return radio.std_init(&SPI);
}
uint32_t radio_get_rng_seed() {
return radio.random(0x7FFFFFFF);
}
void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
radio.setFrequency(freq);
radio.setSpreadingFactor(sf);
radio.setBandwidth(bw);
radio.setCodingRate(cr);
}
void radio_set_tx_power(int8_t dbm) {
radio.setOutputPower(dbm);
}
mesh::LocalIdentity radio_new_identity() {
RadioNoiseListener rng(radio);
return mesh::LocalIdentity(&rng); // create new random identity
}

View file

@ -0,0 +1,22 @@
#pragma once
#define RADIOLIB_STATIC_ONLY 1
#include <RadioLib.h>
#include <helpers/radiolib/RadioLibWrappers.h>
#include <R1NeoBoard.h>
#include <helpers/radiolib/CustomSX1262Wrapper.h>
#include <helpers/AutoDiscoverRTCClock.h>
#include <helpers/sensors/EnvironmentSensorManager.h>
extern R1NeoBoard board;
extern WRAPPER_CLASS radio_driver;
extern AutoDiscoverRTCClock rtc_clock;
extern EnvironmentSensorManager sensors;
extern DISPLAY_CLASS display;
extern MomentaryButton user_btn;
bool radio_init();
uint32_t radio_get_rng_seed();
void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
void radio_set_tx_power(int8_t dbm);
mesh::LocalIdentity radio_new_identity();

View file

@ -0,0 +1,92 @@
/*
Copyright (c) 2014-2015 Arduino LLC. All right reserved.
Copyright (c) 2016 Sandeep Mistry All right reserved.
Copyright (c) 2018, Adafruit Industries (adafruit.com)
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "variant.h"
#include "wiring_constants.h"
#include "wiring_digital.h"
#include "nrf.h"
const uint32_t g_ADigitalPinMap[] =
{
// P0
0, // P0.00 (NC) (XTAL)
1, // P0.01 (NC) (XTAL)
2, // P0.02 (30) GPS_PPS
3, // P0.03 (29) BUZZER_DRIVE
4, // P0.04 (41) NC
5, // P0.05 (40) NC
6, // P0.06 (NC) NOT_PRESENT
7, // P0.07 (NC) (TRACECLK)
8, // P0.08 (NC) NOT_PRESENT
9, // P0.09 (13) NC
10, // P0.10 (12) NC
11, // P0.11 (NC) NOT_PRESENT
12, // P0.12 (NC) NOT_PRESENT
13, // P0.13 (04) DCDC_EN_MCU_HOLD
14, // P0.14 (05) NC
15, // P0.15 (06) NC
16, // P0.16 (07) NC
17, // P0.17 (08) NC
18, // P0.18 (17) !RESET
19, // P0.19 (09) RTC_SDA
20, // P0.20 (10) RTC_SCL
21, // P0.21 (11) NC
22, // P0.22 (NC) NOT_PRESENT
23, // P0.23 (NC) NOT_PRESENT
24, // P0.24 (23) UART_GPS_RX
25, // P0.25 (24) UART_GPS_TX
26, // P0.26 (26) BTN_OK/USR_BTN_PROCESSED
27, // P0.27 (NC) NOT_PRESENT
28, // P0.28 (31) BLU_LED_RAK
29, // P0.29 (32) SOFT_SHUTDOWN_SIGNAL
30, // P0.30 (33) MCU_SIGNAL
31, // P0.31 (39) ADC_VBAT
// P1
32, // P1.00 (NC) NOT_PRESENT
33, // P1.01 (25) GPS_EN
34, // P1.02 (26) BAT_CHG_STATUS
35, // P1.03 (27) NC
36, // P1.04 (28) GRN_LED_RAK
37, // P1.05 (SX) SX126X_POWER_EN
38, // P1.06 (SX) P_LORA_RESET
39, // P1.07 (NC) NOT_PRESENT
40, // P1.08 (NC) NOT_PRESENT
41, // P1.09 (NC) NOT_PRESENT
42, // P1.10 (SX) P_LORA_NSS
43, // P1.11 (SX) P_LORA_SCLK
44, // P1.12 (SX) P_LORA_MOSI
45, // P1.13 (SX) P_LORA_MISO
46, // P1.14 (SX) P_LORA_BUSY
47 // P1.15 (SX) P_LORA_DIO_1
};
void initVariant()
{
// Red & Green LEDs - enable & turn off
pinMode(LED_GREEN, OUTPUT);
ledOff(LED_GREEN);
pinMode(LED_BLUE, OUTPUT);
ledOff(LED_BLUE);
pinMode(PIN_GPS_EN, OUTPUT);
}

View file

@ -0,0 +1,183 @@
/*
Copyright (c) 2014-2015 Arduino LLC. All right reserved.
Copyright (c) 2016 Sandeep Mistry All right reserved.
Copyright (c) 2018, Adafruit Industries (adafruit.com)
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef _VARIANT_R1NEO_
#define _VARIANT_R1NEO_
#define RAK4630
/** Master clock frequency */
#define VARIANT_MCK (64000000ul)
#define USE_LFXO // Board uses 32khz crystal for LF
// define USE_LFRC // Board uses RC for LF
/*----------------------------------------------------------------------------
* Headers
*----------------------------------------------------------------------------*/
#include "WVariant.h"
#ifdef __cplusplus
extern "C"
{
#endif // __cplusplus
/* Number of pins defined in PinDescription array */
#define PINS_COUNT (48)
#define NUM_DIGITAL_PINS (48)
#define NUM_ANALOG_INPUTS (8)
#define NUM_ANALOG_OUTPUTS (0)
/* R1Neo peculiarities */
#define PIN_DCDC_EN_MCU_HOLD (13) // P0.13 (04) DCDC_EN_MCU_HOLD
#define PIN_SOFT_SHUTDOWN (29) // P0.29 (32) SOFT_SHUTDOWN_SIGNAL
#define PIN_MCU_SIGNAL (30) // P0.30 (33) MCU_SIGNAL
/* R1Neo LoRa Radio */
// RAK4630/4631 pins
#define P_LORA_DIO_1 (47) // P1.15 (SX)
#define P_LORA_NSS (42) // P1.10 (SX)
#define P_LORA_RESET RADIOLIB_NC // P1.06 (SX) -- 38
#define P_LORA_BUSY (46) // P1.14 (SX)
#define P_LORA_SCLK (43) // P1.11 (SX)
#define P_LORA_MISO (45) // P1.13 (SX)
#define P_LORA_MOSI (44) // P1.12 (SX)
#define SX126X_POWER_EN (37) // P1.05 (SX)
#define SX126X_DIO2_AS_RF_SWITCH true
#define SX126X_DIO3_TCXO_VOLTAGE 1.8
/* R1Neo peripherals */
/* GPS */
#define GPS_RX (24) // P0.24 (23) UART_GPS_RX
#define GPS_TX (25) // P0.25 (24) UART_GPS_TX
#define GPS_EN (33) // P1.01 (25) GPS_EN
#define GPS_PPS (2) // P0.02 (30) GPS_PPS
#define PIN_GPS_1PPS GPS_PPS
#define GPS_BAUD_RATE 9600
/* RTC */
#define RTC_SDA (19) // P0.19 (9) RTC_SDA
#define RTC_SCL (20) // P0.20 (10) RTC_SCL
/* LEDs */
#define LED_GREEN (36) // P1.04 (28) GRN_LED_RAK
#define LED_BLUE (28) // P0.28 (31) BLU_LED_RAK
#define LED_BUILTIN (0xFF)
#ifndef P_LORA_TX_LED
#define P_LORA_TX_LED LED_GREEN
#endif
#define LED_STATE_ON 1 // State when LED is lit
/* Buttons */
#define PIN_USER_BTN (26)
/* Buzzer */
#define PIN_BUZZER (3)
/* Analog pins */
// Arduino makes me angry
#define PIN_A0 (0xFF) // NOT_PRESENT
#define PIN_A1 (0xFF) // NOT_PRESENT
#define PIN_A2 (4) // P0.04 (41) NC
#define PIN_A3 (5) // P0.05 (40) NC
#define PIN_A4 (0xFF) // NOT_PRESENT
#define PIN_A5 (0xFF) // NOT_PRESENT
#define PIN_A6 (0xFF) // NOT_PRESENT
#define PIN_A7 (31) // P0.31 (39) ADC_VBAT
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;
static const uint8_t A4 = PIN_A4;
static const uint8_t A5 = PIN_A5;
static const uint8_t A6 = PIN_A6;
static const uint8_t A7 = PIN_A7;
#define ADC_RESOLUTION 14
// Other pins
#define PIN_AREF (0xFF) // No analog reference
static const uint8_t AREF = PIN_AREF;
/* Serial interfaces */
#define PIN_GPS_TX (GPS_TX)
#define PIN_GPS_RX (GPS_RX)
#define PIN_GPS_EN (GPS_EN)
#define PIN_SERIAL1_TX (PIN_GPS_TX)
#define PIN_SERIAL1_RX (PIN_GPS_RX)
/* SPI Interfaces */
// unused pins - define anyways
#define SPI_INTERFACES_COUNT 1
#define PIN_SPI_MOSI (9) // P0.09 (13) NC
#define PIN_SPI_MISO (10) // P0.10 (12) NC
#define PIN_SPI_SCK (21) // P0.21 (11) NC
/* I2C Interfaces */
#define WIRE_INTERFACES_COUNT 1
#define PIN_WIRE_SDA (RTC_SDA)
#define PIN_WIRE_SCL (RTC_SCL)
/* QSPI Pins */
// interface occupied by peripherals, define anyways
#define PIN_QSPI_SCK (3) // P0.03 (29) BUZZER
#define PIN_QSPI_CS (26) // P0.26 (34) USER_BUTTON
#define PIN_QSPI_IO0 (30) // P0.30 (33) MCU_SIGNAL
#define PIN_QSPI_IO1 (29) // P0.29 (32) SOFT_SHUTDOWN
#define PIN_QSPI_IO2 (28) // P0.28 (31) BLU_LED_RAK
#define PIN_QSPI_IO3 (2) // P0.02 (30) GPS_PPS
/* On-board QSPI Flash */
// No QSPI (define anyways)
#define EXTERNAL_FLASH_DEVICES IS25LP080D
#define EXTERNAL_FLASH_USE_QSPI
/* Battery */
#define PIN_VBAT_READ (31) // P0.31 (39) ADC_VBAT
#define PIN_BAT_CHG (34) // P1.02 (26) BAT_CHG_STATUS
#define ADC_MULTIPLIER (3 * 1.73 * 1.187 * 1000)
// Power management boot protection threshold (millivolts)
// Set to 0 to disable boot protection
// disabled for now until I can figure this out
#define PWRMGT_VOLTAGE_BOOTLOCK 0 // Won't boot below this voltage (mV)
// LPCOMP wake configuration (voltage recovery from SYSTEMOFF)
// AIN3 = P0.05 = PIN_A0 / PIN_VBAT_READ
#define PWRMGT_LPCOMP_AIN 5
#define PWRMGT_LPCOMP_REFSEL 4 // 5/8 VDD (~3.13-3.44V)
#ifdef __cplusplus
}
#endif
/*----------------------------------------------------------------------------
* Arduino objects - C++ only
*----------------------------------------------------------------------------*/
#endif

View file

@ -20,6 +20,7 @@ build_flags = ${nrf52_base.build_flags}
-D LORA_TX_POWER=22
-D SX126X_CURRENT_LIMIT=140
-D SX126X_RX_BOOSTED_GAIN=1
-D ENV_INCLUDE_RAK12035=1
build_src_filter = ${nrf52_base.build_src_filter}
+<../variants/rak4631>
+<helpers/sensors>