From 3fbed7b963b2fb9aaccec475e9fd064f6b10b909 Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Sat, 19 Mar 2022 22:08:54 +0100 Subject: [PATCH] modem fixed --- src/TaskModem.cpp | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/src/TaskModem.cpp b/src/TaskModem.cpp index e6c5ca6..645626b 100644 --- a/src/TaskModem.cpp +++ b/src/TaskModem.cpp @@ -17,7 +17,7 @@ bool ModemTask::setup(System &system) { SPI.begin(system.getBoardConfig()->LoraSck, system.getBoardConfig()->LoraMiso, system.getBoardConfig()->LoraMosi, system.getBoardConfig()->LoraCS); _lora_aprs.setPins(system.getBoardConfig()->LoraCS, system.getBoardConfig()->LoraReset, system.getBoardConfig()->LoraIRQ); if (!_lora_aprs.begin(system.getUserConfig()->lora.frequencyRx)) { - logPrintlnE("Starting LoRa failed!"); + system.getLogger().log(logging::LoggerLevel::LOGGER_LEVEL_ERROR, getName(), "Starting LoRa failed!"); _stateInfo = "LoRa-Modem failed"; _state = Error; while (true) @@ -39,32 +39,19 @@ bool ModemTask::setup(System &system) { bool ModemTask::loop(System &system) { if (_lora_aprs.checkMessage()) { std::shared_ptr msg = _lora_aprs.getMessage(); - // msg->getAPRSBody()->setData(msg->getAPRSBody()->getData() + " 123"); - logPrintD("[" + timeString() + "] "); - logPrintD("Received packet '"); - logPrintD(msg->toString()); - logPrintD("' with RSSI "); - logPrintD(String(_lora_aprs.packetRssi())); - logPrintD(" and SNR "); - logPrintlnD(String(_lora_aprs.packetSnr())); - + system.getLogger().log(logging::LoggerLevel::LOGGER_LEVEL_DEBUG, getName(), "[%s] Received packet '%s' with RSSI %d and SNR %f", timeString(), msg->toString(), _lora_aprs.packetRssi(), _lora_aprs.packetSnr()); _fromModem.addElement(msg); system.getDisplay().addFrame(std::shared_ptr(new TextFrame("LoRa", msg->toString()))); } if (!_toModem.empty()) { std::shared_ptr msg = _toModem.getElement(); - logPrintD("[" + timeString() + "] "); if (system.getUserConfig()->lora.tx_enable) { - logPrintD("Transmitting packet '"); - logPrintD(msg->toString()); - logPrintlnD("'"); + system.getLogger().log(logging::LoggerLevel::LOGGER_LEVEL_DEBUG, getName(), "[%s] Transmitting packet '%s'", timeString(), msg->toString()); _lora_aprs.sendMessage(msg); - logPrintlnD("TX done"); + system.getLogger().log(logging::LoggerLevel::LOGGER_LEVEL_DEBUG, getName(), "[%s] TX done", timeString()); } else { - logPrintD("NOT transmitting packet as TX is not enabled '"); - logPrintD(msg->toString()); - logPrintlnD("'"); + system.getLogger().log(logging::LoggerLevel::LOGGER_LEVEL_DEBUG, getName(), "[%s] NOT transmitting packet as TX is not enabled '%s'", timeString(), msg->toString()); } }