Commit Graph

5328 Commits

Author SHA1 Message Date
Ulrich Mohr e73b9ff72c Merge pull request 'v6.0.0' (#729) from development into master
fsfw/fsfw/pipeline/head There was a failure building this commit Details
Reviewed-on: #729
2023-02-23 13:42:48 +01:00
Ulrich Mohr dc7afc5415 Version bump, CHANGELOG update, format
fsfw/fsfw/pipeline/pr-master This commit looks good Details
fsfw/fsfw/pipeline/head There was a failure building this commit Details
2023-02-23 13:38:24 +01:00
Ulrich Mohr 9bf3ff95b7 Merge pull request 'Add Health Service Announce All Health Info' (#725) from eive/fsfw:add_health_service_announce_all into development
fsfw/fsfw/pipeline/pr-master This commit looks good Details
Reviewed-on: #725
2023-02-23 13:13:56 +01:00
Ulrich Mohr 61562b18ab Merge branch 'development' into add_health_service_announce_all
fsfw/fsfw/pipeline/pr-development This commit looks good Details
2023-02-23 12:56:12 +01:00
Ulrich Mohr d76d97a36b changed health table parameter to objectId
fsfw/fsfw/pipeline/pr-development There was a failure building this commit Details
2023-02-23 12:44:42 +01:00
Ulrich Mohr 76b377c4c0 Merge pull request 'Mode Service: Add allowed subservice' (#739) from eive/fsfw:small_mode_service_fix into development
fsfw/fsfw/pipeline/pr-master This commit looks good Details
Reviewed-on: #739
2023-02-20 13:40:53 +01:00
Ulrich Mohr 3562bf11b9 CHANGELOG update
fsfw/fsfw/pipeline/pr-master This commit looks good Details
2023-02-10 11:06:46 +01:00
Ulrich Mohr fffb2b61e5 release check helper 2023-02-10 11:06:30 +01:00
Robin Müller 94e5f62331
add allowed subservice
fsfw/fsfw/pipeline/pr-development This commit looks good Details
2023-02-09 18:30:08 +01:00
Ulrich Mohr 0a9c563bbc format 2023-02-09 15:58:48 +01:00
Ulrich Mohr fa7675897d Merge pull request 'Mode Service Bugfixes' (#736) from eive/fsfw:mode_service_fixes into development
fsfw/fsfw/pipeline/pr-master This commit looks good Details
Reviewed-on: #736
2023-02-09 15:56:26 +01:00
Ulrich Mohr 3a2393885f more style
fsfw/fsfw/pipeline/pr-development This commit looks good Details
2023-02-09 15:44:39 +01:00
Ulrich Mohr c752b6d143 Merge pull request 'Generic TMTC Bridge Update' (#734) from eive/fsfw:tmtcbridge_tweaks into development
fsfw/fsfw/pipeline/pr-master This commit looks good Details
Reviewed-on: #734
2023-02-09 15:37:35 +01:00
Ulrich Mohr b676040c7c Merge pull request 'CMakeLists file updates' (#731) from eive/fsfw:cmakelists_update into development
fsfw/fsfw/pipeline/pr-master This commit looks good Details
Reviewed-on: #731
2023-02-09 15:29:46 +01:00
Ulrich Mohr 010509efb4 removed unneeded find_package parameter for etl
fsfw/fsfw/pipeline/pr-development This commit looks good Details
2023-02-09 13:50:16 +01:00
Ulrich Mohr dfb1633f00 Merge branch 'development' into mode_service_fixes
fsfw/fsfw/pipeline/pr-development Something is wrong with the build of this commit Details
2023-02-09 13:46:19 +01:00
Ulrich Mohr 5f7172e130 Merge pull request 'TCP/IP TMTC bridge memory leak fixes' (#737) from eive/fsfw:possible_tcpip_bridge_fixes into development
fsfw/fsfw/pipeline/pr-master This commit looks good Details
Reviewed-on: #737
2023-02-09 12:15:45 +01:00
Ulrich Mohr 0c6465cd95 Merge pull request 'time stamper empty ctor' (#730) from eive/fsfw:empty_cds_short_ctor into development
fsfw/fsfw/pipeline/pr-master This commit looks good Details
Reviewed-on: #730
2023-02-09 11:45:49 +01:00
Ulrich Mohr f94987c46d Merge pull request 'RM3100 important bugfix' (#733) from eive/fsfw:rm3100_fixes into development
fsfw/fsfw/pipeline/pr-master This commit looks good Details
Reviewed-on: #733
2023-02-09 11:41:53 +01:00
Ulrich Mohr 1809ce359b Merge pull request 'comment tweak to event parser can read everything' (#732) from eive/fsfw:health_if_update into development
fsfw/fsfw/pipeline/pr-master This commit looks good Details
Reviewed-on: #732
2023-02-09 11:39:53 +01:00
Ulrich Mohr 8c712441ab Making fetch Catch2 quiet as well.
fsfw/fsfw/pipeline/pr-development This commit looks good Details
2023-02-09 11:34:58 +01:00
Robin Müller f1b0ca7cff
add PR link
fsfw/fsfw/pipeline/pr-development This commit looks good Details
2023-02-08 21:26:37 +01:00
Robin Müller 000df85556
bump changelog
fsfw/fsfw/pipeline/pr-development There was a failure building this commit Details
2023-02-08 21:24:00 +01:00
Robin Müller 1fffcc2229 possiible leak fixes 2023-02-08 21:23:21 +01:00
Robin Müller a419806a05
Merge remote-tracking branch 'upstream/development' into mode_service_fixes
fsfw/fsfw/pipeline/pr-development There was a failure building this commit Details
2023-02-08 09:33:13 +01:00
Robin Müller 6445debfa1
bump changelog
fsfw/fsfw/pipeline/pr-development There was a failure building this commit Details
2023-02-08 09:24:55 +01:00
Robin Müller 8014e4adf9
mode service fixes 2023-02-08 09:23:48 +01:00
Robin Müller 134d908f26
that stuff is not in upstream yet..
fsfw/fsfw/pipeline/pr-development Build started... Details
2023-02-07 12:52:18 +01:00
Robin Müller 40a9e12416
1000 is a bit much
fsfw/fsfw/pipeline/pr-development This commit looks good Details
2023-02-07 12:47:40 +01:00
Robin Müller f39054edd4
introduce warning switch 2023-02-07 12:45:29 +01:00
Robin Müller 5adf89b911
changelog update
fsfw/fsfw/pipeline/pr-development There was a failure building this commit Details
2023-02-07 12:41:42 +01:00
Robin Müller c2e6a22dec
important bugfix for RM3100 2023-02-07 12:39:43 +01:00
Robin Müller c8e065a713
comment tweak to event parser can read everything
fsfw/fsfw/pipeline/pr-development This commit looks good Details
2023-02-07 12:36:42 +01:00
Robin Müller 3ed49dbae3
Merge remote-tracking branch 'upstream/development' into empty_cds_short_ctor
fsfw/fsfw/pipeline/pr-development Build started... Details
2023-02-07 12:24:02 +01:00
Robin Müller 4cf52d5dfe Merge pull request 'Time Service 9 update' (#726) from eive/fsfw:updates_fixes_pus_time_service into development
fsfw/fsfw/pipeline/pr-master This commit looks good Details
Reviewed-on: #726
2023-02-07 12:19:45 +01:00
Robin Müller 539d7aac9e
suppress error if ETL is not found
fsfw/fsfw/pipeline/pr-development This commit looks good Details
2023-02-07 12:17:03 +01:00
Robin Müller 0a23f2c85a
correction for printout, add prefix
fsfw/fsfw/pipeline/pr-development This commit looks good Details
2023-02-07 12:15:44 +01:00
Robin Müller 46230e6c6d
Merge remote-tracking branch 'upstream/development' into updates_fixes_pus_time_service
fsfw/fsfw/pipeline/pr-development This commit looks good Details
2023-02-07 12:11:29 +01:00
Robin Müller b22d439300
bump changelog
fsfw/fsfw/pipeline/pr-development There was a failure building this commit Details
2023-02-07 12:10:11 +01:00
Robin Müller 7e7b3bbbc9
time stamper empty ctor
fsfw/fsfw/pipeline/pr-development This commit looks good Details
2023-02-07 12:07:41 +01:00
Steffen Gaisser 5b92247fbd Merge branch 'development' into add_health_service_announce_all
fsfw/fsfw/pipeline/pr-development There was a failure building this commit Details
2023-02-06 16:31:05 +01:00
Steffen Gaisser e2b66df72e Merge pull request 'various fixes related to linux Unittests and memory leaks' (#715) from eive/fsfw:unittest_fix_semaphore into development
fsfw/fsfw/pipeline/pr-master This commit looks good Details
Reviewed-on: #715
2023-02-06 16:30:37 +01:00
Steffen Gaisser d9da55fdab Merge branch 'development' into add_health_service_announce_all
fsfw/fsfw/pipeline/pr-development This commit looks good Details
2023-02-06 15:03:52 +01:00
Steffen Gaisser 7b828f233a Merge pull request 'I2C Linux: remove duplicate printout' (#718) from eive/fsfw:i2c_remove_duplicate_printout into development
fsfw/fsfw/pipeline/pr-master This commit looks good Details
Reviewed-on: #718
2023-02-06 14:54:58 +01:00
Steffen Gaisser c3d1000cd5 Merge branch 'development' into unittest_fix_semaphore
fsfw/fsfw/pipeline/pr-development This commit looks good Details
2023-02-06 14:46:45 +01:00
Steffen Gaisser 8e0e57714d Merge pull request 'allow using SO_REUSEADDR and SO_REUSEPORT on TCP server' (#722) from eive/fsfw:tcp_server_reuseaddr_reusesocket into development
fsfw/fsfw/pipeline/pr-master This commit looks good Details
Reviewed-on: #722
2023-02-06 14:45:40 +01:00
Robin Müller 066f7a6f9b
remove unreachable code
fsfw/fsfw/pipeline/pr-development This commit looks good Details
2023-02-06 14:41:14 +01:00
Steffen Gaisser cc9e54ea6b Merge pull request 'improve srv20 error messages' (#723) from eive/fsfw:srv20_error_msgs into development
fsfw/fsfw/pipeline/pr-master This commit looks good Details
Reviewed-on: #723
2023-02-06 14:37:26 +01:00
Steffen Gaisser 31465a4e0f Merge pull request 'MGM: small tweak, gain factor was always them same' (#724) from eive/fsfw:mgm_handler_small_fix into development
fsfw/fsfw/pipeline/pr-master This commit looks good Details
Reviewed-on: #724
2023-02-06 14:36:34 +01:00
Steffen Gaisser c0e5d1eb99 Merge branch 'development' into tcp_server_reuseaddr_reusesocket
fsfw/fsfw/pipeline/pr-development This commit looks good Details
2023-02-06 14:34:52 +01:00