Commit Graph

5699 Commits

Author SHA1 Message Date
4392598a67
Merge remote-tracking branch 'origin/develop' into thermal_controller
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2023-03-14 14:16:59 +01:00
7ce881debc Merge pull request 'Parameter for MEKF invalid Event Timer' (#469) from mekf-invalid-violation-parameter into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #469
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2023-03-14 14:13:20 +01:00
90d00b44ee nothing to see here
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build queued...
2023-03-14 14:12:55 +01:00
7d6c6f03ef Merge branch 'develop' into mekf-invalid-violation-parameter
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build started...
2023-03-14 14:07:22 +01:00
b7abab1114 Merge pull request 'store more TCP/IP packets' (#472) from tweak_store_more_tcpip_packets into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #472
2023-03-14 14:06:43 +01:00
fe9c8c50f2
changelog
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build queued...
2023-03-14 14:06:33 +01:00
9af43cb93b
store more TCP/IP packets
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop Build queued...
2023-03-14 14:05:41 +01:00
70806cffff Merge branch 'develop' into mekf-invalid-violation-parameter
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-14 13:37:08 +01:00
e03e35ab77 Merge pull request 'Fixes and Updates for EM build' (#468) from bugfixes_em_build into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #468
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
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build started...
2023-03-14 13:34:49 +01:00
143d787f60 Merge branch 'develop' into mekf-invalid-violation-parameter
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-14 13:22:11 +01:00
4664a9f4e7 changelog
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-14 13:19:48 +01:00
3a56297a83 mekfViolationTimer as parameter
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
2023-03-14 13:15:48 +01:00
b43e1ef4e9 Merge pull request 'PLOC commands' (#462) from meier/ploc-commands into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #462
2023-03-14 13:08:45 +01:00
a83adb148e Merge remote-tracking branch 'origin/develop' into meier/ploc-commands
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build queued...
2023-03-14 13:08:35 +01:00
4a386ae641
bump tmtc
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build queued...
2023-03-14 13:08:22 +01:00
b59a84b3d5
changelog
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-14 13:07:22 +01:00
a0fda428bf
update changelog
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-14 13:04:56 +01:00
870cc1da10
now it works
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2023-03-14 11:44:51 +01:00
cd5061fe0f Merge remote-tracking branch 'origin/develop' into bugfixes_em_build
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2023-03-14 11:37:41 +01:00
1981c4f70a
always schedule PL components
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2023-03-14 11:33:14 +01:00
192c7c6f31
payload mode announce
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2023-03-14 11:21:37 +01:00
a1f6143b92
almost reaching EIVE syste mmode for EM
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2023-03-14 10:54:44 +01:00
853215e0dd
always add TCS CTRL now
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-13 18:37:07 +01:00
e7811ebd0c
make system components work for EM
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-03-13 18:29:22 +01:00
b4b6363337 Merge pull request 'syrlinks task name fix' (#464) from tweak_task_name_fix into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #464
2023-03-13 18:27:51 +01:00
090ef88030
EM obj factory fixes
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-03-13 17:53:02 +01:00
26a9dce0a0
basic implementation for passive cooling
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2023-03-13 17:36:41 +01:00
9d1d62aee0
bump fsfw
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2023-03-13 16:02:24 +01:00
bf2d97bd60
continue thermal controller overheating
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2023-03-13 15:59:19 +01:00
721a01409e Merge branch 'thermal_controller' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into thermal_controller
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2023-03-13 13:28:02 +01:00
a0d6552781 . 2023-03-13 13:27:36 +01:00
c709b2a526 Merge branch 'develop' into thermal_controller
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-13 13:01:31 +01:00
5793d73ff6 printouts
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-13 12:53:40 +01:00
977235df87
changelog
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-13 11:36:10 +01:00
84adbeda38
syrlinks task name fix
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-13 11:34:51 +01:00
f5b5fcd7ff Merge pull request 'command to execute shell command' (#460) from feature_add_cmd_to_execute_shell_cmd into develop
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Reviewed-on: #460
Reviewed-by: mkranz <kranzm@irs.uni-stuttgart.de>
2023-03-13 11:11:16 +01:00
ace01e2742
afmt
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-13 11:05:21 +01:00
b14038e29c
re-point fsfw
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-13 11:04:49 +01:00
f115e6ca33
Merge remote-tracking branch 'origin/develop' into meier/ploc-commands
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-13 11:04:09 +01:00
bfd2ed5b6e
Merge remote-tracking branch 'origin/develop' into feature_add_cmd_to_execute_shell_cmd
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-13 10:58:20 +01:00
fde644cdbf Merge pull request 'Some ACS bugfixes' (#459) from acs-ctrl-bugfixes into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #459
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2023-03-13 10:27:05 +01:00
f71fe274f4 changelog
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
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
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-12 20:51:33 +01:00
569fdfef6e Merge pull request 'prep v1.37.0' (#458) from prep_v1.37.0 into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #458
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
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop Build started...
2023-03-11 15:09:31 +01:00
58a5ede270 Merge pull request 'Refactor TM handling' (#450) from refactor_tm_handling into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #450
2023-03-11 15:05:21 +01:00