ua1zbe
/
LoRa_APRS_iGate111
mirror of https://github.com/richonguzman/LoRa_APRS_iGate.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

first library cleaning in platformio

This commit is contained in:
richonguzman 2024-04-23 10:29:46 -04:00
parent f2a6bbf0a9
commit eb472b1506
3 changed files with 64 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
platformio.ini
View File

@ -21,43 +21,48 @@ board_build.embed_files =
data_embed/script.js.gz data_embed/script.js.gz
data_embed/bootstrap.css.gz data_embed/bootstrap.css.gz
data_embed/bootstrap.js.gz data_embed/bootstrap.js.gz
extra_scripts =
pre:tools/compress.py
debug_tool = esp-prog
[common]
lib_deps = lib_deps =
bblanchon/ArduinoJson@^6.20.2 bblanchon/ArduinoJson @ 6.21.3
mikalhart/TinyGPSPlus @ 1.0.3
jgromes/RadioLib @ 6.1.0
adafruit/Adafruit GFX Library @ 1.11.5 adafruit/Adafruit GFX Library @ 1.11.5
adafruit/Adafruit SSD1306 @ 2.5.7 adafruit/Adafruit SSD1306 @ 2.5.7
mikalhart/TinyGPSPlus @ 1.0.3
adafruit/Adafruit Unified Sensor@^1.1.9 adafruit/Adafruit Unified Sensor@^1.1.9
adafruit/Adafruit BME280 Library@^2.2.2 adafruit/Adafruit BME280 Library@^2.2.2
adafruit/Adafruit BMP280 Library@^2.6.8 adafruit/Adafruit BMP280 Library@^2.6.8
adafruit/Adafruit BME680 Library@^2.0.4 adafruit/Adafruit BME680 Library@^2.0.4
jgromes/RadioLib @ 6.1.0
lewisxhe/XPowersLib@^0.1.8
ayushsharma82/ElegantOTA@^3.1.0 ayushsharma82/ElegantOTA@^3.1.0
ottowinter/ESPAsyncWebServer-esphome@3.0.0 ottowinter/ESPAsyncWebServer-esphome@3.0.0
esphome/AsyncTCP-esphome@2.1.1 esphome/AsyncTCP-esphome@2.1.1
extra_scripts =
pre:tools/compress.py
debug_tool = esp-prog
[env:ttgo-lora32-v21] [env:ttgo-lora32-v21]
board = ttgo-lora32-v21 board = ttgo-lora32-v21
build_flags = build_flags =
-Werror -Wall -Werror -Wall
-DTTGO_T_LORA32_V2_1 -DTTGO_T_LORA32_V2_1
-DHAS_SX127X
-DHAS_SX1278 -DHAS_SX1278
-DELEGANTOTA_USE_ASYNC_WEBSERVER=1 -DELEGANTOTA_USE_ASYNC_WEBSERVER=1
lib_deps =
${common.lib_deps}
[env:heltec-lora32-v2] [env:heltec-lora32-v2]
board = ttgo-lora32-v21 board = ttgo-lora32-v21
build_flags = build_flags =
-Werror -Wall -Werror -Wall
-DHELTEC_V2 -DHELTEC_V2
-DHAS_SX127X
-DHAS_SX1278 -DHAS_SX1278
-DELEGANTOTA_USE_ASYNC_WEBSERVER=1 -DELEGANTOTA_USE_ASYNC_WEBSERVER=1
lib_deps =
${common.lib_deps}
[env:heltec_wifi_lora_32_V3] [env:heltec_wifi_lora_32_V3]
board = heltec_wifi_lora_32_V3 board = heltec_wifi_lora_32_V3
@ -65,76 +70,96 @@ board_build.mcu = esp32s3
build_flags = build_flags =
-Werror -Wall -Werror -Wall
-DHELTEC_V3 -DHELTEC_V3
-DHAS_SX126X
-DHAS_SX1262 -DHAS_SX1262
-DELEGANTOTA_USE_ASYNC_WEBSERVER=1 -DELEGANTOTA_USE_ASYNC_WEBSERVER=1
lib_deps =
${common.lib_deps}
[env:ESP32_DIY_LoRa] [env:ESP32_DIY_LoRa]
board = esp32dev board = esp32dev
build_flags = build_flags =
-Werror -Wall -Werror -Wall
-DESP32_DIY_LoRa -DESP32_DIY_LoRa
-DHAS_SX127X
-DHAS_SX1278 -DHAS_SX1278
-DELEGANTOTA_USE_ASYNC_WEBSERVER=1 -DELEGANTOTA_USE_ASYNC_WEBSERVER=1
lib_deps =
${common.lib_deps}
[env:ESP32_DIY_1W_LoRa] [env:ESP32_DIY_1W_LoRa]
board = esp32dev board = esp32dev
build_flags = build_flags =
-Werror -Wall -Werror -Wall
-DESP32_DIY_1W_LoRa -DESP32_DIY_1W_LoRa
-DHAS_SX126X
-DHAS_SX1268 -DHAS_SX1268
-DELEGANTOTA_USE_ASYNC_WEBSERVER=1 -DELEGANTOTA_USE_ASYNC_WEBSERVER=1
lib_deps =
${common.lib_deps}
[env:ttgo-t-beam-v1_2] [env:ttgo-t-beam-v1_2]
board = ttgo-t-beam board = ttgo-t-beam
build_flags = build_flags =
-Werror -Wall -Werror -Wall
-DTTGO_T_Beam_V1_2 -DTTGO_T_Beam_V1_2
-DHAS_SX127X
-DHAS_SX1278 -DHAS_SX1278
-DHAS_AXP2101 -DHAS_AXP2101
-DELEGANTOTA_USE_ASYNC_WEBSERVER=1 -DELEGANTOTA_USE_ASYNC_WEBSERVER=1
lib_deps =
${common.lib_deps}
lewisxhe/XPowersLib@^0.1.8
[env:ttgo-t-beam-v1] [env:ttgo-t-beam-v1]
board = ttgo-t-beam board = ttgo-t-beam
build_flags = build_flags =
-Werror -Wall -Werror -Wall
-DTTGO_T_Beam_V1_0 -DTTGO_T_Beam_V1_0
-DHAS_SX127X
-DHAS_SX1278 -DHAS_SX1278
-DHAS_AXP192 -DHAS_AXP192
-DELEGANTOTA_USE_ASYNC_WEBSERVER=1 -DELEGANTOTA_USE_ASYNC_WEBSERVER=1
lib_deps =
${common.lib_deps}
lewisxhe/XPowersLib@^0.1.8
[env:ttgo-t-beam-v1_SX1268] [env:ttgo-t-beam-v1_SX1268]
board = ttgo-t-beam board = ttgo-t-beam
build_flags = build_flags =
-Werror -Wall -Werror -Wall
-DTTGO_T_Beam_V1_0_SX1268 -DTTGO_T_Beam_V1_0_SX1268
-DHAS_SX126X
-DHAS_SX1268 -DHAS_SX1268
-DHAS_AXP192 -DHAS_AXP192
-DELEGANTOTA_USE_ASYNC_WEBSERVER=1 -DELEGANTOTA_USE_ASYNC_WEBSERVER=1
lib_deps =
${common.lib_deps}
lewisxhe/XPowersLib@^0.1.8
[env:ttgo-t-beam-v1_2_SX1262] [env:ttgo-t-beam-v1_2_SX1262]
board = ttgo-t-beam board = ttgo-t-beam
build_flags = build_flags =
-Werror -Wall -Werror -Wall
-DTTGO_T_Beam_V1_2_SX1262 -DTTGO_T_Beam_V1_2_SX1262
-DHAS_SX126X
-DHAS_SX1262 -DHAS_SX1262
-DHAS_AXP2101 -DHAS_AXP2101
-DELEGANTOTA_USE_ASYNC_WEBSERVER=1 -DELEGANTOTA_USE_ASYNC_WEBSERVER=1
lib_deps =
${common.lib_deps}
lewisxhe/XPowersLib@^0.1.8
[env:OE5HWN_MeshCom] [env:OE5HWN_MeshCom]
board = esp32dev board = esp32dev
build_flags = build_flags =
-Werror -Wall -Werror -Wall
-DOE5HWN_MeshCom -DOE5HWN_MeshCom
-DHAS_SX126X
-DHAS_SX1268 -DHAS_SX1268
-DELEGANTOTA_USE_ASYNC_WEBSERVER=1 -DELEGANTOTA_USE_ASYNC_WEBSERVER=1
lib_deps =
${common.lib_deps}
[env:heltec_wireless_stick] [env:heltec_wireless_stick]
board = heltec_wifi_lora_32_V3 board = heltec_wifi_lora_32_V3
@ -142,9 +167,11 @@ board_build.mcu = esp32s3
build_flags = build_flags =
-Werror -Wall -Werror -Wall
-DHELTEC_WS -DHELTEC_WS
-DHAS_SX126X
-DHAS_SX1262 -DHAS_SX1262
-DELEGANTOTA_USE_ASYNC_WEBSERVER=1 -DELEGANTOTA_USE_ASYNC_WEBSERVER=1
lib_deps =
${common.lib_deps}
[env:heltec_ht-ct62] [env:heltec_ht-ct62]
board = heltec_wireless_stick_lite board = heltec_wireless_stick_lite
@ -152,24 +179,29 @@ board_build.mcu = esp32c3
build_flags = build_flags =
-Werror -Wall -Werror -Wall
-DHELTEC_HTCT62 -DHELTEC_HTCT62
-DHAS_SX126X
-DHAS_SX1262 -DHAS_SX1262
-DELEGANTOTA_USE_ASYNC_WEBSERVER=1 -DELEGANTOTA_USE_ASYNC_WEBSERVER=1
lib_deps =
${common.lib_deps}
[env:WEMOS-LOLIN32-OLED-DIY] [env:WEMOS-LOLIN32-OLED-DIY]
board = lolin32 board = lolin32
build_flags = build_flags =
-Werror -Wall -Werror -Wall
-DWEMOS_LOLIN32_OLED_DIY_LoRa -DWEMOS_LOLIN32_OLED_DIY_LoRa
-DHAS_SX127X
-DHAS_SX1278 -DHAS_SX1278
-DELEGANTOTA_USE_ASYNC_WEBSERVER=1 -DELEGANTOTA_USE_ASYNC_WEBSERVER=1
lib_deps =
${common.lib_deps}
[env:ESP32_DIY_LoRa_A7670] [env:ESP32_DIY_LoRa_A7670]
board = esp32dev board = esp32dev
build_flags = build_flags =
-Werror -Wall -Werror -Wall
-DESP32_DIY_LoRa_A7670 -DESP32_DIY_LoRa_A7670
-DHAS_SX127X
-DHAS_SX1278 -DHAS_SX1278
-DELEGANTOTA_USE_ASYNC_WEBSERVER=1 -DELEGANTOTA_USE_ASYNC_WEBSERVER=1
lib_deps =
${common.lib_deps}

