eive/eive-obsw
eive/eive-obsw
12
3
Fork 0
Code Issues 3 Pull Requests Releases 118 Wiki Activity

post merge cleanup
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
Details

Browse Source
This commit is contained in:
Marius Eggert 2022-11-04 14:54:23 +01:00
parent 895d03a35c
commit d184f7487e
6 changed files with 26 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
bsp_q7s/core/InitMission.cpp
View File

@ -163,29 +163,29 @@ void initmission::initTasks() {
}
#endif
#if OBSW_Q7S_EM == 1
acsTask->addComponent(objects::MGM_0_LIS3_HANDLER);
acsTask->addComponent(objects::MGM_1_RM3100_HANDLER);
acsTask->addComponent(objects::MGM_2_LIS3_HANDLER);
acsTask->addComponent(objects::MGM_3_RM3100_HANDLER);
acsTask->addComponent(objects::IMTQ_HANDLER);
acsTask->addComponent(objects::SUS_0_N_LOC_XFYFZM_PT_XF);
acsTask->addComponent(objects::SUS_6_R_LOC_XFYBZM_PT_XF);
acsTask->addComponent(objects::SUS_1_N_LOC_XBYFZM_PT_XB);
acsTask->addComponent(objects::SUS_7_R_LOC_XBYBZM_PT_XB);
acsTask->addComponent(objects::SUS_2_N_LOC_XFYBZB_PT_YB);
acsTask->addComponent(objects::SUS_8_R_LOC_XBYBZB_PT_YB);
acsTask->addComponent(objects::SUS_3_N_LOC_XFYBZF_PT_YF);
acsTask->addComponent(objects::SUS_9_R_LOC_XBYBZB_PT_YF);
acsTask->addComponent(objects::SUS_4_N_LOC_XMYFZF_PT_ZF);
acsTask->addComponent(objects::SUS_10_N_LOC_XMYBZF_PT_ZF);
acsTask->addComponent(objects::SUS_5_N_LOC_XFYMZB_PT_ZB);
acsTask->addComponent(objects::SUS_11_R_LOC_XBYMZB_PT_ZB);
acsTask->addComponent(objects::GYRO_0_ADIS_HANDLER);
acsTask->addComponent(objects::GYRO_1_L3G_HANDLER);
acsTask->addComponent(objects::GYRO_2_ADIS_HANDLER);
acsTask->addComponent(objects::GYRO_3_L3G_HANDLER);
acsTask->addComponent(objects::GPS_CONTROLLER);
acsTask->addComponent(objects::STAR_TRACKER);
acsCtrlTask->addComponent(objects::MGM_0_LIS3_HANDLER);
acsCtrlTask->addComponent(objects::MGM_1_RM3100_HANDLER);
acsCtrlTask->addComponent(objects::MGM_2_LIS3_HANDLER);
acsCtrlTask->addComponent(objects::MGM_3_RM3100_HANDLER);
acsCtrlTask->addComponent(objects::IMTQ_HANDLER);
acsCtrlTask->addComponent(objects::SUS_0_N_LOC_XFYFZM_PT_XF);
acsCtrlTask->addComponent(objects::SUS_6_R_LOC_XFYBZM_PT_XF);
acsCtrlTask->addComponent(objects::SUS_1_N_LOC_XBYFZM_PT_XB);
acsCtrlTask->addComponent(objects::SUS_7_R_LOC_XBYBZM_PT_XB);
acsCtrlTask->addComponent(objects::SUS_2_N_LOC_XFYBZB_PT_YB);
acsCtrlTask->addComponent(objects::SUS_8_R_LOC_XBYBZB_PT_YB);
acsCtrlTask->addComponent(objects::SUS_3_N_LOC_XFYBZF_PT_YF);
acsCtrlTask->addComponent(objects::SUS_9_R_LOC_XBYBZB_PT_YF);
acsCtrlTask->addComponent(objects::SUS_4_N_LOC_XMYFZF_PT_ZF);
acsCtrlTask->addComponent(objects::SUS_10_N_LOC_XMYBZF_PT_ZF);
acsCtrlTask->addComponent(objects::SUS_5_N_LOC_XFYMZB_PT_ZB);
acsCtrlTask->addComponent(objects::SUS_11_R_LOC_XBYMZB_PT_ZB);
acsCtrlTask->addComponent(objects::GYRO_0_ADIS_HANDLER);
acsCtrlTask->addComponent(objects::GYRO_1_L3G_HANDLER);
acsCtrlTask->addComponent(objects::GYRO_2_ADIS_HANDLER);
acsCtrlTask->addComponent(objects::GYRO_3_L3G_HANDLER);
acsCtrlTask->addComponent(objects::GPS_CONTROLLER);
acsCtrlTask->addComponent(objects::STAR_TRACKER);
#endif
PeriodicTaskIF* acsSysTask = factory->createPeriodicTask(

2
fsfw

@ -1 +1 @@
Subproject commit 7e0a5d5a9e4f38c6d818bbdd5b44d34d8007eb1e
Subproject commit 672fca5169b017387e58e2ff864913d932c59aa1

1
mission/controller/AcsController.cpp
View File

@ -637,4 +637,3 @@ void AcsController::copyGyrData() {
}
}
}

1
mission/controller/AcsController.h
View File

@ -1,7 +1,6 @@
#ifndef MISSION_CONTROLLER_ACSCONTROLLER_H_
#define MISSION_CONTROLLER_ACSCONTROLLER_H_
#include <commonObjects.h>
#include <fsfw/controller/ExtendedControllerBase.h>
#include <fsfw/globalfunctions/math/VectorOperations.h>

4
mission/controller/acs/SensorValues.h
View File

@ -1,17 +1,15 @@
#ifndef SENSORVALUES_H_
#define SENSORVALUES_H_
#include <commonObjects.h>
#include "fsfw_hal/devicehandlers/MgmLIS3MDLHandler.h"
#include "fsfw_hal/devicehandlers/MgmRM3100Handler.h"
#include "linux/devices/devicedefinitions/StarTrackerDefinitions.h"
#include "mission/devices/devicedefinitions/GPSDefinitions.h"
#include "mission/devices/devicedefinitions/GyroADIS1650XDefinitions.h"
#include "mission/devices/devicedefinitions/GyroL3GD20Definitions.h"
#include "mission/devices/devicedefinitions/IMTQHandlerDefinitions.h"
#include "mission/devices/devicedefinitions/RwDefinitions.h"
#include "mission/devices/devicedefinitions/SusDefinitions.h"
#include "mission/devices/devicedefinitions/imtqHandlerDefinitions.h"
namespace ACS {

9
mission/controller/acs/config/classIds.h
View File

@ -1,14 +1,7 @@
/*
* classIds.h
*
* Created on: 1 Mar 2022
* Author: rooob
*/
#ifndef ACS_CONFIG_CLASSIDS_H_
#define ACS_CONFIG_CLASSIDS_H_
#include <common/config/commonClassIds.h>
#include <common/config/eive/resultClassIds.h>
#include <fsfw/returnvalues/FwClassIds.h>
namespace CLASS_ID {