Skip to content

Commit 7bcf1f1

Browse files
authored
Merge pull request #828 from recrof/meshadventurer-build-fix
fixed meshadventurer failing build
2 parents 84feb63 + f2cff53 commit 7bcf1f1

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

variants/meshadventurer/platformio.ini

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ build_flags =
88
-D MESHADVENTURER
99
-D P_LORA_TX_LED=2
1010
-D PIN_VBAT_READ=35
11-
-D PIN_USER_BTN_ANA=39
11+
-D PIN_USER_BTN=39
1212
-D P_LORA_DIO_1=33
1313
-D P_LORA_NSS=18
1414
-D P_LORA_RESET=23
@@ -28,6 +28,7 @@ build_flags =
2828
-D DISPLAY_CLASS=SSD1306Display
2929
build_src_filter = ${esp32_base.build_src_filter}
3030
+<../variants/meshadventurer>
31+
+<helpers/ui/MomentaryButton.cpp>
3132
lib_deps =
3233
${esp32_base.lib_deps}
3334
stevemarple/MicroNMEA @ ^2.0.6

variants/meshadventurer/target.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ MASensorManager sensors = MASensorManager(nmea);
1616

1717
#ifdef DISPLAY_CLASS
1818
DISPLAY_CLASS display;
19+
MomentaryButton user_btn(PIN_USER_BTN, 1000, true);
1920
#endif
2021

2122
bool radio_init() {

variants/meshadventurer/target.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include <helpers/sensors/LocationProvider.h>
1212
#ifdef DISPLAY_CLASS
1313
#include <helpers/ui/SSD1306Display.h>
14+
#include <helpers/ui/MomentaryButton.h>
1415
#endif
1516

1617
class MASensorManager : public SensorManager {
@@ -37,8 +38,10 @@ extern MASensorManager sensors;
3738

3839
#ifdef DISPLAY_CLASS
3940
extern DISPLAY_CLASS display;
41+
extern MomentaryButton user_btn;
4042
#endif
4143

44+
4245
bool radio_init();
4346
uint32_t radio_get_rng_seed();
4447
void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);

0 commit comments

Comments
 (0)