|
|
4fdb2de510
|
Merge branch 'develop' into acs-safe-mode-failure
# Conflicts:
# CHANGELOG.md
# mission/controller/AcsController.cpp
# mission/controller/AcsController.h
|
2023-03-15 10:06:02 +01:00 |
|
|
|
3eb5fc7f47
|
Merge pull request 'patch for v1.37.2' (#483) from patch_v1.37.2 into develop
Reviewed-on: #483
v1.37.2
|
2023-03-14 20:03:00 +01:00 |
|
|
|
533aaa207c
|
bump version
|
2023-03-14 20:02:39 +01:00 |
|
|
|
005d5a5223
|
prep patch version
|
2023-03-14 20:02:27 +01:00 |
|
|
|
13c7ef373d
|
Merge pull request 'unittest hotfix' (#482) from unttest_hotfix into develop
Reviewed-on: #482
v1.37.1
|
2023-03-14 18:48:05 +01:00 |
|
|
|
adcc68e0fa
|
unittest hotfix
|
2023-03-14 18:47:48 +01:00 |
|
|
|
11106cf755
|
Merge pull request 'prep v1.37.1' (#481) from prep_v1.37.1 into develop
Reviewed-on: #481
|
2023-03-14 18:45:20 +01:00 |
|
|
|
f966b517a4
|
prep v1.37.1
|
2023-03-14 18:44:50 +01:00 |
|
|
|
59ee375fc1
|
Merge pull request 'bump fsfw' (#480) from bump_fsfw into develop
Reviewed-on: #480
|
2023-03-14 18:34:45 +01:00 |
|
|
|
bbb8dd7a8a
|
bump fsfw
|
2023-03-14 18:34:23 +01:00 |
|
|
|
af1d03f53f
|
Merge pull request 'bump fsfw, tmtc and allow spilling for pools' (#479) from feature_stores_allow_spilling into develop
Reviewed-on: #479
|
2023-03-14 18:30:32 +01:00 |
|
|
|
8a6d292a48
|
bump fsfw, tmtc and allow spilling for pools
|
2023-03-14 18:29:21 +01:00 |
|
|
|
52ec5093bc
|
Merge pull request 'new subsystem.csv' (#478) from update_generators_subsystem_csvs into develop
Reviewed-on: #478
|
2023-03-14 17:12:44 +01:00 |
|
|
|
77e39f3a92
|
new subsystem.csv
|
2023-03-14 17:12:05 +01:00 |
|
|
|
af59a4e5d5
|
Merge pull request 'cfg set subscription' (#476) from bpx_batt_cfg_set into develop
Reviewed-on: #476
|
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' (#477) from bump_fsfw_datapool_manager into develop
Reviewed-on: #477
|
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' (#475) from bump_fsfwgen_retval_now_ordered into develop
Reviewed-on: #475
|
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' (#473) from bump_tmtc into develop
Reviewed-on: #473
|
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' (#469) from mekf-invalid-violation-parameter into develop
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
|
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' (#472) from tweak_store_more_tcpip_packets into develop
Reviewed-on: #472
|
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' (#468) from bugfixes_em_build into develop
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
|
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' (#462) from meier/ploc-commands into develop
Reviewed-on: #462
|
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' (#464) from tweak_task_name_fix into develop
Reviewed-on: #464
|
2023-03-13 18:27:51 +01:00 |
|
|
|
090ef88030
|
EM obj factory fixes
|
2023-03-13 17:53:02 +01:00 |
|
