From 4121ae2b9d12cc89fd17a2ddf156ca16d1665bef Mon Sep 17 00:00:00 2001 From: richonguzman Date: Fri, 25 Oct 2024 16:23:02 -0300 Subject: [PATCH] platformio cleaned --- platformio.ini | 185 +++++++++++++++++++------------------- src/LoRa_APRS_Tracker.cpp | 2 +- 2 files changed, 92 insertions(+), 95 deletions(-) diff --git a/platformio.ini b/platformio.ini index 052b868..951e4b3 100644 --- a/platformio.ini +++ b/platformio.ini @@ -38,6 +38,28 @@ platform = nordicnrf52 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 @@ -53,13 +75,16 @@ lib_deps = 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] extends = env:esp32 board = ttgo-t-beam build_flags = - -Werror -Wall + ${common.build_flags} -DTTGO_T_Beam_V1_2 -DHAS_SX1278 -DHAS_AXP2101 @@ -67,16 +92,15 @@ build_flags = -DHAS_GPS_CTRL lib_deps = ${common.lib_deps} + ${common.display_libs} 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_915] extends = env:esp32 board = ttgo-t-beam build_flags = - -Werror -Wall + ${common.build_flags} -DTTGO_T_Beam_V1_2_915 -DHAS_SX1276 -DHAS_AXP2101 @@ -84,9 +108,8 @@ build_flags = -DHAS_GPS_CTRL lib_deps = ${common.lib_deps} + ${common.display_libs} lewisxhe/XPowersLib @ 0.2.4 - adafruit/Adafruit GFX Library @ 1.11.9 - adafruit/Adafruit SSD1306 @ 2.5.10 adafruit/Adafruit SH110X @ 2.1.10 @@ -94,7 +117,7 @@ lib_deps = extends = env:esp32 board = ttgo-t-beam build_flags = - -Werror -Wall + ${common.build_flags} -DTTGO_T_Beam_V1_2_SX1262 -DHAS_SX1262 -DHAS_AXP2101 @@ -102,9 +125,8 @@ build_flags = -DHAS_GPS_CTRL lib_deps = ${common.lib_deps} + ${common.display_libs} lewisxhe/XPowersLib @ 0.2.4 - adafruit/Adafruit GFX Library @ 1.11.9 - adafruit/Adafruit SSD1306 @ 2.5.10 adafruit/Adafruit SH110X @ 2.1.10 @@ -112,7 +134,7 @@ lib_deps = extends = env:esp32 board = ttgo-t-beam build_flags = - -Werror -Wall + ${common.build_flags} -DTTGO_T_Beam_V1_0 -DHAS_SX1278 -DHAS_AXP192 @@ -120,16 +142,15 @@ build_flags = -DHAS_GPS_CTRL lib_deps = ${common.lib_deps} + ${common.display_libs} 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_915] extends = env:esp32 board = ttgo-t-beam build_flags = - -Werror -Wall + ${common.build_flags} -DTTGO_T_Beam_V1_0_915 -DHAS_SX1276 -DHAS_AXP192 @@ -137,9 +158,8 @@ build_flags = -DHAS_GPS_CTRL lib_deps = ${common.lib_deps} + ${common.display_libs} lewisxhe/XPowersLib @ 0.2.4 - adafruit/Adafruit GFX Library @ 1.11.9 - adafruit/Adafruit SSD1306 @ 2.5.10 adafruit/Adafruit SH110X @ 2.1.10 @@ -147,7 +167,7 @@ lib_deps = extends = env:esp32 board = ttgo-t-beam build_flags = - -Werror -Wall + ${common.build_flags} -DTTGO_T_Beam_V1_0_SX1268 -DHAS_SX1268 -DHAS_AXP192 @@ -155,9 +175,8 @@ build_flags = -DHAS_GPS_CTRL lib_deps = ${common.lib_deps} + ${common.display_libs} lewisxhe/XPowersLib @ 0.2.4 - adafruit/Adafruit GFX Library @ 1.11.9 - adafruit/Adafruit SSD1306 @ 2.5.10 adafruit/Adafruit SH110X @ 2.1.10 @@ -165,14 +184,13 @@ lib_deps = extends = env:esp32 board = ttgo-t-beam build_flags = - -Werror -Wall + ${common.build_flags} -DTTGO_T_Beam_V0_7 -DHAS_SX1278 -DHAS_BT_CLASSIC lib_deps = ${common.lib_deps} - adafruit/Adafruit GFX Library @ 1.11.9 - adafruit/Adafruit SSD1306 @ 2.5.10 + ${common.display_libs} adafruit/Adafruit SH110X @ 2.1.10 @@ -180,28 +198,26 @@ lib_deps = extends = env:esp32 board = ttgo-lora32-v21 build_flags = - -Werror -Wall + ${common.build_flags} -DTTGO_T_LORA32_V2_1_GPS -DHAS_SX1278 -DHAS_BT_CLASSIC lib_deps = ${common.lib_deps} - adafruit/Adafruit GFX Library @ 1.11.9 - adafruit/Adafruit SSD1306 @ 2.5.10 + ${common.display_libs} 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 + ${common.build_flags} -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 + ${common.display_libs} adafruit/Adafruit SH110X @ 2.1.10 @@ -209,30 +225,28 @@ lib_deps = extends = env:esp32 board = ttgo-lora32-v21 build_flags = - -Werror -Wall + ${common.build_flags} -DTTGO_T_LORA32_V2_1_TNC -DHAS_SX1278 -DHAS_BT_CLASSIC -DHAS_NO_GPS lib_deps = ${common.lib_deps} - adafruit/Adafruit GFX Library @ 1.11.9 - adafruit/Adafruit SSD1306 @ 2.5.10 + ${common.display_libs} 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 + ${common.build_flags} -DTTGO_T_LORA32_V2_1_TNC_915 -DHAS_SX1276 -DHAS_BT_CLASSIC -DHAS_NO_GPS lib_deps = ${common.lib_deps} - adafruit/Adafruit GFX Library @ 1.11.9 - adafruit/Adafruit SSD1306 @ 2.5.10 + ${common.display_libs} adafruit/Adafruit SH110X @ 2.1.10 @@ -241,22 +255,21 @@ extends = env:esp32 board = heltec_wifi_lora_32_V3 board_build.mcu = esp32s3 build_flags = - -Werror -Wall + ${common.build_flags} -DHELTEC_V3_GPS -DHAS_SX1262 -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 + ${common.display_libs} [env:heltec_wifi_lora_32_v3_TNC] extends = env:esp32 board = heltec_wifi_lora_32_V3 board_build.mcu = esp32s3 build_flags = - -Werror -Wall + ${common.build_flags} -DHELTEC_V3_TNC -DHAS_SX1262 -DHAS_NO_GPS @@ -264,8 +277,7 @@ build_flags = -DARDUINO_USB_CDC_ON_BOOT=1 lib_deps = ${common.lib_deps} - adafruit/Adafruit GFX Library @ 1.11.9 - adafruit/Adafruit SSD1306 @ 2.5.10 + ${common.display_libs} [env:heltec_wireless_tracker] @@ -273,7 +285,7 @@ extends = env:esp32 board = esp32-s3-devkitc-1 board_build.mcu = esp32s3 build_flags = - -Werror -Wall + ${common.build_flags} -DHELTEC_WIRELESS_TRACKER -DHAS_SX1262 -DGPS_BAUDRATE=115200 @@ -313,7 +325,7 @@ extends = env:esp32 board = esp32-s3-devkitc-1 board_build.mcu = esp32s3 build_flags = - -Werror -Wall + ${common.build_flags} -DTTGO_T_Beam_S3_SUPREME_V3 -DBOARD_HAS_PSRAM -DHAS_SX1262 @@ -323,9 +335,8 @@ build_flags = -DARDUINO_USB_CDC_ON_BOOT=1 lib_deps = ${common.lib_deps} + ${common.display_libs} lewisxhe/XPowersLib @ 0.2.4 - adafruit/Adafruit GFX Library @ 1.11.9 - adafruit/Adafruit SSD1306 @ 2.5.10 adafruit/Adafruit SH110X @ 2.1.10 @@ -347,7 +358,7 @@ extra_scripts = pre:tools/compress.py debug_tool = esp-prog build_flags = - -Werror -Wall + ${common.build_flags} -DTTGO_T_DECK_GPS -DBOARD_HAS_PSRAM -DHAS_SX1262 @@ -400,7 +411,7 @@ extra_scripts = pre:tools/compress.py debug_tool = esp-prog build_flags = - -Werror -Wall + ${common.build_flags} -DTTGO_T_DECK_PLUS -DBOARD_HAS_PSRAM -DHAS_SX1262 @@ -441,28 +452,26 @@ lib_deps = extends = env:esp32 board = esp32dev build_flags = - -Werror -Wall + ${common.build_flags} -DESP32_DIY_LoRa_GPS -DHAS_SX1278 -DHAS_BT_CLASSIC lib_deps = ${common.lib_deps} - adafruit/Adafruit GFX Library @ 1.11.9 - adafruit/Adafruit SSD1306 @ 2.5.10 + ${common.display_libs} adafruit/Adafruit SH110X @ 2.1.10 [env:ESP32_DIY_LoRa_GPS_915] extends = env:esp32 board = esp32dev build_flags = - -Werror -Wall + ${common.build_flags} -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 + ${common.display_libs} adafruit/Adafruit SH110X @ 2.1.10 @@ -471,15 +480,14 @@ extends = env:esp32 board = esp32-s3-devkitc-1 board_build.mcu = esp32s3 build_flags = - -Werror -Wall + ${common.build_flags} -DESP32S3_DIY_LoRa_GPS -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 + ${common.display_libs} adafruit/Adafruit SH110X @ 2.1.10 [env:ESP32S3_DIY_LoRa_GPS_915] @@ -487,15 +495,14 @@ extends = env:esp32 board = esp32-s3-devkitc-1 board_build.mcu = esp32s3 build_flags = - -Werror -Wall + ${common.build_flags} -DESP32S3_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 - adafruit/Adafruit SSD1306 @ 2.5.10 + ${common.display_libs} adafruit/Adafruit SH110X @ 2.1.10 @@ -503,75 +510,70 @@ lib_deps = extends = env:esp32 board = esp32dev build_flags = - -Werror -Wall + ${common.build_flags} -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 + ${common.display_libs} adafruit/Adafruit SH110X @ 2.1.10 [env:ESP32_DIY_1W_LoRa_GPS_915] extends = env:esp32 board = esp32dev build_flags = - -Werror -Wall + ${common.build_flags} -DESP32_DIY_1W_LoRa_GPS_915 -DHAS_SX1262 -DHAS_1W_LORA -DHAS_BT_CLASSIC lib_deps = ${common.lib_deps} - adafruit/Adafruit GFX Library @ 1.11.9 - adafruit/Adafruit SSD1306 @ 2.5.10 + ${common.display_libs} adafruit/Adafruit SH110X @ 2.1.10 [env:ESP32_DIY_1W_LoRa_GPS_LLCC68] - extends = env:esp32 - board = esp32dev - build_flags = - -Werror -Wall +extends = env:esp32 +board = esp32dev +build_flags = + ${common.build_flags} -DESP32_DIY_1W_LoRa_GPS_LLCC68 -DHAS_LLCC68 -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 +lib_deps = + ${common.lib_deps} + ${common.display_libs} + adafruit/Adafruit SH110X @ 2.1.10 [env:OE5HWN_MeshCom] extends = env:esp32 board = esp32dev build_flags = - -Werror -Wall + ${common.build_flags} -DOE5HWN_MeshCom -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 + ${common.display_libs} adafruit/Adafruit SH110X @ 2.1.10 [env:Wemos_ESP32_Bat_LoRa_GPS] extends = env:esp32 board = esp32dev build_flags = - -Werror -Wall + ${common.build_flags} -DWEMOS_ESP32_Bat_LoRa_GPS -DHAS_SX1278 -DHAS_BT_CLASSIC lib_deps = ${common.lib_deps} - adafruit/Adafruit GFX Library @ 1.11.9 - adafruit/Adafruit SSD1306 @ 2.5.10 + ${common.display_libs} adafruit/Adafruit SH110X @ 2.1.10 @@ -580,15 +582,14 @@ extends = env:esp32 board = esp32-c3-devkitm-1 board_build.mcu = esp32c3 build_flags = - -Werror -Wall + ${common.build_flags} -DESP32_C3_DIY_LoRa_GPS -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 + ${common.display_libs} adafruit/Adafruit SH110X @ 2.1.10 [env:esp32_c3_DIY_LoRa_GPS_915] @@ -596,62 +597,58 @@ extends = env:esp32 board = esp32-c3-devkitm-1 board_build.mcu = esp32c3 build_flags = - -Werror -Wall + ${common.build_flags} -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 - adafruit/Adafruit SSD1306 @ 2.5.10 + ${common.display_libs} adafruit/Adafruit SH110X @ 2.1.10 [env:heltec-lora32-v2_GPS] extends = env:esp32 board = ttgo-lora32-v21 build_flags = - -Werror -Wall + ${common.build_flags} -DHELTEC_V2_GPS -DHAS_SX1278 -DHAS_BT_CLASSIC lib_deps = ${common.lib_deps} - adafruit/Adafruit GFX Library @ 1.11.9 - adafruit/Adafruit SSD1306 @ 2.5.10 + ${common.display_libs} [env:heltec-lora32-v2_GPS_915] extends = env:esp32 board = ttgo-lora32-v21 build_flags = - -Werror -Wall + ${common.build_flags} -DHELTEC_V2_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 + ${common.display_libs} [env:heltec_ht-ct62_GPS] extends = env:esp32 board = heltec_wireless_stick_lite board_build.mcu = esp32c3 build_flags = - -Werror -Wall + ${common.build_flags} -DHELTEC_HTCT62_GPS -DHAS_SX1262 lib_deps = ${common.lib_deps} - adafruit/Adafruit GFX Library @ 1.11.9 - adafruit/Adafruit SSD1306 @ 2.5.10 + ${common.display_libs} [env:QRPLabs_LightTracker_Plus_1_0] extends = env:esp32 board = esp32-s3-devkitc-1 board_build.mcu = esp32s3 build_flags = - -Werror -Wall + ${common.build_flags} -DLIGHTTRACKER_PLUS_1_0 -DHAS_SX1268 -DHAS_1W_LORA diff --git a/src/LoRa_APRS_Tracker.cpp b/src/LoRa_APRS_Tracker.cpp index df9b62c..344b25d 100644 --- a/src/LoRa_APRS_Tracker.cpp +++ b/src/LoRa_APRS_Tracker.cpp @@ -49,7 +49,7 @@ TinyGPSPlus gps; OneButton userButton = OneButton(BUTTON_PIN, true, true); #endif -String versionDate = "2024.10.24"; +String versionDate = "2024.10.25"; uint8_t myBeaconsIndex = 0; int myBeaconsSize = Config.beacons.size();