From fb75fae1e45044029ba3d29e7f124f957de21e9f Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Fri, 27 Mar 2026 06:55:33 -0500 Subject: [PATCH] Trunk fmt --- src/platform/nrf52/Nrf52SaadcLock.cpp | 2 +- src/platform/nrf52/main-nrf52.cpp | 2 +- variants/nrf52840/rak_wismeshtag/variant.cpp | 8 ++++---- variants/nrf52840/rak_wismeshtag/variant.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/platform/nrf52/Nrf52SaadcLock.cpp b/src/platform/nrf52/Nrf52SaadcLock.cpp index a4ac3d832..21f4f4dfd 100644 --- a/src/platform/nrf52/Nrf52SaadcLock.cpp +++ b/src/platform/nrf52/Nrf52SaadcLock.cpp @@ -1,6 +1,6 @@ -#include "configuration.h" #include "Nrf52SaadcLock.h" #include "concurrency/Lock.h" +#include "configuration.h" #ifdef ARCH_NRF52 diff --git a/src/platform/nrf52/main-nrf52.cpp b/src/platform/nrf52/main-nrf52.cpp index 016271b30..73780b6eb 100644 --- a/src/platform/nrf52/main-nrf52.cpp +++ b/src/platform/nrf52/main-nrf52.cpp @@ -341,7 +341,7 @@ void nrf52Loop() checkSDEvents(); reportLittleFSCorruptionOnce(); - variant_nrf52LoopHook(); // Optional variant hook called each nrf52Loop(); + variant_nrf52LoopHook(); // Optional variant hook called each nrf52Loop(); } #ifdef USE_SEMIHOSTING diff --git a/variants/nrf52840/rak_wismeshtag/variant.cpp b/variants/nrf52840/rak_wismeshtag/variant.cpp index 1c53bbc0d..a0394b2dd 100644 --- a/variants/nrf52840/rak_wismeshtag/variant.cpp +++ b/variants/nrf52840/rak_wismeshtag/variant.cpp @@ -19,13 +19,13 @@ */ #include "variant.h" +#include "Arduino.h" +#include "FreeRTOS.h" #include "nrf.h" -#include "wiring_constants.h" -#include "wiring_digital.h" #include "power/PowerHAL.h" #include "sleep.h" -#include "FreeRTOS.h" -#include "Arduino.h" +#include "wiring_constants.h" +#include "wiring_digital.h" const uint32_t g_ADigitalPinMap[] = { // P0 diff --git a/variants/nrf52840/rak_wismeshtag/variant.h b/variants/nrf52840/rak_wismeshtag/variant.h index 350fb2d62..9ea215e42 100644 --- a/variants/nrf52840/rak_wismeshtag/variant.h +++ b/variants/nrf52840/rak_wismeshtag/variant.h @@ -225,7 +225,7 @@ SO GPIO 39/TXEN MAY NOT BE DEFINED FOR SUCCESSFUL OPERATION OF THE SX1262 - TG #define AREF_VOLTAGE 3.0 #define VBAT_AR_INTERNAL AR_INTERNAL_3_0 #define ADC_MULTIPLIER 1.73 -#define OCV_ARRAY 4160, 4020, 3940, 3870, 3810, 3760, 3740, 3720, 3680, 3620, 2990 // updated OCV array for rak_wismeshtag +#define OCV_ARRAY 4160, 4020, 3940, 3870, 3810, 3760, 3740, 3720, 3680, 3620, 2990 // updated OCV array for rak_wismeshtag // Wake from System OFF when battery rises again (LPCOMP). // BAT_ADC divider: R22=1M (top), R24=1.5M (bottom) => V_BAT_ADC = VBAT * (1.5 / (1.0 + 1.5)) = 0.6 * VBAT