Skip to content
Snippets Groups Projects
Commit 8780f303 authored by Alberto Nidasio's avatar Alberto Nidasio
Browse files

[CI] Fixed pipeline

parent 9df4b548
No related branches found
No related tags found
No related merge requests found
...@@ -123,7 +123,7 @@ struct AccelerometerData ...@@ -123,7 +123,7 @@ struct AccelerometerData
AccelerometerData(const AccelerometerData& data) = default; AccelerometerData(const AccelerometerData& data) = default;
AccelerometerData(const Eigen::Vector3f& acc) explicit AccelerometerData(const Eigen::Vector3f& acc)
: accelerationX(acc(0)), accelerationY(acc(1)), accelerationZ(acc(2)) : accelerationX(acc(0)), accelerationY(acc(1)), accelerationZ(acc(2))
{ {
} }
...@@ -165,7 +165,7 @@ struct GyroscopeData ...@@ -165,7 +165,7 @@ struct GyroscopeData
GyroscopeData(const GyroscopeData& data) = default; GyroscopeData(const GyroscopeData& data) = default;
GyroscopeData(const Eigen::Vector3f& vel) explicit GyroscopeData(const Eigen::Vector3f& vel)
: angularVelocityX(vel(0)), angularVelocityY(vel(1)), : angularVelocityX(vel(0)), angularVelocityY(vel(1)),
angularVelocityZ(vel(2)) angularVelocityZ(vel(2))
{ {
...@@ -208,7 +208,7 @@ struct MagnetometerData ...@@ -208,7 +208,7 @@ struct MagnetometerData
MagnetometerData(const MagnetometerData& data) = default; MagnetometerData(const MagnetometerData& data) = default;
MagnetometerData(const Eigen::Vector3f& mag) explicit MagnetometerData(const Eigen::Vector3f& mag)
: magneticFieldX(mag(0)), magneticFieldY(mag(1)), magneticFieldZ(mag(2)) : magneticFieldX(mag(0)), magneticFieldY(mag(1)), magneticFieldZ(mag(2))
{ {
} }
......
/* Copyright (c) 2021 Skyward Experimental Rocketry /* Copyright (c) 2021 Skyward Experimental Rocketry
* Author: Riccardo Musso, Alberto Nidasio * Authors: Riccardo Musso, Alberto Nidasio
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy * Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal * of this software and associated documentation files (the "Software"), to deal
......
/* Copyright (c) 2021 Skyward Experimental Rocketry /* Copyright (c) 2021 Skyward Experimental Rocketry
* Author: Riccardo Musso, Alberto Nidasio * Authors: Riccardo Musso, Alberto Nidasio
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy * Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal * of this software and associated documentation files (the "Software"), to deal
......
...@@ -91,11 +91,12 @@ int main() ...@@ -91,11 +91,12 @@ int main()
elapsed += sleepMillis; elapsed += sleepMillis;
sensor.sample(); sensor.sample();
AccelerometerData tmp = corrector.correct(sensor.getLastSample()); auto tmp = corrector.correct(
static_cast<AccelerometerData>(sensor.getLastSample()));
testData.accelerationX = tmp.accelerationX; testData.accelerationX = tmp(0);
testData.accelerationY = tmp.accelerationY; testData.accelerationY = tmp(1);
testData.accelerationZ = tmp.accelerationZ; testData.accelerationZ = tmp(2);
if (elapsed > 500) if (elapsed > 500)
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment