From a6796d3b824e90aeba0eb106d541e05cef821dc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=B2=20Caruso?= <niccolo.caruso@skywarder.eu>
Date: Wed, 2 Oct 2024 15:17:14 +0200
Subject: [PATCH] [VN300, submodule] Update submodule skyward-boardcore rebased
on VN300
Fixes for VN300 naming changes
---
src/boards/Groundstation/Automated/SMA/SMA.cpp | 12 ++++++------
.../Groundstation/Automated/Sensors/Sensors.cpp | 2 +-
src/boards/Groundstation/LyraGS/BoardStatus.cpp | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/boards/Groundstation/Automated/SMA/SMA.cpp b/src/boards/Groundstation/Automated/SMA/SMA.cpp
index 9afec5cf2..52bced99a 100644
--- a/src/boards/Groundstation/Automated/SMA/SMA.cpp
+++ b/src/boards/Groundstation/Automated/SMA/SMA.cpp
@@ -153,18 +153,18 @@ void SMA::update()
{
// update antenna coordinates
vn300Data = sensors->getVN300LastSample();
- if (vn300Data.fix_gps == 3)
+ if (vn300Data.gpsFix == 3)
{
// build the GPSData struct with the VN300 data
antennaCoordinates.gpsTimestamp = vn300Data.insTimestamp;
antennaCoordinates.latitude = vn300Data.latitude;
antennaCoordinates.longitude = vn300Data.longitude;
antennaCoordinates.height = vn300Data.altitude;
- antennaCoordinates.velocityNorth = vn300Data.nedVelX;
- antennaCoordinates.velocityEast = vn300Data.nedVelY;
- antennaCoordinates.velocityDown = vn300Data.nedVelZ;
- antennaCoordinates.satellites = vn300Data.fix_gps;
- antennaCoordinates.fix = vn300Data.fix_gps;
+ antennaCoordinates.velocityNorth = vn300Data.velocityX;
+ antennaCoordinates.velocityEast = vn300Data.velocityY;
+ antennaCoordinates.velocityDown = vn300Data.velocityZ;
+ antennaCoordinates.satellites = vn300Data.gpsFix;
+ antennaCoordinates.fix = vn300Data.gpsFix;
// update follower with coordinates
follower.setAntennaCoordinates(antennaCoordinates);
diff --git a/src/boards/Groundstation/Automated/Sensors/Sensors.cpp b/src/boards/Groundstation/Automated/Sensors/Sensors.cpp
index 4f9fcd256..ec7be31c6 100644
--- a/src/boards/Groundstation/Automated/Sensors/Sensors.cpp
+++ b/src/boards/Groundstation/Automated/Sensors/Sensors.cpp
@@ -53,7 +53,7 @@ bool Sensors::vn300Init()
{
vn300 =
new Boardcore::VN300(getModule<LyraGS::Buses>()->usart2, 115200,
- VN300Defs::SampleOptions::ARP,
+ VN300Defs::SampleOptions::REDUCED,
VNCommonSerial::CRCOptions::CRC_ENABLE_16,
std::chrono::seconds(5)); ///< TODO: see that CRC
///< behaves correctly
diff --git a/src/boards/Groundstation/LyraGS/BoardStatus.cpp b/src/boards/Groundstation/LyraGS/BoardStatus.cpp
index 03038a32f..4aaeeaaae 100644
--- a/src/boards/Groundstation/LyraGS/BoardStatus.cpp
+++ b/src/boards/Groundstation/LyraGS/BoardStatus.cpp
@@ -91,7 +91,7 @@ void BoardStatus::arpRoutine()
tm.gps_latitude = vn300.latitude; /*< [deg] Latitude*/
tm.gps_longitude = vn300.longitude; /*< [deg] Longitude*/
tm.gps_height = vn300.altitude; /*< [m] Altitude*/
- tm.gps_fix = vn300.fix_gps; /*< Wether the GPS has a FIX*/
+ tm.gps_fix = vn300.gpsFix; /*< Wether the GPS has a FIX*/
tm.log_number =
Logger::getInstance().getCurrentLogNumber(); /*< Log number*/
--
GitLab