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

stm32wl: add hardware RTC support (rak3172) (#10961)

Browse Source 
* stm32wl: add hardware RTC support infrastructure

Wires the STM32WL chip's internal RTC (running off the LSE 32.768kHz
crystal) into meshtastic's existing time-of-day framework
(perhapsSetRTC()/readFromRTC()), following the same pattern already
used for I2C RTC chips (RV3028, PCF8563/85063, RX8130CE).

LSE is started and polled manually before ever calling into the
STM32RTC library, with our own bounded timeout - the library's own
internal LSE startup path has no bounded fallback and hangs forever
via Error_Handler() if the crystal never locks, so this is required
for a board with a missing/faulty crystal to boot normally rather
than hang.

Gated behind a new HAS_LSE variant flag (currently unset everywhere,
so this is inert until a variant opts in - see follow-up commit).

Signed-off-by: Andrew Yong <me@ndoo.sg>
Assisted-by: Claude Sonnet 5 <noreply@anthropic.com>

* gps: qualify RTC.h includes to avoid case-insensitive filesystem collision with STM32RTC

The stm32duino STM32RTC library (added to lib_deps in a follow-up
commit) ships its own src/rtc.h. On case-insensitive filesystems
(the macOS default), an unqualified #include "RTC.h"/<RTC.h> from
any file outside src/gps/ resolves to the library's rtc.h instead of
src/gps/RTC.h, since PlatformIO's LDF puts lib_deps include paths
ahead of the project's own -Isrc/gps.

Qualify every include as gps/RTC.h so it can't collide with any
same-named header a future dependency might ship, regardless of
filesystem case sensitivity. Purely mechanical, no behavior change.

Signed-off-by: Andrew Yong <me@ndoo.sg>
Assisted-by: Claude Sonnet 5 <noreply@anthropic.com>

* stm32wl(rak3172): enable hardware RTC support

Opts rak3172 into the HAS_LSE infrastructure added previously: sets
STM32WL_LSE_DRIVE to a conservative default and pulls in the
STM32RTC library. rak3172 has ~63KB flash headroom going in;
build-verified at 76.7% flash usage after this change (up from a
73.8% baseline), well within budget.

wio-e5 is not opted in here despite sharing the same STM32WLE5 chip
- it's already at 96.8% flash usage today (GPS + I2C sensor support
compiled in, unlike rak3172), leaving too little headroom to safely
add STM32RTC without first trimming something else.

Signed-off-by: Andrew Yong <me@ndoo.sg>
Assisted-by: Claude Sonnet 5 <noreply@anthropic.com>

* stm32wl: add docstrings for LSE/RTC setup functions

Addresses CodeRabbit's docstring coverage check on PR #10961.

Signed-off-by: Andrew Yong <me@ndoo.sg>
Assisted-by: Claude Sonnet 5 <noreply@anthropic.com>

* stm32wl: address CodeRabbit nitpicks on PR #10961

- Brace the single-statement HAS_LSE branch in perhapsSetRTC() to
  match the sibling readFromRTC() branch's style.
- Quote the RTC.h include in PhoneAPI.cpp for consistency with every
  other qualified include site.

Signed-off-by: Andrew Yong <me@ndoo.sg>
Assisted-by: Claude Sonnet 5 <noreply@anthropic.com>

---------

