From 9dead41e796b43033ad00787472a7599e135c0ef Mon Sep 17 00:00:00 2001 From: richonguzman Date: Fri, 17 May 2024 15:11:59 -0400 Subject: [PATCH] version update --- README.md | 1 + src/lora_utils.cpp | 16 +++++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index ccb814c2..25e28604 100644 --- a/README.md +++ b/README.md @@ -50,6 +50,7 @@ ____________________________________________________ ____________________________________________________ ## Timeline (Versions): +- 2024.05.17 HELTEC Wireless Stick Lite v3 support added. - 2024.05.11 HELTEC Wireless Tracker support added. - 2024.04.23 T-LoRa32 v1.6/v2.1 with 915MHz support added. - 2024.04.23 ESP32 + 4G/LTE MODEM A7670SA + LoRa (SX1278) support added. diff --git a/src/lora_utils.cpp b/src/lora_utils.cpp index c374ed5b..eeee1c22 100644 --- a/src/lora_utils.cpp +++ b/src/lora_utils.cpp @@ -12,8 +12,8 @@ extern uint32_t lastRxTime; extern std::vector receivedPackets; -bool operationDone = false; -bool transmitFlag = false; +bool operationDone = true; +bool transmitFlag = true; #ifdef HAS_SX1262 SX1262 radio = new Module(RADIO_CS_PIN, RADIO_DIO1_PIN, RADIO_RST_PIN, RADIO_BUSY_PIN); @@ -66,15 +66,18 @@ namespace LoRa_Utils { radio.setCodingRate(Config.loramodule.codingRate4); radio.setCRC(true); - #if defined(ESP32_DIY_1W_LoRa) + #if defined(ESP32_DIY_1W_LoRa) || defined(OE5HWN_MeshCom) radio.setRfSwitchPins(RADIO_RXEN, RADIO_TXEN); + state = radio.setOutputPower(Config.loramodule.power); // max value 20dB for 400M30S as it has Low Noise Amp + radio.setCurrentLimit(140); // to be validated (100 , 120, 140)? #endif - - #if defined(HAS_SX1278) || defined(HAS_SX1276) || ESP32_DIY_1W_LoRa + #if defined(HAS_SX1278) || defined(HAS_SX1276) state = radio.setOutputPower(Config.loramodule.power); // max value 20dB for 400M30S as it has Low Noise Amp - #endif + radio.setCurrentLimit(100); // to be validated (80 , 100)? + #endif #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. + radio.setCurrentLimit(140); #endif #if defined(HAS_SX1262) || defined(HAS_SX1268) @@ -83,7 +86,6 @@ namespace LoRa_Utils { if (state == RADIOLIB_ERR_NONE) { Utils::println("init : LoRa Module ... done!"); - radio.startReceive(); } else { Utils::println("Starting LoRa failed!"); while (true);