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

testing

This commit is contained in:
richonguzman 2024-11-16 12:11:10 -03:00
parent a40348eba1
commit 1aaa11df0a
5 changed files with 111 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/LoRa_APRS_Tracker.cpp
View File

@ -82,7 +82,6 @@ uint32_t lastTxTime = 0;
double lastTxLat = 0.0; double lastTxLat = 0.0;
double lastTxLng = 0.0; double lastTxLng = 0.0;
double lastTxDistance = 0.0; double lastTxDistance = 0.0;
uint32_t lastBatteryCheckTime = 0;
uint32_t menuTime = millis(); uint32_t menuTime = millis();
@ -114,7 +113,6 @@ void setup() {
POWER_Utils::setup(); POWER_Utils::setup();
displaySetup(); displaySetup();
BATTERY_Utils::checkBatteryInitVoltage();
POWER_Utils::externalPinSetup(); POWER_Utils::externalPinSetup();
STATION_Utils::loadIndex(0); STATION_Utils::loadIndex(0);
@ -218,12 +216,10 @@ void loop() {
if (gps_loc_update) { if (gps_loc_update) {
Utils::checkStatus(); Utils::checkStatus();
STATION_Utils::checkTelemetryTx(); STATION_Utils::checkTelemetryTx();
} else {
if (millis() - lastBatteryCheckTime > 15 * 1000) {
BATTERY_Utils::checkBatteryInitVoltage();
lastBatteryCheckTime = millis();
}
} }
if (!gps.location.isValid()) BATTERY_Utils::checkVoltageWithoutGPSFix();
if (!sendUpdate && gps_loc_update && smartBeaconActive) { if (!sendUpdate && gps_loc_update && smartBeaconActive) {
GPS_Utils::calculateDistanceTraveled(); GPS_Utils::calculateDistanceTraveled();
if (!sendUpdate) { if (!sendUpdate) {

16
src/battery_utils.cpp
View File

@ -5,7 +5,8 @@
#include "display.h" #include "display.h"
int telemetryCounter = random(1,999); int telemetryCounter = random(1,999);
uint32_t lastNoGPSCheckTime = 0;
namespace BATTERY_Utils { namespace BATTERY_Utils {
@ -61,12 +62,15 @@ namespace BATTERY_Utils {
} }
} }
void checkBatteryInitVoltage() { void checkVoltageWithoutGPSFix() {
#ifdef BATTERY_PIN #ifdef BATTERY_PIN
String batteryVoltage = POWER_Utils::getBatteryInfoVoltage(); if (lastNoGPSCheckTime == 0 || millis() - lastNoGPSCheckTime > 15 * 60 * 1000) {
if (batteryVoltage.toFloat() < 3.0) { String batteryVoltage = POWER_Utils::getBatteryInfoVoltage();
displayShow("!BATTERY!", "", "LOW BATTERY VOLTAGE!",3000); if (batteryVoltage.toFloat() < 3.0) {
POWER_Utils::shutdown(); displayShow("!BATTERY!", "", "LOW BATTERY VOLTAGE!",5000);
POWER_Utils::shutdown();
}
lastNoGPSCheckTime = millis();
} }
#endif #endif
} }

2
src/battery_utils.h
View File

@ -8,7 +8,7 @@ namespace BATTERY_Utils {
String generateEncodedTelemetry(float voltage); String generateEncodedTelemetry(float voltage);
String getPercentVoltageBattery(float voltage); String getPercentVoltageBattery(float voltage);
void checkBatteryInitVoltage(); void checkVoltageWithoutGPSFix();
} }

1
src/boards_pinout.h
View File

@ -113,6 +113,7 @@
#define BATTERY_PIN 1 #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 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 VEXT_CTRL 3 // To turn on GPS and TFT
#define BOARD_BL_PIN 21
#define BOARD_I2C_SDA 7 #define BOARD_I2C_SDA 7
#define BOARD_I2C_SCL 6 #define BOARD_I2C_SCL 6
#define RADIO_SCLK_PIN 9 #define RADIO_SCLK_PIN 9

243
src/display.cpp
View File

@ -6,7 +6,6 @@
#include "display.h" #include "display.h"
#include "TimeLib.h" #include "TimeLib.h"
String currentSymbol, lastSymbol, lastHeader;
#ifdef HAS_TFT #ifdef HAS_TFT
#include <TFT_eSPI.h> #include <TFT_eSPI.h>
@ -15,6 +14,9 @@ String currentSymbol, lastSymbol, lastHeader;
TFT_eSprite sprite = TFT_eSprite(&tft); TFT_eSprite sprite = TFT_eSprite(&tft);
#define red 0xB061 #define red 0xB061
int brightnessValues[6] = {70, 90, 120, 160, 200, 250};
int tftBrightness = 3;
unsigned short grays[13];
#ifdef HELTEC_WIRELESS_TRACKER #ifdef HELTEC_WIRELESS_TRACKER
#define bigSizeFont 2 #define bigSizeFont 2
@ -22,18 +24,13 @@ String currentSymbol, lastSymbol, lastHeader;
#define lineSpacing 12 #define lineSpacing 12
#endif #endif
#if defined(TTGO_T_DECK_GPS) || defined(TTGO_T_DECK_PLUS) #if defined(TTGO_T_DECK_GPS) || defined(TTGO_T_DECK_PLUS)
int brightnessValues[6] = {70, 90, 120, 160, 200, 250};
int tftBrightness = 5;
unsigned short grays[13];
#define color1 TFT_BLACK #define color1 TFT_BLACK
#define color2 0x0249 #define color2 0x0249
#define green 0x1B08 #define green 0x1B08
#define bigSizeFont 4 #define bigSizeFont 4
#define smallSizeFont 2 #define normalSizeFont 2
#define smallSizeFont 1
#define lineSpacing 22 #define lineSpacing 22
#endif #endif
#else #else
@ -83,16 +80,16 @@ bool symbolAvailable = true;
extern logging::Logger logger; extern logging::Logger logger;
#ifdef HAS_TFT #if defined(HAS_TFT) && (defined(TTGO_T_DECK_PLUS) || defined(TTGO_T_DECK_GPS))
void drawTop(const String& header, const String& datetime, const String& location) { void draw_T_DECK_Top(const String& header, const String& datetime, const String& location) {
sprite.fillSprite(TFT_BLACK); sprite.fillSprite(TFT_BLACK);
sprite.fillRect(0, 0, 320, 38, red); sprite.fillRect(0, 0, 320, 38, red);
sprite.setTextFont(0); sprite.setTextFont(0);
sprite.setTextSize(4); sprite.setTextSize(bigSizeFont);
sprite.setTextColor(TFT_WHITE, red); sprite.setTextColor(TFT_WHITE, red);
sprite.drawString(currentBeacon->callsign, 3, 5); sprite.drawString(currentBeacon->callsign, 3, 5);
sprite.setTextSize(1); sprite.setTextSize(smallSizeFont);
sprite.setTextColor(TFT_WHITE, red); sprite.setTextColor(TFT_WHITE, red);
String date = datetime.substring(0, datetime.indexOf(" ")); String date = datetime.substring(0, datetime.indexOf(" "));
sprite.drawString(date, 258, 5); sprite.drawString(date, 258, 5);
@ -107,29 +104,17 @@ void drawTop(const String& header, const String& datetime, const String& locatio
sprite.drawString(location, 8, 44); sprite.drawString(location, 8, 44);
} }
void drawBody(const String& linea1, const String& linea2, const String& linea3, const String& linea4, const String& linea5, const String& linea6) { void draw_T_DECK_Body(const String& line1, const String& line2, const String& line3, const String& line4, const String& line5, const String& line6) {
sprite.setTextSize(2); sprite.setTextSize(normalSizeFont);
sprite.setTextColor(TFT_WHITE, TFT_BLACK); sprite.setTextColor(TFT_WHITE, TFT_BLACK);
sprite.drawString(linea1, 3, 70); const String* const lines[] = {&line1, &line2, &line3, &line4, &line5, &line6};
sprite.drawString(linea2, 3, 90); for (int i = 0; i < 6; i++) {
sprite.drawString(linea3, 3, 110); sprite.drawString(*lines[i], 3, 70 + (i * 20));
sprite.drawString(linea4, 3, 130); }
sprite.drawString(linea5, 3, 150);
sprite.drawString(linea6, 3, 170);
} }
#endif #endif
/*String lat = location.substring(0, location.indexOf(" "));
sprite.drawString(lat, 3, 46);
String temp = location.substring(location.indexOf(" ") + 1);
String lng = temp.substring(0, temp.indexOf(" "));
sprite.drawString(lng, 126, 46);
String sat = temp.substring(temp.indexOf(" ") + 1);
sprite.setTextSize(1);
sprite.drawString(sat, 290, 25);*/
//sprite.fillRect(0, 38, 320, 2, TFT_DARKGREY); //sprite.fillRect(0, 38, 320, 2, TFT_DARKGREY);
//sprite.fillRect(0, 20, 320, 2, color2); // linea bajo techo //sprite.fillRect(0, 20, 320, 2, color2); // linea bajo techo
//sprite.fillRect(0, 202, 320, 2, 0xBC81); // linea abajo amarilla //sprite.fillRect(0, 202, 320, 2, 0xBC81); // linea abajo amarilla
@ -150,18 +135,15 @@ void drawBody(const String& linea1, const String& linea2, const String& linea3,
sprite.fillRect(282+(i*8), 207, 5, 8, grays[7]); sprite.fillRect(282+(i*8), 207, 5, 8, grays[7]);
} }
}*/ }*/
//for (int i = 0; i < 9; i++) sprite.drawFastHLine(4, 38+(i*18), 312, grays[8]); // draw horizonatl lines //for (int i = 0; i < 9; i++) sprite.drawFastHLine(4, 38+(i*18), 312, grays[8]); // draw horizonatl lines
/*sprite.setTextFont(0); /*sprite.setTextFont(0);
sprite.setTextSize(1); sprite.setTextSize(1);
sprite.setTextColor(TFT_WHITE, TFT_BLUE); sprite.setTextColor(TFT_WHITE, TFT_BLUE);
sprite.drawString("LoRa", 6, 4); sprite.drawString("LoRa", 6, 4);
sprite.setTextColor(TFT_BLACK, grays[6]); sprite.setTextColor(TFT_BLACK, grays[6]);
sprite.drawString("APRS", 21, 4); // escribir DECK en x=21 , y=4*/ sprite.drawString("APRS", 21, 4); // escribir DECK en x=21 , y=4*/
/*sprite.setTextColor(grays[1],c olor2); /*sprite.setTextColor(grays[1],c olor2);
sprite.drawString(notice, 6, 223, 2); sprite.drawString(notice, 6, 223, 2);
@ -196,9 +178,9 @@ void drawBody(const String& linea1, const String& linea2, const String& linea3,
sprite.drawString(String(recN), 215, 208);*/ sprite.drawString(String(recN), 215, 208);*/
void cleanTFT() { void cleanTFT() {
#ifdef HAS_TFT /*#ifdef HAS_TFT
tft.fillScreen(TFT_BLACK); tft.fillScreen(TFT_BLACK);
#endif #endif*/
} }
String fillStringLength(const String& line, uint8_t length) { String fillStringLength(const String& line, uint8_t length) {
@ -212,36 +194,26 @@ String fillStringLength(const String& line, uint8_t length) {
void displaySetup() { void displaySetup() {
delay(500); delay(500);
#ifdef HAS_TFT #ifdef HAS_TFT
#if defined(TTGO_T_DECK_PLUS) tft.init();
tft.init(); tft.begin();
tft.begin(); if (Config.display.turn180) {
if (Config.display.turn180) { tft.setRotation(3);
tft.setRotation(3); } else {
} else { tft.setRotation(1);
tft.setRotation(1); }
} analogWrite(BOARD_BL_PIN, brightnessValues[tftBrightness]);
analogWrite(BOARD_BL_PIN, brightnessValues[tftBrightness]); tft.setTextFont(0);
tft.setTextFont(0); tft.fillScreen(TFT_BLACK);
tft.fillScreen(TFT_BLACK); #if defined(TTGO_T_DECK_PLUS) || defined(TTGO_T_DECK_GPS)
sprite.createSprite(320,240); sprite.createSprite(320,240);
int co = 210;
for (int i = 0; i < 13; i++) {
grays[i] = tft.color565(co, co, co);
co = co - 20;
}
#else #else
tft.init(); sprite.createSprite(160,80);
tft.begin();
if (Config.display.turn180) {
tft.setRotation(3);
} else {
tft.setRotation(1);
}
tft.setTextFont(0);
tft.fillScreen(TFT_BLACK);
#endif #endif
int co = 210;
for (int i = 0; i < 13; i++) {
grays[i] = tft.color565(co, co, co);
co = co - 20;
}
#else #else
#ifdef OLED_DISPLAY_HAS_RST_PIN #ifdef OLED_DISPLAY_HAS_RST_PIN
pinMode(OLED_RST, OUTPUT); pinMode(OLED_RST, OUTPUT);
@ -309,32 +281,27 @@ void displayToggle(bool toggle) {
void displayShow(const String& header, const String& line1, const String& line2, int wait) { void displayShow(const String& header, const String& line1, const String& line2, int wait) {
#ifdef HAS_TFT #ifdef HAS_TFT
#if defined(TTGO_T_DECK_PLUS) #if defined(TTGO_T_DECK_PLUS) || defined(TTGO_T_DECK_GPS)
drawTop(header, line1, line2); draw_T_DECK_Top(header, line1, line2);
sprite.pushSprite(0,0); #endif
#else #if defined(HELTEC_WIRELESS_TRACKER)
String filledLine1 = fillStringLength(line1, 22); sprite.fillSprite(TFT_BLACK);
String filledLine2 = fillStringLength(line2, 22); sprite.fillRect(0, 0, 160, 19, red);
const String* const lines[] = {&filledLine1, &filledLine2}; sprite.setTextFont(0);
sprite.setTextSize(bigSizeFont);
cleanTFT(); sprite.setTextColor(TFT_WHITE, red);
tft.setTextColor(TFT_WHITE,TFT_BLACK); sprite.drawString(header, 3, 3);
tft.setTextSize(bigSizeFont);
tft.setCursor(0, 0);
if (header != lastHeader) { const String* const lines[] = {&line1, &line2};
tft.print(fillStringLength(header, 11));
lastHeader = header;
} else {
tft.print(header);
}
tft.setTextSize(smallSizeFont); sprite.setTextSize(smallSizeFont);
for (int i = 0; i < 2; i++) { sprite.setTextColor(TFT_WHITE, TFT_BLACK);
tft.setCursor(0, ((lineSpacing * (2 + i)) - 2));
tft.print(*lines[i]); for (int i = 0; i < 5; i++) {
sprite.drawString(*lines[i], 3,(lineSpacing * (2 + i)) - 2);
} }
#endif #endif
sprite.pushSprite(0,0);
#else #else
const String* const lines[] = {&line1, &line2}; const String* const lines[] = {&line1, &line2};
@ -363,41 +330,46 @@ void displayShow(const String& header, const String& line1, const String& line2,
delay(wait); delay(wait);
} }
void drawSymbol(int symbolIndex, bool bluetoothActive) {
const uint8_t *bitMap = symbolsAPRS[symbolIndex];
#ifdef HAS_TFT
if (bluetoothActive) bitMap = bluetoothSymbol;
#if defined(HELTEC_WIRELESS_TRACKER)
sprite.drawBitmap(128 - SYMBOL_WIDTH, 3, bitMap, SYMBOL_WIDTH, SYMBOL_HEIGHT, TFT_WHITE);
#endif
#if defined(TTGO_T_DECK_GPS) || defined(TTGO_T_DECK_PLUS)
sprite.drawBitmap(280, 70, bitMap, SYMBOL_WIDTH, SYMBOL_HEIGHT, TFT_WHITE);
#endif
#else
display.drawBitmap((display.width() - SYMBOL_WIDTH), 0, bitMap, SYMBOL_WIDTH, SYMBOL_HEIGHT, 1);
#endif
}
void displayShow(const String& header, const String& line1, const String& line2, const String& line3, const String& line4, const String& line5, int wait) { void displayShow(const String& header, const String& line1, const String& line2, const String& line3, const String& line4, const String& line5, int wait) {
#ifdef HAS_TFT #ifdef HAS_TFT
#if defined(TTGO_T_DECK_PLUS) #if defined(TTGO_T_DECK_PLUS)
drawTop(header, line1, line2); draw_T_DECK_Top(header, line1, line2);
drawBody(header, line1, line2, line3, line4, line5); draw_T_DECK_Body(header, line1, line2, line3, line4, line5);
sprite.pushSprite(0,0); #endif
#else #if defined(HELTEC_WIRELESS_TRACKER)
String filledLine1 = fillStringLength(line1, 22); sprite.fillSprite(TFT_BLACK);
String filledLine2 = fillStringLength(line2, 22); sprite.fillRect(0, 0, 160, 19, red);
String filledLine3 = fillStringLength(line3, 22); sprite.setTextFont(0);
String filledLine4 = fillStringLength(line4, 22); sprite.setTextSize(bigSizeFont);
String filledLine5 = fillStringLength(line5, 22); sprite.setTextColor(TFT_WHITE, red);
const String* const lines[] = {&filledLine1, &filledLine2, &filledLine3, &filledLine4, &filledLine5}; sprite.drawString(header, 3, 3);
if (menuDisplay != lastMenuDisplay) { const String* const lines[] = {&line1, &line2, &line3, &line4, &line5};
lastMenuDisplay = menuDisplay;
cleanTFT();
}
//tft.setTextColor(TFT_RED,TFT_BLACK);
tft.setTextColor(TFT_WHITE,TFT_BLACK);
tft.setTextSize(bigSizeFont);
tft.setCursor(0, 0);
if (header != lastHeader) { sprite.setTextSize(smallSizeFont);
tft.print(fillStringLength(header, 11)); sprite.setTextColor(TFT_WHITE, TFT_BLACK);
lastHeader = header;
} else {
tft.print(header);
}
tft.setTextSize(smallSizeFont);
for (int i = 0; i < 5; i++) { for (int i = 0; i < 5; i++) {
tft.setCursor(0, ((lineSpacing * (2 + i)) - 2)); sprite.drawString(*lines[i], 3,(lineSpacing * (2 + i)) - 2);
tft.print(*lines[i]);
} }
#endif
if (menuDisplay == 0 && Config.display.showSymbol) { if (menuDisplay == 0 && Config.display.showSymbol) {
int symbol = 100; int symbol = 100;
for (int i = 0; i < symbolArraySize; i++) { for (int i = 0; i < symbolArraySize; i++) {
@ -409,37 +381,18 @@ void displayShow(const String& header, const String& line1, const String& line2,
symbolAvailable = symbol != 100; symbolAvailable = symbol != 100;
/* /* Symbol alternate every 5s
* Symbol alternate every 5s * If bluetooth is disconnected or if we are in the first part of the clock, then we show the APRS symbol
* If bluetooth is disconnected or if we are in the first part of the clock, then we show the APRS symbol * Otherwise, we are in the second part of the clock, then we show BT connected */
* Otherwise, we are in the second part of the clock, then we show BT connected
*/
const auto time_now = now(); const auto time_now = now();
if (!bluetoothConnected || time_now % 10 < 5) { if (!bluetoothConnected || time_now % 10 < 5) {
if (symbolAvailable) { if (symbolAvailable) drawSymbol(symbol, false);
currentSymbol = symbolArray[symbol];
#if defined(HELTEC_WIRELESS_TRACKER)
if (currentSymbol != lastSymbol) {
tft.fillRect((TFT_WIDTH - SYMBOL_WIDTH + (128 - TFT_WIDTH)), 0, SYMBOL_WIDTH, SYMBOL_HEIGHT, TFT_BLACK);
lastSymbol = currentSymbol;
}
tft.drawBitmap((TFT_WIDTH - SYMBOL_WIDTH + (128 - TFT_WIDTH)), 0, symbolsAPRS[symbol], SYMBOL_WIDTH, SYMBOL_HEIGHT, TFT_WHITE);//, TFT_RED);
#endif
#if defined(TTGO_T_DECK_GPS) || defined(TTGO_T_DECK_PLUS)
tft.drawBitmap((TFT_WIDTH - SYMBOL_WIDTH), 0, symbolsAPRS[symbol], SYMBOL_WIDTH, SYMBOL_HEIGHT, TFT_WHITE);//, TFT_RED);
#endif
}
} else if (bluetoothConnected) { // TODO In this case, the text symbol stay displayed due to symbolAvailable false in menu_utils } else if (bluetoothConnected) { // TODO In this case, the text symbol stay displayed due to symbolAvailable false in menu_utils
#if defined(HELTEC_WIRELESS_TRACKER) drawSymbol(symbol, true);
tft.drawBitmap((TFT_WIDTH - SYMBOL_WIDTH + (128 - TFT_WIDTH)), 0, bluetoothSymbol, SYMBOL_WIDTH, SYMBOL_HEIGHT, TFT_WHITE);
#endif
#if defined(TTGO_T_DECK_GPS) || defined(TTGO_T_DECK_PLUS)
tft.drawBitmap((TFT_WIDTH - SYMBOL_WIDTH), 0, bluetoothSymbol, SYMBOL_WIDTH, SYMBOL_HEIGHT, TFT_WHITE);
#endif
} }
} }
#endif sprite.pushSprite(0,0);
#else #else
const String* const lines[] = {&line1, &line2, &line3, &line4, &line5}; const String* const lines[] = {&line1, &line2, &line3, &line4, &line5};
@ -482,15 +435,11 @@ void displayShow(const String& header, const String& line1, const String& line2,
*/ */
const auto time_now = now(); const auto time_now = now();
if (!bluetoothConnected || time_now % 10 < 5) { if (!bluetoothConnected || time_now % 10 < 5) {
if (symbolAvailable) { if (symbolAvailable) drawSymbol(symbol, false);
display.drawBitmap((display.width() - SYMBOL_WIDTH), 0, symbolsAPRS[symbol], SYMBOL_WIDTH, SYMBOL_HEIGHT, 1); } else if (bluetoothConnected) { // TODO In this case, the text symbol stay displayed due to symbolAvailable false in menu_utils
} drawSymbol(symbol, true);
} else if (bluetoothConnected) {
// TODO In this case, the text symbol stay displayed due to symbolAvailable false in menu_utils
display.drawBitmap((display.width() - SYMBOL_WIDTH), 0, bluetoothSymbol, SYMBOL_WIDTH, SYMBOL_HEIGHT, 1);
} }
} }
display.display(); display.display();
#endif #endif
delay(wait); delay(wait);