Merge branch 'dev' into lora-longer-preamble

This commit is contained in:
OverkillFPV
2026-04-16 20:43:46 +10:00
committed by GitHub
315 changed files with 7641 additions and 1800 deletions

View File

@@ -10,7 +10,7 @@ class HeltecE290Board : public ESP32Board {
public:
RefCountedDigitalPin periph_power;
HeltecE290Board() : periph_power(PIN_VEXT_EN) { }
HeltecE290Board() : periph_power(PIN_VEXT_EN, PIN_VEXT_EN_ACTIVE) { }
void begin();
void enterDeepSleep(uint32_t secs, int pin_wake_btn = -1);

View File

@@ -6,6 +6,7 @@ build_flags =
-I variants/heltec_e290
-D Vision_Master_E290
-D ARDUINO_USB_CDC_ON_BOOT=1
-D USE_SX1262
-D RADIO_CLASS=CustomSX1262
-D WRAPPER_CLASS=CustomSX1262Wrapper
-D LORA_TX_POWER=22
@@ -34,7 +35,7 @@ lib_deps =
${esp32_base.lib_deps}
https://github.com/Quency-D/heltec-eink-modules/archive/563dd41fd850a1bc3039b8723da4f3a20fe1c800.zip
[env:Heltec_E290_companion_ble_]
[env:Heltec_E290_companion_ble]
extends = Heltec_E290_base
build_flags =
${Heltec_E290_base.build_flags}
@@ -42,6 +43,7 @@ build_flags =
-D MAX_CONTACTS=350
-D MAX_GROUP_CHANNELS=40
-D DISPLAY_CLASS=E290Display
-D AUTO_OFF_MILLIS=0
-D BLE_PIN_CODE=123456 ; dynamic, random PIN
-D BLE_DEBUG_LOGGING=1
-D OFFLINE_QUEUE_SIZE=256
@@ -53,8 +55,9 @@ build_src_filter = ${Heltec_E290_base.build_src_filter}
lib_deps =
${Heltec_E290_base.lib_deps}
densaugeo/base64 @ ~1.4.0
bakercp/CRC32 @ ^2.0.0
[env:Heltec_E290_companion_usb_]
[env:Heltec_E290_companion_usb]
extends = Heltec_E290_base
build_flags =
${Heltec_E290_base.build_flags}
@@ -62,6 +65,7 @@ build_flags =
-D MAX_CONTACTS=350
-D MAX_GROUP_CHANNELS=40
-D DISPLAY_CLASS=E290Display
-D AUTO_OFF_MILLIS=0
-D BLE_PIN_CODE=123456 ; dynamic, random PIN
-D BLE_DEBUG_LOGGING=1
-D OFFLINE_QUEUE_SIZE=256
@@ -73,8 +77,9 @@ build_src_filter = ${Heltec_E290_base.build_src_filter}
lib_deps =
${Heltec_E290_base.lib_deps}
densaugeo/base64 @ ~1.4.0
bakercp/CRC32 @ ^2.0.0
[env:Heltec_E290_repeater_]
[env:Heltec_E290_repeater]
extends = Heltec_E290_base
build_flags =
${Heltec_E290_base.build_flags}
@@ -90,8 +95,9 @@ build_src_filter = ${Heltec_E290_base.build_src_filter}
lib_deps =
${Heltec_E290_base.lib_deps}
${esp32_ota.lib_deps}
bakercp/CRC32 @ ^2.0.0
; [env:Heltec_E290_repeater_bridge_rs232_]
; [env:Heltec_E290_repeater_bridge_rs232]
; extends = Heltec_E290_base
; build_flags =
; ${Heltec_E290_base.build_flags}
@@ -114,8 +120,9 @@ lib_deps =
; lib_deps =
; ${Heltec_E290_base.lib_deps}
; ${esp32_ota.lib_deps}
; bakercp/CRC32 @ ^2.0.0
[env:Heltec_E290_repeater_bridge_espnow_]
[env:Heltec_E290_repeater_bridge_espnow]
extends = Heltec_E290_base
build_flags =
${Heltec_E290_base.build_flags}
@@ -136,8 +143,9 @@ build_src_filter = ${Heltec_E290_base.build_src_filter}
lib_deps =
${Heltec_E290_base.lib_deps}
${esp32_ota.lib_deps}
bakercp/CRC32 @ ^2.0.0
[env:Heltec_E290_room_server_]
[env:Heltec_E290_room_server]
extends = Heltec_E290_base
build_flags =
${Heltec_E290_base.build_flags}
@@ -153,3 +161,4 @@ build_src_filter = ${Heltec_E290_base.build_src_filter}
lib_deps =
${Heltec_E290_base.lib_deps}
${esp32_ota.lib_deps}
bakercp/CRC32 @ ^2.0.0

View File

@@ -18,7 +18,7 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock);
SensorManager sensors;
#ifdef DISPLAY_CLASS
DISPLAY_CLASS display;
DISPLAY_CLASS display(&board.periph_power);
MomentaryButton user_btn(PIN_USER_BTN, 1000, true);
#endif

View File

@@ -26,4 +26,4 @@ bool radio_init();
uint32_t radio_get_rng_seed();
void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
void radio_set_tx_power(int8_t dbm);
mesh::LocalIdentity radio_new_identity();
mesh::LocalIdentity radio_new_identity();