kopia lustrzana https://github.com/lora-aprs/LoRa_APRS_Tracker
update tracker config
Peter Buchegger
rodzic
e35de077e8
commit
7120010a83
|
|
@ -1,6 +1,5 @@
|
|||
{
|
||||
"debug": false,
|
||||
"enhance_precision": true,
|
||||
"beacons": [
|
||||
{
|
||||
"callsign": "NOCALL-7",
|
||||
|
|
@ -8,23 +7,24 @@
|
|||
"message": "LoRa Tracker",
|
||||
"timeout": 1,
|
||||
"symbol": "[",
|
||||
"overlay": "/"
|
||||
"overlay": "/",
|
||||
"smart_beacon": {
|
||||
"active": true,
|
||||
"turn_min": 25,
|
||||
"slow_rate": 300,
|
||||
"slow_speed": 10,
|
||||
"fast_rate": 60,
|
||||
"fast_speed": 100,
|
||||
"min_tx_dist": 100,
|
||||
"min_bcn": 5
|
||||
},
|
||||
"enhance_precision": true
|
||||
}
|
||||
],
|
||||
"button": {
|
||||
"tx": true,
|
||||
"alt_message": true
|
||||
},
|
||||
"smart_beacon": {
|
||||
"active": true,
|
||||
"turn_min": 25,
|
||||
"slow_rate": 300,
|
||||
"slow_speed": 10,
|
||||
"fast_rate": 60,
|
||||
"fast_speed": 100,
|
||||
"min_tx_dist": 100,
|
||||
"min_bcn": 5
|
||||
},
|
||||
"lora": {
|
||||
"frequency_rx": 433775000,
|
||||
"frequency_tx": 433775000,
|
||||
|
|
|
|||
|
|
@ -0,0 +1,23 @@
|
|||
#include "BeaconManager.h"
|
||||
|
||||
BeaconManager::BeaconManager() : _currentBeaconConfig(_beacon_config.end()) {
|
||||
}
|
||||
|
||||
// cppcheck-suppress unusedFunction
|
||||
void BeaconManager::loadConfig(const std::list<Configuration::Beacon> &beacon_config) {
|
||||
_beacon_config = beacon_config;
|
||||
_currentBeaconConfig = _beacon_config.begin();
|
||||
}
|
||||
|
||||
// cppcheck-suppress unusedFunction
|
||||
std::list<Configuration::Beacon>::iterator BeaconManager::getCurrentBeaconConfig() const {
|
||||
return _currentBeaconConfig;
|
||||
}
|
||||
|
||||
// cppcheck-suppress unusedFunction
|
||||
void BeaconManager::loadNextBeacon() {
|
||||
++_currentBeaconConfig;
|
||||
if (_currentBeaconConfig == _beacon_config.end()) {
|
||||
_currentBeaconConfig = _beacon_config.begin();
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
#ifndef BEACON_MANAGER_H_
|
||||
#define BEACON_MANAGER_H_
|
||||
|
||||
#include "configuration.h"
|
||||
|
||||
class BeaconManager {
|
||||
public:
|
||||
BeaconManager();
|
||||
|
||||
void loadConfig(const std::list<Configuration::Beacon> &beacon_config);
|
||||
|
||||
std::list<Configuration::Beacon>::iterator getCurrentBeaconConfig() const;
|
||||
void loadNextBeacon();
|
||||
|
||||
private:
|
||||
std::list<Configuration::Beacon> _beacon_config;
|
||||
std::list<Configuration::Beacon>::iterator _currentBeaconConfig;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
@ -7,12 +7,14 @@
|
|||
#include <WiFi.h>
|
||||
#include <logger.h>
|
||||
|
||||
#include "BeaconManager.h"
|
||||
#include "configuration.h"
|
||||
#include "display.h"
|
||||
#include "pins.h"
|
||||
#include "power_management.h"
|
||||
|
||||
Configuration Config;
|
||||
BeaconManager BeaconMan;
|
||||
|
||||
PowerManagement powerManagement;
|
||||
OneButton userButton = OneButton(BUTTON_PIN, true, true);
|
||||
|
|
@ -41,8 +43,8 @@ static void handle_tx_click() {
|
|||
}
|
||||
|
||||
static void handle_next_beacon() {
|
||||
Configuration::Beacon beacon = Config.SetNextBeacon();
|
||||
show_display(beacon.callsign, beacon.message, 2000);
|
||||
BeaconMan.loadNextBeacon();
|
||||
show_display(BeaconMan.getCurrentBeaconConfig()->callsign, BeaconMan.getCurrentBeaconConfig()->message, 2000);
|
||||
}
|
||||
|
||||
// cppcheck-suppress unusedFunction
|
||||
|
|
@ -127,13 +129,13 @@ void loop() {
|
|||
|
||||
if (gps_loc_update && nextBeaconTimeStamp <= now()) {
|
||||
send_update = true;
|
||||
if (Config.smart_beacon.active) {
|
||||
if (BeaconMan.getCurrentBeaconConfig()->smart_beacon.active) {
|
||||
currentHeading = gps.course.deg();
|
||||
// enforce message text on slowest Config.smart_beacon.slow_rate
|
||||
rate_limit_message_text = 0;
|
||||
} else {
|
||||
// enforce message text every n's Config.beacon.timeout frame
|
||||
if (Config.GetCurrentBeacon().timeout * rate_limit_message_text > 30) {
|
||||
if (BeaconMan.getCurrentBeaconConfig()->timeout * rate_limit_message_text > 30) {
|
||||
rate_limit_message_text = 0;
|
||||
}
|
||||
}
|
||||
|
|
@ -160,7 +162,7 @@ void loop() {
|
|||
}
|
||||
#endif
|
||||
|
||||
if (!send_update && gps_loc_update && Config.smart_beacon.active) {
|
||||
if (!send_update && gps_loc_update && BeaconMan.getCurrentBeaconConfig()->smart_beacon.active) {
|
||||
uint32_t lastTx = millis() - lastTxTime;
|
||||
currentHeading = gps.course.deg();
|
||||
lastTxdistance = TinyGPSPlus::distanceBetween(gps.location.lat(), gps.location.lng(), lastTxLat, lastTxLng);
|
||||
|
|
@ -176,9 +178,9 @@ void loop() {
|
|||
// Get headings and heading delta
|
||||
double headingDelta = abs(previousHeading - currentHeading);
|
||||
|
||||
if (lastTx > Config.smart_beacon.min_bcn * 1000) {
|
||||
if (lastTx > BeaconMan.getCurrentBeaconConfig()->smart_beacon.min_bcn * 1000) {
|
||||
// Check for heading more than 25 degrees
|
||||
if (headingDelta > Config.smart_beacon.turn_min && lastTxdistance > Config.smart_beacon.min_tx_dist) {
|
||||
if (headingDelta > BeaconMan.getCurrentBeaconConfig()->smart_beacon.turn_min && lastTxdistance > BeaconMan.getCurrentBeaconConfig()->smart_beacon.min_tx_dist) {
|
||||
send_update = true;
|
||||
}
|
||||
}
|
||||
|
|
@ -186,22 +188,20 @@ void loop() {
|
|||
}
|
||||
|
||||
if (send_update && gps_loc_update) {
|
||||
send_update = false;
|
||||
Configuration::Beacon beacon = Config.GetCurrentBeacon();
|
||||
send_update = false;
|
||||
|
||||
nextBeaconTimeStamp = now() + (Config.smart_beacon.active ? Config.smart_beacon.slow_rate : (beacon.timeout * SECS_PER_MIN));
|
||||
nextBeaconTimeStamp = now() + (BeaconMan.getCurrentBeaconConfig()->smart_beacon.active ? BeaconMan.getCurrentBeaconConfig()->smart_beacon.slow_rate : (BeaconMan.getCurrentBeaconConfig()->timeout * SECS_PER_MIN));
|
||||
|
||||
APRSMessage msg;
|
||||
String lat;
|
||||
String lng;
|
||||
String dao;
|
||||
|
||||
msg.setSource(beacon.callsign);
|
||||
msg.setPath(beacon.path);
|
||||
msg.setSource(BeaconMan.getCurrentBeaconConfig()->callsign);
|
||||
msg.setPath(BeaconMan.getCurrentBeaconConfig()->path);
|
||||
msg.setDestination("APLT00-1");
|
||||
msg.setPath(Config.beacon.path);
|
||||
|
||||
if (!Config.enhance_precision) {
|
||||
if (!BeaconMan.getCurrentBeaconConfig()->enhance_precision) {
|
||||
lat = create_lat_aprs(gps.location.rawLat());
|
||||
lng = create_long_aprs(gps.location.rawLng());
|
||||
} else {
|
||||
|
|
@ -245,19 +245,19 @@ void loop() {
|
|||
}
|
||||
|
||||
String aprsmsg;
|
||||
aprsmsg = "!" + lat + beacon.overlay + lng + beacon.symbol + course_and_speed + alt;
|
||||
aprsmsg = "!" + lat + BeaconMan.getCurrentBeaconConfig()->overlay + lng + BeaconMan.getCurrentBeaconConfig()->symbol + course_and_speed + alt;
|
||||
// message_text every 10's packet (i.e. if we have beacon rate 1min at high
|
||||
// speed -> every 10min). May be enforced above (at expirey of smart beacon
|
||||
// rate (i.e. every 30min), or every third packet on static rate (i.e.
|
||||
// static rate 10 -> every third packet)
|
||||
if (!(rate_limit_message_text++ % 10)) {
|
||||
aprsmsg += beacon.message;
|
||||
aprsmsg += BeaconMan.getCurrentBeaconConfig()->message;
|
||||
}
|
||||
if (BatteryIsConnected) {
|
||||
aprsmsg += " - _Bat.: " + batteryVoltage + "V - Cur.: " + batteryChargeCurrent + "mA";
|
||||
}
|
||||
|
||||
if (Config.enhance_precision) {
|
||||
if (BeaconMan.getCurrentBeaconConfig()->enhance_precision) {
|
||||
aprsmsg += " " + dao;
|
||||
}
|
||||
|
||||
|
|
@ -280,7 +280,7 @@ void loop() {
|
|||
LoRa.write((const uint8_t *)data.c_str(), data.length());
|
||||
LoRa.endPacket();
|
||||
|
||||
if (Config.smart_beacon.active) {
|
||||
if (BeaconMan.getCurrentBeaconConfig()->smart_beacon.active) {
|
||||
lastTxLat = gps.location.lat();
|
||||
lastTxLng = gps.location.lng();
|
||||
previousHeading = currentHeading;
|
||||
|
|
@ -296,15 +296,15 @@ void loop() {
|
|||
|
||||
if (gps_time_update) {
|
||||
|
||||
show_display(Config.GetCurrentBeacon().callsign, createDateString(now()) + " " + createTimeString(now()), String("Sats: ") + gps.satellites.value() + " HDOP: " + gps.hdop.hdop(), String("Nxt Bcn: ") + (Config.smart_beacon.active ? "~" : "") + createTimeString(nextBeaconTimeStamp), BatteryIsConnected ? (String("Bat: ") + batteryVoltage + "V, " + batteryChargeCurrent + "mA") : "Powered via USB", String("Smart Beacon: " + getSmartBeaconState()));
|
||||
show_display(BeaconMan.getCurrentBeaconConfig()->callsign, createDateString(now()) + " " + createTimeString(now()), String("Sats: ") + gps.satellites.value() + " HDOP: " + gps.hdop.hdop(), String("Nxt Bcn: ") + (BeaconMan.getCurrentBeaconConfig()->smart_beacon.active ? "~" : "") + createTimeString(nextBeaconTimeStamp), BatteryIsConnected ? (String("Bat: ") + batteryVoltage + "V, " + batteryChargeCurrent + "mA") : "Powered via USB", String("Smart Beacon: " + getSmartBeaconState()));
|
||||
|
||||
if (Config.smart_beacon.active) {
|
||||
if (BeaconMan.getCurrentBeaconConfig()->smart_beacon.active) {
|
||||
// Change the Tx internal based on the current speed
|
||||
int curr_speed = (int)gps.speed.kmph();
|
||||
if (curr_speed < Config.smart_beacon.slow_speed) {
|
||||
txInterval = Config.smart_beacon.slow_rate * 1000;
|
||||
} else if (curr_speed > Config.smart_beacon.fast_speed) {
|
||||
txInterval = Config.smart_beacon.fast_rate * 1000;
|
||||
if (curr_speed < BeaconMan.getCurrentBeaconConfig()->smart_beacon.slow_speed) {
|
||||
txInterval = BeaconMan.getCurrentBeaconConfig()->smart_beacon.slow_rate * 1000;
|
||||
} else if (curr_speed > BeaconMan.getCurrentBeaconConfig()->smart_beacon.fast_speed) {
|
||||
txInterval = BeaconMan.getCurrentBeaconConfig()->smart_beacon.fast_rate * 1000;
|
||||
} else {
|
||||
/* Interval inbetween low and high speed
|
||||
min(slow_rate, ..) because: if slow rate is 300s at slow speed <=
|
||||
|
|
@ -316,7 +316,7 @@ void loop() {
|
|||
would lead to decrease of beacon rate in between 5 to 20 km/h. what
|
||||
is even below the slow speed rate.
|
||||
*/
|
||||
txInterval = min(Config.smart_beacon.slow_rate, Config.smart_beacon.fast_speed * Config.smart_beacon.fast_rate / curr_speed) * 1000;
|
||||
txInterval = min(BeaconMan.getCurrentBeaconConfig()->smart_beacon.slow_rate, BeaconMan.getCurrentBeaconConfig()->smart_beacon.fast_speed * BeaconMan.getCurrentBeaconConfig()->smart_beacon.fast_rate / curr_speed) * 1000;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -331,7 +331,8 @@ void loop() {
|
|||
void load_config() {
|
||||
ConfigurationManagement confmg("/tracker.json");
|
||||
Config = confmg.readConfiguration();
|
||||
if (Config.GetCurrentBeacon().callsign == "NOCALL-10") {
|
||||
BeaconMan.loadConfig(Config.beacons);
|
||||
if (BeaconMan.getCurrentBeaconConfig()->callsign == "NOCALL-10") {
|
||||
logPrintlnE("You have to change your settings in 'data/tracker.json' and "
|
||||
"upload it via \"Upload File System image\"!");
|
||||
show_display("ERROR", "You have to change your settings in 'data/tracker.json' and "
|
||||
|
|
@ -476,7 +477,7 @@ String createTimeString(time_t t) {
|
|||
}
|
||||
|
||||
String getSmartBeaconState() {
|
||||
if (Config.smart_beacon.active) {
|
||||
if (BeaconMan.getCurrentBeaconConfig()->smart_beacon.active) {
|
||||
return "On";
|
||||
}
|
||||
return "Off";
|
||||
|
|
|
|||
|
|
@ -34,8 +34,7 @@ Configuration ConfigurationManagement::readConfiguration() {
|
|||
|
||||
Configuration conf;
|
||||
|
||||
conf.debug = data["debug"] | false;
|
||||
conf.enhance_precision = data["enhance_precision"] | false;
|
||||
conf.debug = data["debug"] | false;
|
||||
|
||||
JsonArray beacons = data["beacons"].as<JsonArray>();
|
||||
for (JsonVariant v : beacons) {
|
||||
|
|
@ -53,18 +52,20 @@ Configuration ConfigurationManagement::readConfiguration() {
|
|||
if (v.containsKey("overlay"))
|
||||
beacon.overlay = v["overlay"].as<String>();
|
||||
|
||||
beacon.smart_beacon.active = v["smart_beacon"]["active"] | false;
|
||||
beacon.smart_beacon.turn_min = v["smart_beacon"]["turn_min"] | 25;
|
||||
beacon.smart_beacon.slow_rate = v["smart_beacon"]["slow_rate"] | 300;
|
||||
beacon.smart_beacon.slow_speed = v["smart_beacon"]["slow_speed"] | 10;
|
||||
beacon.smart_beacon.fast_rate = v["smart_beacon"]["fast_rate"] | 60;
|
||||
beacon.smart_beacon.fast_speed = v["smart_beacon"]["fast_speed"] | 100;
|
||||
beacon.smart_beacon.min_tx_dist = v["smart_beacon"]["min_tx_dist"] | 100;
|
||||
beacon.smart_beacon.min_bcn = v["smart_beacon"]["min_bcn"] | 5;
|
||||
|
||||
beacon.enhance_precision = v["enhance_precision"] | false;
|
||||
|
||||
conf.beacons.push_back(beacon);
|
||||
}
|
||||
|
||||
conf.smart_beacon.active = data["smart_beacon"]["active"] | false;
|
||||
conf.smart_beacon.turn_min = data["smart_beacon"]["turn_min"] | 25;
|
||||
conf.smart_beacon.slow_rate = data["smart_beacon"]["slow_rate"] | 300;
|
||||
conf.smart_beacon.slow_speed = data["smart_beacon"]["slow_speed"] | 10;
|
||||
conf.smart_beacon.fast_rate = data["smart_beacon"]["fast_rate"] | 60;
|
||||
conf.smart_beacon.fast_speed = data["smart_beacon"]["fast_speed"] | 100;
|
||||
conf.smart_beacon.min_tx_dist = data["smart_beacon"]["min_tx_dist"] | 100;
|
||||
conf.smart_beacon.min_bcn = data["smart_beacon"]["min_bcn"] | 5;
|
||||
|
||||
conf.button.tx = data["button"]["tx"] | false;
|
||||
conf.button.alt_message = data["button"]["alt_message"] | false;
|
||||
|
||||
|
|
@ -102,23 +103,24 @@ void ConfigurationManagement::writeConfiguration(Configuration conf) {
|
|||
v["timeout"] = beacon.timeout;
|
||||
v["symbol"] = beacon.symbol;
|
||||
v["overlay"] = beacon.overlay;
|
||||
|
||||
v["smart_beacon"]["active"] = beacon.smart_beacon.active;
|
||||
v["smart_beacon"]["turn_min"] = beacon.smart_beacon.turn_min;
|
||||
v["smart_beacon"]["slow_rate"] = beacon.smart_beacon.slow_rate;
|
||||
v["smart_beacon"]["slow_speed"] = beacon.smart_beacon.slow_speed;
|
||||
v["smart_beacon"]["fast_rate"] = beacon.smart_beacon.fast_rate;
|
||||
v["smart_beacon"]["fast_speed"] = beacon.smart_beacon.fast_speed;
|
||||
v["smart_beacon"]["min_tx_dist"] = beacon.smart_beacon.min_tx_dist;
|
||||
v["smart_beacon"]["min_bcn"] = beacon.smart_beacon.min_bcn;
|
||||
|
||||
v["enhance_precision"] = beacon.enhance_precision;
|
||||
}
|
||||
|
||||
data["debug"] = conf.debug;
|
||||
data["enhance_precision"] = conf.enhance_precision;
|
||||
data["debug"] = conf.debug;
|
||||
|
||||
data["button"]["tx"] = conf.button.tx;
|
||||
data["button"]["alt_message"] = conf.button.alt_message;
|
||||
|
||||
data["smart_beacon"]["active"] = conf.smart_beacon.active;
|
||||
data["smart_beacon"]["turn_min"] = conf.smart_beacon.turn_min;
|
||||
data["smart_beacon"]["slow_rate"] = conf.smart_beacon.slow_rate;
|
||||
data["smart_beacon"]["slow_speed"] = conf.smart_beacon.slow_speed;
|
||||
data["smart_beacon"]["fast_rate"] = conf.smart_beacon.fast_rate;
|
||||
data["smart_beacon"]["fast_speed"] = conf.smart_beacon.fast_speed;
|
||||
data["smart_beacon"]["min_tx_dist"] = conf.smart_beacon.min_tx_dist;
|
||||
data["smart_beacon"]["min_bcn"] = conf.smart_beacon.min_bcn;
|
||||
|
||||
data["lora"]["frequency_rx"] = conf.lora.frequencyRx;
|
||||
data["lora"]["frequency_tx"] = conf.lora.frequencyTx;
|
||||
data["lora"]["power"] = conf.lora.power;
|
||||
|
|
@ -135,16 +137,3 @@ void ConfigurationManagement::writeConfiguration(Configuration conf) {
|
|||
serializeJson(data, file);
|
||||
file.close();
|
||||
}
|
||||
|
||||
Configuration::Beacon Configuration::GetCurrentBeacon() {
|
||||
auto iterator = this->beacons.begin();
|
||||
std::advance(iterator, this->current_beacon_index);
|
||||
return *iterator;
|
||||
}
|
||||
|
||||
Configuration::Beacon Configuration::SetNextBeacon() {
|
||||
this->current_beacon_index++;
|
||||
if (this->current_beacon_index >= this->beacons.size())
|
||||
this->current_beacon_index = 0;
|
||||
return this->GetCurrentBeacon();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,31 +10,32 @@ class Configuration {
|
|||
public:
|
||||
class Beacon {
|
||||
public:
|
||||
Beacon() : callsign("NOCALL-10"), path("WIDE1-1"), message("LoRa Tracker"), timeout(1), symbol("["), overlay("/") {
|
||||
class Smart_Beacon {
|
||||
public:
|
||||
Smart_Beacon() : active(false), turn_min(25), slow_rate(300), slow_speed(10), fast_rate(60), fast_speed(100), min_tx_dist(100), min_bcn(5) {
|
||||
}
|
||||
|
||||
bool active;
|
||||
int turn_min;
|
||||
int slow_rate;
|
||||
int slow_speed;
|
||||
int fast_rate;
|
||||
int fast_speed;
|
||||
int min_tx_dist;
|
||||
int min_bcn;
|
||||
};
|
||||
|
||||
Beacon() : callsign("NOCALL-10"), path("WIDE1-1"), message("LoRa Tracker"), timeout(1), symbol("["), overlay("/"), enhance_precision(true) {
|
||||
}
|
||||
|
||||
String callsign;
|
||||
String path;
|
||||
String message;
|
||||
String path;
|
||||
int timeout;
|
||||
String symbol;
|
||||
String overlay;
|
||||
};
|
||||
|
||||
class Smart_Beacon {
|
||||
public:
|
||||
Smart_Beacon() : active(false), turn_min(25), slow_rate(300), slow_speed(10), fast_rate(60), fast_speed(100), min_tx_dist(100), min_bcn(5) {
|
||||
}
|
||||
|
||||
bool active;
|
||||
int turn_min;
|
||||
int slow_rate;
|
||||
int slow_speed;
|
||||
int fast_rate;
|
||||
int fast_speed;
|
||||
int min_tx_dist;
|
||||
int min_bcn;
|
||||
String callsign;
|
||||
String path;
|
||||
String message;
|
||||
int timeout;
|
||||
String symbol;
|
||||
String overlay;
|
||||
Smart_Beacon smart_beacon;
|
||||
bool enhance_precision;
|
||||
};
|
||||
|
||||
class LoRa {
|
||||
|
|
@ -71,19 +72,14 @@ public:
|
|||
int alt_message;
|
||||
};
|
||||
|
||||
Configuration() : debug(false), enhance_precision(true), current_beacon_index(0){};
|
||||
Configuration() : debug(false) {
|
||||
}
|
||||
|
||||
bool debug;
|
||||
bool enhance_precision;
|
||||
std::list<Beacon> beacons;
|
||||
int current_beacon_index;
|
||||
Smart_Beacon smart_beacon;
|
||||
LoRa lora;
|
||||
PTT ptt;
|
||||
Button button;
|
||||
|
||||
Beacon GetCurrentBeacon();
|
||||
Beacon SetNextBeacon();
|
||||
};
|
||||
|
||||
class ConfigurationManagement {
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue