From 7f6db09da7ac4022f051ff2917b398aeaab6762c Mon Sep 17 00:00:00 2001
From: Federico Mandelli <federicomandelli@skywarder.eu>
Date: Fri, 30 Jun 2023 18:24:49 +0200
Subject: [PATCH] [Busses] Updated busses to new interface
---
src/boards/Parafoil/Buses.h | 22 ++++++++-------------
src/boards/Parafoil/Configs/SensorsConfig.h | 3 +--
src/boards/Parafoil/Sensors/Sensors.cpp | 3 +--
3 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/src/boards/Parafoil/Buses.h b/src/boards/Parafoil/Buses.h
index 426c2c90a..2330dc0ce 100644
--- a/src/boards/Parafoil/Buses.h
+++ b/src/boards/Parafoil/Buses.h
@@ -43,24 +43,18 @@ struct Buses : public ParafoilModule
public:
#ifndef USE_MOCK_PERIPHERALS
Buses()
- : usart1(USART1, Boardcore::USARTInterface::Baudrate::B115200),
- usart2(USART2, Boardcore::USARTInterface::Baudrate::B115200),
- usart3(USART3, Boardcore::USARTInterface::Baudrate::B115200),
- uart4(UART4, Boardcore::USARTInterface::Baudrate::B115200),
- spi1(SPI1), spi2(SPI2)
+ : usart1(USART1, 115200), usart2(USART2, 115200),
+ usart3(USART3, 115200), uart4(UART4, 115200), spi1(SPI1), spi2(SPI2)
{
- usart1.init();
- usart2.init();
- usart3.init();
- uart4.init();
+ /* usart1.init();
+ usart2.init();
+ usart3.init();
+ uart4.init();*/
}
#else
Buses()
- : usart1(USART1, Boardcore::USARTInterface::Baudrate::B115200),
- usart2(USART2, Boardcore::USARTInterface::Baudrate::B115200),
- usart3(USART3, Boardcore::USARTInterface::Baudrate::B115200),
- uart4(UART4, Boardcore::USARTInterface::Baudrate::B115200), spi1({}),
- spi2({})
+ : usart1(USART1, 115200), usart2(USART2, 115200),
+ usart3(USART3, 115200), uart4(UART4, 115200), spi1({}), spi2({})
{
usart2.init();
usart3.init();
diff --git a/src/boards/Parafoil/Configs/SensorsConfig.h b/src/boards/Parafoil/Configs/SensorsConfig.h
index a129e8457..b59475d30 100644
--- a/src/boards/Parafoil/Configs/SensorsConfig.h
+++ b/src/boards/Parafoil/Configs/SensorsConfig.h
@@ -106,8 +106,7 @@ constexpr Boardcore::LIS3MDL::FullScale MAG_LIS_FULLSCALE =
Boardcore::LIS3MDL::FS_4_GAUSS;
// GPS
-static constexpr Boardcore::USARTInterface::Baudrate GPS_BAUD_RATE =
- Boardcore::USARTInterface::Baudrate::B460800;
+static constexpr int GPS_BAUD_RATE = 460800;
static constexpr unsigned int GPS_SAMPLE_RATE = 10;
// Sampling periods and dividers
diff --git a/src/boards/Parafoil/Sensors/Sensors.cpp b/src/boards/Parafoil/Sensors/Sensors.cpp
index cd584fb82..57caa5c88 100644
--- a/src/boards/Parafoil/Sensors/Sensors.cpp
+++ b/src/boards/Parafoil/Sensors/Sensors.cpp
@@ -465,8 +465,7 @@ void Sensors::ms5803Init()
void Sensors::ubxGpsInit()
{
- ubxGps = new UBXGPSSerial(GPS_BAUD_RATE, GPS_SAMPLE_RATE, USART2,
- USARTInterface::Baudrate::B9600);
+ ubxGps = new UBXGPSSerial(GPS_BAUD_RATE, GPS_SAMPLE_RATE, USART2, 9600);
SensorInfo info("UBXGPS", SAMPLE_PERIOD_GPS,
[&]()
--
GitLab