diff --git a/data/is-cfg.json b/data/is-cfg.json index 20e836e..6f40fbb 100644 --- a/data/is-cfg.json +++ b/data/is-cfg.json @@ -36,7 +36,8 @@ "active": true, "passcode": "", "server": "euro.aprs2.net", - "port": 14580 + "port": 14580, + "filter": "" }, "digi": { "active": false, diff --git a/src/TaskAprsIs.cpp b/src/TaskAprsIs.cpp index b8fccf5..2b880ac 100644 --- a/src/TaskAprsIs.cpp +++ b/src/TaskAprsIs.cpp @@ -44,8 +44,13 @@ bool AprsIsTask::loop(System &system) { } bool AprsIsTask::connect(System &system) { - system.getLogger().log(logging::LoggerLevel::LOGGER_LEVEL_INFO, getName(), "connecting to APRS-IS server: %s on port: %d", system.getUserConfig()->aprs_is.server.c_str(), system.getUserConfig()->aprs_is.port); - APRS_IS::ConnectionStatus status = _aprs_is.connect(system.getUserConfig()->aprs_is.server, system.getUserConfig()->aprs_is.port); + system.getLogger().log(logging::LoggerLevel::LOGGER_LEVEL_INFO, getName(), "connecting to APRS-IS server: %s on port: %d, with filter: '%s'", system.getUserConfig()->aprs_is.server.c_str(), system.getUserConfig()->aprs_is.port, system.getUserConfig()->aprs_is.filter); + APRS_IS::ConnectionStatus status = APRS_IS::ConnectionStatus::ERROR_CONNECTION; + if (system.getUserConfig()->aprs_is.filter.isEmpty()) { + status = _aprs_is.connect(system.getUserConfig()->aprs_is.server, system.getUserConfig()->aprs_is.port); + } else { + status = _aprs_is.connect(system.getUserConfig()->aprs_is.server, system.getUserConfig()->aprs_is.port, system.getUserConfig()->aprs_is.filter); + } if (status == APRS_IS::ERROR_CONNECTION) { system.getLogger().log(logging::LoggerLevel::LOGGER_LEVEL_ERROR, getName(), "Something went wrong on connecting! Is the server reachable?"); system.getLogger().log(logging::LoggerLevel::LOGGER_LEVEL_ERROR, getName(), "Connection failed."); diff --git a/src/project_configuration.cpp b/src/project_configuration.cpp index 393d608..47e0fc3 100644 --- a/src/project_configuration.cpp +++ b/src/project_configuration.cpp @@ -52,6 +52,8 @@ void ProjectConfigurationManagement::readProjectConfiguration(DynamicJsonDocumen if (data.containsKey("aprs_is") && data["aprs_is"].containsKey("server")) conf.aprs_is.server = data["aprs_is"]["server"].as(); conf.aprs_is.port = data["aprs_is"]["port"] | 14580; + if (data.containsKey("aprs_is") && data["aprs_is"].containsKey("filter")) + conf.aprs_is.filter = data["aprs_is"]["filter"].as(); conf.digi.active = data["digi"]["active"] | false; conf.digi.beacon = data["digi"]["beacon"] | false; @@ -147,6 +149,7 @@ void ProjectConfigurationManagement::writeProjectConfiguration(Configuration &co data["aprs_is"]["passcode"] = conf.aprs_is.passcode; data["aprs_is"]["server"] = conf.aprs_is.server; data["aprs_is"]["port"] = conf.aprs_is.port; + data["aprs_is"]["filter"] = conf.aprs_is.filter; data["digi"]["active"] = conf.digi.active; data["digi"]["beacon"] = conf.digi.beacon; data["lora"]["frequency_rx"] = conf.lora.frequencyRx; diff --git a/src/project_configuration.h b/src/project_configuration.h index fd3b13a..7ca1274 100644 --- a/src/project_configuration.h +++ b/src/project_configuration.h @@ -67,6 +67,7 @@ public: String passcode; String server; int port; + String filter; }; class Digi {