primera prueba 915

This commit is contained in:
richonguzman 2024-06-30 22:18:42 -04:00
parent a31b15598b
commit e359275e61
3 changed files with 114 additions and 8 deletions

View File

@ -59,6 +59,22 @@ lib_deps =
adafruit/Adafruit SSD1306 @ 2.5.10
adafruit/Adafruit SH110X @ 2.1.10
[env:ttgo-t-beam-v1_2_915]
extends = env:esp32
board = ttgo-t-beam
build_flags =
-Werror -Wall
-DTTGO_T_Beam_V1_2_915
-DHAS_SX1276
-DHAS_AXP2101
-DHAS_BT_CLASSIC
lib_deps =
${common.lib_deps}
lewisxhe/XPowersLib @ 0.2.4
adafruit/Adafruit GFX Library @ 1.11.9
adafruit/Adafruit SSD1306 @ 2.5.10
adafruit/Adafruit SH110X @ 2.1.10
[env:ttgo-t-beam-v1_2_SX1262]
extends = env:esp32
@ -93,6 +109,22 @@ lib_deps =
adafruit/Adafruit SSD1306 @ 2.5.10
adafruit/Adafruit SH110X @ 2.1.10
[env:ttgo-t-beam-v1_915]
extends = env:esp32
board = ttgo-t-beam
build_flags =
-Werror -Wall
-DTTGO_T_Beam_V1_0_915
-DHAS_SX1276
-DHAS_AXP192
-DHAS_BT_CLASSIC
lib_deps =
${common.lib_deps}
lewisxhe/XPowersLib @ 0.2.4
adafruit/Adafruit GFX Library @ 1.11.9
adafruit/Adafruit SSD1306 @ 2.5.10
adafruit/Adafruit SH110X @ 2.1.10
[env:ttgo-t-beam-v1_SX1268]
extends = env:esp32
@ -140,6 +172,20 @@ lib_deps =
adafruit/Adafruit SSD1306 @ 2.5.10
adafruit/Adafruit SH110X @ 2.1.10
[env:ttgo-t-lora32-v2_1_GPS_915]
extends = env:esp32
board = ttgo-lora32-v21
build_flags =
-Werror -Wall
-DTTGO_T_LORA32_V2_1_GPS_915
-DHAS_SX1276
-DHAS_BT_CLASSIC
lib_deps =
${common.lib_deps}
adafruit/Adafruit GFX Library @ 1.11.9
adafruit/Adafruit SSD1306 @ 2.5.10
adafruit/Adafruit SH110X @ 2.1.10
[env:ttgo-t-lora32-v2_1_TNC]
extends = env:esp32
@ -155,6 +201,20 @@ lib_deps =
adafruit/Adafruit SSD1306 @ 2.5.10
adafruit/Adafruit SH110X @ 2.1.10
[env:ttgo-t-lora32-v2_1_TNC_915]
extends = env:esp32
board = ttgo-lora32-v21
build_flags =
-Werror -Wall
-DTTGO_T_LORA32_V2_1_TNC_915
-DHAS_SX1276
-DHAS_BT_CLASSIC
lib_deps =
${common.lib_deps}
adafruit/Adafruit GFX Library @ 1.11.9
adafruit/Adafruit SSD1306 @ 2.5.10
adafruit/Adafruit SH110X @ 2.1.10
[env:heltec_wifi_lora_32_v3_GPS]
extends = env:esp32
@ -290,6 +350,20 @@ lib_deps =
adafruit/Adafruit SSD1306 @ 2.5.10
adafruit/Adafruit SH110X @ 2.1.10
[env:ESP32_DIY_LoRa_GPS_915]
extends = env:esp32
board = esp32dev
build_flags =
-Werror -Wall
-DESP32_DIY_LoRa_GPS_915
-DHAS_SX1276
-DHAS_BT_CLASSIC
lib_deps =
${common.lib_deps}
adafruit/Adafruit GFX Library @ 1.11.9
adafruit/Adafruit SSD1306 @ 2.5.10
adafruit/Adafruit SH110X @ 2.1.10
[env:ESP32_DIY_1W_LoRa_GPS]
extends = env:esp32
@ -298,6 +372,22 @@ build_flags =
-Werror -Wall
-DESP32_DIY_1W_LoRa_GPS
-DHAS_SX1268
-DHAS_1W_LORA
-DHAS_BT_CLASSIC
lib_deps =
${common.lib_deps}
adafruit/Adafruit GFX Library @ 1.11.9
adafruit/Adafruit SSD1306 @ 2.5.10
adafruit/Adafruit SH110X @ 2.1.10
[env:ESP32_DIY_1W_LoRa_GPS_915]
extends = env:esp32
board = esp32dev
build_flags =
-Werror -Wall
-DESP32_DIY_1W_LoRa_GPS_915
-DHAS_SX1262
-DHAS_1W_LORA
-DHAS_BT_CLASSIC
lib_deps =
${common.lib_deps}
@ -313,6 +403,7 @@ build_flags =
-Werror -Wall
-DOE5HWN_MeshCom
-DHAS_SX1268
-DHAS_1W_LORA
-DHAS_BT_CLASSIC
lib_deps =
${common.lib_deps}
@ -320,7 +411,6 @@ lib_deps =
adafruit/Adafruit SSD1306 @ 2.5.10
adafruit/Adafruit SH110X @ 2.1.10
[env:Wemos_ESP32_Bat_LoRa_GPS]
extends = env:esp32
board = esp32dev
@ -346,6 +436,22 @@ build_flags =
-DHAS_SX1278
-DARDUINO_USB_MODE=1
-DARDUINO_USB_CDC_ON_BOOT=1
lib_deps =
${common.lib_deps}
adafruit/Adafruit GFX Library @ 1.11.9
adafruit/Adafruit SSD1306 @ 2.5.10
adafruit/Adafruit SH110X @ 2.1.10
[env:esp32_c3_DIY_LoRa_GPS_915]
extends = env:esp32
board = esp32-c3-devkitm-1
board_build.mcu = esp32c3
build_flags =
-Werror -Wall
-DESP32_C3_DIY_LoRa_GPS_915
-DHAS_SX1276
-DARDUINO_USB_MODE=1
-DARDUINO_USB_CDC_ON_BOOT=1
lib_deps =
${common.lib_deps}
adafruit/Adafruit GFX Library @ 1.11.9

