Commit Graph

171 Commits

Author SHA1 Message Date
5205c5b78a include cleanup
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-02-23 11:06:45 +01:00
29f1dd0f8e Merge branch 'develop' into eggert/acs-ctrl-action-cmds
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-02-23 09:31:58 +01:00
8873ecae48 boop
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2023-02-22 17:31:40 +01:00
5ad2fa5e93 added action commands
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2023-02-22 17:10:42 +01:00
2a91105124 added executeAction
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-02-22 16:10:30 +01:00
83b81e1ba8 changed mekf events again
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-22 14:57:44 +01:00
f19729e11d throw a single event every time the mekf stops working
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-02-21 17:10:59 +01:00
2a9c1aab7f added mekf status to dataset
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-02-21 16:02:26 +01:00
a2a822c118 get
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-02-21 11:30:42 +01:00
b3b736a7bd ctrlValData gets updated in every perform function
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-02-21 11:13:06 +01:00
40446b1fea all used guidance parts and their calls in AcsCrtl should work now
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2023-02-20 16:30:53 +01:00
81a4112c45 nadir should work again
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2023-02-20 16:23:14 +01:00
2c8cfa3874 can never happen
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2023-02-20 16:00:54 +01:00
6016063add fixed unused variables
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2023-02-20 16:00:17 +01:00
04e1cb52ac when did i push this last
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2023-02-20 15:59:01 +01:00
700d7ced64 only one guidance function to calculate error quaternion 2023-02-20 11:52:53 +01:00
0dae3b04be PTG_TARGET should work now
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2023-02-17 15:57:07 +01:00
0d32bc0c0a added target rotation rate to ctrlValData set
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2023-02-17 15:15:47 +01:00
6352b65f46 some things also broken some things fixed again 2023-02-17 14:46:41 +01:00
f12fa77644 still broken
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2023-02-17 13:54:36 +01:00
d709e190e2 added function for updating ctrlValData
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-02-17 13:28:29 +01:00
1518fba6bd moved actuatorCmdData to function
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-02-17 11:11:48 +01:00
75ade4d8f8 event for multiple invalid rw now triggert after 5 failures 2023-02-17 09:21:30 +01:00
97f7f7c973 RW pseudo inverses now set from RW state. multiple invalids trigger event and disable ptgCtrl
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-02-16 15:40:16 +01:00
29e78a7ae3
Merge remote-tracking branch 'origin/develop' into eggert/rw-cmd-acs-ctrl
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-14 17:33:37 +01:00
2aac3c67ee
instrumented some more tasks
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2023-02-14 11:10:18 +01:00
66d20dc118
add tracing for first tasks
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2023-02-14 10:59:35 +01:00
ac22a00e09 Merge branch 'develop' into eggert/rw-cmd-acs-ctrl 2023-02-13 10:29:56 +01:00
2c0efdee5a
printout corrections
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-02-13 10:03:16 +01:00
7e3de3ca95
timing problem does not fully disappear..
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-02-13 09:56:57 +01:00
3759b5d34a
I am happy with this version
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-13 01:26:30 +01:00
109560feb2 disabled actCmd from acsCtrl again for now
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2023-02-10 11:30:52 +01:00
ea32d87c25 function now handles actuator cmd
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-10 11:27:25 +01:00
a3eaace4a5 added RwSpeedActuationSets to AcsController
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2023-02-09 17:31:26 +01:00
1d12d5f144 removed sensorValues inits 2023-02-08 17:02:22 +01:00
2e11f067e2
start replacing chained locks
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-08 15:30:14 +01:00
4528e61fcd
initialize ACS controller
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-02-08 15:02:56 +01:00
da166c7bc3
resolve merge conflicts
All checks were successful
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
Some checks failed
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
Some checks failed
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
All checks were successful
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
Some checks failed
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
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-07 18:07:19 +01:00
8bc71b268e
some tests with subsystem
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-07 17:28:59 +01:00
e3cc45d7e3 merge aftermath:
All checks were successful
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
Some checks failed
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
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-03 16:13:40 +01:00
d9514e4184
a lot of bugfixes
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-02-03 16:08:34 +01:00
f9ae4860d9
typo
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-03 14:31:22 +01:00
4ed1e2411a
works
All checks were successful
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
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-03 11:25:03 +01:00
2b00d3a565
ACS updates
Some checks failed
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
All checks were successful
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
All checks were successful
EIVE/eive-obsw/pipeline/pr-eggert/acs This commit looks good
2023-02-01 15:27:01 +01:00
13f3963f69 Update
All checks were successful
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
All checks were successful
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
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-01-20 10:50:43 +01:00
7e6ab01528
mekf is now diagnostic as well
All checks were successful
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
All checks were successful
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
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-01-16 15:43:40 +01:00
Robin Marquardt
ce3841a23d use std::memcpy
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-01-12 17:19:35 +01:00
Robin Marquardt
d8c0ba19fd changed pointingParameters struct
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-01-12 15:19:21 +01:00
a2626afebb added gpsPosition to gpsProcessedData
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-01-11 13:42:48 +01:00
ac83e66016 naming and frmt
All checks were successful
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
All checks were successful
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
All checks were successful
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
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-01-09 09:30:37 +01:00
b53cc475fe bugfix acs controller
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-12-21 16:11:53 +01:00
98597b98d7 use memset for zeroing
Some checks are pending
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
All checks were successful
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
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-12-14 10:39:41 +01:00
b49d37e15a clang
Some checks failed
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
Some checks failed
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
Some checks failed
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
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-11-24 13:40:55 +01:00
Robin Marquardt
609d429161 added Nadir FLP version
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-11-22 21:10:05 +01:00
Robin Marquardt
55dec574c5 added inertial pointing
All checks were successful
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()
Some checks failed
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
Some checks failed
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
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-11-04 17:21:17 +01:00
d184f7487e post merge cleanup
Some checks failed
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
All checks were successful
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
44dda9455d SensorProcessing writes to AcsController DataSets now
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-26 17:13:23 +02:00
9b8d2f3097
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-25 13:13:41 +02:00
69099881bd small stuff
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-25 11:31:54 +02:00
4bd2a2dac8 added and implemented all ACS related DataPools to AcsController
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-24 10:41:28 +02:00
75a4cd1b69
awful solution but works
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-20 16:09:18 +02:00
29a34256a7
old code seems to work
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-20 15:08:33 +02:00
deb7c4e500 added saftCtrl to acsController 2022-10-20 11:07:45 +02:00
84fc44fd5f fixed GPS and STR inputs
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-12 15:06:24 +02:00
4aecd07970 added PtgCtrl code. matched inputs to actual SensorValues inputs
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-12 10:28:44 +02:00
8536c79445 clean up
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-11 15:01:44 +02:00
82e9c6d092 comments 2022-10-10 16:02:17 +02:00
f77b3498ec fixed inputs. removed outputs. minor fixes
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-10 09:54:06 +02:00
84e960a9ef enabled performSafe 2022-10-06 15:37:41 +02:00