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

encoded Telemetry added

This commit is contained in:
richonguzman 2024-09-17 22:24:48 -03:00
parent c1c1908de4
commit c438928465
9 changed files with 197 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -49,6 +49,7 @@ ____________________________________________________
____________________________________________________ ____________________________________________________
## Timeline (Versions): ## Timeline (Versions):
- 2024.09.17 Battery Info now as Encoded Telemetry in GPS Beacon.
- 2024.08.26 New reformating of code ahead of WebInstaller: SmartBeacon change. - 2024.08.26 New reformating of code ahead of WebInstaller: SmartBeacon change.
- 2024.08.16 BLE support for Android devices (not APRSDroid yet). - 2024.08.16 BLE support for Android devices (not APRSDroid yet).
- 2024.08.12 Added support for EByte E220 400M30S 1Watt LoRa module for DIY ESP32 Tracker (LLCC68 supports spreading factor only in range of 5 - 11!) - 2024.08.12 Added support for EByte E220 400M30S 1Watt LoRa module for DIY ESP32 Tracker (LLCC68 supports spreading factor only in range of 5 - 11!)

6
data/tracker_config.json
View File

@ -37,6 +37,11 @@
"timeout": 4, "timeout": 4,
"turn180" : false "turn180" : false
}, },
"battery": {
"sendVoltage": true,
"voltageAsTelemetry": true,
"sendVoltageAlways": true
},
"other": { "other": {
"simplifiedTrackerMode": false, "simplifiedTrackerMode": false,
"sendCommentAfterXBeacons": 10, "sendCommentAfterXBeacons": 10,
@ -46,7 +51,6 @@
"maxDistanceToTracker": 30, "maxDistanceToTracker": 30,
"standingUpdateTime": 15, "standingUpdateTime": 15,
"sendAltitude": true, "sendAltitude": true,
"sendBatteryInfo": false,
"bluetoothType": 0, "bluetoothType": 0,
"bluetoothActive": true, "bluetoothActive": true,
"disableGPS": false "disableGPS": false

4
src/LoRa_APRS_Tracker.cpp
View File

@ -41,13 +41,13 @@ Configuration Config;
HardwareSerial neo6m_gps(1); HardwareSerial neo6m_gps(1);
TinyGPSPlus gps; TinyGPSPlus gps;
#ifdef HAS_BT_CLASSIC #ifdef HAS_BT_CLASSIC
BluetoothSerial SerialBT; BluetoothSerial SerialBT;
#endif #endif
#ifdef BUTTON_PIN #ifdef BUTTON_PIN
OneButton userButton = OneButton(BUTTON_PIN, true, true); OneButton userButton = OneButton(BUTTON_PIN, true, true);
#endif #endif
String versionDate = "2024.09.10"; String versionDate = "2024.09.17";
uint8_t myBeaconsIndex = 0; uint8_t myBeaconsIndex = 0;
int myBeaconsSize = Config.beacons.size(); int myBeaconsSize = Config.beacons.size();

50
src/battery_utils.cpp Normal file
View File

@ -0,0 +1,50 @@
#include <Arduino.h>
#include "battery_utils.h"
int telemetryCounter = random(1,999);
namespace BATTERY_Utils {
String generateEncodedTelemetryBytes(float value, bool firstBytes, byte voltageType) { // 0 = internal battery(0-4,2V) , 1 = external battery(0-15V)
String encodedBytes;
int tempValue;
if (firstBytes) {
tempValue = value;
} else {
switch (voltageType) {
case 0:
tempValue = value * 100; // Internal voltage calculation
break;
case 1:
tempValue = (value * 100) / 2; // External voltage calculation
break;
default:
tempValue = value;
break;
}
}
int firstByte = tempValue / 91;
tempValue -= firstByte * 91;
encodedBytes = char(firstByte + 33);
encodedBytes += char(tempValue + 33);
return encodedBytes;
}
String generateEncodedTelemetry(float voltage) {
String telemetry = "|";
telemetry += generateEncodedTelemetryBytes(telemetryCounter, true, 0);
telemetryCounter++;
if (telemetryCounter == 1000) {
telemetryCounter = 0;
}
telemetry += generateEncodedTelemetryBytes(voltage, false, 0);
telemetry += "|";
return telemetry;
}
}

13
src/battery_utils.h Normal file
View File

@ -0,0 +1,13 @@
#ifndef BATTERY_UTILS_H_
#define BATTERY_UTILS_H_
#include <Arduino.h>
namespace BATTERY_Utils {
String generateEncodedTelemetry(float voltage);
}
#endif

109
src/configuration.cpp
View File

@ -27,76 +27,79 @@ void Configuration::readFile(fs::FS &fs, const char *fileName) {
for (int i = 0; i < BeaconsArray.size(); i++) { for (int i = 0; i < BeaconsArray.size(); i++) {
Beacon bcn; Beacon bcn;
bcn.callsign = BeaconsArray[i]["callsign"] | "NOCALL-7"; bcn.callsign = BeaconsArray[i]["callsign"] | "NOCALL-7";
bcn.callsign.toUpperCase(); bcn.callsign.toUpperCase();
bcn.symbol = BeaconsArray[i]["symbol"] | ">"; bcn.symbol = BeaconsArray[i]["symbol"] | ">";
bcn.overlay = BeaconsArray[i]["overlay"] | "/"; bcn.overlay = BeaconsArray[i]["overlay"] | "/";
bcn.comment = BeaconsArray[i]["comment"] | ""; bcn.comment = BeaconsArray[i]["comment"] | "";
bcn.smartBeaconActive = BeaconsArray[i]["smartBeaconActive"] | true; bcn.smartBeaconActive = BeaconsArray[i]["smartBeaconActive"] | true;
bcn.smartBeaconSetting = BeaconsArray[i]["smartBeaconSetting"] | 0; bcn.smartBeaconSetting = BeaconsArray[i]["smartBeaconSetting"] | 0;
bcn.micE = BeaconsArray[i]["micE"] | ""; bcn.micE = BeaconsArray[i]["micE"] | "";
bcn.gpsEcoMode = BeaconsArray[i]["gpsEcoMode"] | false; bcn.gpsEcoMode = BeaconsArray[i]["gpsEcoMode"] | false;
beacons.push_back(bcn); beacons.push_back(bcn);
} }
display.showSymbol = data["display"]["showSymbol"] | true; display.showSymbol = data["display"]["showSymbol"] | true;
display.ecoMode = data["display"]["ecoMode"] | false; display.ecoMode = data["display"]["ecoMode"] | false;
display.timeout = data["display"]["timeout"] | 4; display.timeout = data["display"]["timeout"] | 4;
display.turn180 = data["display"]["turn180"] | false; display.turn180 = data["display"]["turn180"] | false;
winlink.password = data["winlink"]["password"] | "NOPASS"; battery.sendVoltage = data["battery"]["sendVoltage"] | false;
battery.voltageAsTelemetry = data["battery"]["voltageAsTelemetry"] | false;
battery.sendVoltageAlways = data["battery"]["sendVoltageAlways"] | false;
bme.active = data["bme"]["active"] | false; winlink.password = data["winlink"]["password"] | "NOPASS";
bme.temperatureCorrection = data["bme"]["temperatureCorrection"] | 0.0;
bme.sendTelemetry = data["bme"]["sendTelemetry"] | false;
notification.ledTx = data["notification"]["ledTx"] | false; bme.active = data["bme"]["active"] | false;
notification.ledTxPin = data["notification"]["ledTxPin"]| 13; bme.temperatureCorrection = data["bme"]["temperatureCorrection"] | 0.0;
notification.ledMessage = data["notification"]["ledMessage"] | false; bme.sendTelemetry = data["bme"]["sendTelemetry"] | false;
notification.ledMessagePin = data["notification"]["ledMessagePin"] | 2;
notification.ledFlashlight = data["notification"]["ledFlashlight"] | false; notification.ledTx = data["notification"]["ledTx"] | false;
notification.ledFlashlightPin = data["notification"]["ledFlashlightPin"] | 14; notification.ledTxPin = data["notification"]["ledTxPin"]| 13;
notification.buzzerActive = data["notification"]["buzzerActive"] | false; notification.ledMessage = data["notification"]["ledMessage"] | false;
notification.buzzerPinTone = data["notification"]["buzzerPinTone"] | 33; notification.ledMessagePin = data["notification"]["ledMessagePin"] | 2;
notification.buzzerPinVcc = data["notification"]["buzzerPinVcc"] | 25; notification.ledFlashlight = data["notification"]["ledFlashlight"] | false;
notification.bootUpBeep = data["notification"]["bootUpBeep"] | false; notification.ledFlashlightPin = data["notification"]["ledFlashlightPin"] | 14;
notification.txBeep = data["notification"]["txBeep"] | false; notification.buzzerActive = data["notification"]["buzzerActive"] | false;
notification.messageRxBeep = data["notification"]["messageRxBeep"] | false; notification.buzzerPinTone = data["notification"]["buzzerPinTone"] | 33;
notification.stationBeep = data["notification"]["stationBeep"] | false; notification.buzzerPinVcc = data["notification"]["buzzerPinVcc"] | 25;
notification.lowBatteryBeep = data["notification"]["lowBatteryBeep"] | false; notification.bootUpBeep = data["notification"]["bootUpBeep"] | false;
notification.shutDownBeep = data["notification"]["shutDownBeep"] | false; notification.txBeep = data["notification"]["txBeep"] | false;
notification.messageRxBeep = data["notification"]["messageRxBeep"] | false;
notification.stationBeep = data["notification"]["stationBeep"] | false;
notification.lowBatteryBeep = data["notification"]["lowBatteryBeep"] | false;
notification.shutDownBeep = data["notification"]["shutDownBeep"] | false;
JsonArray LoraTypesArray = data["lora"]; JsonArray LoraTypesArray = data["lora"];
for (int j = 0; j < LoraTypesArray.size(); j++) { for (int j = 0; j < LoraTypesArray.size(); j++) {
LoraType loraType; LoraType loraType;
loraType.frequency = LoraTypesArray[j]["frequency"] | 433775000; loraType.frequency = LoraTypesArray[j]["frequency"] | 433775000;
loraType.spreadingFactor = LoraTypesArray[j]["spreadingFactor"] | 12; loraType.spreadingFactor = LoraTypesArray[j]["spreadingFactor"] | 12;
loraType.signalBandwidth = LoraTypesArray[j]["signalBandwidth"] | 125000; loraType.signalBandwidth = LoraTypesArray[j]["signalBandwidth"] | 125000;
loraType.codingRate4 = LoraTypesArray[j]["codingRate4"] | 5; loraType.codingRate4 = LoraTypesArray[j]["codingRate4"] | 5;
loraType.power = LoraTypesArray[j]["power"] | 20; loraType.power = LoraTypesArray[j]["power"] | 20;
loraTypes.push_back(loraType); loraTypes.push_back(loraType);
} }
ptt.active = data["pttTrigger"]["active"] | false; ptt.active = data["pttTrigger"]["active"] | false;
ptt.io_pin = data["pttTrigger"]["io_pin"] | 4; ptt.io_pin = data["pttTrigger"]["io_pin"] | 4;
ptt.preDelay = data["pttTrigger"]["preDelay"] | 0; ptt.preDelay = data["pttTrigger"]["preDelay"] | 0;
ptt.postDelay = data["pttTrigger"]["postDelay"] | 0; ptt.postDelay = data["pttTrigger"]["postDelay"] | 0;
ptt.reverse = data["pttTrigger"]["reverse"] | false; ptt.reverse = data["pttTrigger"]["reverse"] | false;
simplifiedTrackerMode = data["other"]["simplifiedTrackerMode"] | false; simplifiedTrackerMode = data["other"]["simplifiedTrackerMode"] | false;
sendCommentAfterXBeacons = data["other"]["sendCommentAfterXBeacons"] | 10; sendCommentAfterXBeacons = data["other"]["sendCommentAfterXBeacons"] | 10;
path = data["other"]["path"] | "WIDE1-1"; path = data["other"]["path"] | "WIDE1-1";
nonSmartBeaconRate = data["other"]["nonSmartBeaconRate"] | 15; nonSmartBeaconRate = data["other"]["nonSmartBeaconRate"] | 15;
rememberStationTime = data["other"]["rememberStationTime"] | 30; rememberStationTime = data["other"]["rememberStationTime"] | 30;
maxDistanceToTracker = data["other"]["maxDistanceToTracker"] | 30; maxDistanceToTracker = data["other"]["maxDistanceToTracker"] | 30;
standingUpdateTime = data["other"]["standingUpdateTime"] | 15; standingUpdateTime = data["other"]["standingUpdateTime"] | 15;
sendAltitude = data["other"]["sendAltitude"] | true; sendAltitude = data["other"]["sendAltitude"] | true;
sendBatteryInfo = data["other"]["sendBatteryInfo"] | false; bluetoothType = data["other"]["bluetoothType"] | 1;
bluetoothType = data["other"]["bluetoothType"] | 1; bluetoothActive = data["other"]["bluetoothActive"] | true;
bluetoothActive = data["other"]["bluetoothActive"] | true; disableGPS = data["other"]["disableGPS"] | false;
disableGPS = data["other"]["disableGPS"] | false;
configFile.close(); configFile.close();
} }

9
src/configuration.h
View File

@ -25,6 +25,13 @@ public:
bool turn180; bool turn180;
}; };
class Battery {
public:
bool sendVoltage;
bool voltageAsTelemetry;
bool sendVoltageAlways;
};
class Winlink { class Winlink {
public: public:
String password; String password;
@ -79,6 +86,7 @@ public:
std::vector<Beacon> beacons; std::vector<Beacon> beacons;
Display display; Display display;
Battery battery;
Winlink winlink; Winlink winlink;
BME bme; BME bme;
Notification notification; Notification notification;
@ -93,7 +101,6 @@ public:
int maxDistanceToTracker; int maxDistanceToTracker;
int standingUpdateTime; int standingUpdateTime;
bool sendAltitude; bool sendAltitude;
bool sendBatteryInfo;
int bluetoothType; int bluetoothType;
bool bluetoothActive; bool bluetoothActive;
bool disableGPS; bool disableGPS;

2
src/power_utils.cpp
View File

@ -164,7 +164,7 @@ namespace POWER_Utils {
BatteryIsConnected = isBatteryConnected(); BatteryIsConnected = isBatteryConnected();
if (BatteryIsConnected) { if (BatteryIsConnected) {
#ifdef HAS_AXP2101 #ifdef HAS_AXP2101
batteryVoltage = String(PMU.getBattVoltage()); batteryVoltage = String(PMU.getBattVoltage()/1000);
#else #else
batteryVoltage = String(getBatteryVoltage(), 2); batteryVoltage = String(getBatteryVoltage(), 2);
#endif #endif

86
src/station_utils.cpp
View File

@ -2,6 +2,7 @@
#include <SPIFFS.h> #include <SPIFFS.h>
#include "APRSPacketLib.h" #include "APRSPacketLib.h"
#include "station_utils.h" #include "station_utils.h"
#include "battery_utils.h"
#include "configuration.h" #include "configuration.h"
#include "boards_pinout.h" #include "boards_pinout.h"
#include "power_utils.h" #include "power_utils.h"
@ -43,7 +44,7 @@ bool sendStandingUpdate = false;
uint8_t updateCounter = Config.sendCommentAfterXBeacons; uint8_t updateCounter = Config.sendCommentAfterXBeacons;
bool sendStartTelemetry = true;
uint32_t lastTelemetryTx = 0; uint32_t lastTelemetryTx = 0;
uint32_t telemetryTx = millis(); uint32_t telemetryTx = millis();
@ -176,6 +177,38 @@ namespace STATION_Utils {
} }
void sendBeacon(uint8_t type) { void sendBeacon(uint8_t type) {
if (sendStartTelemetry && Config.battery.voltageAsTelemetry) {
String sender = currentBeacon->callsign;
for (int i = sender.length(); i < 9; i++) {
sender += ' ';
}
String basePacket = currentBeacon->callsign;
basePacket += ">APLRT1";
if (Config.path != "") {
basePacket += ",";
basePacket += Config.path;
}
basePacket += "::";
basePacket += sender;
basePacket += ":";
String tempPacket = basePacket;
tempPacket += "EQNS.0,0.01,0";
LoRa_Utils::sendNewPacket(tempPacket);
delay(3000);
tempPacket = basePacket;
tempPacket += "UNIT.VDC";
LoRa_Utils::sendNewPacket(tempPacket);
delay(3000);
tempPacket = basePacket;
tempPacket += "PARM.V_Batt";
LoRa_Utils::sendNewPacket(tempPacket);
delay(3000);
sendStartTelemetry = false;
}
String packet; String packet;
if (Config.bme.sendTelemetry && type == 1) { // WX if (Config.bme.sendTelemetry && type == 1) { // WX
packet = APRSPacketLib::generateGPSBeaconPacket(currentBeacon->callsign, "APLRT1", Config.path, "/", APRSPacketLib::encodeGPS(gps.location.lat(),gps.location.lng(), gps.course.deg(), 0.0, currentBeacon->symbol, Config.sendAltitude, gps.altitude.feet(), sendStandingUpdate, "Wx")); packet = APRSPacketLib::generateGPSBeaconPacket(currentBeacon->callsign, "APLRT1", Config.path, "/", APRSPacketLib::encodeGPS(gps.location.lat(),gps.location.lng(), gps.course.deg(), 0.0, currentBeacon->symbol, Config.sendAltitude, gps.altitude.feet(), sendStandingUpdate, "Wx"));
@ -197,36 +230,39 @@ namespace STATION_Utils {
} }
String comment; String comment;
int sendCommentAfterXBeacons; int sendCommentAfterXBeacons;
if (winlinkCommentState) { if (winlinkCommentState || Config.battery.sendVoltageAlways) {
comment = " winlink"; if (winlinkCommentState) comment = " winlink";
sendCommentAfterXBeacons = 1; sendCommentAfterXBeacons = 1;
} else { } else {
comment = currentBeacon->comment; comment = currentBeacon->comment;
sendCommentAfterXBeacons = Config.sendCommentAfterXBeacons; sendCommentAfterXBeacons = Config.sendCommentAfterXBeacons;
} }
String batteryVoltage = POWER_Utils::getBatteryInfoVoltage(); String batteryVoltage = POWER_Utils::getBatteryInfoVoltage();
if (Config.sendBatteryInfo) { if (Config.battery.sendVoltage) {
//String batteryVoltage = POWER_Utils::getBatteryInfoVoltage(); if (Config.battery.voltageAsTelemetry) {
String batteryChargeCurrent = POWER_Utils::getBatteryInfoCurrent(); comment += BATTERY_Utils::generateEncodedTelemetry(batteryVoltage.toFloat());
#ifdef HAS_AXP192 } else {
comment += " Bat="; String batteryChargeCurrent = POWER_Utils::getBatteryInfoCurrent();
comment += batteryVoltage; #ifdef HAS_AXP192
comment += "V ("; comment += " Bat=";
comment += batteryChargeCurrent; comment += batteryVoltage;
comment += "mA)"; comment += "V (";
#endif comment += batteryChargeCurrent;
#ifdef HAS_AXP2101 comment += "mA)";
comment += " Bat="; #endif
comment += String(batteryVoltage.toFloat()/1000,2); #ifdef HAS_AXP2101
comment += "V ("; comment += " Bat=";
comment += batteryChargeCurrent; comment += String(batteryVoltage.toFloat(),2);
comment += "%)"; comment += "V (";
#endif comment += batteryChargeCurrent;
#if defined(HELTEC_V3_GPS) || defined(HELTEC_WIRELESS_TRACKER) || defined(TTGO_T_DECK_GPS) comment += "%)";
comment += " Bat="; #endif
comment += String(batteryVoltage.toFloat(),2); #if defined(HELTEC_V3_GPS) || defined(HELTEC_WIRELESS_TRACKER) || defined(TTGO_T_DECK_GPS)
comment += "V"; comment += " Bat=";
#endif comment += String(batteryVoltage.toFloat(),2);
comment += "V";
#endif
}
} }
if (comment != "") { if (comment != "") {
updateCounter++; updateCounter++;