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

HeltecWirelessTracker cleanup

This commit is contained in:
richonguzman 2024-05-16 12:31:01 -04:00
parent 1247c9a202
commit ad88a8503b
3 changed files with 228 additions and 225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

323
platformio.ini
View File

@ -29,6 +29,7 @@ upload_protocol = nrfutil
[common]
lib_deps =
jgromes/RadioLib @ 6.1.0
mikalhart/TinyGPSPlus @ 1.0.3
paulstoffregen/Time @ 1.6.1
shaggydog/OneButton @ 1.5.0
@ -45,7 +46,7 @@ lib_deps =
[env:ttgo-t-beam-v1_2]
extends = env:esp32
board = ttgo-t-beam
build_flags =
build_flags =
-Werror -Wall
-DTTGO_T_Beam_V1_2
-DHAS_SX1278
@ -53,108 +54,7 @@ build_flags =
-DHAS_BT_CLASSIC
lib_deps =
${common.lib_deps}
lewisxhe/XPowersLib@^0.1.8
jgromes/RadioLib @ 6.1.0
adafruit/Adafruit GFX Library @ 1.11.7
adafruit/Adafruit SSD1306 @ 2.5.7
adafruit/Adafruit SH110X@^2.1.8
[env:ttgo-t-beam-v1]
extends = env:esp32
board = ttgo-t-beam
build_flags =
-Werror -Wall
-DTTGO_T_Beam_V1_0
-DHAS_SX1278
-DHAS_AXP192
-DHAS_BT_CLASSIC
lib_deps =
${common.lib_deps}
lewisxhe/XPowersLib@^0.1.8
jgromes/RadioLib @ 6.1.0
adafruit/Adafruit GFX Library @ 1.11.7
adafruit/Adafruit SSD1306 @ 2.5.7
adafruit/Adafruit SH110X@^2.1.8
[env:ttgo-t-lora32-v2_1_TNC]
extends = env:esp32
board = ttgo-lora32-v21
build_flags =
-Werror -Wall
-DTTGO_T_LORA32_V2_1_TNC
-DHAS_SX1278
-DHAS_BT_CLASSIC
lib_deps =
${common.lib_deps}
jgromes/RadioLib @ 6.1.0
adafruit/Adafruit GFX Library @ 1.11.7
adafruit/Adafruit SSD1306 @ 2.5.7
adafruit/Adafruit SH110X@^2.1.8
[env:ttgo-t-lora32-v2_1_GPS]
extends = env:esp32
board = ttgo-lora32-v21
build_flags =
-Werror -Wall
-DTTGO_T_LORA32_V2_1_GPS
-DHAS_SX1278
-DHAS_BT_CLASSIC
lib_deps =
${common.lib_deps}
jgromes/RadioLib @ 6.1.0
adafruit/Adafruit GFX Library @ 1.11.7
adafruit/Adafruit SSD1306 @ 2.5.7
adafruit/Adafruit SH110X@^2.1.8
[env:ESP32_DIY_LoRa_GPS]
extends = env:esp32
board = esp32dev
build_flags =
-Werror -Wall
-DESP32_DIY_LoRa_GPS
-DHAS_SX127X
-DHAS_BT_CLASSIC
lib_deps =
${common.lib_deps}
sandeepmistry/LoRa @ 0.8.0
adafruit/Adafruit GFX Library @ 1.11.7
adafruit/Adafruit SSD1306 @ 2.5.7
adafruit/Adafruit SH110X@^2.1.8
[env:ESP32_DIY_1W_LoRa_GPS]
extends = env:esp32
board = esp32dev
build_flags =
-Werror -Wall
-DESP32_DIY_1W_LoRa_GPS
-DHAS_SX1268
-DHAS_BT_CLASSIC
lib_deps =
${common.lib_deps}
jgromes/RadioLib @ 6.1.0
adafruit/Adafruit GFX Library @ 1.11.7
adafruit/Adafruit SSD1306 @ 2.5.7
adafruit/Adafruit SH110X@^2.1.8
[env:ttgo-t-beam-v1_SX1268]
extends = env:esp32
board = ttgo-t-beam
build_flags =
-Werror -Wall
-DTTGO_T_Beam_V1_0_SX1268
-DHAS_SX1268
-DHAS_AXP192
-DHAS_BT_CLASSIC
lib_deps =
${common.lib_deps}
lewisxhe/XPowersLib@^0.1.8
jgromes/RadioLib @ 6.1.0
lewisxhe/XPowersLib@^0.1.8
adafruit/Adafruit GFX Library @ 1.11.7
adafruit/Adafruit SSD1306 @ 2.5.7
adafruit/Adafruit SH110X@^2.1.8
@ -163,8 +63,8 @@ lib_deps =
[env:ttgo-t-beam-v1_2_SX1262]
extends = env:esp32
board = ttgo-t-beam
build_flags =
-Werror -Wall
build_flags =
-Werror -Wall
-DTTGO_T_Beam_V1_2_SX1262
-DHAS_SX1262
-DHAS_AXP2101
@ -172,7 +72,40 @@ build_flags =
lib_deps =
${common.lib_deps}
lewisxhe/XPowersLib@^0.1.8
jgromes/RadioLib @ 6.1.0
adafruit/Adafruit GFX Library @ 1.11.7
adafruit/Adafruit SSD1306 @ 2.5.7
adafruit/Adafruit SH110X@^2.1.8
[env:ttgo-t-beam-v1]
extends = env:esp32
board = ttgo-t-beam
build_flags =
-Werror -Wall
-DTTGO_T_Beam_V1_0
-DHAS_SX1278
-DHAS_AXP192
-DHAS_BT_CLASSIC
lib_deps =
${common.lib_deps}
lewisxhe/XPowersLib@^0.1.8
adafruit/Adafruit GFX Library @ 1.11.7
adafruit/Adafruit SSD1306 @ 2.5.7
adafruit/Adafruit SH110X@^2.1.8
[env:ttgo-t-beam-v1_SX1268]
extends = env:esp32
board = ttgo-t-beam
build_flags =
-Werror -Wall
-DTTGO_T_Beam_V1_0_SX1268
-DHAS_SX1268
-DHAS_AXP192
-DHAS_BT_CLASSIC
lib_deps =
${common.lib_deps}
lewisxhe/XPowersLib@^0.1.8
adafruit/Adafruit GFX Library @ 1.11.7
adafruit/Adafruit SSD1306 @ 2.5.7
adafruit/Adafruit SH110X@^2.1.8
@ -181,85 +114,60 @@ lib_deps =
[env:ttgo-t-beam-v0_7]
extends = env:esp32
board = ttgo-t-beam
build_flags =
-Werror -Wall
build_flags =
-Werror -Wall
-DTTGO_T_Beam_V0_7
-DHAS_SX1278
-DHAS_BT_CLASSIC
lib_deps =
${common.lib_deps}
jgromes/RadioLib @ 6.1.0
adafruit/Adafruit GFX Library @ 1.11.7
adafruit/Adafruit SSD1306 @ 2.5.7
adafruit/Adafruit SH110X@^2.1.8
[env:ttgo_t_beam_S3_SUPREME_V3]
[env:ttgo-t-lora32-v2_1_GPS]
extends = env:esp32
board = esp32-s3-devkitc-1
board_build.mcu = esp32s3
build_flags =
-DTTGO_T_Beam_S3_SUPREME_V3
-DBOARD_HAS_PSRAM
-DHAS_SX1262
-DHAS_AXP2101
-DARDUINO_USB_MODE=1
-DARDUINO_USB_CDC_ON_BOOT=1
board = ttgo-lora32-v21
build_flags =
-Werror -Wall
-DTTGO_T_LORA32_V2_1_GPS
-DHAS_SX1278
-DHAS_BT_CLASSIC
lib_deps =
${common.lib_deps}
lewisxhe/XPowersLib@^0.1.8
jgromes/RadioLib @ 6.1.0
${common.lib_deps}
adafruit/Adafruit GFX Library @ 1.11.7
adafruit/Adafruit SSD1306 @ 2.5.7
adafruit/Adafruit SH110X@^2.1.8
[env:heltec_V3_GPS]
[env:ttgo-t-lora32-v2_1_TNC]
extends = env:esp32
board = ttgo-lora32-v21
build_flags =
-Werror -Wall
-DTTGO_T_LORA32_V2_1_TNC
-DHAS_SX1278
-DHAS_BT_CLASSIC
lib_deps =
${common.lib_deps}
adafruit/Adafruit GFX Library @ 1.11.7
adafruit/Adafruit SSD1306 @ 2.5.7
adafruit/Adafruit SH110X@^2.1.8
[env:heltec_wifi_lora_32_v3_GPS]
extends = env:esp32
board = heltec_wifi_lora_32_V3
board_build.mcu = esp32s3
build_flags =
build_flags =
-Werror -Wall
-DHELTEC_V3_GPS
-DHAS_SX1262
-DARDUINO_USB_MODE=1
-DARDUINO_USB_CDC_ON_BOOT=1
lib_deps =
${common.lib_deps}
jgromes/RadioLib @ 6.1.0
adafruit/Adafruit GFX Library @ 1.11.7
adafruit/Adafruit SSD1306 @ 2.5.7
adafruit/Adafruit SH110X@^2.1.8
[env:OE5HWN_MeshCom]
extends = env:esp32
board = esp32dev
build_flags =
-Werror -Wall
-DOE5HWN_MeshCom
-DHAS_SX1268
-DHAS_BT_CLASSIC
lib_deps =
${common.lib_deps}
jgromes/RadioLib @ 6.1.0
adafruit/Adafruit GFX Library @ 1.11.7
adafruit/Adafruit SSD1306 @ 2.5.7
adafruit/Adafruit SH110X@^2.1.8
[env:esp32_c3_DIY_LoRa_GPS]
extends = env:esp32
board = esp32-c3-devkitm-1
board_build.mcu = esp32c3
build_flags =
-Werror -Wall
-DESP32_C3_DIY_LoRa_GPS
-DHAS_SX127X
-DARDUINO_USB_MODE=1
-DARDUINO_USB_CDC_ON_BOOT=1
lib_deps =
${common.lib_deps}
sandeepmistry/LoRa @ 0.8.0
adafruit/Adafruit GFX Library @ 1.11.7
adafruit/Adafruit SSD1306 @ 2.5.7
adafruit/Adafruit SH110X@^2.1.8
@ -269,7 +177,8 @@ lib_deps =
extends = env:esp32
board = esp32-s3-devkitc-1
board_build.mcu = esp32s3
build_flags =
build_flags =
-Werror -Wall
-DHELTEC_WIRELESS_TRACKER
-DHAS_SX1262
-DHIGH_GPS_BAUDRATE
@ -300,15 +209,105 @@ build_flags =
-DARDUINO_USB_CDC_ON_BOOT=1
lib_deps =
${common.lib_deps}
jgromes/RadioLib @ 6.1.0
bodmer/TFT_eSPI@^2.5.43
[env:ESP32_DIY_LoRa_GPS]
extends = env:esp32
board = esp32dev
build_flags =
-Werror -Wall
-DESP32_DIY_LoRa_GPS
-DHAS_SX1278
-DHAS_BT_CLASSIC
lib_deps =
${common.lib_deps}
adafruit/Adafruit GFX Library @ 1.11.7
adafruit/Adafruit SSD1306 @ 2.5.7
adafruit/Adafruit SH110X@^2.1.8
[env:ESP32_DIY_1W_LoRa_GPS]
extends = env:esp32
board = esp32dev
build_flags =
-Werror -Wall
-DESP32_DIY_1W_LoRa_GPS
-DHAS_SX1268
-DHAS_BT_CLASSIC
lib_deps =
${common.lib_deps}
jgromes/RadioLib @ 6.1.0
adafruit/Adafruit GFX Library @ 1.11.7
adafruit/Adafruit SSD1306 @ 2.5.7
adafruit/Adafruit SH110X@^2.1.8
[env:ttgo_t_beam_S3_SUPREME_V3]
extends = env:esp32
board = esp32-s3-devkitc-1
board_build.mcu = esp32s3
build_flags =
-DTTGO_T_Beam_S3_SUPREME_V3
-DBOARD_HAS_PSRAM
-DHAS_SX1262
-DHAS_AXP2101
-DARDUINO_USB_MODE=1
-DARDUINO_USB_CDC_ON_BOOT=1
lib_deps =
${common.lib_deps}
lewisxhe/XPowersLib@^0.1.8
jgromes/RadioLib @ 6.1.0
adafruit/Adafruit GFX Library @ 1.11.7
adafruit/Adafruit SSD1306 @ 2.5.7
adafruit/Adafruit SH110X@^2.1.8
[env:OE5HWN_MeshCom]
extends = env:esp32
board = esp32dev
build_flags =
-Werror -Wall
-DOE5HWN_MeshCom
-DHAS_SX1268
-DHAS_BT_CLASSIC
lib_deps =
${common.lib_deps}
jgromes/RadioLib @ 6.1.0
adafruit/Adafruit GFX Library @ 1.11.7
adafruit/Adafruit SSD1306 @ 2.5.7
adafruit/Adafruit SH110X@^2.1.8
[env:esp32_c3_DIY_LoRa_GPS]
extends = env:esp32
board = esp32-c3-devkitm-1
board_build.mcu = esp32c3
build_flags =
-Werror -Wall
-DESP32_C3_DIY_LoRa_GPS
-DHAS_SX127X
-DARDUINO_USB_MODE=1
-DARDUINO_USB_CDC_ON_BOOT=1
lib_deps =
${common.lib_deps}
sandeepmistry/LoRa @ 0.8.0
adafruit/Adafruit GFX Library @ 1.11.7
adafruit/Adafruit SSD1306 @ 2.5.7
adafruit/Adafruit SH110X@^2.1.8
[env:ttgo_t_deck_gps]
extends = env:esp32
board = esp32-s3-devkitc-1
board_build.mcu = esp32s3
build_flags =
build_flags =
-DTTGO_T_DECK_GPS
-DHAS_SX1262
-DHAS_TFT

