Browse Source
Merge pull request #828 from recrof/meshadventurer-build-fix
fixed meshadventurer failing build
pull/842/head
ripplebiz
8 months ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with
6 additions and
1 deletions
-
variants/meshadventurer/platformio.ini
-
variants/meshadventurer/target.cpp
-
variants/meshadventurer/target.h
|
|
|
@ -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> |
|
|
|
+<helpers/ui/MomentaryButton.cpp> |
|
|
|
lib_deps = |
|
|
|
${esp32_base.lib_deps} |
|
|
|
stevemarple/MicroNMEA @ ^2.0.6 |
|
|
|
|
|
|
|
@ -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() { |
|
|
|
|
|
|
|
@ -11,6 +11,7 @@ |
|
|
|
#include <helpers/sensors/LocationProvider.h> |
|
|
|
#ifdef DISPLAY_CLASS |
|
|
|
#include <helpers/ui/SSD1306Display.h> |
|
|
|
#include <helpers/ui/MomentaryButton.h> |
|
|
|
#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); |
|
|
|
|
