diff --git a/src/boards/Groundstation/Automated/Config/SMAConfig.h b/src/boards/Groundstation/Automated/Config/SMAConfig.h index bf6ad7cf2afaae44d14f97473b85fa71a4f3b9e2..e22f0d193040846badd9b80a333e262c0ec8b063 100644 --- a/src/boards/Groundstation/Automated/Config/SMAConfig.h +++ b/src/boards/Groundstation/Automated/Config/SMAConfig.h @@ -21,6 +21,9 @@ */ #pragma once +#include <chrono> + +/* linter off */ using namespace std::chrono; namespace Antennas { @@ -29,7 +32,7 @@ namespace SMAConfig { /// @brief Period of the propagator algorithm [ms]. -constexpr uint32_t UPDATE_PERIOD = 100; // 10 Hz +constexpr milliseconds UPDATE_PERIOD = 100ms; // 10 Hz } // namespace SMAConfig } // namespace Antennas diff --git a/src/boards/Groundstation/Automated/SMA/SMA.cpp b/src/boards/Groundstation/Automated/SMA/SMA.cpp index 52bced99ad7cf7b5597e226dd862ce58fc901fa4..c14fbf72303055ba9348456fb4b7715eefd8e2f6 100644 --- a/src/boards/Groundstation/Automated/SMA/SMA.cpp +++ b/src/boards/Groundstation/Automated/SMA/SMA.cpp @@ -235,10 +235,9 @@ void SMA::update() FollowerState follow = follower.getState(); // Log the target angles and propagations info - AntennaAngles target = follower.getTargetAngles(); - target.nrPropagations = predicted.nPropagations; + AntennaAngles target = follower.getTargetAngles(); Boardcore::Logger::getInstance().log( - static_cast<Boardcore::AntennaAngles>(target)); + Boardcore::AntennaAnglesLog(target, predicted.nPropagations)); // actuate the steppers auto steppers = getModule<Actuators>(); @@ -301,10 +300,9 @@ void SMA::update() FollowerState follow = follower.getState(); // Log the target angles and propagations info - AntennaAngles target = follower.getTargetAngles(); - target.nrPropagations = predicted.nPropagations; + AntennaAngles target = follower.getTargetAngles(); Boardcore::Logger::getInstance().log( - static_cast<Boardcore::AntennaAngles>(target)); + Boardcore::AntennaAnglesLog(target, predicted.nPropagations)); // actuate the steppers steppers->setSpeed(StepperList::STEPPER_X, follow.horizontalSpeed); diff --git a/src/entrypoints/Groundstation/lyra-gs-entry.cpp b/src/entrypoints/Groundstation/lyra-gs-entry.cpp index 6e5b617156537d1ede595f48063beb1834b5d724..67afc5177d80d27c2a74b8a0e32aea279107b775 100644 --- a/src/entrypoints/Groundstation/lyra-gs-entry.cpp +++ b/src/entrypoints/Groundstation/lyra-gs-entry.cpp @@ -69,7 +69,7 @@ DipStatusLyraGS getDipStatus(uint8_t read) dipRead.payloadHasBackup = 1 & (read >> 2); dipRead.mainTXenable = 1 & (read >> 3); dipRead.payloadTXenable = 1 & (read >> 4); - dipRead.ipConfig = 0 | (read >> 5); + dipRead.ipConfig = read >> 5; return dipRead; } @@ -128,7 +128,7 @@ int main() GpioPin clk = dipSwitch::clk::getPin(); GpioPin qh = dipSwitch::qh::getPin(); - DipSwitch dip(sh, clk, qh, microSecClk); + DipSwitch dip(sh, clk, qh, std::chrono::microseconds(microSecClk)); DipStatusLyraGS dipRead = getDipStatus(dip.read()); DependencyManager manager; diff --git a/src/scripts/logdecoder/AutomatedAntennas/logdecoder.cpp b/src/scripts/logdecoder/AutomatedAntennas/logdecoder.cpp index d23475aee3875732ee844c1ad628fec14700f604..2495a7affe4dd7dd93c68ce7d2d8d6f350a14097 100644 --- a/src/scripts/logdecoder/AutomatedAntennas/logdecoder.cpp +++ b/src/scripts/logdecoder/AutomatedAntennas/logdecoder.cpp @@ -31,6 +31,7 @@ #include <sensors/Vectornav/VN300/VN300Data.h> #include <tscpp/stream.h> +#include <cstdint> #include <fstream> #include <iostream> #include <stdexcept> @@ -60,7 +61,7 @@ void registerTypes(Deserializer& ds) ds.registerType<StepperYData>(); ds.registerType<VN300Data>(); ds.registerType<NASState>(); - ds.registerType<AntennaAngles>(); + ds.registerType<AntennaAnglesLog>(); ds.registerType<GPSData>(); ds.registerType<SMAStatus>(); ds.registerType<PinChangeData>();