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

more updates

This commit is contained in:
richonguzman 2023-06-06 19:02:41 -04:00
parent 38f380dc33
commit 2e441e6d0f
5 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/tracker_config.json
View File

@ -64,9 +64,9 @@
"path": "WIDE1-1",
"overlay": "/",
"nonSmartBeaconRate": 15,
"listeningTrackerTime": 30,
"rememberStationTime": 30,
"maxDistanceToTracker": 30,
"defaultStatusAfterBoot" : true,
"statusAfterBoot" : true,
"defaultStatus": "https://github.com/richonguzman/LoRa_APRS_Tracker",
"standingUpdateTime": 15,
"sendAltitude": true

10
src/LoRa_APRS_Tracker.cpp
View File

@ -40,7 +40,7 @@ static uint32_t displayTime = millis();
static bool displayState = true;
static bool send_update = true;
static int messagesIterator = 0;
static bool statusAfterBootState = true;
bool statusAfterBootState = Config.statusAfterBoot;
std::vector<String> loadedAPRSMessages;
@ -89,7 +89,9 @@ static void ButtonLongPress() {
} else {
myBeaconsIndex++;
}
statusAfterBootState = true;
if (Config.defaultStatus) {
statusAfterBootState = true;
}
display_toggle(true);
displayTime = millis();
show_display("__INFO____", "", "CHANGING CALLSIGN ...", 1000);
@ -359,7 +361,7 @@ void loop() {
lastTxTime = millis();
send_update = false;
if (Config.defaultStatusAfterBoot && statusAfterBootState) {
if (statusAfterBootState) {
startingStatus();
}
}
@ -378,7 +380,7 @@ void loop() {
case 10: // Display Received/Saved APRS Messages
{
String msgSender = loadedAPRSMessages[messagesIterator].substring(0, loadedAPRSMessages[messagesIterator].indexOf(","));
String msgSender = loadedAPRSMessages[messagesIterator].substring(0,loadedAPRSMessages[messagesIterator].indexOf(","));
String restOfMessage = loadedAPRSMessages[messagesIterator].substring(loadedAPRSMessages[messagesIterator].indexOf(",")+1);
String msgGate = restOfMessage.substring(0,restOfMessage.indexOf(","));
String msgText = restOfMessage.substring(restOfMessage.indexOf(",")+1);

4
src/configuration.cpp
View File

@ -55,9 +55,9 @@ void Configuration::readFile(fs::FS &fs, const char *fileName) {
path = data["other"]["path"].as<String>();
overlay = data["other"]["overlay"].as<String>();
nonSmartBeaconRate = data["other"]["nonSmartBeaconRate"].as<int>();
listeningTrackerTime = data["other"]["listeningTrackerTime"].as<int>();
rememberStationTime = data["other"]["rememberStationTime"].as<int>();
maxDistanceToTracker = data["other"]["maxDistanceToTracker"].as<int>();
defaultStatusAfterBoot = data["other"]["defaultStatusAfterBoot"].as<bool>();
statusAfterBoot = data["other"]["statusAfterBoot"].as<bool>();
defaultStatus = data["other"]["defaultStatus"].as<String>();
standingUpdateTime = data["other"]["standingUpdateTime"].as<int>();
sendAltitude = data["other"]["sendAltitude"].as<bool>();

5
src/configuration.h
View File

@ -45,11 +45,10 @@ public:
String path;
String overlay;
int nonSmartBeaconRate;
int listeningTrackerTime;
int rememberStationTime;
int maxDistanceToTracker;
bool defaultStatusAfterBoot;
bool statusAfterBoot;
String defaultStatus;
bool standingUpdate;
int standingUpdateTime;
bool sendAltitude;

10
src/messages.cpp
View File

@ -350,28 +350,28 @@ void deleteListenedTrackersbyTime() {
if (firstNearTracker != "") {
firstNearTrackermillis = firstNearTracker.substring(firstNearTracker.indexOf(",")+1);
firstTrackermillis = firstNearTrackermillis.toInt();
if ((millis() - firstTrackermillis) > Config.listeningTrackerTime*60*1000) {
if ((millis() - firstTrackermillis) > Config.rememberStationTime*60*1000) {
firstNearTracker = "";
}
}
if (secondNearTracker != "") {
secondNearTrackermillis = secondNearTracker.substring(secondNearTracker.indexOf(",")+1);
secondTrackermillis = secondNearTrackermillis.toInt();
if ((millis() - secondTrackermillis) > Config.listeningTrackerTime*60*1000) {
if ((millis() - secondTrackermillis) > Config.rememberStationTime*60*1000) {
secondNearTracker = "";
}
}
if (thirdNearTracker != "") {
thirdNearTrackermillis = thirdNearTracker.substring(thirdNearTracker.indexOf(",")+1);
thirdTrackermillis = thirdNearTrackermillis.toInt();
if ((millis() - thirdTrackermillis) > Config.listeningTrackerTime*60*1000) {
if ((millis() - thirdTrackermillis) > Config.rememberStationTime*60*1000) {
thirdNearTracker = "";
}
}
if (fourthNearTracker != "") {
fourthNearTrackermillis = fourthNearTracker.substring(fourthNearTracker.indexOf(",")+1);
fourthTrackermillis = fourthNearTrackermillis.toInt();
if ((millis() - fourthTrackermillis) > Config.listeningTrackerTime*60*1000) {
if ((millis() - fourthTrackermillis) > Config.rememberStationTime*60*1000) {
fourthNearTracker = "";
}
}
@ -395,7 +395,7 @@ void deleteListenedTrackersbyTime() {
}
void checkListenedTrackersByTimeAndDelete() {
if (millis() - lastDeleteListenedTracker > Config.listeningTrackerTime*60*1000) {
if (millis() - lastDeleteListenedTracker > Config.rememberStationTime*60*1000) {
deleteListenedTrackersbyTime();
}
}