From f06026b28da80c590d23492c1c723227e7ae4aff Mon Sep 17 00:00:00 2001
From: Davide Mor <davide.mor@skywarder.eu>
Date: Sat, 16 Sep 2023 10:25:52 +0200
Subject: [PATCH] [sx1278] Fixed formatting
---
src/entrypoints/sx1278-serial.cpp | 30 ++++++++---------
src/shared/radio/SX1278/SX1278Lora.cpp | 3 +-
.../radio/sx1278/test-sx1278-mavlink.cpp | 32 +++++++++----------
3 files changed, 33 insertions(+), 32 deletions(-)
diff --git a/src/entrypoints/sx1278-serial.cpp b/src/entrypoints/sx1278-serial.cpp
index 2eaeafd5c..796673e08 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 e2bbd4a57..ab598fbf1 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 d8bf407b4..96e7b4a38 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)
--
GitLab