Commit Graph

1716 Commits

Author SHA1 Message Date
d6f537da5f
Merge remote-tracking branch 'origin/develop' into thermal_controller
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-23 15:58:10 +01:00
33d552693f Merge branch 'develop' into bugfix_shadowed_variables_dual_assys
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build started...
2023-02-23 15:53:09 +01:00
91af3ac497
skip private retval
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-02-23 15:40:06 +01:00
0ee7bdad0a
Merge remote-tracking branch 'origin/develop' into bugfix_shadowed_variables_dual_assys
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-23 15:27:15 +01:00
419864e5da Merge pull request 'tweaks for ACS scheduling' (#395) from tweaks_acs_scheduling into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #395
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2023-02-23 15:23:34 +01:00
66d3b06f9e
Merge remote-tracking branch 'origin/develop' into meier/com-ss
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-23 13:06:22 +01:00
bd60255220
interior structure changes, use new sched block
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-23 11:57:12 +01:00
9f83a49690
remove shadowed member variables
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-23 11:46:30 +01:00
9a7779cffb struct heaterStates and more
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-22 21:46:56 +01:00
a190d99f6d
auto-formatter
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-22 19:45:41 +01:00
0fa1bab94d comments
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-02-22 19:14:35 +01:00
29179bde0c merge conflicts
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-02-22 18:01:54 +01:00
b9a6425078 dummy change
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-02-22 17:50:03 +01:00
e13636167f limit for error events thermalcontroller + dummy beta
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-02-22 17:30:30 +01:00
Jakob Meier
0d8cb295d9 removed duplicate code
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-22 16:55:12 +01:00
67a14ca6f6 handle ACS event in AcsSubsystem
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-22 15:02:15 +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
Jakob Meier
3137ebb86e com subsystem complete
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-22 13:02:40 +01:00
Jakob Meier
018f93cfbe fixed bugs in com subsystem 2023-02-22 09:53:09 +01:00
Jakob Meier
c64a490324 Merge branch 'develop' into meier/com-ss 2023-02-22 07:17:02 +01:00
9b849d10e9 small changes
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-02-21 17:49:55 +01:00
2c3a7791e1 Merge branch 'develop' into eggert/acs-dataset-stuff
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-21 17:16:15 +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
019cc29c24 useMekf actually now uses returnvalues as inteded 2023-02-21 17:09:49 +01:00
d1402587dc differentiate between mekf not working during safe/detumble or any higer mode
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-02-21 17:06:24 +01:00
793e6f4119 returnvalues for all mekf termination cases now
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-02-21 16:56:13 +01:00
0ec0d551a3 added functions for updating datasets upon errors or success
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-02-21 16:08:46 +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
b01b9d3b99 Merge branch 'develop' into eggert/acs-dataset-stuff
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-02-21 11:31:27 +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
0f5e65e5ce Merge branch 'develop' into bugfixes_code_review_msg_handling
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-21 11:29:03 +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
7bda0dfb97
Merge remote-tracking branch 'origin/develop' into add_heater_info_set
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2023-02-21 11:06:14 +01:00
1a8f9ab4a2 Merge branch 'develop' into eggert/acs-dataset-stuff
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-02-21 10:55:06 +01:00
0d7b77e5d1 this should make steffen happy
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2023-02-21 10:50:08 +01:00
1d5856b4d4 same for nadir single axis
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2023-02-21 10:45:25 +01:00
35ad0a40d3 output is now target quaternion 2023-02-21 10:38:10 +01:00
5349fb45e3 revert single axis pointing to original code
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2023-02-21 10:22:02 +01:00
582c8e8eff
some more fixes so heater info works 2023-02-21 02:28:57 +01:00
3ffdcf3885
announce mode worsk for heaters
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-21 01:53:23 +01:00
a864d51ddf
Merge remote-tracking branch 'origin/develop' into add_heater_info_set
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-20 23:33:59 +01:00
124e08e80b
Merge remote-tracking branch 'origin/develop' into refactor_imtq_handling
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-20 20:03:09 +01:00
030d3272d3
afmt
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-02-20 20:01:36 +01:00
7af4a777ae
ignoe replies when not in nml mode
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
disable traces
2023-02-20 19:54:04 +01:00
c98b3f6aa4
stupid merge conflict
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-20 19:47:19 +01:00
e3d9614fae
Merge remote-tracking branch 'origin/develop' into refactor_imtq_handling
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2023-02-20 19:45:45 +01:00
9ce065adb2
another small fix, verfiy timing now
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2023-02-20 19:44:54 +01:00
d38b5346a2
another fix
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2023-02-20 19:40:16 +01:00
fb0ff922a8
resolve merge conflict
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2023-02-20 19:38:41 +01:00
cac634503d
small compile fix
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2023-02-20 19:37:26 +01:00