5666 Commits

Author SHA1 Message Date
70806cffff Merge branch 'develop' into mekf-invalid-violation-parameter 2023-03-14 13:37:08 +01:00
e03e35ab77 Merge pull request 'Fixes and Updates for EM build' () from bugfixes_em_build into develop
Reviewed-on: 
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2023-03-14 13:35:06 +01:00
ee08adb525 Merge branch 'develop' into bugfixes_em_build 2023-03-14 13:34:49 +01:00
143d787f60 Merge branch 'develop' into mekf-invalid-violation-parameter 2023-03-14 13:22:11 +01:00
4664a9f4e7 changelog 2023-03-14 13:19:48 +01:00
3a56297a83 mekfViolationTimer as parameter 2023-03-14 13:15:48 +01:00
b43e1ef4e9 Merge pull request 'PLOC commands' () from meier/ploc-commands into develop
Reviewed-on: 
2023-03-14 13:08:45 +01:00
a83adb148e Merge remote-tracking branch 'origin/develop' into meier/ploc-commands 2023-03-14 13:08:35 +01:00
4a386ae641
bump tmtc 2023-03-14 13:08:22 +01:00
b59a84b3d5
changelog 2023-03-14 13:07:22 +01:00
a0fda428bf
update changelog 2023-03-14 13:04:56 +01:00
870cc1da10
now it works 2023-03-14 11:44:51 +01:00
cd5061fe0f Merge remote-tracking branch 'origin/develop' into bugfixes_em_build 2023-03-14 11:37:41 +01:00
1981c4f70a
always schedule PL components 2023-03-14 11:33:14 +01:00
192c7c6f31
payload mode announce 2023-03-14 11:21:37 +01:00
a1f6143b92
almost reaching EIVE syste mmode for EM 2023-03-14 10:54:44 +01:00
853215e0dd
always add TCS CTRL now 2023-03-13 18:37:07 +01:00
e7811ebd0c
make system components work for EM 2023-03-13 18:29:22 +01:00
b4b6363337 Merge pull request 'syrlinks task name fix' () from tweak_task_name_fix into develop
Reviewed-on: 
2023-03-13 18:27:51 +01:00
090ef88030
EM obj factory fixes 2023-03-13 17:53:02 +01:00
977235df87
changelog 2023-03-13 11:36:10 +01:00
84adbeda38
syrlinks task name fix 2023-03-13 11:34:51 +01:00
f5b5fcd7ff Merge pull request 'command to execute shell command' () from feature_add_cmd_to_execute_shell_cmd into develop
Reviewed-on: 
Reviewed-by: mkranz <kranzm@irs.uni-stuttgart.de>
2023-03-13 11:11:16 +01:00
ace01e2742
afmt 2023-03-13 11:05:21 +01:00
b14038e29c
re-point fsfw 2023-03-13 11:04:49 +01:00
f115e6ca33
Merge remote-tracking branch 'origin/develop' into meier/ploc-commands 2023-03-13 11:04:09 +01:00
bfd2ed5b6e
Merge remote-tracking branch 'origin/develop' into feature_add_cmd_to_execute_shell_cmd 2023-03-13 10:58:20 +01:00
fde644cdbf Merge pull request 'Some ACS bugfixes' () from acs-ctrl-bugfixes into develop
Reviewed-on: 
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2023-03-13 10:27:05 +01:00
f71fe274f4 changelog 2023-03-13 10:05:54 +01:00
b1fa3fd016 fixed max speed limitation done before calculation to right unit scale 2023-03-13 10:03:40 +01:00
eb66d7585c fixed ptgCtrl after acs submode to mode changes 2023-03-13 10:01:08 +01:00
a83136515c
command to execute shell command 2023-03-12 20:51:33 +01:00
569fdfef6e Merge pull request 'prep v1.37.0' () from prep_v1.37.0 into develop
Reviewed-on: 
v1.37.0
2023-03-11 15:26:38 +01:00
eb861c9f01
bump eive-tmtc to v2.18.1 2023-03-11 15:24:43 +01:00
7fd2fbc481
prep v1.37.0 2023-03-11 15:09:31 +01:00
58a5ede270 Merge pull request 'Refactor TM handling' () from refactor_tm_handling into develop
Reviewed-on: 
2023-03-11 15:05:21 +01:00
08ca196c74 Merge remote-tracking branch 'origin/develop' into refactor_tm_handling 2023-03-11 15:01:46 +01:00
16ea033fd2
re-generate files 2023-03-11 15:01:38 +01:00
a4e6d877ff
this is more useful information 2023-03-11 14:59:55 +01:00
baf69fac44 Merge pull request 'Fix for GYR Bias Removal' () from gyr-bias-fix into develop
Reviewed-on: 
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2023-03-11 14:44:49 +01:00
0f7fd39d72 changelog 2023-03-11 10:22:21 +01:00
9892938601 fixed bias substraction 2023-03-11 10:21:09 +01:00
97698a08d5
tweak events.. comntinue later 2023-03-10 21:13:11 +01:00
b603554a80
new events 2023-03-10 21:01:32 +01:00
bbd27eca76
basic FDIR if dump takes too long 2023-03-10 20:32:11 +01:00
f9c03af538
logic errors 2023-03-10 20:13:36 +01:00
68ed3fa232
tweak priorities 2023-03-10 19:42:36 +01:00
8c450596f6
Merge remote-tracking branch 'origin/develop' into refactor_tm_handling 2023-03-10 19:35:45 +01:00
5ea2767662
bugfixes for iterator handling 2023-03-10 19:34:32 +01:00
b4129950cf Merge pull request 'ACS Ctrl Bug Bash' () from acs-bug-bash into develop
Reviewed-on: 
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2023-03-10 19:21:18 +01:00