|
da166c7bc3
|
resolve merge conflicts
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-02-08 13:40:03 +01:00 |
|
|
80f48acb07
|
Merge remote-tracking branch 'origin/develop' into eggert/acs
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2023-02-08 13:27:09 +01:00 |
|
|
098fcc4f12
|
Merge branch 'develop' into eggert/acs
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2023-02-08 13:21:49 +01:00 |
|
|
bfa61632c2
|
use singular enum name
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-02-08 13:18:45 +01:00 |
|
|
4412690652
|
Merge remote-tracking branch 'origin/develop' into acs_update_scheduling
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2023-02-08 13:08:00 +01:00 |
|
|
4f2853e1b8
|
adapted new acs submodes for checkModeCommand
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-02-07 18:07:19 +01:00 |
|
|
8bc71b268e
|
some tests with subsystem
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-02-07 17:28:59 +01:00 |
|
|
e3cc45d7e3
|
merge aftermath:
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
- fixed missing declarations of functions
- fixed use of deprecated submode definitions
- changed naming of some submodes
|
2023-02-07 13:09:42 +01:00 |
|
|
6567fd1023
|
Merge branch 'develop' into eggert/acs
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2023-02-07 10:08:20 +01:00 |
|
|
3b8903b2e2
|
Merge remote-tracking branch 'origin/develop' into acs_update_scheduling
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-02-03 16:13:40 +01:00 |
|
|
d9514e4184
|
a lot of bugfixes
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-02-03 16:08:34 +01:00 |
|
|
f9ae4860d9
|
typo
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-02-03 14:31:22 +01:00 |
|
|
4ed1e2411a
|
works
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-02-03 14:21:36 +01:00 |
|
|
2c2c73b23f
|
fixes and updates for ACS mode tree
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-02-03 11:25:03 +01:00 |
|
|
2b00d3a565
|
ACS updates
EIVE/eive-obsw/pipeline/head There was a failure building this commit
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
- Adapt ACS subsystem to handle events from ACS CTRL
- Some fixes and updates for ACS subsystem
|
2023-02-02 16:27:50 +01:00 |
|
|
43deed9dc0
|
Merge branch 'develop' into eggert/acs
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-02-02 10:59:12 +01:00 |
|
Robin Marquardt
|
60e75612fd
|
fixed merge conflict
EIVE/eive-obsw/pipeline/pr-eggert/acs This commit looks good
|
2023-02-01 15:27:01 +01:00 |
|
|
13f3963f69
|
Update
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
- COM Subsystem now handles datarate config
- torquer config and comCfg moved to mission/config folder
- CCSDS Handler: Added default rate submode
|
2023-01-27 18:38:36 +01:00 |
|
Robin Marquardt
|
adef468c0b
|
applyed CppStyle Format
EIVE/eive-obsw/pipeline/pr-eggert/acs This commit looks good
|
2023-01-23 16:34:52 +01:00 |
|
|
bd7a38ac2b
|
Merge branch 'develop' into eggert/acs
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-01-20 10:50:43 +01:00 |
|
|
7e6ab01528
|
mekf is now diagnostic as well
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-01-18 16:02:57 +01:00 |
|
|
a0750210ca
|
gyro sets are diagnostic now
|
2023-01-18 15:58:38 +01:00 |
|
Robin Marquardt
|
44b384cd17
|
access to different paramset for every pointing mode
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-eggert/acs This commit looks good
|
2023-01-17 20:11:45 +01:00 |
|
|
673c24a34d
|
frmt
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-01-16 15:43:40 +01:00 |
|
Robin Marquardt
|
ce3841a23d
|
use std::memcpy
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-01-12 17:19:35 +01:00 |
|
Robin Marquardt
|
d8c0ba19fd
|
changed pointingParameters struct
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-01-12 15:19:21 +01:00 |
|
|
a2626afebb
|
added gpsPosition to gpsProcessedData
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-01-11 13:42:48 +01:00 |
|
|
ac83e66016
|
naming and frmt
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-01-10 13:52:26 +01:00 |
|
|
0854b1c778
|
ACS Ctrl getParameter forwarding to ACS Param
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-01-10 09:16:13 +01:00 |
|
|
887d193526
|
added ReceiversParameterMessagesIF and ParameterHelper to ACS Ctrl
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-01-10 09:06:09 +01:00 |
|
|
341966e709
|
added GS target mode
|
2023-01-09 09:36:00 +01:00 |
|
|
00d4a7602a
|
Merge branch 'develop' into eggert/acs
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-01-09 09:30:37 +01:00 |
|
|
b53cc475fe
|
bugfix acs controller
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-12-21 16:11:53 +01:00 |
|
|
98597b98d7
|
use memset for zeroing
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-12-20 11:43:02 +01:00 |
|
|
3f2910c3a7
|
changed order of submodes and their naming
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-12-14 13:04:41 +01:00 |
|
|
8b415883e9
|
removed references to deprecated OutputValues and renamed guidance strategies
|
2022-12-14 11:46:58 +01:00 |
|
|
c97d319b2a
|
added gpsVelocity to gpsProcessed dataSet
EIVE/eive-obsw/pipeline/head There was a failure building this commit
|
2022-12-14 10:39:41 +01:00 |
|
|
b49d37e15a
|
clang
EIVE/eive-obsw/pipeline/head There was a failure building this commit
|
2022-12-13 11:51:03 +01:00 |
|
|
d33ae9ede7
|
Merge branch 'eggert/acs' into marquardt/ptgCtrl
EIVE/eive-obsw/pipeline/head There was a failure building this commit
# Conflicts:
# mission/controller/AcsController.cpp
# mission/controller/AcsController.h
# mission/controller/acs/AcsParameters.h
# mission/controller/acs/ActuatorCmd.h
# mission/controller/acs/Guidance.cpp
# mission/controller/acs/Guidance.h
# mission/controller/acs/MultiplicativeKalmanFilter.cpp
# mission/controller/acs/OutputValues.h
# mission/controller/acs/SensorProcessing.cpp
# mission/controller/acs/SensorProcessing.h
# mission/controller/acs/control/Detumble.cpp
# mission/controller/acs/control/Detumble.h
# mission/controller/acs/control/PtgCtrl.cpp
# mission/controller/acs/util/MathOperations.h
|
2022-12-13 11:26:23 +01:00 |
|
|
08bdc87505
|
removed hardcoded modes
EIVE/eive-obsw/pipeline/head There was a failure building this commit
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2022-12-01 14:19:42 +01:00 |
|
Robin Marquardt
|
8d1cbd9f8b
|
changed calculation of quaternion for target and sun pointing
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-11-24 13:40:55 +01:00 |
|
Robin Marquardt
|
609d429161
|
added Nadir FLP version
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-11-22 21:10:05 +01:00 |
|
Robin Marquardt
|
55dec574c5
|
added inertial pointing
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-11-14 17:16:47 +01:00 |
|
Robin Marquardt
|
20936faec6
|
added Antistiction, added Nadir Pointing, added performSafe()
EIVE/eive-obsw/pipeline/head There was a failure building this commit
|
2022-11-08 13:48:50 +01:00 |
|
|
8cc368b131
|
fixed types for actuatorCmdData
EIVE/eive-obsw/pipeline/head There was a failure building this commit
|
2022-11-08 10:56:12 +01:00 |
|
Robin Marquardt
|
75ab11fc35
|
updated AcsParameters. change DCM_EJ calc to with precission and nutation
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-11-04 17:21:17 +01:00 |
|
|
d184f7487e
|
post merge cleanup
EIVE/eive-obsw/pipeline/head There was a failure building this commit
|
2022-11-04 14:54:23 +01:00 |
|
|
895d03a35c
|
Merge branch 'develop' into eggert/acs
# Conflicts:
# dummies/CMakeLists.txt
# mission/controller/AcsController.cpp
# mission/controller/AcsController.h
|
2022-11-04 14:19:43 +01:00 |
|
|
c7bfe4002d
|
added event for SAFE to DETUMBLE transition. changed actuator input from double to int
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-11-03 14:24:09 +01:00 |
|
|
a13ccb43d2
|
removed OutputValues
amended sumbode list
inserted writes to output DataPools
|
2022-11-03 10:43:27 +01:00 |
|