diff --git a/src/shared/radio/SX1278/SX1278Fsk.cpp b/src/shared/radio/SX1278/SX1278Fsk.cpp index ddd8668755e944e4baf892189052e9d0d2d21183..1cf29fceea9de8e894c51ab6a1b1ba746164595c 100644 --- a/src/shared/radio/SX1278/SX1278Fsk.cpp +++ b/src/shared/radio/SX1278/SX1278Fsk.cpp @@ -63,9 +63,15 @@ bool SX1278Fsk::checkVersion() SPITransaction spi(getSpiSlave()); uint8_t version = spi.readRegister(REG_VERSION); - TRACE("[sx1278] Chip id: %d\n", version); - - return version == 0x12; + if (version == 0x12) + { + return true; + } + else + { + LOG_ERR(logger, "Wrong chip id: {}", version); + return false; + } } SX1278Fsk::Error SX1278Fsk::configure(const Config &config) diff --git a/src/shared/radio/SX1278/SX1278Fsk.h b/src/shared/radio/SX1278/SX1278Fsk.h index b67f6c202eb45fa1a5425d4cf2b4424d011b1b53..b25d645e99d3450d0e15de1de5ab712d067ed7c1 100644 --- a/src/shared/radio/SX1278/SX1278Fsk.h +++ b/src/shared/radio/SX1278/SX1278Fsk.h @@ -212,7 +212,7 @@ private: bool crc_enabled; long long last_tx = 0; float last_rx_rssi = 0.0f; - PrintLogger logger = Logging::getLogger("sx1278"); + PrintLogger logger = Logging::getLogger("sx1278-fsk"); }; } // namespace Boardcore diff --git a/src/shared/radio/SX1278/SX1278Lora.cpp b/src/shared/radio/SX1278/SX1278Lora.cpp index 6062b50b231dbd2437207dbedd5a04c19fb04db4..fe6b5f315ecfe699fc61bf01d7ad4e95500367ba 100644 --- a/src/shared/radio/SX1278/SX1278Lora.cpp +++ b/src/shared/radio/SX1278/SX1278Lora.cpp @@ -135,7 +135,6 @@ SX1278Lora::Error SX1278Lora::init(const Config &config) // First probe for the device if (!checkVersion()) { - TRACE("[sx1278] Wrong chipid\n"); return Error::BAD_VALUE; } @@ -152,9 +151,15 @@ bool SX1278Lora::checkVersion() SPITransaction spi(getSpiSlave()); uint8_t version = spi.readRegister(REG_VERSION); - TRACE("[sx1278] Chip id: %d\n", version); - - return version == 0x12; + if (version == 0x12) + { + return true; + } + else + { + LOG_ERR(logger, "Wrong chip id: {}", version); + return false; + } } SX1278Lora::Error SX1278Lora::configure(const Config &config) diff --git a/src/shared/radio/SX1278/SX1278Lora.h b/src/shared/radio/SX1278/SX1278Lora.h index c30bdf41f72962659748fca95b292272d6ca32b8..edde853ae4379ea71b183416fcfad6ad8c3b5e61 100644 --- a/src/shared/radio/SX1278/SX1278Lora.h +++ b/src/shared/radio/SX1278/SX1278Lora.h @@ -22,6 +22,8 @@ #pragma once +#include <diagnostic/PrintLogger.h> + #include "SX1278Common.h" #include "SX1278LoraTimings.h" @@ -203,9 +205,8 @@ private: void setMode(Mode mode) override; void setMapping(SX1278::DioMapping mapping) override; - void setFreqRF(int freq_rf); - bool crc_enabled; + PrintLogger logger = Logging::getLogger("sx1278-lora"); }; } // namespace Boardcore