Commit Graph

6108 Commits

Author SHA1 Message Date
14a92b3d89
typo 2023-02-09 18:28:16 +01:00
e4fd424d66
Merge branch 'possible_tc_sched_fixes' into develop 2023-02-09 18:25:44 +01:00
341a66c265
changelog 2023-02-09 18:22:00 +01:00
b9b076aa4c logic error 2023-02-09 18:18:25 +01:00
d93486a340 that time margin check is possible broken 2023-02-09 18:18:05 +01:00
820a7f059c
logic error 2023-02-09 18:13:58 +01:00
f4d188c36f
that time margin check is possible broken 2023-02-09 18:12:43 +01:00
1841f92944
important bugfix for thermal set 2023-02-09 17:17:42 +01:00
b279985859
refactor DHB: Bugfix for thermal module 2023-02-09 16:42:38 +01:00
0a9c563bbc format 2023-02-09 15:58:48 +01:00
fa7675897d Merge pull request 'Mode Service Bugfixes' (#736) from eive/fsfw:mode_service_fixes into development
Reviewed-on: fsfw/fsfw#736
2023-02-09 15:56:26 +01:00
3a2393885f more style 2023-02-09 15:44:39 +01:00
c752b6d143 Merge pull request 'Generic TMTC Bridge Update' (#734) from eive/fsfw:tmtcbridge_tweaks into development
Reviewed-on: fsfw/fsfw#734
2023-02-09 15:37:35 +01:00
b676040c7c Merge pull request 'CMakeLists file updates' (#731) from eive/fsfw:cmakelists_update into development
Reviewed-on: fsfw/fsfw#731
2023-02-09 15:29:46 +01:00
010509efb4 removed unneeded find_package parameter for etl 2023-02-09 13:50:16 +01:00
dfb1633f00 Merge branch 'development' into mode_service_fixes 2023-02-09 13:46:19 +01:00
5f7172e130 Merge pull request 'TCP/IP TMTC bridge memory leak fixes' (#737) from eive/fsfw:possible_tcpip_bridge_fixes into development
Reviewed-on: fsfw/fsfw#737
2023-02-09 12:15:45 +01:00
0c6465cd95 Merge pull request 'time stamper empty ctor' (#730) from eive/fsfw:empty_cds_short_ctor into development
Reviewed-on: fsfw/fsfw#730
2023-02-09 11:45:49 +01:00
f94987c46d Merge pull request 'RM3100 important bugfix' (#733) from eive/fsfw:rm3100_fixes into development
Reviewed-on: fsfw/fsfw#733
2023-02-09 11:41:53 +01:00
1809ce359b Merge pull request 'comment tweak to event parser can read everything' (#732) from eive/fsfw:health_if_update into development
Reviewed-on: fsfw/fsfw#732
2023-02-09 11:39:53 +01:00
8c712441ab Making fetch Catch2 quiet as well. 2023-02-09 11:34:58 +01:00
6ce80ea6c5
Merge branch 'possible_tcpip_bridge_fixes' into develop 2023-02-08 21:27:26 +01:00
f1b0ca7cff
add PR link 2023-02-08 21:26:37 +01:00
000df85556
bump changelog 2023-02-08 21:24:00 +01:00
1fffcc2229 possiible leak fixes 2023-02-08 21:23:21 +01:00
6f05d6b7b0
possiible leak fixes 2023-02-08 20:38:32 +01:00
7f907fb9d3 Merge remote-tracking branch 'origin/develop' into mueller/pus-15-tm-storage 2023-02-08 17:17:33 +01:00
a419806a05
Merge remote-tracking branch 'upstream/development' into mode_service_fixes 2023-02-08 09:33:13 +01:00
84bbef0167
make it consistent 2023-02-08 09:27:14 +01:00
88b2b0e005
Merge branch 'mode_service_fixes' into develop 2023-02-08 09:26:38 +01:00
6445debfa1
bump changelog 2023-02-08 09:24:55 +01:00
8014e4adf9
mode service fixes 2023-02-08 09:23:48 +01:00
84dc7ac0ce
bump changelog 2023-02-08 01:31:32 +01:00
ec12ab5daa
mode service fixes 2023-02-08 01:20:28 +01:00
134d908f26
that stuff is not in upstream yet.. 2023-02-07 12:52:18 +01:00
40a9e12416
1000 is a bit much 2023-02-07 12:47:40 +01:00
f39054edd4
introduce warning switch 2023-02-07 12:45:29 +01:00
5adf89b911
changelog update 2023-02-07 12:41:42 +01:00
c2e6a22dec
important bugfix for RM3100 2023-02-07 12:39:43 +01:00
c8e065a713
comment tweak to event parser can read everything 2023-02-07 12:36:42 +01:00
69c94645df
add back HAL section 2023-02-07 12:36:01 +01:00
37e850c5a7
use upstream changelog 2023-02-07 12:31:19 +01:00
3ed49dbae3
Merge remote-tracking branch 'upstream/development' into empty_cds_short_ctor 2023-02-07 12:24:02 +01:00
a1567de9e8 Merge branch 'develop' into mueller/pus-15-tm-storage 2023-02-07 12:21:35 +01:00
4cf52d5dfe Merge pull request 'Time Service 9 update' (#726) from eive/fsfw:updates_fixes_pus_time_service into development
Reviewed-on: fsfw/fsfw#726
2023-02-07 12:19:45 +01:00
2646707d3f Merge branch 'cmakelists_update' into develop 2023-02-07 12:18:49 +01:00
539d7aac9e
suppress error if ETL is not found 2023-02-07 12:17:03 +01:00
0a23f2c85a
correction for printout, add prefix 2023-02-07 12:15:44 +01:00
06e30684fe
Merge remote-tracking branch 'upstream/development' into develop 2023-02-07 12:14:31 +01:00
46230e6c6d
Merge remote-tracking branch 'upstream/development' into updates_fixes_pus_time_service 2023-02-07 12:11:29 +01:00