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

preparing for Variants mod

This commit is contained in:
richonguzman 2024-11-06 13:42:00 -03:00
parent 98aa145da5
commit 4d1d3bb07b
4 changed files with 92 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
common_settings.ini Normal file
View File

@ -0,0 +1,45 @@
[common]
build_flags =
-Werror -Wall
-DRADIOLIB_EXCLUDE_CC1101=1
-DRADIOLIB_EXCLUDE_NRF24=1
-DRADIOLIB_EXCLUDE_RF69=1
-DRADIOLIB_EXCLUDE_SX1231=1
-DRADIOLIB_EXCLUDE_SX1233=1
-DRADIOLIB_EXCLUDE_SI443X=1
-DRADIOLIB_EXCLUDE_RFM2X=1
-DRADIOLIB_EXCLUDE_AFSK=1
-DRADIOLIB_EXCLUDE_BELL=1
-DRADIOLIB_EXCLUDE_HELLSCHREIBER=1
-DRADIOLIB_EXCLUDE_MORSE=1
-DRADIOLIB_EXCLUDE_RTTY=1
-DRADIOLIB_EXCLUDE_SSTV=1
-DRADIOLIB_EXCLUDE_AX25=1
-DRADIOLIB_EXCLUDE_DIRECT_RECEIVE=1
-DRADIOLIB_EXCLUDE_BELL=1
-DRADIOLIB_EXCLUDE_PAGER=1
-DRADIOLIB_EXCLUDE_FSK4=1
-DRADIOLIB_EXCLUDE_APRS=1
-DRADIOLIB_EXCLUDE_LORAWAN=1
-I variants/${PIOENV}
lib_deps =
adafruit/Adafruit BusIO @ 1.16.1
adafruit/Adafruit Unified Sensor @ 1.1.14
adafruit/Adafruit BME280 Library @ 2.2.4
adafruit/Adafruit BMP280 Library @ 2.6.8
adafruit/Adafruit BME680 Library @ 2.0.4
bblanchon/ArduinoJson @ 6.21.3
h2zero/NimBLE-Arduino @ 1.4.1
jgromes/RadioLib @ 6.6.0
mathieucarbou/AsyncTCP @ 3.2.5
mathieucarbou/ESPAsyncWebServer @ 3.2.3
mikalhart/TinyGPSPlus @ 1.0.3
paulstoffregen/Time @ 1.6.1
peterus/esp-logger @ 1.0.0
shaggydog/OneButton @ 1.5.0
display_libs =
adafruit/Adafruit GFX Library @ 1.11.9
adafruit/Adafruit SSD1306 @ 2.5.10
usb_flags=
-DARDUINO_USB_MODE=1
-DARDUINO_USB_CDC_ON_BOOT=1

79
platformio.ini
View File

