From 63abe791cd2d4f89f566c056609d5dd95322cfac Mon Sep 17 00:00:00 2001 From: Christoph Kottke Date: Tue, 25 May 2021 11:15:01 +0200 Subject: [PATCH] move WIDE1-1 Path to Digi Msg --- src/TaskRouter.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/TaskRouter.cpp b/src/TaskRouter.cpp index ebaf38b..4e7eee5 100644 --- a/src/TaskRouter.cpp +++ b/src/TaskRouter.cpp @@ -21,10 +21,10 @@ RouterTask::~RouterTask() { bool RouterTask::setup(System &system) { // setup beacon _beacon_timer.setTimeout(system.getUserConfig()->beacon.timeout * 60 * 1000); + _beaconMsg = std::shared_ptr(new APRSMessage()); _beaconMsg->setSource(system.getUserConfig()->callsign); _beaconMsg->setDestination("APLG01"); - _beaconMsg->setPath("WIDE1-1"); String lat = create_lat_aprs(system.getUserConfig()->beacon.positionLatitude); String lng = create_long_aprs(system.getUserConfig()->beacon.positionLongitude); _beaconMsg->getBody()->setData(String("=") + lat + "L" + lng + "&" + system.getUserConfig()->beacon.message); @@ -88,8 +88,11 @@ bool RouterTask::loop(System &system) { if (system.getUserConfig()->aprs_is.active) _toAprsIs.addElement(_beaconMsg); - if (system.getUserConfig()->digi.beacon) - _toModem.addElement(_beaconMsg); + if (system.getUserConfig()->digi.beacon) { + std::shared_ptr digiBeaconMsg = std::make_shared(*_beaconMsg); + digiBeaconMsg->setPath("WIDE1-1"); + _toModem.addElement(digiBeaconMsg); + } system.getDisplay().addFrame(std::shared_ptr(new TextFrame("BEACON", _beaconMsg->toString())));