diff --git a/src/boards/Main/Sensors/HILSensors.h b/src/boards/Main/Sensors/HILSensors.h index a78575f97c1516658729deaee1aa0593f10285a7..4b5d478a3b6dab91a70362893445f6313c414a03 100644 --- a/src/boards/Main/Sensors/HILSensors.h +++ b/src/boards/Main/Sensors/HILSensors.h @@ -41,6 +41,14 @@ public: explicit HILSensors(bool enableHw) : Super{}, enableHw{enableHw} {} private: + void lsm6dsrxCallback() override + { + if (!lsm6dsrx) + return; + + Boardcore::Logger::getInstance().log(lsm6dsrx->getLastSample()); + } + bool postSensorCreationHook() override { using namespace Boardcore; diff --git a/src/boards/Main/Sensors/Sensors.h b/src/boards/Main/Sensors/Sensors.h index 0fe1840bd7c25ea9e9a9c85e34b3503f1175719e..9a1beeaea930c168dcdf74651d13131bde1a66b2 100644 --- a/src/boards/Main/Sensors/Sensors.h +++ b/src/boards/Main/Sensors/Sensors.h @@ -116,6 +116,8 @@ public: protected: virtual bool postSensorCreationHook() { return true; } + virtual void lsm6dsrxCallback(); + Boardcore::TaskScheduler& getSensorsScheduler(); miosix::FastMutex canMutex; @@ -165,7 +167,6 @@ private: void ubxgpsCallback(); void lsm6dsrxInit(); - void lsm6dsrxCallback(); void vn100Init(); void vn100Callback(); diff --git a/src/boards/Payload/Sensors/HILSensors.h b/src/boards/Payload/Sensors/HILSensors.h index 533b455bb26bc93ce4bd3a8148970d45aa0a1e1a..46b2dae87493c9195c4f9a26661655f5df5e1340 100644 --- a/src/boards/Payload/Sensors/HILSensors.h +++ b/src/boards/Payload/Sensors/HILSensors.h @@ -41,6 +41,14 @@ public: explicit HILSensors(bool enableHw) : Super{}, enableHw{enableHw} {} private: + void lsm6dsrxCallback() override + { + if (!lsm6dsrx) + return; + + Boardcore::Logger::getInstance().log(lsm6dsrx->getLastSample()); + } + bool postSensorCreationHook() override { using namespace Boardcore; diff --git a/src/boards/Payload/Sensors/Sensors.h b/src/boards/Payload/Sensors/Sensors.h index 8d729965bfba2f4a36745358bb67697e708088c8..07ac1dfd1478d62efd69e56ab509425d825c4425 100644 --- a/src/boards/Payload/Sensors/Sensors.h +++ b/src/boards/Payload/Sensors/Sensors.h @@ -139,6 +139,8 @@ protected: */ virtual bool postSensorCreationHook() { return true; } + virtual void lsm6dsrxCallback(); + std::unique_ptr<Boardcore::LPS22DF> lps22df; std::unique_ptr<Boardcore::LPS28DFW> lps28dfw; std::unique_ptr<Boardcore::H3LIS331DL> h3lis331dl; @@ -177,7 +179,6 @@ private: void ubxgpsCallback(); void lsm6dsrxInit(); - void lsm6dsrxCallback(); void ads131m08Init(); void ads131m08Callback();