mirror of
https://github.com/meshcore-dev/MeshCore.git
synced 2026-04-20 22:13:47 +00:00
Merge 08b4a1e59b into dee3e26ac0
This commit is contained in:
commit
222dce9bab
3 changed files with 17 additions and 2 deletions
|
|
@ -6,7 +6,6 @@ board_build.mcu = esp32s3
|
||||||
build_flags = ${esp32_base.build_flags}
|
build_flags = ${esp32_base.build_flags}
|
||||||
${sensor_base.build_flags}
|
${sensor_base.build_flags}
|
||||||
-I variants/xiao_s3_wio
|
-I variants/xiao_s3_wio
|
||||||
-UENV_INCLUDE_GPS
|
|
||||||
-D SEEED_XIAO_S3
|
-D SEEED_XIAO_S3
|
||||||
-D P_LORA_DIO_1=39
|
-D P_LORA_DIO_1=39
|
||||||
-D P_LORA_NSS=41
|
-D P_LORA_NSS=41
|
||||||
|
|
@ -29,6 +28,13 @@ build_flags = ${esp32_base.build_flags}
|
||||||
-D WRAPPER_CLASS=CustomSX1262Wrapper
|
-D WRAPPER_CLASS=CustomSX1262Wrapper
|
||||||
-D LORA_TX_POWER=22
|
-D LORA_TX_POWER=22
|
||||||
-D SX126X_RX_BOOSTED_GAIN=1
|
-D SX126X_RX_BOOSTED_GAIN=1
|
||||||
|
-D ENV_INCLUDE_GPS=1
|
||||||
|
-D PIN_GPS_RX=D6
|
||||||
|
-D PIN_GPS_TX=D7
|
||||||
|
-D PIN_GPS_RESET=D2
|
||||||
|
-D PIN_GPS_RESET_ACTIVE=LOW
|
||||||
|
-D PIN_GPS_EN=D0
|
||||||
|
-D PIN_GPS_EN_ACTIVE=HIGH
|
||||||
build_src_filter = ${esp32_base.build_src_filter}
|
build_src_filter = ${esp32_base.build_src_filter}
|
||||||
+<../variants/xiao_s3_wio>
|
+<../variants/xiao_s3_wio>
|
||||||
+<helpers/sensors>
|
+<helpers/sensors>
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,13 @@ WRAPPER_CLASS radio_driver(radio, board);
|
||||||
|
|
||||||
ESP32RTCClock fallback_clock;
|
ESP32RTCClock fallback_clock;
|
||||||
AutoDiscoverRTCClock rtc_clock(fallback_clock);
|
AutoDiscoverRTCClock rtc_clock(fallback_clock);
|
||||||
EnvironmentSensorManager sensors;
|
|
||||||
|
#ifdef ENV_INCLUDE_GPS
|
||||||
|
MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock);
|
||||||
|
EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea);
|
||||||
|
#else
|
||||||
|
EnvironmentSensorManager sensors = EnvironmentSensorManager();
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef DISPLAY_CLASS
|
#ifdef DISPLAY_CLASS
|
||||||
DISPLAY_CLASS display;
|
DISPLAY_CLASS display;
|
||||||
|
|
|
||||||
|
|
@ -11,6 +11,9 @@
|
||||||
#include <helpers/ui/SSD1306Display.h>
|
#include <helpers/ui/SSD1306Display.h>
|
||||||
#include <helpers/ui/MomentaryButton.h>
|
#include <helpers/ui/MomentaryButton.h>
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef ENV_INCLUDE_GPS
|
||||||
|
#include <helpers/sensors/MicroNMEALocationProvider.h>
|
||||||
|
#endif
|
||||||
#include "XiaoS3WIOBoard.h"
|
#include "XiaoS3WIOBoard.h"
|
||||||
|
|
||||||
extern XiaoS3WIOBoard board;
|
extern XiaoS3WIOBoard board;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue