diff --git a/skyward-boardcore b/skyward-boardcore index 77bbf515fe7eeac550db458279e4490e2a9f7115..2a2bc66dfc1856b6d67b1270c5ca543a4a0e7111 160000 --- a/skyward-boardcore +++ b/skyward-boardcore @@ -1 +1 @@ -Subproject commit 77bbf515fe7eeac550db458279e4490e2a9f7115 +Subproject commit 2a2bc66dfc1856b6d67b1270c5ca543a4a0e7111 diff --git a/src/boards/Main/StateMachines/NASController/NASController.cpp b/src/boards/Main/StateMachines/NASController/NASController.cpp index 4fa5114b71bf861447b5cc075072a464035d4122..166ec0f67886dc51313eabfcbbe813f0f861a0c9 100644 --- a/src/boards/Main/StateMachines/NASController/NASController.cpp +++ b/src/boards/Main/StateMachines/NASController/NASController.cpp @@ -80,7 +80,6 @@ void NASController::update() } #ifdef HILSimulation - // useful only for hil testing updateData(nas.getState()); #endif // HILSimulation } diff --git a/src/boards/Main/TMRepository/TMRepository.cpp b/src/boards/Main/TMRepository/TMRepository.cpp index 83e639981ba8f11429036ab1eb6c804d5ea54715..89173c5b4563b59babdc7fd616497395f9a006b9 100644 --- a/src/boards/Main/TMRepository/TMRepository.cpp +++ b/src/boards/Main/TMRepository/TMRepository.cpp @@ -278,24 +278,14 @@ mavlink_message_t TMRepository::packSystemTm(SystemTMList tmId, uint8_t msgId, tm.nas_vn = nasState.vn; tm.nas_ve = nasState.ve; tm.nas_vd = nasState.vd; + tm.nas_qx = nasState.qx; + tm.nas_qy = nasState.qy; + tm.nas_qz = nasState.qz; + tm.nas_qw = nasState.qw; tm.nas_bias_x = nasState.bx; tm.nas_bias_y = nasState.by; tm.nas_bias_z = nasState.bz; - // Test triad - StateInitializer state; - state.triad({imuData.accelerationX, imuData.accelerationY, - imuData.accelerationZ}, - {imuData.magneticFieldX, imuData.magneticFieldY, - imuData.magneticFieldZ}, - Common::ReferenceConfig::nedMag); - auto testState = state.getInitX(); - - tm.nas_qw = testState(9); - tm.nas_qx = testState(6); - tm.nas_qy = testState(7); - tm.nas_qz = testState(8); - // Sensing pins statuses tm.pin_launch = PinHandler::getInstance().getPinsData()[LAUNCH_PIN].lastState;