5736 Commits

Author SHA1 Message Date
69525b6fd1
bump fsfw 2023-03-15 14:10:53 +01:00
c1d8eda2c7 Merge remote-tracking branch 'origin/develop' into thermal_controller 2023-03-15 14:10:36 +01:00
22076ea25e Merge pull request 'bump fsfw' () from bump_fsfw into develop
Reviewed-on: 
2023-03-15 11:42:21 +01:00
7c54e920ef
bump fsfw 2023-03-15 11:42:03 +01:00
37e128041f Merge pull request 'Reset RW dataset on shutdown' () from rw-dataset-reset into develop
Reviewed-on: 
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2023-03-15 11:27:29 +01:00
bab0bbf82d changelog 2023-03-15 10:38:00 +01:00
7d9be35cb4 reset relevant datasets on shutdown 2023-03-15 10:36:25 +01:00
8b11302028
unittest works again 2023-03-14 20:35:49 +01:00
c1b4a1c164 Merge branch 'thermal_controller' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into thermal_controller 2023-03-14 20:04:03 +01:00
58212d7081 Merge remote-tracking branch 'origin/develop' into thermal_controller 2023-03-14 20:04:00 +01:00
a6e6ee053d Merge branch 'develop' into thermal_controller 2023-03-14 20:03:29 +01:00
3eb5fc7f47 Merge pull request 'patch for v1.37.2' () from patch_v1.37.2 into develop
Reviewed-on: 
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
e82777479b
Merge remote-tracking branch 'origin/develop' into thermal_controller 2023-03-14 18:50:28 +01:00
13c7ef373d Merge pull request 'unittest hotfix' () from unttest_hotfix into develop
Reviewed-on: 
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' () from prep_v1.37.1 into develop
Reviewed-on: 
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' () from bump_fsfw into develop
Reviewed-on: 
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' () from feature_stores_allow_spilling into develop
Reviewed-on: 
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' () from update_generators_subsystem_csvs into develop
Reviewed-on: 
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' () 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
a51a680396
Merge remote-tracking branch 'origin/develop' into thermal_controller 2023-03-14 15:34:25 +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
d3bf70243b
Merge remote-tracking branch 'origin/develop' into thermal_controller 2023-03-14 14:25:35 +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
4392598a67
Merge remote-tracking branch 'origin/develop' into thermal_controller 2023-03-14 14:16:59 +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