diff --git a/src/boards/Parafoil/Buses.h b/src/boards/Parafoil/Buses.h index 426c2c90a6a8cad7072e122f81d0d0a452ecd900..2330dc0cee155bafa3dc6cbd97795b6bb767add1 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 a129e84577f33fbdf88a4daf9d1f0dbdd117f70e..b59475d30e4aa4534409951049964990f480286c 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 cd584fb82ed972cb43a458f0120fc6dfaea85cf1..57caa5c8818867b6edbb051ba2a02e1f3491e84e 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, [&]()