|
|
ccf1fcaa79
|
stuff
|
2023-03-15 10:06:24 +01:00 |
|
|
|
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 |
|
|
|
2b12cc4fa2
|
Merge branch 'develop' into feature_boot_sequence_eive_sys
|
2023-03-14 18:49:25 +01:00 |
|
|
|
ec2db69236
|
Merge branch 'develop' into feature_scheduling_tweaks
|
2023-03-14 18:49:16 +01:00 |
|
|
|
263f4eb25f
|
Merge branch 'develop' into refactoring_bugfixes_power_switching
|
2023-03-14 18:49:06 +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 |
|
|
|
3e5937db67
|
Merge remote-tracking branch 'origin/develop' into feature_scheduling_tweaks
|
2023-03-14 18:41:28 +01:00 |
|
|
|
d322096573
|
changelog
|
2023-03-14 18:41:11 +01:00 |
|
|
|
a392e31f99
|
Merge remote-tracking branch 'origin/develop' into feature_boot_sequence_eive_sys
|
2023-03-14 18:39:08 +01:00 |
|
|
|
719ffcad2b
|
Merge remote-tracking branch 'origin/develop' into refactoring_bugfixes_power_switching
|
2023-03-14 18:36:43 +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 |
|
|
|
8fa2d0be0b
|
Merge branch 'develop' into feature_scheduling_tweaks
|
2023-03-14 18:33:33 +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 |
|
|
|
07394ddfc9
|
Merge remote-tracking branch 'origin/develop' into feature_scheduling_tweaks
|
2023-03-14 15:35:52 +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 |
|
|
|
9c300298b7
|
missing code
|
2023-03-14 15:26:39 +01:00 |
|
|
|
dcbf1502a2
|
boot sequence EIVE sys
|
2023-03-14 15:08:56 +01:00 |
|
|
|
f8c9ddbc3c
|
changelog
|
2023-03-14 14:48:12 +01:00 |
|
|
|
74fa81d8f6
|
boot sequence
|
2023-03-14 14:44:32 +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 |
|
|
|
6e049f3ee1
|
changelog update
|
2023-03-14 14:03:27 +01:00 |
|
|
|
157e7d2b4d
|
Merge remote-tracking branch 'origin/develop' into feature_scheduling_tweaks
|
2023-03-14 14:01:55 +01:00 |
|
|
|
882fb02600
|
Merge remote-tracking branch 'origin/develop' into refactoring_bugfixes_power_switching
|
2023-03-14 13:56:54 +01:00 |
|
|
|
6688499128
|
power updates
|
2023-03-14 13:56:19 +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 |
|
