Commit Graph

5361 Commits

Author SHA1 Message Date
Ulrich Mohr f95c373076 Merge pull request 'TCP/IP server fixes and improvements' (#747) from eive/fsfw:tcpip_server_fixes_improvements into development
fsfw/fsfw/pipeline/head There was a failure building this commit Details
Reviewed-on: #747
2023-05-25 16:04:28 +02:00
Ulrich Mohr e03731bcf8 Merge pull request 'event manager improvements' (#741) from eive/fsfw:event_manager_improvements into development
fsfw/fsfw/pipeline/head There was a failure building this commit Details
Reviewed-on: #741
2023-05-25 15:46:42 +02:00
Robin Müller 2714e588d7
improvements
fsfw/fsfw/pipeline/pr-development This commit looks good Details
2023-05-25 15:01:53 +02:00
Robin Müller e905288adc
Merge remote-tracking branch 'upstream/development' into tcpip_server_fixes_improvements
fsfw/fsfw/pipeline/pr-development This commit looks good Details
2023-05-25 15:00:42 +02:00
Robin Müller 3805ea50a7
remove unused constant
fsfw/fsfw/pipeline/pr-development This commit looks good Details
2023-05-25 14:58:18 +02:00
Robin Müller 699bd694cd Merge branch 'development' into event_manager_improvements
fsfw/fsfw/pipeline/pr-development This commit looks good Details
2023-05-25 14:44:22 +02:00
Ulrich Mohr 4518fec65c CHANGELOG
fsfw/fsfw/pipeline/head There was a failure building this commit Details
2023-05-08 15:25:47 +02:00
Ulrich Mohr dac1aacab2 Merge pull request 'Update Power Switch IF' (#743) from eive/fsfw:update_power_switch_if into development
fsfw/fsfw/pipeline/head There was a failure building this commit Details
Reviewed-on: #743
2023-05-08 15:00:47 +02:00
Ulrich Mohr 0042f92fdf Merge pull request 'bump ETL version' (#748) from KSat/fsfw:bump_etl_dep into development
fsfw/fsfw/pipeline/head There was a failure building this commit Details
Reviewed-on: #748
2023-05-08 14:53:02 +02:00
Ulrich Mohr 656faf8169 Merge remote-tracking branch 'upstream/development' into update_power_switch_if
fsfw/fsfw/pipeline/pr-development This commit looks good Details
2023-05-08 14:44:27 +02:00
Ulrich Mohr f84431e965 Merge pull request 'bugfix and changelog for Linux getUptime' (#745) from eive/fsfw:important_bugfix_linux_get_uptime into development
fsfw/fsfw/pipeline/head There was a failure building this commit Details
Reviewed-on: #745
2023-05-08 14:29:55 +02:00
Ulrich Mohr 0cec9ebb73 Merge pull request 'small tweak for version getter' (#744) from eive/fsfw:small_version_getter_tweak into development
fsfw/fsfw/pipeline/head There was a failure building this commit Details
Reviewed-on: #744
2023-05-08 14:13:06 +02:00
Ulrich Mohr a440b7c394 Merge pull request 'add CFDP subsystem ID' (#742) from eive/fsfw:add_cfdp_subsystem_id into development
fsfw/fsfw/pipeline/head There was a failure building this commit Details
Reviewed-on: #742
2023-05-08 14:09:04 +02:00
Ulrich Mohr bbfc1b2b34 Merge pull request 'FixedArrayList compile time assert' (#740) from eive/fsfw:container_additional_assert into development
fsfw/fsfw/pipeline/head There was a failure building this commit Details
Reviewed-on: #740
2023-05-08 14:04:56 +02:00
Robin Müller 025b379e8b
bump ETL version
fsfw/fsfw/pipeline/pr-development This commit looks good Details
2023-05-04 14:04:55 +02:00
Robin Müller c35a0a8541
TCP/IP server fixes and improvements
fsfw/fsfw/pipeline/pr-development There was a failure building this commit Details
2023-03-15 12:40:44 +01:00
Robin Müller 0f81d5e458
Merge remote-tracking branch 'upstream/development' into container_additional_assert
fsfw/fsfw/pipeline/pr-development This commit looks good Details
2023-03-15 12:34:36 +01:00
Robin Müller e0a072859b
Merge remote-tracking branch 'upstream/development' into event_manager_improvements
fsfw/fsfw/pipeline/pr-development This commit looks good Details
2023-03-15 12:33:57 +01:00
Robin Müller b50f092939
Merge remote-tracking branch 'upstream/development' into update_power_switch_if
fsfw/fsfw/pipeline/pr-development There was a failure building this commit Details
2023-03-15 12:33:08 +01:00
Robin Müller 2f90e12179
Merge remote-tracking branch 'upstream/development' into important_bugfix_linux_get_uptime
fsfw/fsfw/pipeline/pr-development Build started... Details
2023-03-15 12:32:25 +01:00
Robin Müller 8b77fac099 Merge pull request 'health service fixes and changelog' (#746) from eive/fsfw:health_service_fixes into development
fsfw/fsfw/pipeline/head There was a failure building this commit Details
Reviewed-on: #746
2023-03-15 12:29:31 +01:00
Robin Müller 47503824d7
health service fixes and changelog
fsfw/fsfw/pipeline/pr-development Build started... Details
2023-03-15 12:27:39 +01:00
Robin Müller 5e3f5c4121
fuse update
fsfw/fsfw/pipeline/pr-development There was a failure building this commit Details
2023-03-15 12:25:39 +01:00
Robin Müller 1f36c082ef
bugfix and changelog for Linux getUptime
fsfw/fsfw/pipeline/pr-development There was a failure building this commit Details
2023-03-15 12:21:50 +01:00
Robin Müller aa84e93603
small tweak for version getter
fsfw/fsfw/pipeline/pr-development Build started... Details
2023-03-15 12:17:36 +01:00
Robin Müller 8f63a0e747
changelog
fsfw/fsfw/pipeline/pr-development This commit looks good Details
2023-03-15 12:15:21 +01:00
Robin Müller 6fc8f756a7
update power switch IF 2023-03-15 12:13:55 +01:00
Robin Müller 067cb7d0f8
update catch factory
fsfw/fsfw/pipeline/pr-development There was a failure building this commit Details
2023-03-15 12:11:22 +01:00
Robin Müller d98ed40e3d
add CFDP subsystem ID
fsfw/fsfw/pipeline/pr-development Build started... Details
2023-03-15 12:09:30 +01:00
Robin Müller 2c17af4ef8
changelog
fsfw/fsfw/pipeline/pr-development There was a failure building this commit Details
2023-03-15 12:06:13 +01:00
Robin Müller 110fb43b9c
event manager improvements
fsfw/fsfw/pipeline/pr-development There was a failure building this commit Details
2023-03-15 12:05:22 +01:00
Robin Müller b057250bfb
changelog
fsfw/fsfw/pipeline/pr-development There was a failure building this commit Details
2023-03-15 11:53:12 +01:00
Robin Müller 066dd0d397
changelog 2023-03-15 11:52:20 +01:00
Robin Müller f735c2e9d4
assert size larger than 0 2023-03-15 11:51:51 +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