diff --git a/include/station_utils.h b/include/station_utils.h index c6d72e8..2230216 100644 --- a/include/station_utils.h +++ b/include/station_utils.h @@ -18,8 +18,7 @@ struct LastHeardStation { namespace STATION_Utils { - void loadBlacklist(); - void loadManagers(); + void loadBlacklistAndManagers(); bool isBlacklisted(const String& callsign); bool isManager(const String& callsign); bool checkObjectTime(const String& packet); diff --git a/src/LoRa_APRS_iGate.cpp b/src/LoRa_APRS_iGate.cpp index 1b135fd..1a0182e 100644 --- a/src/LoRa_APRS_iGate.cpp +++ b/src/LoRa_APRS_iGate.cpp @@ -86,8 +86,7 @@ void setup() { LoRa_Utils::setup(); Utils::validateFreqs(); GPS_Utils::setup(); - STATION_Utils::loadBlacklist(); - STATION_Utils::loadManagers(); + STATION_Utils::loadBlacklistAndManagers(); #ifdef STARTUP_DELAY // (TEST) just to wait for WiFi init of Routers displayShow("", " STARTUP DELAY ...", "", "", 0); diff --git a/src/station_utils.cpp b/src/station_utils.cpp index a7f6af8..88cb570 100644 --- a/src/station_utils.cpp +++ b/src/station_utils.cpp @@ -45,12 +45,9 @@ namespace STATION_Utils { return loadedList; } - void loadBlacklist() { - blacklist = loadCallSignList(Config.blacklist); - } - - void loadManagers() { - managers = loadCallSignList(Config.remoteManagement.managers); + void loadBlacklistAndManagers() { + blacklist = loadCallSignList(Config.blacklist); + managers = loadCallSignList(Config.remoteManagement.managers); } bool checkCallsignList(const std::vector& list, const String& callsign) {