diff --git a/src/entrypoints/sx1278-serial.cpp b/src/entrypoints/sx1278-serial.cpp index 796673e08a2014af2000d7551fbd872025d373f6..f5115d7c6b801aeba38dc500950e7e793861e8bd 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 @@ -239,11 +239,11 @@ int main() #elif defined SX1278_IS_SKYWARD433 printf("[sx1278] Confuring Skyward 433 frontend...\n"); std::unique_ptr<Boardcore::SX1278::ISX1278Frontend> frontend( - new Boardcore::Skyward433Frontend()); + new Boardcore::Skyward433Frontend()); #else printf("[sx1278] Confuring RA01 frontend...\n"); std::unique_ptr<Boardcore::SX1278::ISX1278Frontend> frontend( - new Boardcore::RA01Frontend()); + new Boardcore::RA01Frontend()); #endif #ifdef SX1278_IS_LORA @@ -267,27 +267,27 @@ int main() #else // Run default configuration Boardcore::SX1278Fsk::Config config = { - .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}; + .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) { - // FIXME: Why does clang-format put this line up here? + // FIXME: Why does clang-format put this line up here? printf("[sx1278] sx1278->init error\n"); return false; } diff --git a/src/shared/radio/SX1278/SX1278Common.cpp b/src/shared/radio/SX1278/SX1278Common.cpp index 6591fdefaa313084f21d49c515ebe0bf29abd8a9..a8b11a0e5c8278c5d9b28e5feb8ae1f87ac874fc 100644 --- a/src/shared/radio/SX1278/SX1278Common.cpp +++ b/src/shared/radio/SX1278/SX1278Common.cpp @@ -116,7 +116,7 @@ SX1278Common::IrqFlags SX1278Common::waitForIrqBusy(LockMode &guard, IrqFlags reset_irq, int timeout) { - long long start = miosix::getTick(); + long long start = miosix::getTick(); while ((miosix::getTick() - start) < timeout) { // Delay between polls diff --git a/src/tests/radio/sx1278/test-sx1278-mavlink.cpp b/src/tests/radio/sx1278/test-sx1278-mavlink.cpp index 96e7b4a38a2995be8ab1321edd19b9b11596357d..d5d7e1bb3acd6a47cb55f52f4883521e5be6bdfc 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 @@ -243,7 +243,7 @@ int main() #elif defined SX1278_IS_SKYWARD433 printf("[sx1278] Confuring Skyward 433 frontend...\n"); std::unique_ptr<Boardcore::SX1278::ISX1278Frontend> frontend( - new Boardcore::Skyward433Frontend()); + new Boardcore::Skyward433Frontend()); #else printf("[sx1278] Confuring RA01 frontend...\n"); std::unique_ptr<Boardcore::SX1278::ISX1278Frontend> frontend( @@ -272,27 +272,27 @@ 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) { - // FIXME: Why does clang-format put this line up here? + // FIXME: Why does clang-format put this line up here? printf("[sx1278] sx1278->init error\n"); return false; }