Signed-off-by: Andrew Yong <me@ndoo.sg>
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
This commit is contained in:
Andrew Yong
2026-07-16 19:00:45 -05:00
committed by GitHub
co-authored by GitHub Ben Meadors
parent cf0cb9087a
commit b71c1adb26
53 changed files with 167 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/RedirectablePrint.cpp
+1 -1
View File
@@ -1,8 +1,8 @@
#include "RedirectablePrint.h"
#include "NodeDB.h"
#include "RTC.h"
#include "concurrency/OSThread.h"
#include "configuration.h"
#include "gps/RTC.h"
#include "main.h"
#include "memGet.h"
#include "mesh/generated/meshtastic/mesh.pb.h"
src/gps/GPS.cpp
+1 -1
View File
@@ -8,10 +8,10 @@
#include "GpioLogic.h"
#include "NodeDB.h"
#include "PowerMon.h"
#include "RTC.h"
#include "Throttle.h"
#include "buzz.h"
#include "concurrency/Periodic.h"
#include "gps/RTC.h"
#include "meshUtils.h"
#include "main.h" // pmu_found
src/gps/NMEAWPL.cpp
+1 -1
View File
@@ -1,7 +1,7 @@
#if !MESHTASTIC_EXCLUDE_GPS
#include "NMEAWPL.h"
#include "GeoCoord.h"
#include "RTC.h"
#include "gps/RTC.h"
#include <time.h>
/* -------------------------------------------
src/gps/RTC.cpp
+33 -1
View File
@@ -1,4 +1,4 @@
#include "RTC.h"
#include "gps/RTC.h"
#include "configuration.h"
#include "detect/ScanI2C.h"
#include "main.h"
@@ -7,6 +7,10 @@
#include <sys/time.h>
#include <time.h>
#if HAS_LSE
#include <STM32RTC.h>
#endif
static RTCQuality currentQuality = RTCQualityNone;
uint32_t lastSetFromPhoneNtpOrGps = 0;
@@ -211,6 +215,30 @@ RTCSetResult readFromRTC()
return RTCSetResultSuccess;
}
}
#elif HAS_LSE
if (stm32wlRtcAvailable()) {
uint32_t now = millis();
tv.tv_sec = STM32RTC::getInstance().getEpoch();
tv.tv_usec = 0;
uint32_t printableEpoch = tv.tv_sec; // Print lib only supports 32 bit but time_t can be 64 bit on some platforms
#ifdef BUILD_EPOCH
if (tv.tv_sec < BUILD_EPOCH) {
if (Throttle::isWithinTimespanMs(lastTimeValidationWarning, TIME_VALIDATION_WARNING_INTERVAL_MS) == false) {
LOG_WARN("Ignore time (%ld) before build epoch (%ld)!", printableEpoch, BUILD_EPOCH);
lastTimeValidationWarning = millis();
}
return RTCSetResultInvalidTime;
}
#endif
if (currentQuality == RTCQualityNone) {
RTCQuality oldQuality = currentQuality;
timeStartMsec = now;
zeroOffsetSecs = tv.tv_sec;
currentQuality = RTCQualityDevice;
triggerNodeInfoCheckOnTimeSource(oldQuality, currentQuality);
}
return RTCSetResultSuccess;
}
#else
return readFromSystemTimeFallback();
#endif
@@ -335,6 +363,10 @@ RTCSetResult perhapsSetRTC(RTCQuality q, const struct timeval *tv, bool forceUpd
LOG_WARN("Failed to set time for RX8130CE");
}
}
#elif HAS_LSE
if (stm32wlRtcAvailable()) {
STM32RTC::getInstance().setEpoch(tv->tv_sec);
}
#elif defined(ARCH_ESP32) || defined(ARCH_RP2040)
settimeofday(tv, NULL);
#endif
src/gps/RTC.h
+5
View File
@@ -8,6 +8,11 @@
#include <ArtronShop_RX8130CE.h>
#endif
#if HAS_LSE
// True once the STM32WL LSE crystal has locked and the hardware RTC is running (see stm32wlSetup()).
bool stm32wlRtcAvailable();
#endif
enum RTCQuality {
/// We haven't had our RTC set yet
src/graphics/SharedUIDisplay.cpp
+1 -1
View File
@@ -3,8 +3,8 @@
#include "MeshService.h"
#include "NodeDB.h"
#include "Power.h"
#include "RTC.h"
#include "draw/NodeListRenderer.h"
#include "gps/RTC.h"
#include "graphics/ScreenFonts.h"
#include "graphics/SharedUIDisplay.h"
#include "graphics/TFTColorRegions.h"
src/graphics/draw/UIRenderer.cpp
+1 -1
View File
@@ -24,8 +24,8 @@
#include "main.h"
#include "target_specific.h"
#include <OLEDDisplay.h>
#include <RTC.h>
#include <cstring>
#include <gps/RTC.h>
// External variables
extern graphics::Screen *screen;
src/graphics/niche/InkHUD/Applet.cpp
+1 -1
View File
@@ -6,7 +6,7 @@
#include "main.h"
#include "RTC.h"
#include "gps/RTC.h"
using namespace NicheGraphics;
src/graphics/niche/InkHUD/Applets/Bases/NodeList/NodeListApplet.cpp
+1 -1
View File
@@ -1,6 +1,6 @@
#ifdef MESHTASTIC_INCLUDE_INKHUD
#include "RTC.h"
#include "gps/RTC.h"
#include "GeoCoord.h"
#include "NodeDB.h"
src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.cpp
+1 -1
View File
@@ -8,9 +8,9 @@
#include "MeshService.h"
#include "MessageStore.h"
#include "Power.h"
#include "RTC.h"
#include "Router.h"
#include "airtime.h"
#include "gps/RTC.h"
#include "graphics/niche/InkHUD/Applets/Bases/Map/MapApplet.h"
#include "graphics/niche/Utils/FlashData.h"
#include "main.h"
src/graphics/niche/InkHUD/Applets/System/Notification/NotificationApplet.cpp
+1 -1
View File
@@ -9,7 +9,7 @@
#include "meshUtils.h"
#include "modules/TextMessageModule.h"
#include "RTC.h"
#include "gps/RTC.h"
using namespace NicheGraphics;
src/graphics/niche/InkHUD/Applets/User/Heard/HeardApplet.cpp
+1 -1
View File
@@ -1,6 +1,6 @@
#ifdef MESHTASTIC_INCLUDE_INKHUD
#include "RTC.h"
#include "gps/RTC.h"
#include "gps/GeoCoord.h"
src/graphics/niche/InkHUD/Applets/User/RecentsList/RecentsListApplet.cpp
+1 -1
View File
@@ -2,7 +2,7 @@
#include "./RecentsListApplet.h"
#include "RTC.h"
#include "gps/RTC.h"
using namespace NicheGraphics;
src/graphics/niche/InkHUD/Applets/User/ThreadedMessage/ThreadedMessageApplet.cpp
+1 -1
View File
@@ -2,7 +2,7 @@
#include "./ThreadedMessageApplet.h"
#include "RTC.h"
#include "gps/RTC.h"
#include "mesh/NodeDB.h"
using namespace NicheGraphics;
src/graphics/niche/InkHUD/Events.cpp
+1 -1
View File
@@ -4,8 +4,8 @@
#include "MessageStore.h"
#include "PowerFSM.h"
#include "RTC.h"
#include "buzz.h"
#include "gps/RTC.h"
#include "modules/ExternalNotificationModule.h"
#include "modules/TextMessageModule.h"
#include "sleep.h"
src/main.cpp
+5 -1
View File
@@ -22,13 +22,13 @@
#include "FSCommon.h"
#include "Power.h"
#include "RTC.h"
#include "SPILock.h"
#include "Throttle.h"
#include "concurrency/OSThread.h"
#include "concurrency/Periodic.h"
#include "detect/ScanI2C.h"
#include "error.h"
#include "gps/RTC.h"
#if !MESHTASTIC_EXCLUDE_I2C
#include "detect/ScanI2CConsumer.h"
@@ -816,6 +816,10 @@ void setup()
rp2040Setup();
#endif
#ifdef ARCH_STM32WL
stm32wlSetup();
#endif
// We do this as early as possible because this loads preferences from flash
// but we need to do this after main cpu init (esp32setup), because we need the random seed set
nodeDB = new NodeDB;
src/main.h
+2 -1
View File
@@ -113,7 +113,8 @@ extern bool runASAP;
extern bool pauseBluetoothLogging;
void nrf52Setup(), esp32Setup(), nrf52Loop(), esp32Loop(), rp2040Setup(), rp2040Loop(), clearBonds(), enterDfuMode();
void nrf52Setup(), esp32Setup(), nrf52Loop(), esp32Loop(), rp2040Setup(), rp2040Loop(), clearBonds(), enterDfuMode(),
stm32wlSetup();
#ifdef ARCH_ESP32
void esp32ReleaseBluetoothMemoryIfUnused();
#endif
src/mesh/MeshService.cpp
+1 -1
View File
@@ -11,8 +11,8 @@
#include "NodeDB.h"
#include "Power.h"
#include "PowerFSM.h"
#include "RTC.h"
#include "TypeConversions.h"
#include "gps/RTC.h"
#include "graphics/draw/MessageRenderer.h"
#include "main.h"
#include "mesh-pb-constants.h"
src/mesh/NodeDB.cpp
+1 -1
View File
@@ -13,7 +13,6 @@
#include "NodeDB.h"
#include "PacketHistory.h"
#include "PowerFSM.h"
#include "RTC.h"
#include "RadioInterface.h"
#include "Router.h"
#include "SPILock.h"
@@ -21,6 +20,7 @@
#include "TransmitHistory.h"
#include "TypeConversions.h"
#include "error.h"
#include "gps/RTC.h"
#include "main.h"
#include "memory/MemAudit.h"
#include "mesh-pb-constants.h"
src/mesh/PhoneAPI.cpp
+1 -1
View File
@@ -38,7 +38,7 @@
#include "mqtt/MQTT.h"
#endif
#include "Throttle.h"
#include <RTC.h>
#include "gps/RTC.h"
namespace
{
src/mesh/Router.cpp
+1 -1
View File
@@ -5,7 +5,7 @@
#include "MeshService.h"
#include "NodeDB.h"
#include "PositionPrecision.h"
#include "RTC.h"
#include "gps/RTC.h"
#include "configuration.h"
#include "main.h"
src/mesh/StreamAPI.cpp
+1 -1
View File
@@ -1,9 +1,9 @@
#include "StreamAPI.h"
#include "PowerFSM.h"
#include "RTC.h"
#include "Throttle.h"
#include "concurrency/LockGuard.h"
#include "configuration.h"
#include "gps/RTC.h"
#define START1 0x94
#define START2 0xc3
src/mesh/TransmitHistory.cpp
+1 -1
View File
@@ -1,7 +1,7 @@
#include "TransmitHistory.h"
#include "FSCommon.h"
#include "RTC.h"
#include "SPILock.h"
#include "gps/RTC.h"
#include <Throttle.h>
#ifdef FSCom
src/mesh/eth/ethClient.cpp
+1 -1
View File
@@ -1,8 +1,8 @@
#include "mesh/eth/ethClient.h"
#include "NodeDB.h"
#include "RTC.h"
#include "concurrency/Periodic.h"
#include "configuration.h"
#include "gps/RTC.h"
#include "main.h"
#include "mesh/api/ethServerAPI.h"
#include "target_specific.h"
src/mesh/wifi/WiFiAPClient.cpp
+1 -1
View File
@@ -1,8 +1,8 @@
#include "configuration.h"
#if HAS_WIFI
#include "NodeDB.h"
#include "RTC.h"
#include "concurrency/Periodic.h"
#include "gps/RTC.h"
#include "mesh/wifi/WiFiAPClient.h"
#include "main.h"
src/modules/AdminModule.cpp
+1 -1
View File
@@ -5,8 +5,8 @@
#include "NodeDB.h"
#include "PositionPrecision.h"
#include "PowerFSM.h"
#include "RTC.h"
#include "SPILock.h"
#include "gps/RTC.h"
#include "input/InputBroker.h"
#include "meshUtils.h"
#include <FSCommon.h>
src/modules/ExternalNotificationModule.cpp
+1 -1
View File
@@ -16,10 +16,10 @@
#include "ExternalNotificationModule.h"
#include "MeshService.h"
#include "NodeDB.h"
#include "RTC.h"
#include "Router.h"
#include "buzz/buzz.h"
#include "configuration.h"
#include "gps/RTC.h"
#include "main.h"
#include "mesh/generated/meshtastic/rtttl.pb.h"
#include <Arduino.h>
src/modules/KeyVerificationModule.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
#include "CryptoEngine.h"
#include "HardwareRNG.h"
#include "MeshService.h"
#include "RTC.h"
#include "gps/RTC.h"
#include "graphics/draw/MenuHandler.h"
#include "main.h"
#include "meshUtils.h"
src/modules/MeshBeaconModule.cpp
+1 -1
View File
@@ -2,11 +2,11 @@
#include "Default.h"
#include "DisplayFormatters.h"
#include "NodeDB.h"
#include "RTC.h"
#include "RadioInterface.h"
#include "Router.h"
#include "TransmitHistory.h"
#include "configuration.h"
#include "gps/RTC.h"
#include "main.h"
#include <Throttle.h>
#include <string.h>
src/modules/NeighborInfoModule.cpp
+1 -1
View File
@@ -2,7 +2,7 @@
#include "Default.h"
#include "MeshService.h"
#include "NodeDB.h"
#include "RTC.h"
#include "gps/RTC.h"
#include <Throttle.h>
NeighborInfoModule *neighborInfoModule;
src/modules/NodeInfoModule.cpp
+1 -1
View File
@@ -3,10 +3,10 @@
#include "MeshService.h"
#include "NodeDB.h"
#include "NodeStatus.h"
#include "RTC.h"
#include "Router.h"
#include "TransmitHistory.h"
#include "configuration.h"
#include "gps/RTC.h"
#include "main.h"
#include <Throttle.h>
#include <algorithm>
src/modules/PositionModule.cpp
+1 -1
View File
@@ -5,13 +5,13 @@
#include "MeshService.h"
#include "NodeDB.h"
#include "PositionPrecision.h"
#include "RTC.h"
#include "Router.h"
#include "TransmitHistory.h"
#include "TypeConversions.h"
#include "airtime.h"
#include "configuration.h"
#include "gps/GeoCoord.h"
#include "gps/RTC.h"
#include "main.h"
#include "meshUtils.h"
#include "meshtastic/atak.pb.h"
src/modules/PowerStressModule.cpp
+1 -1
View File
@@ -2,9 +2,9 @@
#include "MeshService.h"
#include "NodeDB.h"
#include "PowerMon.h"
#include "RTC.h"
#include "Router.h"
#include "configuration.h"
#include "gps/RTC.h"
#include "main.h"
#include "sleep.h"
#include "target_specific.h"
src/modules/RangeTestModule.cpp
+1 -1
View File
@@ -13,12 +13,12 @@
#include "MeshService.h"
#include "NodeDB.h"
#include "PowerFSM.h"
#include "RTC.h"
#include "Router.h"
#include "SPILock.h"
#include "airtime.h"
#include "configuration.h"
#include "gps/GeoCoord.h"
#include "gps/RTC.h"
#include <Arduino.h>
#include <Throttle.h>
src/modules/RemoteHardwareModule.cpp
+1 -1
View File
@@ -1,9 +1,9 @@
#include "RemoteHardwareModule.h"
#include "MeshService.h"
#include "NodeDB.h"
#include "RTC.h"
#include "Router.h"
#include "configuration.h"
#include "gps/RTC.h"
#include "main.h"
#include <Throttle.h>
src/modules/SerialModule.cpp
+1 -1
View File
@@ -3,9 +3,9 @@
#include "MeshService.h"
#include "NMEAWPL.h"
#include "NodeDB.h"
#include "RTC.h"
#include "Router.h"
#include "configuration.h"
#include "gps/RTC.h"
#include <Arduino.h>
#include <Throttle.h>
src/modules/StoreForwardModule.cpp
+1 -1
View File
@@ -15,11 +15,11 @@
#include "StoreForwardModule.h"
#include "MeshService.h"
#include "NodeDB.h"
#include "RTC.h"
#include "Router.h"
#include "Throttle.h"
#include "airtime.h"
#include "configuration.h"
#include "gps/RTC.h"
#include "memGet.h"
#include "mesh-pb-constants.h"
#include "mesh/generated/meshtastic/storeforward.pb.h"
src/modules/Telemetry/AirQualityTelemetry.cpp
+1 -1
View File
@@ -9,11 +9,11 @@
#include "MeshService.h"
#include "NodeDB.h"
#include "PowerFSM.h"
#include "RTC.h"
#include "Router.h"
#include "TransmitHistory.h"
#include "UnitConversions.h"
#include "detect/ScanI2CTwoWire.h"
#include "gps/RTC.h"
#include "graphics/ScreenFonts.h"
#include "graphics/SharedUIDisplay.h"
#include "graphics/images.h"
src/modules/Telemetry/DeviceTelemetry.cpp
+1 -1
View File
@@ -4,11 +4,11 @@
#include "MeshService.h"
#include "NodeDB.h"
#include "PowerFSM.h"
#include "RTC.h"
#include "RadioLibInterface.h"
#include "Router.h"
#include "TransmitHistory.h"
#include "configuration.h"
#include "gps/RTC.h"
#include "main.h"
#include "memGet.h"
#include <OLEDDisplay.h>
src/modules/Telemetry/EnvironmentTelemetry.cpp
+1 -1
View File
@@ -9,11 +9,11 @@
#include "NodeDB.h"
#include "Power.h"
#include "PowerFSM.h"
#include "RTC.h"
#include "Router.h"
#include "TransmitHistory.h"
#include "UnitConversions.h"
#include "buzz.h"
#include "gps/RTC.h"
#include "graphics/SharedUIDisplay.h"
#include "graphics/images.h"
#include "main.h"
src/modules/Telemetry/HealthTelemetry.cpp
+1 -1
View File
@@ -9,10 +9,10 @@
#include "NodeDB.h"
#include "Power.h"
#include "PowerFSM.h"
#include "RTC.h"
#include "Router.h"
#include "TransmitHistory.h"
#include "UnitConversions.h"
#include "gps/RTC.h"
#include "main.h"
#include "sleep.h"
#include "target_specific.h"
src/modules/Telemetry/PowerTelemetry.cpp
+1 -1
View File
@@ -9,9 +9,9 @@
#include "Power.h"
#include "PowerFSM.h"
#include "PowerTelemetry.h"
#include "RTC.h"
#include "Router.h"
#include "TransmitHistory.h"
#include "gps/RTC.h"
#include "graphics/SharedUIDisplay.h"
#include "main.h"
#include "sleep.h"
src/modules/Telemetry/Sensor/PMSA003ISensor.h
+1 -1
View File
@@ -4,8 +4,8 @@
#include "../detect/ReClockI2C.h"
#include "../mesh/generated/meshtastic/telemetry.pb.h"
#include "RTC.h"
#include "TelemetrySensor.h"
#include "gps/RTC.h"
#define PMSA003I_I2C_CLOCK_SPEED 100000
#define PMSA003I_FRAME_LENGTH 32
src/modules/Telemetry/Sensor/SCD4XSensor.h
+1 -1
View File
@@ -4,8 +4,8 @@
#include "../detect/ReClockI2C.h"
#include "../mesh/generated/meshtastic/telemetry.pb.h"
#include "RTC.h"
#include "TelemetrySensor.h"
#include "gps/RTC.h"
#include <SensirionI2cScd4x.h>
// Max speed 400kHz
src/modules/Telemetry/Sensor/SEN5XSensor.h
+1 -1
View File
@@ -4,9 +4,9 @@
#include "../detect/ReClockI2C.h"
#include "../mesh/generated/meshtastic/telemetry.pb.h"
#include "RTC.h"
#include "TelemetrySensor.h"
#include "Wire.h"
#include "gps/RTC.h"
// Warm up times for SEN5X from the datasheet
#ifndef SEN5X_WARMUP_MS_1
src/modules/Telemetry/Sensor/SFA30Sensor.h
+1 -1
View File
@@ -4,8 +4,8 @@
#include "../detect/ReClockI2C.h"
#include "../mesh/generated/meshtastic/telemetry.pb.h"
#include "RTC.h"
#include "TelemetrySensor.h"
#include "gps/RTC.h"
#include <SensirionI2cSfa3x.h>
#define SFA30_I2C_CLOCK_SPEED 100000
src/modules/esp32/AudioModule.cpp
+1 -1
View File
@@ -4,8 +4,8 @@
#include "FSCommon.h"
#include "MeshService.h"
#include "NodeDB.h"
#include "RTC.h"
#include "Router.h"
#include "gps/RTC.h"
/*
AudioModule
src/mqtt/MQTT.cpp
+1 -1
View File
@@ -38,7 +38,7 @@
#include <machine/endian.h>
#define ntohl __ntohl
#endif
#include <RTC.h>
#include <gps/RTC.h>
MQTT *mqtt;
src/platform/stm32wl/architecture.h
+16
View File
@@ -16,6 +16,22 @@
#ifndef HAS_WIRE
#define HAS_WIRE 1
#endif
#ifndef HAS_LSE
#define HAS_LSE 0
#endif
// How long to wait for the LSE 32.768kHz crystal to lock before giving up on hardware RTC support.
// Override in a variant's variant.h if that board's crystal needs longer to stabilize.
#ifndef STM32WL_LSE_TIMEOUT_MS
#define STM32WL_LSE_TIMEOUT_MS 2000
#endif
// A variant that sets HAS_LSE must also define STM32WL_LSE_DRIVE - catch that mistake here, not as a confusing
// HAL compile error deep in main-stm32wl.cpp.
#if HAS_LSE && !defined(STM32WL_LSE_DRIVE)
#error \
"HAS_LSE is set but STM32WL_LSE_DRIVE is not defined - set it in the variant's variant.h to one of RCC_LSEDRIVE_LOW/MEDIUMLOW/MEDIUMHIGH/HIGH"
#endif
//
// set HW_VENDOR
src/platform/stm32wl/main-stm32wl.cpp
+53 -1
View File
@@ -1,10 +1,21 @@
#include "RTC.h"
#include "configuration.h"
#include "gps/RTC.h"
#include <Throttle.h>
#include <cstring>
#include <stdarg.h>
#include <stm32wle5xx.h>
#include <stm32wlxx_hal.h>
#if HAS_LSE
#include <STM32RTC.h>
// LSEDRV is a 2-bit RCC_BDCR field where every combination is a legal drive level, so this covers all 4 values.
static_assert((STM32WL_LSE_DRIVE & ~RCC_LSEDRIVE_HIGH) == 0,
"STM32WL_LSE_DRIVE must be one of RCC_LSEDRIVE_LOW/MEDIUMLOW/MEDIUMHIGH/HIGH");
static bool stm32wlRtcValid = false;
#endif
// ─── Bootloader redirect ──────────────────────────────────────────────────────
//
// Why .noinit + constructor instead of TAMP backup registers:
@@ -86,6 +97,47 @@ bool getDeviceId(uint8_t *deviceId)
return true;
}
#if HAS_LSE
// Starts the LSE crystal with a bounded timeout and, if it locks, brings up the STM32 hardware RTC on it.
void stm32wlSetup()
{
HAL_PWR_EnableBkUpAccess();
__HAL_RCC_LSEDRIVE_CONFIG(STM32WL_LSE_DRIVE);
__HAL_RCC_LSE_CONFIG(RCC_LSE_ON);
uint32_t start = millis();
bool lseReady = false;
while (Throttle::isWithinTimespanMs(start, STM32WL_LSE_TIMEOUT_MS)) {
if (__HAL_RCC_GET_FLAG(RCC_FLAG_LSERDY)) {
lseReady = true;
break;
}
delay(5);
}
if (lseReady) {
STM32RTC &rtc = STM32RTC::getInstance();
rtc.setClockSource(STM32RTC::LSE_CLOCK);
rtc.begin();
stm32wlRtcValid = true;
LOG_INFO("STM32WL: LSE locked, hardware RTC available");
} else {
// Don't leave a failed oscillator burning current.
__HAL_RCC_LSE_CONFIG(RCC_LSE_OFF);
LOG_WARN("STM32WL: LSE failed to start within %dms (crystal missing/faulty?) - hardware RTC unavailable",
STM32WL_LSE_TIMEOUT_MS);
}
}
// True once stm32wlSetup() has confirmed the LSE crystal is locked and the hardware RTC is running.
bool stm32wlRtcAvailable()
{
return stm32wlRtcValid;
}
#else
void stm32wlSetup() {}
#endif
void cpuDeepSleep(uint32_t msecToWake) {}
// Hacks to force more code and data out.
src/security/EncryptedStorage.cpp
+1 -1
View File
@@ -5,10 +5,10 @@
// Common includes - available for all platform implementations
#include "EncryptedStorage.h"
#include "FSCommon.h"
#include "RTC.h"
#include "SPILock.h"
#include "SafeFile.h"
#include "SecureZero.h"
#include "gps/RTC.h"
#include <algorithm>
#ifdef ARCH_NRF52