eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity

Fix inverted X-Axis for PTG Target #875

Merged
meggert merged 3 commits from fix-tgt-ptg into main 2024-03-06 13:33:08 +01:00
Conversation 0 Commits 3 Files Changed 3 +9 -1
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
View File

@ -16,6 +16,13 @@ will consitute of a breaking change warranting a new major release:
# [unreleased] # [unreleased]
# [v7.7.2] 2024-03-06
## Fixed
- Camera and E-band antenna now point towards the target instead of away from the target for the
pointing target mode.
# [v7.7.1] 2024-03-06 # [v7.7.1] 2024-03-06
- Bumped `eive-tmtc` to v6.1.1 - Bumped `eive-tmtc` to v6.1.1

2
CMakeLists.txt
View File

@ -11,7 +11,7 @@ cmake_minimum_required(VERSION 3.13)
set(OBSW_VERSION_MAJOR 7) set(OBSW_VERSION_MAJOR 7)
set(OBSW_VERSION_MINOR 7) set(OBSW_VERSION_MINOR 7)
set(OBSW_VERSION_REVISION 1) set(OBSW_VERSION_REVISION 2)
# set(CMAKE_VERBOSE TRUE) # set(CMAKE_VERBOSE TRUE)

1
mission/controller/acs/Guidance.cpp
View File

@ -59,6 +59,7 @@ void Guidance::targetQuatPtgTarget(timeval timeAbsolute, const double timeDelta,
// this aligns with the camera, E- and S-band antennas // this aligns with the camera, E- and S-band antennas
double xAxisIX[3] = {0, 0, 0}; double xAxisIX[3] = {0, 0, 0};
VectorOperations<double>::normalize(targetDirI, xAxisIX, 3); VectorOperations<double>::normalize(targetDirI, xAxisIX, 3);
VectorOperations<double>::mulScalar(xAxisIX, -1, xAxisIX, 3);
// transform velocity into inertial frame // transform velocity into inertial frame
double velSatI[3] = {0, 0, 0}; double velSatI[3] = {0, 0, 0};