6
src/lora_utils.cpp
View File

@ -48,10 +48,10 @@ namespace LoRa_Utils {
Utils::println("Starting LoRa failed!"); Utils::println("Starting LoRa failed!");
while (true); while (true);
} }
#ifdef HAS_SX127X #ifdef HAS_SX1278
radio.setDio0Action(setFlag, RISING); radio.setDio0Action(setFlag, RISING);
#endif #endif
#ifdef HAS_SX126X #if defined(HAS_SX1262) || defined(HAS_SX1268)
if (!Config.lowPowerMode) { if (!Config.lowPowerMode) {
radio.setDio1Action(setFlag); radio.setDio1Action(setFlag);
} else { } else {
@ -68,7 +68,7 @@ namespace LoRa_Utils {
radio.setRfSwitchPins(RADIO_RXEN, RADIO_TXEN); radio.setRfSwitchPins(RADIO_RXEN, RADIO_TXEN);
#endif #endif
#if defined(HAS_SX127X) || ESP32_DIY_1W_LoRa #if defined(HAS_SX1278) || ESP32_DIY_1W_LoRa
state = radio.setOutputPower(Config.loramodule.power); // max value 20dB for 400M30S as it has Low Noise Amp state = radio.setOutputPower(Config.loramodule.power); // max value 20dB for 400M30S as it has Low Noise Amp
#endif #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_WS) || defined(TTGO_T_Beam_V1_0_SX1268) || defined(TTGO_T_Beam_V1_2_SX1262)

4
src/power_utils.h
View File

@ -2,7 +2,11 @@
#define POWER_UTILS_H_ #define POWER_UTILS_H_
#include <Arduino.h> #include <Arduino.h>
#if defined(HAS_AXP192) || defined(HAS_AXP2101)
#include "XPowersLib.h" #include "XPowersLib.h"
#else
#include <Wire.h>
#endif
namespace POWER_Utils { namespace POWER_Utils {