5683 Commits

Author SHA1 Message Date
77e39f3a92
new subsystem.csv 2023-03-14 17:12:05 +01:00
af59a4e5d5 Merge pull request 'cfg set subscription' () from bpx_batt_cfg_set into develop
Reviewed-on: 
2023-03-14 16:53:09 +01:00
dc1047b7f9 Merge branch 'develop' into bpx_batt_cfg_set 2023-03-14 16:53:00 +01:00
e27b0875e0 Merge pull request 'bump fsfw' () from bump_fsfw_datapool_manager into develop
Reviewed-on: 
2023-03-14 16:52:40 +01:00
0d46349caa
bump fsfw 2023-03-14 16:52:03 +01:00
1d935d46e7
afmt 2023-03-14 16:44:47 +01:00
8dd350e8dd
cfg set subscription 2023-03-14 16:43:41 +01:00
551a4fe00f Merge pull request 'best PR' () from bump_fsfwgen_retval_now_ordered into develop
Reviewed-on: 
2023-03-14 15:32:23 +01:00
306fe7a2d9
best PR 2023-03-14 15:30:26 +01:00
4429dd1be9 Merge pull request 'bump tmtc and retval csv' () from bump_tmtc into develop
Reviewed-on: 
2023-03-14 14:23:16 +01:00
d15db7668d
bump tmtc and retval csv 2023-03-14 14:22:24 +01:00
7ce881debc Merge pull request 'Parameter for MEKF invalid Event Timer' () from mekf-invalid-violation-parameter into develop
Reviewed-on: 
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2023-03-14 14:13:20 +01:00
90d00b44ee nothing to see here 2023-03-14 14:12:55 +01:00
7d6c6f03ef Merge branch 'develop' into mekf-invalid-violation-parameter 2023-03-14 14:07:22 +01:00
b7abab1114 Merge pull request 'store more TCP/IP packets' () from tweak_store_more_tcpip_packets into develop
Reviewed-on: 
2023-03-14 14:06:43 +01:00
fe9c8c50f2
changelog 2023-03-14 14:06:33 +01:00
9af43cb93b
store more TCP/IP packets 2023-03-14 14:05:41 +01:00
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