From 41cbd77db3d337aa357fd906ef8f41217a582897 Mon Sep 17 00:00:00 2001 From: Jonathan Bennett Date: Tue, 2 Dec 2025 01:56:55 -0600 Subject: [PATCH 1/2] Move everything from /arch to /variant (#8831) --- platformio.ini | 2 +- {arch => variants}/esp32/esp32.ini | 0 {arch/esp32 => variants/esp32c3}/esp32c3.ini | 0 {arch/esp32 => variants/esp32c6}/esp32c6.ini | 0 {arch/esp32 => variants/esp32s2}/esp32s2.ini | 0 {arch/esp32 => variants/esp32s3}/esp32s3.ini | 0 {arch/portduino => variants/native}/portduino.ini | 0 {arch/nrf52 => variants/nrf52840}/cpp_overrides/lfs_util.h | 0 {arch/nrf52 => variants/nrf52840}/nrf52.ini | 2 +- {arch/nrf52 => variants/nrf52840}/nrf52832.ini | 0 {arch/nrf52 => variants/nrf52840}/nrf52840.ini | 0 {arch/rp2xx0 => variants/rp2040}/rp2040.ini | 0 {arch/rp2xx0 => variants/rp2350}/rp2350.ini | 0 {arch => variants}/stm32/stm32.ini | 0 14 files changed, 2 insertions(+), 2 deletions(-) rename {arch => variants}/esp32/esp32.ini (100%) rename {arch/esp32 => variants/esp32c3}/esp32c3.ini (100%) rename {arch/esp32 => variants/esp32c6}/esp32c6.ini (100%) rename {arch/esp32 => variants/esp32s2}/esp32s2.ini (100%) rename {arch/esp32 => variants/esp32s3}/esp32s3.ini (100%) rename {arch/portduino => variants/native}/portduino.ini (100%) rename {arch/nrf52 => variants/nrf52840}/cpp_overrides/lfs_util.h (100%) rename {arch/nrf52 => variants/nrf52840}/nrf52.ini (96%) rename {arch/nrf52 => variants/nrf52840}/nrf52832.ini (100%) rename {arch/nrf52 => variants/nrf52840}/nrf52840.ini (100%) rename {arch/rp2xx0 => variants/rp2040}/rp2040.ini (100%) rename {arch/rp2xx0 => variants/rp2350}/rp2350.ini (100%) rename {arch => variants}/stm32/stm32.ini (100%) diff --git a/platformio.ini b/platformio.ini index 5b9d965ef..9b8d0a124 100644 --- a/platformio.ini +++ b/platformio.ini @@ -5,7 +5,7 @@ default_envs = tbeam extra_configs = - arch/*/*.ini + variants/*/*.ini variants/*/*/platformio.ini variants/*/diy/*/platformio.ini src/graphics/niche/InkHUD/PlatformioConfig.ini diff --git a/arch/esp32/esp32.ini b/variants/esp32/esp32.ini similarity index 100% rename from arch/esp32/esp32.ini rename to variants/esp32/esp32.ini diff --git a/arch/esp32/esp32c3.ini b/variants/esp32c3/esp32c3.ini similarity index 100% rename from arch/esp32/esp32c3.ini rename to variants/esp32c3/esp32c3.ini diff --git a/arch/esp32/esp32c6.ini b/variants/esp32c6/esp32c6.ini similarity index 100% rename from arch/esp32/esp32c6.ini rename to variants/esp32c6/esp32c6.ini diff --git a/arch/esp32/esp32s2.ini b/variants/esp32s2/esp32s2.ini similarity index 100% rename from arch/esp32/esp32s2.ini rename to variants/esp32s2/esp32s2.ini diff --git a/arch/esp32/esp32s3.ini b/variants/esp32s3/esp32s3.ini similarity index 100% rename from arch/esp32/esp32s3.ini rename to variants/esp32s3/esp32s3.ini diff --git a/arch/portduino/portduino.ini b/variants/native/portduino.ini similarity index 100% rename from arch/portduino/portduino.ini rename to variants/native/portduino.ini diff --git a/arch/nrf52/cpp_overrides/lfs_util.h b/variants/nrf52840/cpp_overrides/lfs_util.h similarity index 100% rename from arch/nrf52/cpp_overrides/lfs_util.h rename to variants/nrf52840/cpp_overrides/lfs_util.h diff --git a/arch/nrf52/nrf52.ini b/variants/nrf52840/nrf52.ini similarity index 96% rename from arch/nrf52/nrf52.ini rename to variants/nrf52840/nrf52.ini index e60d47ce7..2904f770e 100644 --- a/arch/nrf52/nrf52.ini +++ b/variants/nrf52840/nrf52.ini @@ -13,7 +13,7 @@ platform_packages = build_type = debug build_flags = - -include arch/nrf52/cpp_overrides/lfs_util.h + -include variants/nrf52840/cpp_overrides/lfs_util.h ${arduino_base.build_flags} -DSERIAL_BUFFER_SIZE=1024 -Wno-unused-variable diff --git a/arch/nrf52/nrf52832.ini b/variants/nrf52840/nrf52832.ini similarity index 100% rename from arch/nrf52/nrf52832.ini rename to variants/nrf52840/nrf52832.ini diff --git a/arch/nrf52/nrf52840.ini b/variants/nrf52840/nrf52840.ini similarity index 100% rename from arch/nrf52/nrf52840.ini rename to variants/nrf52840/nrf52840.ini diff --git a/arch/rp2xx0/rp2040.ini b/variants/rp2040/rp2040.ini similarity index 100% rename from arch/rp2xx0/rp2040.ini rename to variants/rp2040/rp2040.ini diff --git a/arch/rp2xx0/rp2350.ini b/variants/rp2350/rp2350.ini similarity index 100% rename from arch/rp2xx0/rp2350.ini rename to variants/rp2350/rp2350.ini diff --git a/arch/stm32/stm32.ini b/variants/stm32/stm32.ini similarity index 100% rename from arch/stm32/stm32.ini rename to variants/stm32/stm32.ini From 525c048354a77931b0786b363b10733079407a51 Mon Sep 17 00:00:00 2001 From: Jonathan Bennett Date: Tue, 2 Dec 2025 05:46:24 -0600 Subject: [PATCH 2/2] Move device specific OCV curves to their respective device.h (#8834) --- src/power.h | 13 +------------ variants/nrf52840/heltec_mesh_pocket/variant.h | 6 ++++++ variants/nrf52840/rak_wismeshtag/variant.h | 1 + variants/nrf52840/seeed_solar_node/variant.h | 1 + .../nrf52840/seeed_wio_tracker_L1_eink/variant.h | 2 ++ variants/nrf52840/tracker-t1000-e/variant.h | 2 ++ 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/power.h b/src/power.h index 3f28dedb2..c826d98b4 100644 --- a/src/power.h +++ b/src/power.h @@ -13,6 +13,7 @@ #define NUM_OCV_POINTS 11 #endif +// Device specific curves go in variant.h #ifndef OCV_ARRAY #ifdef CELL_TYPE_LIFEPO4 #define OCV_ARRAY 3400, 3350, 3320, 3290, 3270, 3260, 3250, 3230, 3200, 3120, 3000 @@ -24,18 +25,6 @@ #define OCV_ARRAY 1400, 1300, 1280, 1270, 1260, 1250, 1240, 1230, 1210, 1150, 1000 #elif defined(CELL_TYPE_LTO) #define OCV_ARRAY 2700, 2560, 2540, 2520, 2500, 2460, 2420, 2400, 2380, 2320, 1500 -#elif defined(TRACKER_T1000_E) -#define OCV_ARRAY 4190, 4042, 3957, 3885, 3820, 3776, 3746, 3725, 3696, 3644, 3100 -#elif defined(HELTEC_MESH_POCKET_BATTERY_5000) -#define OCV_ARRAY 4300, 4240, 4120, 4000, 3888, 3800, 3740, 3698, 3655, 3580, 3400 -#elif defined(HELTEC_MESH_POCKET_BATTERY_10000) -#define OCV_ARRAY 4100, 4060, 3960, 3840, 3729, 3625, 3550, 3500, 3420, 3345, 3100 -#elif defined(SEEED_WIO_TRACKER_L1) -#define OCV_ARRAY 4200, 3876, 3826, 3763, 3713, 3660, 3573, 3485, 3422, 3359, 3300 -#elif defined(SEEED_SOLAR_NODE) -#define OCV_ARRAY 4200, 3986, 3922, 3812, 3734, 3645, 3527, 3420, 3281, 3087, 2786 -#elif defined(WISMESH_TAG) -#define OCV_ARRAY 4240, 4112, 4029, 3970, 3906, 3846, 3824, 3802, 3776, 3650, 3072 #else // LiIon #define OCV_ARRAY 4190, 4050, 3990, 3890, 3800, 3720, 3630, 3530, 3420, 3300, 3100 #endif diff --git a/variants/nrf52840/heltec_mesh_pocket/variant.h b/variants/nrf52840/heltec_mesh_pocket/variant.h index e765dab66..f4f695b34 100644 --- a/variants/nrf52840/heltec_mesh_pocket/variant.h +++ b/variants/nrf52840/heltec_mesh_pocket/variant.h @@ -122,6 +122,12 @@ No longer populated on PCB #define VBAT_AR_INTERNAL AR_INTERNAL_3_0 #define ADC_MULTIPLIER (4.6425F) +#if defined(HELTEC_MESH_POCKET_BATTERY_5000) +#define OCV_ARRAY 4300, 4240, 4120, 4000, 3888, 3800, 3740, 3698, 3655, 3580, 3400 +#elif defined(HELTEC_MESH_POCKET_BATTERY_10000) +#define OCV_ARRAY 4100, 4060, 3960, 3840, 3729, 3625, 3550, 3500, 3420, 3345, 3100 +#endif + #undef HAS_GPS #define HAS_GPS 0 #define HAS_RTC 0 diff --git a/variants/nrf52840/rak_wismeshtag/variant.h b/variants/nrf52840/rak_wismeshtag/variant.h index eba910dc1..159cabf07 100644 --- a/variants/nrf52840/rak_wismeshtag/variant.h +++ b/variants/nrf52840/rak_wismeshtag/variant.h @@ -230,6 +230,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 4240, 4112, 4029, 3970, 3906, 3846, 3824, 3802, 3776, 3650, 3072 #define RAK_4631 1 diff --git a/variants/nrf52840/seeed_solar_node/variant.h b/variants/nrf52840/seeed_solar_node/variant.h index da89fcfa5..7b7738547 100644 --- a/variants/nrf52840/seeed_solar_node/variant.h +++ b/variants/nrf52840/seeed_solar_node/variant.h @@ -110,6 +110,7 @@ static const uint8_t SCL = PIN_WIRE_SCL; #define ADC_MULTIPLIER 3.3 #define BATTERY_PIN PIN_VBAT // PIN_A7 #define AREF_VOLTAGE 3.3 +#define OCV_ARRAY 4200, 3986, 3922, 3812, 3734, 3645, 3527, 3420, 3281, 3087, 2786 // ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ // GPS L76KB // ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ diff --git a/variants/nrf52840/seeed_wio_tracker_L1_eink/variant.h b/variants/nrf52840/seeed_wio_tracker_L1_eink/variant.h index f33d200b1..09fefc7f2 100644 --- a/variants/nrf52840/seeed_wio_tracker_L1_eink/variant.h +++ b/variants/nrf52840/seeed_wio_tracker_L1_eink/variant.h @@ -122,6 +122,8 @@ static const uint8_t SCL = PIN_WIRE_SCL; #define ADC_MULTIPLIER 2.0 #define BATTERY_PIN PIN_VBAT // PIN_A7 #define AREF_VOLTAGE 3.6 +#define OCV_ARRAY 4200, 3876, 3826, 3763, 3713, 3660, 3573, 3485, 3422, 3359, 3300 + // ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ // GPS L76KB // ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ diff --git a/variants/nrf52840/tracker-t1000-e/variant.h b/variants/nrf52840/tracker-t1000-e/variant.h index 403552ec0..5b6719e12 100644 --- a/variants/nrf52840/tracker-t1000-e/variant.h +++ b/variants/nrf52840/tracker-t1000-e/variant.h @@ -142,6 +142,8 @@ extern "C" { #define AREF_VOLTAGE 3.0 #define VBAT_AR_INTERNAL AR_INTERNAL_3_0 +#define OCV_ARRAY 4190, 4042, 3957, 3885, 3820, 3776, 3746, 3725, 3696, 3644, 3100 + // Buzzer #define BUZZER_EN_PIN (32 + 5) // P1.05, always high #define PIN_BUZZER (0 + 25) // P0.25, pwm output