40
src/bme_utils.cpp
View File

@ -17,11 +17,11 @@ uint8_t wxModuleAddress = 0x00;
Adafruit_BME280 bme280;
Adafruit_BME680 bme680;
#ifdef HELTEC_V3_GPS
Adafruit_BMP280 bmp280(&Wire1);
#else
Adafruit_BMP280 bmp280;
Adafruit_BME680 bme680;
#endif
@ -39,6 +39,7 @@ namespace BME_Utils {
err = Wire.endTransmission();
#endif
if (err == 0) {
//Serial.println(addr); this shows any connected board to I2C
if (addr == 0x76 || addr == 0x77) {
wxModuleAddress = addr;
return;
@ -58,13 +59,6 @@ namespace BME_Utils {
wxModuleType = 1;
wxModuleFound = true;
}
if (!wxModuleFound) {
if (bme680.begin(wxModuleAddress, &Wire1)) {
logger.log(logging::LoggerLevel::LOGGER_LEVEL_INFO, "BME", " BME680 sensor found");
wxModuleType = 3;
wxModuleFound = true;
}
}
#else
if (bme280.begin(wxModuleAddress)) {
logger.log(logging::LoggerLevel::LOGGER_LEVEL_INFO, "BME", " BME280 sensor found");
@ -109,11 +103,13 @@ namespace BME_Utils {
logger.log(logging::LoggerLevel::LOGGER_LEVEL_INFO, "BMP", " BMP280 Module init done!");
break;
case 3:
bme680.setTemperatureOversampling(BME680_OS_1X);
bme680.setHumidityOversampling(BME680_OS_1X);
bme680.setPressureOversampling(BME680_OS_1X);
bme680.setIIRFilterSize(BME680_FILTER_SIZE_0);
logger.log(logging::LoggerLevel::LOGGER_LEVEL_INFO, "BME", " BMP680 Module init done!");
#ifndef HELTEC_V3_GPS
bme680.setTemperatureOversampling(BME680_OS_1X);
bme680.setHumidityOversampling(BME680_OS_1X);
bme680.setPressureOversampling(BME680_OS_1X);
bme680.setIIRFilterSize(BME680_FILTER_SIZE_0);
logger.log(logging::LoggerLevel::LOGGER_LEVEL_INFO, "BME", " BMP680 Module init done!");
#endif
break;
}
}
@ -239,14 +235,16 @@ namespace BME_Utils {
newHum = 0;
break;
case 3: // BME680
bme680.performReading();
delay(50);
if (bme680.endReading()) {
newTemp = bme680.temperature;
newPress = (bme680.pressure / 100.0F);
newHum = bme680.humidity;
newGas = bme680.gas_resistance / 1000.0; // in Kilo ohms
}
#ifndef HELTEC_V3_GPS
bme680.performReading();
delay(50);
if (bme680.endReading()) {
newTemp = bme680.temperature;
newPress = (bme680.pressure / 100.0F);
newHum = bme680.humidity;
newGas = bme680.gas_resistance / 1000.0; // in Kilo ohms
}
#endif
break;
}
bmeLastReading = millis();

90
src/boards_pinout.h
View File

@ -6,7 +6,7 @@
#undef OLED_RST
#if defined(TTGO_T_Beam_V1_0) || defined(TTGO_T_Beam_V1_2)
#if defined(TTGO_T_Beam_V1_2) || defined(TTGO_T_Beam_V1_0)
#define OLED_SDA 21
#define OLED_SCL 22
#define OLED_RST 16
@ -22,7 +22,7 @@
#endif
#if defined(TTGO_T_Beam_V1_0_SX1268) || defined(TTGO_T_Beam_V1_2_SX1262)
#if defined(TTGO_T_Beam_V1_2_SX1262) || defined(TTGO_T_Beam_V1_0_SX1268)
#define OLED_SDA 21
#define OLED_SCL 22
#define OLED_RST 16
@ -57,7 +57,7 @@
#endif
#if defined(ESP32_DIY_LoRa_GPS) || defined(TTGO_T_LORA32_V2_1_GPS) || defined(TTGO_T_LORA32_V2_1_TNC)
#if defined(TTGO_T_LORA32_V2_1_GPS) || defined(TTGO_T_LORA32_V2_1_TNC) || defined(ESP32_DIY_LoRa_GPS)
#define OLED_SDA 21
#define OLED_SCL 22
#define OLED_RST 16
@ -78,6 +78,49 @@
#endif
#ifdef HELTEC_V3_GPS
#define OLED_SDA 17
#define OLED_SCL 18
#define OLED_RST 21
#define BOARD_I2C_SDA 41
#define BOARD_I2C_SCL 42
#define GPS_RX 47
#define GPS_TX 48
#define BUTTON_PIN 0
#define BATTERY_PIN 1
#define VEXT_CTRL 36
#define ADC_CTRL 37 // Heltec V3 needs ADC_CTRL = LOW powers the voltage divider to read BatteryPin
#define RADIO_SCLK_PIN 9
#define RADIO_MISO_PIN 11
#define RADIO_MOSI_PIN 10
#define RADIO_CS_PIN 8
#define RADIO_RST_PIN 12
#define RADIO_DIO1_PIN 14
#define RADIO_BUSY_PIN 13
#endif
#ifdef HELTEC_WIRELESS_TRACKER
#define GPS_RX 34
#define GPS_TX 33
#define GPS_PPS 36
#define GPS_RESET 35
#define BUTTON_PIN 0
#define BATTERY_PIN 1
#define ADC_CTRL 2 // HELTEC Wireless Tracker ADC_CTRL = HIGH powers the voltage divider to read BatteryPin. Only on V05 = V1.1
#define VEXT_CTRL 3 // To turn on GPS and TFT
#define BOARD_I2C_SDA 7
#define BOARD_I2C_SCL 6
#define RADIO_SCLK_PIN 9
#define RADIO_MISO_PIN 11
#define RADIO_MOSI_PIN 10
#define RADIO_CS_PIN 8
#define RADIO_RST_PIN 12
#define RADIO_DIO1_PIN 14
#define RADIO_BUSY_PIN 13
#endif
#ifdef ESP32_DIY_1W_LoRa_GPS
#define OLED_SDA 21
#define OLED_SCL 22
@ -152,47 +195,10 @@
#endif
#ifdef HELTEC_V3_GPS
#define OLED_SDA 17
#define OLED_SCL 18
#define OLED_RST 21
#define BOARD_I2C_SDA 41
#define BOARD_I2C_SCL 42
#define GPS_RX 47
#define GPS_TX 48
#define BUTTON_PIN 0
#define BATTERY_PIN 1
#define VEXT_CTRL 36
#define ADC_CTRL 37 // Heltec V3 needs ADC_CTRL = LOW powers the voltage divider to read BatteryPin
#define RADIO_SCLK_PIN 9
#define RADIO_MISO_PIN 11
#define RADIO_MOSI_PIN 10
#define RADIO_CS_PIN 8
#define RADIO_RST_PIN 12
#define RADIO_DIO1_PIN 14
#define RADIO_BUSY_PIN 13
#endif
#ifdef HELTEC_WIRELESS_TRACKER
#define GPS_RX 34
#define GPS_TX 33
#define GPS_PPS 36
#define GPS_RESET 35
#define BUTTON_PIN 0
#define BATTERY_PIN 1
#define ADC_CTRL 2 // HELTEC Wireless Tracker ADC_CTRL = HIGH powers the voltage divider to read BatteryPin. Only on V05 = V1.1
#define VEXT_CTRL 3 // To turn on GPS and TFT
#define BOARD_I2C_SDA 7
#define BOARD_I2C_SCL 6
#define RADIO_SCLK_PIN 9
#define RADIO_MISO_PIN 11
#define RADIO_MOSI_PIN 10
#define RADIO_CS_PIN 8
#define RADIO_RST_PIN 12
#define RADIO_DIO1_PIN 14
#define RADIO_BUSY_PIN 13
#endif
#ifdef TTGO_T_DECK_GPS