From 0e944441984d58ae30aefc5cb45bc525b7b8f67c Mon Sep 17 00:00:00 2001 From: SQ2CPA Date: Thu, 28 Mar 2024 18:33:11 +0100 Subject: [PATCH] fix: rename heltec wireless lite to ht-ct62 --- .github/workflows/build.yml | 2 +- .github/workflows/commit.yml | 2 +- platformio.ini | 4 ++-- src/LoRa_APRS_iGate.cpp | 4 ++-- src/battery_utils.cpp | 2 +- src/lora_utils.cpp | 2 +- src/pins_config.h | 6 +++--- src/utils.cpp | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 344901c..f0118e9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,7 @@ jobs: - "ttgo-t-beam-v1_SX1268" - "ttgo-t-beam-v1_2_SX1262" - "heltec_wireless_stick" - - "heltec_wireless_stick_lite" + - "heltec_ht-ct62" steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/commit.yml b/.github/workflows/commit.yml index c593327..d2512a4 100644 --- a/.github/workflows/commit.yml +++ b/.github/workflows/commit.yml @@ -22,7 +22,7 @@ jobs: - "ttgo-t-beam-v1_SX1268" - "ttgo-t-beam-v1_2_SX1262" - "heltec_wireless_stick" - - "heltec_wireless_stick_lite" + - "heltec_ht-ct62" steps: - uses: actions/checkout@v3 diff --git a/platformio.ini b/platformio.ini index 1bbd747..bc18d67 100644 --- a/platformio.ini +++ b/platformio.ini @@ -136,11 +136,11 @@ build_flags = -DHAS_SX126X -DELEGANTOTA_USE_ASYNC_WEBSERVER=1 -[env:heltec_wireless_stick_lite] +[env:heltec_ht-ct62] board = heltec_wireless_stick_lite board_build.mcu = esp32c3 build_flags = -Werror -Wall - -DHELTEC_WSL + -DHELTEC_HTCT62 -DHAS_SX126X -DELEGANTOTA_USE_ASYNC_WEBSERVER=1 \ No newline at end of file diff --git a/src/LoRa_APRS_iGate.cpp b/src/LoRa_APRS_iGate.cpp index 17d8332..2b74776 100644 --- a/src/LoRa_APRS_iGate.cpp +++ b/src/LoRa_APRS_iGate.cpp @@ -58,7 +58,7 @@ String firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, seven void setup() { Serial.begin(115200); - #if defined(TTGO_T_LORA32_V2_1) || defined(HELTEC_V2) || defined(HELTEC_WSL) + #if defined(TTGO_T_LORA32_V2_1) || defined(HELTEC_V2) || defined(HELTEC_HTCT62) pinMode(batteryPin, INPUT); #endif #ifdef HAS_INTERNAL_LED @@ -81,7 +81,7 @@ void setup() { iGateBeaconPacket = GPS_Utils::generateBeacon(); iGateLoRaBeaconPacket = GPS_Utils::generateiGateLoRaBeacon(); -#ifdef HELTEC_WSL +#ifdef HELTEC_HTCT62 if (Config.lowPowerMode) { gpio_wakeup_enable(GPIO_NUM_3, GPIO_INTR_HIGH_LEVEL); esp_deep_sleep_enable_gpio_wakeup(GPIO_NUM_3, ESP_GPIO_WAKEUP_GPIO_HIGH); diff --git a/src/battery_utils.cpp b/src/battery_utils.cpp index 428b6da..8e9160a 100644 --- a/src/battery_utils.cpp +++ b/src/battery_utils.cpp @@ -25,7 +25,7 @@ namespace BATTERY_Utils { int sample; int sampleSum = 0; for (int i = 0; i < 100; i++) { - #if defined(TTGO_T_LORA32_V2_1) || defined(HELTEC_V2) || defined(HELTEC_WSL) + #if defined(TTGO_T_LORA32_V2_1) || defined(HELTEC_V2) || defined(HELTEC_HTCT62) sample = analogRead(batteryPin); #endif #if defined(HELTEC_V3) || defined(ESP32_DIY_LoRa) || defined(ESP32_DIY_1W_LoRa) diff --git a/src/lora_utils.cpp b/src/lora_utils.cpp index a214d12..8849cf5 100644 --- a/src/lora_utils.cpp +++ b/src/lora_utils.cpp @@ -10,7 +10,7 @@ extern Configuration Config; -#if defined(HELTEC_V3) || defined(HELTEC_WS) || defined(TTGO_T_Beam_V1_2_SX1262) || defined(HELTEC_WSL) +#if defined(HELTEC_V3) || defined(HELTEC_WS) || defined(TTGO_T_Beam_V1_2_SX1262) || defined(HELTEC_HTCT62) SX1262 radio = new Module(RADIO_CS_PIN, RADIO_DIO1_PIN, RADIO_RST_PIN, RADIO_BUSY_PIN); bool transmissionFlag = true; bool enableInterrupt = true; diff --git a/src/pins_config.h b/src/pins_config.h index 2050316..6598146 100644 --- a/src/pins_config.h +++ b/src/pins_config.h @@ -64,7 +64,7 @@ #define RADIO_TXEN 13 #endif -#ifdef HELTEC_WSL +#ifdef HELTEC_HTCT62 #define RADIO_SCLK_PIN 10 // SX1262 SCK #define RADIO_MISO_PIN 6 // SX1262 MISO #define RADIO_MOSI_PIN 7 // SX1262 MOSI @@ -94,7 +94,7 @@ #define OLED_RST 21 #endif -#ifndef HELTEC_WSL +#ifndef HELTEC_HTCT62 #define HAS_DISPLAY #endif @@ -104,7 +104,7 @@ #define HAS_INTERNAL_LED #endif -#ifdef HELTEC_WSL +#ifdef HELTEC_HTCT62 #define batteryPin 1 #endif #if defined(TTGO_T_LORA32_V2_1) || defined(HELTEC_V2) diff --git a/src/utils.cpp b/src/utils.cpp index 84277d9..5d9ee65 100644 --- a/src/utils.cpp +++ b/src/utils.cpp @@ -115,7 +115,7 @@ namespace Utils { secondaryBeaconPacket = iGateLoRaBeaconPacket + Config.beacon.comment; } - #if defined(TTGO_T_LORA32_V2_1) || defined(HELTEC_V2) || defined(HELTEC_WSL) + #if defined(TTGO_T_LORA32_V2_1) || defined(HELTEC_V2) || defined(HELTEC_HTCT62) if (Config.sendBatteryVoltage) { beaconPacket += " Batt=" + String(BATTERY_Utils::checkBattery(),2) + "V"; secondaryBeaconPacket += " Batt=" + String(BATTERY_Utils::checkBattery(),2) + "V";