meshcore-dev/MeshCore
1
0
Fork 0
mirror of https://github.com/meshcore-dev/MeshCore.git synced 2026-04-20 22:13:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #921 from recrof/heltec_v2_cleanup

Browse source 
heltec v2 cleanup
This commit is contained in:
ripplebiz 2025-10-19 14:07:16 +11:00 • committed by GitHub
commit a222578041
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 37 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/helpers/HeltecV2Board.h → variants/heltec_v2/HeltecV2Board.h
View file

@ -1,22 +1,12 @@
#pragma once #pragma once
#include <Arduino.h> #include <Arduino.h>
#include <helpers/ESP32Board.h>
// LoRa radio module pins for Heltec V2
#define P_LORA_DIO_1 26 // DIO0
#define P_LORA_NSS 18
#define P_LORA_RESET RADIOLIB_NC // 14
#define P_LORA_BUSY RADIOLIB_NC
#define P_LORA_SCLK 5
#define P_LORA_MISO 19
#define P_LORA_MOSI 27
// built-ins // built-ins
#define PIN_VBAT_READ 37 #define PIN_VBAT_READ 37
#define PIN_LED_BUILTIN 25 #define PIN_LED_BUILTIN 25
#include "ESP32Board.h"
#include <driver/rtc_io.h> #include <driver/rtc_io.h>
class HeltecV2Board : public ESP32Board { class HeltecV2Board : public ESP32Board {
@ -39,7 +29,7 @@ public:
void enterDeepSleep(uint32_t secs, int pin_wake_btn = -1) { void enterDeepSleep(uint32_t secs, int pin_wake_btn = -1) {
esp_sleep_pd_config(ESP_PD_DOMAIN_RTC_PERIPH, ESP_PD_OPTION_ON); esp_sleep_pd_config(ESP_PD_DOMAIN_RTC_PERIPH, ESP_PD_OPTION_ON);
// Make sure the DIO1 and NSS GPIOs are hold on required levels during deep sleep // Make sure the DIO1 and NSS GPIOs are hold on required levels during deep sleep
rtc_gpio_set_direction((gpio_num_t)P_LORA_DIO_1, RTC_GPIO_MODE_INPUT_ONLY); rtc_gpio_set_direction((gpio_num_t)P_LORA_DIO_1, RTC_GPIO_MODE_INPUT_ONLY);
rtc_gpio_pulldown_en((gpio_num_t)P_LORA_DIO_1); rtc_gpio_pulldown_en((gpio_num_t)P_LORA_DIO_1);

38
variants/heltec_v2/platformio.ini
View file

@ -7,13 +7,20 @@ build_flags =
-D HELTEC_LORA_V2 -D HELTEC_LORA_V2
-D RADIO_CLASS=CustomSX1276 -D RADIO_CLASS=CustomSX1276
-D WRAPPER_CLASS=CustomSX1276Wrapper -D WRAPPER_CLASS=CustomSX1276Wrapper
-D P_LORA_DIO_1=26
-D P_LORA_NSS=18
-D P_LORA_RESET=RADIOLIB_NC
-D P_LORA_BUSY=RADIOLIB_NC
-D P_LORA_SCLK=5
-D P_LORA_MISO=19
-D P_LORA_MOSI=27
-D P_LORA_TX_LED=25
-D SX127X_CURRENT_LIMIT=120 -D SX127X_CURRENT_LIMIT=120
-D LORA_TX_POWER=20 -D LORA_TX_POWER=20
-D PIN_BOARD_SDA=4 -D PIN_BOARD_SDA=4
-D PIN_BOARD_SCL=15 -D PIN_BOARD_SCL=15
-D PIN_USER_BTN=0 -D PIN_USER_BTN=0
-D PIN_OLED_RESET=16 -D PIN_OLED_RESET=16
-D P_LORA_TX_LED=25
build_src_filter = ${esp32_base.build_src_filter} build_src_filter = ${esp32_base.build_src_filter}
+<../variants/heltec_v2> +<../variants/heltec_v2>
lib_deps = lib_deps =
@ -112,7 +119,7 @@ lib_deps =
extends = Heltec_lora32_v2 extends = Heltec_lora32_v2
build_flags = build_flags =
${Heltec_lora32_v2.build_flags} ${Heltec_lora32_v2.build_flags}
-D MAX_CONTACTS=170 -D MAX_CONTACTS=160
-D MAX_GROUP_CHANNELS=1 -D MAX_GROUP_CHANNELS=1
; -D MESH_PACKET_LOGGING=1 ; -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1 ; -D MESH_DEBUG=1
@ -128,7 +135,7 @@ build_flags =
${Heltec_lora32_v2.build_flags} ${Heltec_lora32_v2.build_flags}
-I examples/companion_radio/ui-new -I examples/companion_radio/ui-new
-D DISPLAY_CLASS=SSD1306Display -D DISPLAY_CLASS=SSD1306Display
-D MAX_CONTACTS=170 -D MAX_CONTACTS=160
-D MAX_GROUP_CHANNELS=8 -D MAX_GROUP_CHANNELS=8
; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 ; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1
; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1
@ -148,7 +155,7 @@ build_flags =
${Heltec_lora32_v2.build_flags} ${Heltec_lora32_v2.build_flags}
-I examples/companion_radio/ui-new -I examples/companion_radio/ui-new
-D DISPLAY_CLASS=SSD1306Display -D DISPLAY_CLASS=SSD1306Display
-D MAX_CONTACTS=170 -D MAX_CONTACTS=160
-D MAX_GROUP_CHANNELS=8 -D MAX_GROUP_CHANNELS=8
-D BLE_PIN_CODE=123456 -D BLE_PIN_CODE=123456
-D BLE_DEBUG_LOGGING=1 -D BLE_DEBUG_LOGGING=1
@ -164,3 +171,26 @@ build_src_filter = ${Heltec_lora32_v2.build_src_filter}
lib_deps = lib_deps =
${Heltec_lora32_v2.lib_deps} ${Heltec_lora32_v2.lib_deps}
densaugeo/base64 @ ~1.4.0 densaugeo/base64 @ ~1.4.0
[env:Heltec_v2_companion_radio_wifi]
extends = Heltec_lora32_v2
build_flags =
${Heltec_lora32_v2.build_flags}
-I examples/companion_radio/ui-new
-D DISPLAY_CLASS=SSD1306Display
-D MAX_CONTACTS=160
-D MAX_GROUP_CHANNELS=8
-D WIFI_DEBUG_LOGGING=1
-D WIFI_SSID='"myssid"'
-D WIFI_PWD='"mypwd"'
; -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1
build_src_filter = ${Heltec_lora32_v2.build_src_filter}
+<helpers/esp32/*.cpp>
+<helpers/ui/SSD1306Display.cpp>
+<helpers/ui/MomentaryButton.cpp>
+<../examples/companion_radio/*.cpp>
+<../examples/companion_radio/ui-new/*.cpp>
lib_deps =
${Heltec_lora32_v2.lib_deps}
densaugeo/base64 @ ~1.4.0

2
variants/heltec_v2/target.h
View file

@ -3,7 +3,7 @@
#define RADIOLIB_STATIC_ONLY 1 #define RADIOLIB_STATIC_ONLY 1
#include <RadioLib.h> #include <RadioLib.h>
#include <helpers/radiolib/RadioLibWrappers.h> #include <helpers/radiolib/RadioLibWrappers.h>
#include <helpers/HeltecV2Board.h> #include <HeltecV2Board.h>
#include <helpers/radiolib/CustomSX1276Wrapper.h> #include <helpers/radiolib/CustomSX1276Wrapper.h>
#include <helpers/AutoDiscoverRTCClock.h> #include <helpers/AutoDiscoverRTCClock.h>
#include <helpers/SensorManager.h> #include <helpers/SensorManager.h>