@ -11,6 +11,10 @@
[platformio] [platformio]
default_envs = ttgo-t-beam-v1_2 default_envs = ttgo-t-beam-v1_2
extra_configs =
common_settings.ini
variants/*/platformio.ini
[env] [env]
framework = arduino framework = arduino
monitor_speed = 115200 monitor_speed = 115200
@ -37,48 +41,6 @@ extends = env
platform = nordicnrf52 platform = nordicnrf52
upload_protocol = nrfutil upload_protocol = nrfutil
[common]
build_flags =
-Werror -Wall
-DRADIOLIB_EXCLUDE_CC1101=1
-DRADIOLIB_EXCLUDE_NRF24=1
-DRADIOLIB_EXCLUDE_RF69=1
-DRADIOLIB_EXCLUDE_SX1231=1
-DRADIOLIB_EXCLUDE_SX1233=1
-DRADIOLIB_EXCLUDE_SI443X=1
-DRADIOLIB_EXCLUDE_RFM2X=1
-DRADIOLIB_EXCLUDE_AFSK=1
-DRADIOLIB_EXCLUDE_BELL=1
-DRADIOLIB_EXCLUDE_HELLSCHREIBER=1
-DRADIOLIB_EXCLUDE_MORSE=1
-DRADIOLIB_EXCLUDE_RTTY=1
-DRADIOLIB_EXCLUDE_SSTV=1
-DRADIOLIB_EXCLUDE_AX25=1
-DRADIOLIB_EXCLUDE_DIRECT_RECEIVE=1
-DRADIOLIB_EXCLUDE_BELL=1
-DRADIOLIB_EXCLUDE_PAGER=1
-DRADIOLIB_EXCLUDE_FSK4=1
-DRADIOLIB_EXCLUDE_APRS=1
-DRADIOLIB_EXCLUDE_LORAWAN=1
lib_deps =
jgromes/RadioLib @ 6.6.0
mikalhart/TinyGPSPlus @ 1.0.3
paulstoffregen/Time @ 1.6.1
shaggydog/OneButton @ 1.5.0
bblanchon/ArduinoJson @ 6.21.3
h2zero/NimBLE-Arduino @ 1.4.1
peterus/esp-logger @ 1.0.0
adafruit/Adafruit BusIO @ 1.16.1
adafruit/Adafruit Unified Sensor @ 1.1.14
adafruit/Adafruit BME280 Library @ 2.2.4
adafruit/Adafruit BMP280 Library @ 2.6.8
adafruit/Adafruit BME680 Library @ 2.0.4
mathieucarbou/ESPAsyncWebServer @ 3.2.3
mathieucarbou/AsyncTCP @ 3.2.5
display_libs =
adafruit/Adafruit GFX Library @ 1.11.9
adafruit/Adafruit SSD1306 @ 2.5.10
[env:ttgo-t-beam-v1_2] [env:ttgo-t-beam-v1_2]
extends = env:esp32 extends = env:esp32
@ -256,10 +218,9 @@ board = heltec_wifi_lora_32_V3
board_build.mcu = esp32s3 board_build.mcu = esp32s3
build_flags = build_flags =
${common.build_flags} ${common.build_flags}
${common.usb_flags}
-D HELTEC_V3_GPS -D HELTEC_V3_GPS
-DHAS_SX1262 -DHAS_SX1262
-DARDUINO_USB_MODE=1
-DARDUINO_USB_CDC_ON_BOOT=1
lib_deps = lib_deps =
${common.lib_deps} ${common.lib_deps}
${common.display_libs} ${common.display_libs}
@ -270,11 +231,10 @@ board = heltec_wifi_lora_32_V3
board_build.mcu = esp32s3 board_build.mcu = esp32s3
build_flags = build_flags =
${common.build_flags} ${common.build_flags}
${common.usb_flags}
-D HELTEC_V3_TNC -D HELTEC_V3_TNC
-DHAS_SX1262 -DHAS_SX1262
-DHAS_NO_GPS -DHAS_NO_GPS
-DARDUINO_USB_MODE=1
-DARDUINO_USB_CDC_ON_BOOT=1
lib_deps = lib_deps =
${common.lib_deps} ${common.lib_deps}
${common.display_libs} ${common.display_libs}
@ -286,6 +246,7 @@ board = esp32-s3-devkitc-1
board_build.mcu = esp32s3 board_build.mcu = esp32s3
build_flags = build_flags =
${common.build_flags} ${common.build_flags}
${common.usb_flags}
-D HELTEC_WIRELESS_TRACKER -D HELTEC_WIRELESS_TRACKER
-DHAS_SX1262 -DHAS_SX1262
-DGPS_BAUDRATE=115200 -DGPS_BAUDRATE=115200
@ -313,8 +274,6 @@ build_flags =
-D LOAD_FONT8 -D LOAD_FONT8
-D SPI_FREQUENCY=27000000 -D SPI_FREQUENCY=27000000
-D USE_HSPI_PORT -D USE_HSPI_PORT
-DARDUINO_USB_MODE=1
-DARDUINO_USB_CDC_ON_BOOT=1
lib_deps = lib_deps =
${common.lib_deps} ${common.lib_deps}
bodmer/TFT_eSPI @ 2.5.43 bodmer/TFT_eSPI @ 2.5.43
@ -326,13 +285,12 @@ board = esp32-s3-devkitc-1
board_build.mcu = esp32s3 board_build.mcu = esp32s3
build_flags = build_flags =
${common.build_flags} ${common.build_flags}
${common.usb_flags}
-D TTGO_T_Beam_S3_SUPREME_V3 -D TTGO_T_Beam_S3_SUPREME_V3
-DBOARD_HAS_PSRAM -DBOARD_HAS_PSRAM
-DHAS_SX1262 -DHAS_SX1262
-DHAS_GPS_CTRL -DHAS_GPS_CTRL
-DHAS_AXP2101 -DHAS_AXP2101
-DARDUINO_USB_MODE=1
-DARDUINO_USB_CDC_ON_BOOT=1
lib_deps = lib_deps =
${common.lib_deps} ${common.lib_deps}
${common.display_libs} ${common.display_libs}
@ -359,6 +317,7 @@ extra_scripts =
debug_tool = esp-prog debug_tool = esp-prog
build_flags = build_flags =
${common.build_flags} ${common.build_flags}
${common.usb_flags}
-D TTGO_T_DECK_GPS -D TTGO_T_DECK_GPS
-DBOARD_HAS_PSRAM -DBOARD_HAS_PSRAM
-DHAS_SX1262 -DHAS_SX1262
@ -387,8 +346,6 @@ build_flags =
-DLOAD_FONT8 -DLOAD_FONT8
-DSPI_FREQUENCY=40000000 -DSPI_FREQUENCY=40000000
-DSPI_READ_FREQUENCY=16000000 -DSPI_READ_FREQUENCY=16000000
-DARDUINO_USB_MODE=1
-DARDUINO_USB_CDC_ON_BOOT=1
lib_deps = lib_deps =
${common.lib_deps} ${common.lib_deps}
bodmer/TFT_eSPI @ 2.5.43 bodmer/TFT_eSPI @ 2.5.43
@ -412,6 +369,7 @@ extra_scripts =
debug_tool = esp-prog debug_tool = esp-prog
build_flags = build_flags =
${common.build_flags} ${common.build_flags}
${common.usb_flags}
-D TTGO_T_DECK_PLUS -D TTGO_T_DECK_PLUS
-DBOARD_HAS_PSRAM -DBOARD_HAS_PSRAM
-DHAS_SX1262 -DHAS_SX1262
@ -441,8 +399,6 @@ build_flags =
-DLOAD_FONT8 -DLOAD_FONT8
-DSPI_FREQUENCY=40000000 -DSPI_FREQUENCY=40000000
-DSPI_READ_FREQUENCY=16000000 -DSPI_READ_FREQUENCY=16000000
-DARDUINO_USB_MODE=1
-DARDUINO_USB_CDC_ON_BOOT=1
lib_deps = lib_deps =
${common.lib_deps} ${common.lib_deps}
bodmer/TFT_eSPI @ 2.5.43 bodmer/TFT_eSPI @ 2.5.43
@ -481,10 +437,9 @@ board = esp32-s3-devkitc-1
board_build.mcu = esp32s3 board_build.mcu = esp32s3
build_flags = build_flags =
${common.build_flags} ${common.build_flags}
${common.usb_flags}
-D ESP32S3_DIY_LoRa_GPS -D ESP32S3_DIY_LoRa_GPS
-DHAS_SX1278 -DHAS_SX1278
-DARDUINO_USB_MODE=1
-DARDUINO_USB_CDC_ON_BOOT=1
lib_deps = lib_deps =
${common.lib_deps} ${common.lib_deps}
${common.display_libs} ${common.display_libs}
@ -496,10 +451,9 @@ board = esp32-s3-devkitc-1
board_build.mcu = esp32s3 board_build.mcu = esp32s3
build_flags = build_flags =
${common.build_flags} ${common.build_flags}
${common.usb_flags}
-D ESP32S3_DIY_LoRa_GPS_915 -D ESP32S3_DIY_LoRa_GPS_915
-DHAS_SX1276 -DHAS_SX1276
-DARDUINO_USB_MODE=1
-DARDUINO_USB_CDC_ON_BOOT=1
lib_deps = lib_deps =
${common.lib_deps} ${common.lib_deps}
${common.display_libs} ${common.display_libs}
@ -583,10 +537,9 @@ board = esp32-c3-devkitm-1
board_build.mcu = esp32c3 board_build.mcu = esp32c3
build_flags = build_flags =
${common.build_flags} ${common.build_flags}
${common.usb_flags}
-D ESP32_C3_DIY_LoRa_GPS -D ESP32_C3_DIY_LoRa_GPS
-DHAS_SX1278 -DHAS_SX1278
-DARDUINO_USB_MODE=1
-DARDUINO_USB_CDC_ON_BOOT=1
lib_deps = lib_deps =
${common.lib_deps} ${common.lib_deps}
${common.display_libs} ${common.display_libs}
@ -598,10 +551,9 @@ board = esp32-c3-devkitm-1
board_build.mcu = esp32c3 board_build.mcu = esp32c3
build_flags = build_flags =
${common.build_flags} ${common.build_flags}
${common.usb_flags}
-D ESP32_C3_DIY_LoRa_GPS_915 -D ESP32_C3_DIY_LoRa_GPS_915
-DHAS_SX1276 -DHAS_SX1276
-DARDUINO_USB_MODE=1
-DARDUINO_USB_CDC_ON_BOOT=1
lib_deps = lib_deps =
${common.lib_deps} ${common.lib_deps}
${common.display_libs} ${common.display_libs}
@ -649,11 +601,10 @@ board = esp32-s3-devkitc-1
board_build.mcu = esp32s3 board_build.mcu = esp32s3
build_flags = build_flags =
${common.build_flags} ${common.build_flags}
${common.usb_flags}
-D LIGHTTRACKER_PLUS_1_0 -D LIGHTTRACKER_PLUS_1_0
-DHAS_SX1268 -DHAS_SX1268
-DHAS_1W_LORA -DHAS_1W_LORA
-DARDUINO_USB_MODE=1
-DARDUINO_USB_CDC_ON_BOOT=1
lib_deps = lib_deps =
${common.lib_deps} ${common.lib_deps}
adafruit/Adafruit SHTC3 Library @ 1.0.1 adafruit/Adafruit SHTC3 Library @ 1.0.1

1
src/LoRa_APRS_Tracker.cpp
View File

@ -76,7 +76,6 @@ uint32_t refreshDisplayTime = millis();
bool sendUpdate = true; bool sendUpdate = true;
bool bluetoothConnected = false; bool bluetoothConnected = false;
//String BLEToLoRaPacket = "";
uint32_t lastTx = 0.0; uint32_t lastTx = 0.0;
uint32_t txInterval = 60000L; uint32_t txInterval = 60000L;

4
src/web_utils.h
View File

@ -13,10 +13,6 @@ namespace WEB_Utils {
void handleNotFound(AsyncWebServerRequest *request); void handleNotFound(AsyncWebServerRequest *request);
void handleStatus(AsyncWebServerRequest *request); void handleStatus(AsyncWebServerRequest *request);
void handleHome(AsyncWebServerRequest *request); void handleHome(AsyncWebServerRequest *request);
//void handleReadConfiguration(AsyncWebServerRequest *request);
//void handleWriteConfiguration(AsyncWebServerRequest *request);
void handleStyle(AsyncWebServerRequest *request); void handleStyle(AsyncWebServerRequest *request);
void handleScript(AsyncWebServerRequest *request); void handleScript(AsyncWebServerRequest *request);
void handleBootstrapStyle(AsyncWebServerRequest *request); void handleBootstrapStyle(AsyncWebServerRequest *request);