View File

@ -45,7 +45,7 @@ TinyGPSPlus gps;
OneButton userButton = OneButton(BUTTON_PIN, true, true);
#endif
String versionDate = "2024.06.24";
String versionDate = "2024.07.01";
uint8_t myBeaconsIndex = 0;
int myBeaconsSize = Config.beacons.size();

View File

@ -49,10 +49,10 @@ namespace LoRa_Utils {
float signalBandwidth = currentLoRaType->signalBandwidth/1000;
radio.setBandwidth(signalBandwidth);
radio.setCodingRate(currentLoRaType->codingRate4);
#if defined(TTGO_T_Beam_V1_2_SX1262) || defined(TTGO_T_Beam_V1_0_SX1268) || defined(HELTEC_V3_GPS) || defined(HELTEC_WIRELESS_TRACKER) || defined(TTGO_T_Beam_S3_SUPREME_V3) || defined(TTGO_T_DECK_GPS)
#if (defined(HAS_SX1268) || defined(HAS_SX1262)) && !defined(HAS_1W_LORA)
radio.setOutputPower(currentLoRaType->power + 2); // values available: 10, 17, 22 --> if 20 in tracker_conf.json it will be updated to 22.
#endif
#if defined(HAS_1278) || defined(ESP32_DIY_1W_LoRa_GPS) || defined(OE5HWN_MeshCom)
#if defined(HAS_1278) || defined(HAS_SX1276) || defined(HAS_1W_LORA)
radio.setOutputPower(currentLoRaType->power);
#endif
@ -93,7 +93,7 @@ namespace LoRa_Utils {
#if defined(HAS_SX1262) || defined(HAS_SX1268)
radio.setDio1Action(setFlag);
#endif
#if defined(HAS_SX1278)// || defined(HAS_SX1276)
#if defined(HAS_SX1278) || defined(HAS_SX1276)
radio.setDio0Action(setFlag, RISING);
#endif
radio.setSpreadingFactor(currentLoRaType->spreadingFactor);
@ -106,17 +106,17 @@ namespace LoRa_Utils {
radio.setRfSwitchPins(RADIO_RXEN, RADIO_TXEN);
#endif
#if defined(ESP32_DIY_1W_LoRa_GPS) || defined(OE5HWN_MeshCom)
#ifdef HAS_1W_LORA // Ebyte E22 400M30S (SX1268) / 900M30S (SX1262)
state = radio.setOutputPower(currentLoRaType->power); // max value 20 (when 20dB in setup 30dB in output as 400M30S has Low Noise Amp)
radio.setCurrentLimit(140); // to be validated (100 , 120, 140)?
#endif
#if defined(TTGO_T_Beam_V1_2_SX1262) || defined(TTGO_T_Beam_V1_0_SX1268) || defined(HELTEC_V3_GPS) || defined(HELTEC_WIRELESS_TRACKER) || defined(TTGO_T_Beam_S3_SUPREME_V3) || defined(TTGO_T_DECK_GPS)
#if (defined(HAS_SX1268) || defined(HAS_SX1262)) && !defined(HAS_1W_LORA)
state = radio.setOutputPower(currentLoRaType->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_SX1278)
#if defined(HAS_SX1278) || defined(HAS_SX1276)
state = radio.setOutputPower(currentLoRaType->power);
radio.setCurrentLimit(100); // to be validated (80 , 100)?
#endif