From 8024925950ddd727e9c19128b6218b66c64d0647 Mon Sep 17 00:00:00 2001 From: richonguzman Date: Thu, 16 May 2024 15:43:13 -0400 Subject: [PATCH] HELTEC WSL V3 added --- platformio.ini | 20 ++++++++++++++++---- src/battery_utils.cpp | 4 ++-- src/lora_utils.cpp | 2 +- src/pins_config.h | 21 +++++---------------- src/power_utils.cpp | 5 +++-- 5 files changed, 27 insertions(+), 25 deletions(-) diff --git a/platformio.ini b/platformio.ini index 7f847cf..15762e0 100644 --- a/platformio.ini +++ b/platformio.ini @@ -16,13 +16,13 @@ platform = espressif32 @ 6.3.1 board_build.partitions = min_spiffs.csv framework = arduino monitor_speed = 115200 -board_build.embed_files = +board_build.embed_files = data_embed/index.html.gz data_embed/style.css.gz data_embed/script.js.gz data_embed/bootstrap.css.gz data_embed/bootstrap.js.gz -extra_scripts = +extra_scripts = pre:tools/compress.py debug_tool = esp-prog @@ -31,7 +31,7 @@ debug_tool = esp-prog lib_deps = bblanchon/ArduinoJson @ 6.21.3 mikalhart/TinyGPSPlus @ 1.0.3 - jgromes/RadioLib @ 6.1.0 + jgromes/RadioLib @ 6.1.0 adafruit/Adafruit Unified Sensor@^1.1.9 adafruit/Adafruit BME280 Library@^2.2.2 adafruit/Adafruit BMP280 Library@^2.6.8 @@ -95,6 +95,18 @@ lib_deps = adafruit/Adafruit SSD1306 @ 2.5.7 +[env:heltec_wireless_stick_lite_v3] +board = esp32-s3-devkitc-1 +board_build.mcu = esp32s3 +build_flags = + -Werror -Wall + -DHELTEC_WSL_V3 + -DHAS_SX1262 + -DELEGANTOTA_USE_ASYNC_WEBSERVER=1 +lib_deps = + ${common.lib_deps} + + [env:heltec_ht-ct62] board = heltec_wireless_stick_lite board_build.mcu = esp32c3 @@ -198,7 +210,7 @@ lib_deps = [env:ESP32_DIY_LoRa_A7670] board = esp32dev build_flags = - -Werror -Wall + -Werror -Wall -DESP32_DIY_LoRa_A7670 -DHAS_SX1278 -DELEGANTOTA_USE_ASYNC_WEBSERVER=1 diff --git a/src/battery_utils.cpp b/src/battery_utils.cpp index 5290f56..bb0657e 100644 --- a/src/battery_utils.cpp +++ b/src/battery_utils.cpp @@ -25,7 +25,7 @@ namespace BATTERY_Utils { int sample; int sampleSum = 0; #ifdef ADC_CTRL - #ifdef HELTEC_WIRELESS_TRACKER + #if defined(HELTEC_WSL_V3) || defined(HELTEC_WIRELESS_TRACKER) digitalWrite(ADC_CTRL, HIGH); #endif #ifdef HELTEC_V3 @@ -45,7 +45,7 @@ namespace BATTERY_Utils { } #ifdef ADC_CTRL - #ifdef HELTEC_WIRELESS_TRACKER + #if defined(HELTEC_WSL_V3) || defined(HELTEC_WIRELESS_TRACKER) digitalWrite(ADC_CTRL, LOW); #endif #ifdef HELTEC_V3_GPS diff --git a/src/lora_utils.cpp b/src/lora_utils.cpp index 34074f1..7cb4c31 100644 --- a/src/lora_utils.cpp +++ b/src/lora_utils.cpp @@ -74,7 +74,7 @@ namespace LoRa_Utils { #if defined(HAS_SX1278) || defined(HAS_SX1276) || ESP32_DIY_1W_LoRa state = radio.setOutputPower(Config.loramodule.power); // max value 20dB for 400M30S as it has Low Noise Amp #endif - #if defined(HELTEC_V3) || defined(HELTEC_WS) || defined(TTGO_T_Beam_V1_0_SX1268) || defined(TTGO_T_Beam_V1_2_SX1262) + #if defined(HELTEC_V3) || defined(HELTEC_WSL_V3) || defined(HELTEC_WS) || defined(TTGO_T_Beam_V1_0_SX1268) || defined(TTGO_T_Beam_V1_2_SX1262) state = radio.setOutputPower(Config.loramodule.power + 2); // values available: 10, 17, 22 --> if 20 in tracker_conf.json it will be updated to 22. #endif #if defined(HAS_SX1262) || defined(HAS_SX1268) diff --git a/src/pins_config.h b/src/pins_config.h index a59f260..0cbf570 100644 --- a/src/pins_config.h +++ b/src/pins_config.h @@ -18,7 +18,7 @@ #define RADIO_BUSY_PIN 26 // GPIO26 - SX1278 IRQ ---->DIO0 #endif -#if defined(HELTEC_V3) || defined(HELTEC_WS) +#if defined(HELTEC_V3) || defined(HELTEC_WSL_V3) || defined(HELTEC_WIRELESS_TRACKER) || defined(HELTEC_WS) #define RADIO_SCLK_PIN 9 // SX1262 SCK #define RADIO_MISO_PIN 11 // SX1262 MISO #define RADIO_MOSI_PIN 10 // SX1262 MOSI @@ -95,17 +95,6 @@ #define A7670_RX_PIN 27 #endif -#ifdef HELTEC_WIRELESS_TRACKER - #define RADIO_SCLK_PIN 9 - #define RADIO_MISO_PIN 11 - #define RADIO_MOSI_PIN 10 - #define RADIO_CS_PIN 8 - #define RADIO_RST_PIN 12 - #define RADIO_DIO1_PIN 14 // SX1262 IRQ - #define RADIO_BUSY_PIN 13 // SX1262 BUSY -#endif - - // OLED #if defined(TTGO_T_LORA32_V2_1) || defined(ESP32_DIY_LoRa) || defined(ESP32_DIY_1W_LoRa) || defined(TTGO_T_Beam_V1_0) || defined(TTGO_T_Beam_V1_2) || defined(TTGO_T_Beam_V1_0_SX1268) || defined(TTGO_T_Beam_V1_2_SX1262) || defined(OE5HWN_MeshCom) || defined(ESP32_DIY_LoRa_A7670) || defined(TTGO_T_LORA32_V2_1_915) #define OLED_SDA 21 @@ -131,8 +120,8 @@ #define OLED_RST -1 #endif -#ifndef HELTEC_HTCT62 - #define HAS_DISPLAY +#if !defined(HELTEC_HTCT62) && !defined(HELTEC_WSL_V3) + #define HAS_DISPLAY #endif // Leds and other stuff @@ -143,11 +132,11 @@ #define INTERNAL_LED_PIN 25 // Green Led #define BATTERY_PIN 35 // es 35 el led y 1 bateria? #endif -#if defined(HELTEC_V3) || defined(HELTEC_WS) +#if defined(HELTEC_V3) || defined(HELTEC_WSL_V3) || defined(HELTEC_WS) #define INTERNAL_LED_PIN 35 #define BATTERY_PIN 1 #define VEXT_CTRL 36 - #define ADC_CTRL 37 + #define ADC_CTRL 37 // Heltec WSL_V3 just like Heltec WT #define BOARD_I2C_SDA 41 #define BOARD_I2C_SCL 42 #endif diff --git a/src/power_utils.cpp b/src/power_utils.cpp index 059f605..5170895 100644 --- a/src/power_utils.cpp +++ b/src/power_utils.cpp @@ -88,7 +88,6 @@ namespace POWER_Utils { #endif } - void setup() { #ifdef HAS_AXP192 Wire.begin(SDA, SCL); @@ -135,7 +134,9 @@ namespace POWER_Utils { #ifdef VEXT_CTRL pinMode(VEXT_CTRL,OUTPUT); // GPS + TFT on HELTEC Wireless_Tracker and only for Oled in HELTEC V3 - digitalWrite(VEXT_CTRL, HIGH); + #ifndef HELTEC_WSL_V3 + digitalWrite(VEXT_CTRL, HIGH); + #endif #endif #ifdef ADC_CTRL