rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2026-01-28 20:52:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Ben Meadors
2025-12-09 05:59:15 -06:00
parent ae8d3fbb3d 042543eb25
commit 8e63dcf59a
12 changed files with 33 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/platform/nrf52/architecture.h
View File

@@ -109,7 +109,7 @@
#elif defined(HELTEC_MESH_SOLAR)
#define HW_VENDOR meshtastic_HardwareModel_HELTEC_MESH_SOLAR
#elif defined(MUZI_BASE)
#define HW_VENDOR meshtastic_HardwareModel_RESERVED_FRIED_CHICKEN
#define HW_VENDOR meshtastic_HardwareModel_MUZI_BASE
#else
#define HW_VENDOR meshtastic_HardwareModel_NRF52_UNKNOWN
#endif

10
src/platform/nrf52/main-nrf52.cpp
View File

@@ -335,6 +335,16 @@ void cpuDeepSleep(uint32_t msecToWake)
if (Serial1) // A straightforward solution to the wake from deepsleep problem
Serial1.end();
#endif
#ifdef TTGO_T_ECHO
// To power off the T-Echo, the display must be set
// as an input pin; otherwise, there will be leakage current.
pinMode(PIN_EINK_CS, INPUT);
pinMode(PIN_EINK_DC, INPUT);
pinMode(PIN_EINK_RES, INPUT);
pinMode(PIN_EINK_BUSY, INPUT);
#endif
setBluetoothEnable(false);
#ifdef RAK4630