diff --git a/src/entrypoints/sx1278-serial.cpp b/src/entrypoints/sx1278-serial.cpp index 2eaeafd5ca0b5f08e43fd22cdf8f43e2646d043a..796673e08a2014af2000d7551fbd872025d373f6 100644 --- a/src/entrypoints/sx1278-serial.cpp +++ b/src/entrypoints/sx1278-serial.cpp @@ -78,8 +78,8 @@ using sck = radio::sck; using miso = radio::miso; using mosi = radio::mosi; -using txen = radio::txEn; -using rxen = radio::rxEn; +using txen = radio::txEn; +using rxen = radio::rxEn; #define SX1278_SPI SPI4 @@ -267,22 +267,22 @@ int main() #else // Run default configuration Boardcore::SX1278Fsk::Config config = { - .freq_rf = 434000000, - .freq_dev = 50000, - .bitrate = 48000, - .rx_bw = Boardcore::SX1278Fsk::Config::RxBw::HZ_125000, - .afc_bw = Boardcore::SX1278Fsk::Config::RxBw::HZ_125000, - .ocp = 120, - .power = 13, - .shaping = Boardcore::SX1278Fsk::Config::Shaping::GAUSSIAN_BT_1_0, - .dc_free = Boardcore::SX1278Fsk::Config::DcFree::WHITENING, - .enable_crc = false}; + .freq_rf = 419000000, + .freq_dev = 50000, + .bitrate = 48000, + .rx_bw = Boardcore::SX1278Fsk::Config::RxBw::HZ_125000, + .afc_bw = Boardcore::SX1278Fsk::Config::RxBw::HZ_125000, + .ocp = 120, + .power = 13, + .shaping = Boardcore::SX1278Fsk::Config::Shaping::GAUSSIAN_BT_1_0, + .dc_free = Boardcore::SX1278Fsk::Config::DcFree::WHITENING, + .enable_crc = false}; Boardcore::SX1278Fsk::Error err; sx1278 = new Boardcore::SX1278Fsk(sx1278_bus, cs::getPin(), dio0::getPin(), - dio1::getPin(), dio3::getPin(), - Boardcore::SPI::ClockDivider::DIV_256, - std::move(frontend)); + dio1::getPin(), dio3::getPin(), + Boardcore::SPI::ClockDivider::DIV_256, + std::move(frontend)); printf("\n[sx1278] Configuring sx1278 fsk...\n"); if ((err = sx1278->init(config)) != Boardcore::SX1278Fsk::Error::NONE) diff --git a/src/shared/radio/SX1278/SX1278Lora.cpp b/src/shared/radio/SX1278/SX1278Lora.cpp index e2bbd4a57a380dbf241eb5df758a9408cf647ba4..ab598fbf10f7475070bad0ea663f3b825fe61035 100644 --- a/src/shared/radio/SX1278/SX1278Lora.cpp +++ b/src/shared/radio/SX1278/SX1278Lora.cpp @@ -420,7 +420,8 @@ void SX1278Lora::writeFifo(Lock &guard, uint8_t addr, uint8_t *src, spi.writeRegisters(REG_FIFO, src, size); } -bool SX1278Lora::checkDeviceFailure(Lock &guard) { +bool SX1278Lora::checkDeviceFailure(Lock &guard) +{ // Check that this register is the same as when we configured it, otherwise // the device has failed. diff --git a/src/tests/radio/sx1278/test-sx1278-mavlink.cpp b/src/tests/radio/sx1278/test-sx1278-mavlink.cpp index d8bf407b40306a9b573f16b312cfa1f04d27a3fb..96e7b4a38a2995be8ab1321edd19b9b11596357d 100644 --- a/src/tests/radio/sx1278/test-sx1278-mavlink.cpp +++ b/src/tests/radio/sx1278/test-sx1278-mavlink.cpp @@ -79,11 +79,11 @@ using sck = miosix::radio1::spi::sck; using miso = miosix::radio1::spi::miso; using mosi = miosix::radio1::spi::mosi; -using txen = miosix::radio1::txen; -using rxen = miosix::radio1::rxen; +using txen = miosix::radio1::txen; +using rxen = miosix::radio1::rxen; #define SX1278_NRST -using rst = miosix::radio1::nrst; +using rst = miosix::radio1::nrst; #define SX1278_SPI MIOSIX_RADIO1_SPI @@ -272,22 +272,22 @@ int main() #else // Run default configuration Boardcore::SX1278Fsk::Config config = { - .freq_rf = 434000000, - .freq_dev = 50000, - .bitrate = 48000, - .rx_bw = Boardcore::SX1278Fsk::Config::RxBw::HZ_125000, - .afc_bw = Boardcore::SX1278Fsk::Config::RxBw::HZ_125000, - .ocp = 120, - .power = 13, - .shaping = Boardcore::SX1278Fsk::Config::Shaping::GAUSSIAN_BT_1_0, - .dc_free = Boardcore::SX1278Fsk::Config::DcFree::WHITENING, - .enable_crc = false}; + .freq_rf = 434000000, + .freq_dev = 50000, + .bitrate = 48000, + .rx_bw = Boardcore::SX1278Fsk::Config::RxBw::HZ_125000, + .afc_bw = Boardcore::SX1278Fsk::Config::RxBw::HZ_125000, + .ocp = 120, + .power = 13, + .shaping = Boardcore::SX1278Fsk::Config::Shaping::GAUSSIAN_BT_1_0, + .dc_free = Boardcore::SX1278Fsk::Config::DcFree::WHITENING, + .enable_crc = false}; Boardcore::SX1278Fsk::Error err; sx1278 = new Boardcore::SX1278Fsk(sx1278_bus, cs::getPin(), dio0::getPin(), - dio1::getPin(), dio3::getPin(), - Boardcore::SPI::ClockDivider::DIV_256, - std::move(frontend)); + dio1::getPin(), dio3::getPin(), + Boardcore::SPI::ClockDivider::DIV_256, + std::move(frontend)); printf("\n[sx1278] Configuring sx1278 fsk...\n"); if ((err = sx1278->init(config)) != Boardcore::SX1278Fsk::Error::NONE)