mirror
/
LoRa_APRS_iGate
kopia lustrzana https://github.com/lora-aprs/LoRa_APRS_iGate
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Change logger and correct corrupt source.

pull/168/head
FUJIURA Toyonori 2022-03-20 22:08:20 +09:00
rodzic 804a0afe05
commit d0deb99668
1 zmienionych plików z 5 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

12
src/TaskBeacon.cpp
Wyświetl plik

@ -20,7 +20,7 @@ bool BeaconTask::setup(System &system) {
if (system.getBoardConfig()->GpsRx != 0) { if (system.getBoardConfig()->GpsRx != 0) {
ss.begin(9600, SERIAL_8N1, system.getBoardConfig()->GpsTx, system.getBoardConfig()->GpsRx); ss.begin(9600, SERIAL_8N1, system.getBoardConfig()->GpsTx, system.getBoardConfig()->GpsRx);
} else { } else {
logPrintlnD("NO GPS found."); system.getLogger().log(logging::LoggerLevel::LOGGER_LEVEL_INFO, getName(), "NO GPS found.");
gpsok = false; gpsok = false;
} }
} }
@ -44,12 +44,11 @@ bool BeaconTask::loop(System &system) {
} }
setBeacon(system); setBeacon(system);
}
uint32_t diff = _beacon_timer.getTriggerTimeInSec(); uint32_t diff = _beacon_timer.getTriggerTimeInSec();
_stateInfo = "beacon " + String(uint32_t(diff / 600)) + String(uint32_t(diff / 60) % 10) + ":" + String(uint32_t(diff / 10) % 6) + String(uint32_t(diff % 10)); _stateInfo = "beacon " + String(uint32_t(diff / 600)) + String(uint32_t(diff / 60) % 10) + ":" + String(uint32_t(diff / 10) % 6) + String(uint32_t(diff % 10));
return true; return true;
} }
String create_lat_aprs(double lat) { String create_lat_aprs(double lat) {
@ -96,8 +95,7 @@ void BeaconTask::setBeacon(System &system) {
} }
_beaconMsg->getBody()->setData(String("=") + create_lat_aprs(lat) + "L" + create_long_aprs(lng) + "&" + system.getUserConfig()->beacon.message); _beaconMsg->getBody()->setData(String("=") + create_lat_aprs(lat) + "L" + create_long_aprs(lng) + "&" + system.getUserConfig()->beacon.message);
logPrintD("[" + timeString() + "] "); system.getLogger().log(logging::LoggerLevel::LOGGER_LEVEL_INFO, getName(), "[%s]%s", timeString(), _beaconMsg->encode());
logPrintlnD(_beaconMsg->encode());
if (system.getUserConfig()->aprs_is.active) if (system.getUserConfig()->aprs_is.active)
_toAprsIs.addElement(_beaconMsg); _toAprsIs.addElement(_beaconMsg);