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

Merge pull request #9492 from meshtastic/master

Browse Source 
Master to develop
This commit is contained in:
Ben Meadors
2026-01-30 10:46:11 -06:00
committed by GitHub
co-authored by GitHub
parent 5dd06edd00 4cf01e7e53
commit c19fc62683
12 changed files with 44 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
variants/esp32s3/tlora-pager/platformio.ini
+1 -1
View File
@@ -45,7 +45,7 @@ lib_deps = ${esp32s3_base.lib_deps}
# renovate: datasource=custom.pio depName=SensorLib packageName=lewisxhe/library/SensorLib
lewisxhe/SensorLib@0.3.4
# renovate: datasource=github-tags depName=pschatzmann_arduino-audio-driver packageName=pschatzmann/arduino-audio-driver
https://github.com/pschatzmann/arduino-audio-driver/archive/v0.2.0.zip
https://github.com/pschatzmann/arduino-audio-driver/archive/v0.2.1.zip
# TODO renovate
https://github.com/mverch67/BQ27220/archive/07d92be846abd8a0258a50c23198dac0858b22ed.zip
# TODO renovate
variants/nrf52840/ELECROW-ThinkNode-M3/platformio.ini
+1 -1
View File
@@ -25,4 +25,4 @@ lib_deps =
# renovate: datasource=custom.pio depName=nRF52_PWM packageName=khoih-prog/library/nRF52_PWM
khoih-prog/nRF52_PWM@1.0.1
; # renovate: datasource=custom.pio depName=SensorLib packageName=lewisxhe/library/SensorLib
; lewisxhe/SensorLib@0.3.4
lewisxhe/SensorLib@0.3.4
variants/nrf52840/ELECROW-ThinkNode-M3/variant.h
+2 -2
View File
@@ -115,8 +115,8 @@ extern "C" {
#define SERIAL_PRINT_PORT 0
// PCF8563 RTC Module
// REVISIT https://github.com/meshtastic/firmware/pull/9084
// #define PCF8563_RTC 0x51
#define PCF8563_RTC 0x51
#define HAS_RTC 1
#ifdef __cplusplus
}
variants/nrf52840/ELECROW-ThinkNode-M6/platformio.ini
+1 -1
View File
@@ -22,4 +22,4 @@ build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/ELECROW
lib_deps =
${nrf52840_base.lib_deps}
; # renovate: datasource=custom.pio depName=SensorLib packageName=lewisxhe/library/SensorLib
; lewisxhe/SensorLib@0.3.4
lewisxhe/SensorLib@0.3.4
variants/nrf52840/ELECROW-ThinkNode-M6/variant.cpp
+1 -1
View File
@@ -48,7 +48,7 @@ void variant_shutdown()
// This sets the pin to OUTPUT and LOW for the pins *not* in the if block.
for (int pin = 0; pin < 48; pin++) {
if (pin == PIN_GPS_EN || pin == ADC_CTRL || pin == PIN_BUTTON1 || pin == PIN_SPI_MISO || pin == PIN_SPI_MOSI ||
pin == PIN_SPI_SCK) {
pin == PIN_SPI_SCK || pin == SX126X_CS || pin == SX126X_RESET || pin == SX126X_BUSY || pin == SX126X_DIO1) {
continue;
}
pinMode(pin, OUTPUT);
variants/nrf52840/ELECROW-ThinkNode-M6/variant.h
+2 -2
View File
@@ -120,8 +120,8 @@ static const uint8_t A0 = PIN_A0;
#define PIN_SERIAL2_TX (24)
// PCF8563 RTC Module
// REVISIT https://github.com/meshtastic/firmware/pull/9084
// #define PCF8563_RTC 0x51
#define PCF8563_RTC 0x51
#define HAS_RTC 1
// SPI
#define SPI_INTERFACES_COUNT 1
variants/nrf52840/rak4631/variant.h
+5 -1
View File
@@ -248,9 +248,13 @@ SO GPIO 39/TXEN MAY NOT BE DEFINED FOR SUCCESSFUL OPERATION OF THE SX1262 - TG
#define RV3028_RTC (uint8_t)0b1010010
// RAK18001 Buzzer in Slot C
// #define PIN_BUZZER 21 // IO3 is PWM2
#define PIN_BUZZER 21 // IO3 is PWM2
// NEW: set this via protobuf instead!
// RAK4631 custom ringtone
#undef USERPREFS_RINGTONE_RTTTL
#define USERPREFS_RINGTONE_RTTTL "Rak:d=32,o=5,b=200:b7,p,b7,4p,p"
// Battery
// The battery sense is hooked to pin A0 (5)
#define BATTERY_PIN PIN_A0