From f2cff53b0eb57a267e5f519f0fb08e03bea86a3c Mon Sep 17 00:00:00 2001 From: recrof Date: Wed, 24 Sep 2025 09:04:16 +0200 Subject: [PATCH] fixed meshadventurer failing build --- variants/meshadventurer/platformio.ini | 3 ++- variants/meshadventurer/target.cpp | 1 + variants/meshadventurer/target.h | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/variants/meshadventurer/platformio.ini b/variants/meshadventurer/platformio.ini index be3b4943..270e0314 100644 --- a/variants/meshadventurer/platformio.ini +++ b/variants/meshadventurer/platformio.ini @@ -8,7 +8,7 @@ build_flags = -D MESHADVENTURER -D P_LORA_TX_LED=2 -D PIN_VBAT_READ=35 - -D PIN_USER_BTN_ANA=39 + -D PIN_USER_BTN=39 -D P_LORA_DIO_1=33 -D P_LORA_NSS=18 -D P_LORA_RESET=23 @@ -28,6 +28,7 @@ build_flags = -D DISPLAY_CLASS=SSD1306Display build_src_filter = ${esp32_base.build_src_filter} +<../variants/meshadventurer> + + lib_deps = ${esp32_base.lib_deps} stevemarple/MicroNMEA @ ^2.0.6 diff --git a/variants/meshadventurer/target.cpp b/variants/meshadventurer/target.cpp index cabcee58..0e3b03f2 100644 --- a/variants/meshadventurer/target.cpp +++ b/variants/meshadventurer/target.cpp @@ -16,6 +16,7 @@ MASensorManager sensors = MASensorManager(nmea); #ifdef DISPLAY_CLASS DISPLAY_CLASS display; + MomentaryButton user_btn(PIN_USER_BTN, 1000, true); #endif bool radio_init() { diff --git a/variants/meshadventurer/target.h b/variants/meshadventurer/target.h index 6aeaf079..31bc4066 100644 --- a/variants/meshadventurer/target.h +++ b/variants/meshadventurer/target.h @@ -11,6 +11,7 @@ #include #ifdef DISPLAY_CLASS #include + #include #endif class MASensorManager : public SensorManager { @@ -37,8 +38,10 @@ extern MASensorManager sensors; #ifdef DISPLAY_CLASS extern DISPLAY_CLASS display; + extern MomentaryButton user_btn; #endif + bool radio_init(); uint32_t radio_get_rng_seed(); void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);