eive/fsfw
15
1
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases 1 Wiki Activity
6,038 Commits 28 Branches 1 Tag
6aff3250c29f5243eb4a6111ba0a5c0cc1a3033c
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
mohr c7037d417a nullptr check for optional argument 2023-06-20 11:54:15 +02:00
mohr 4518fec65c CHANGELOG 2023-05-08 15:25:47 +02:00
mohr dac1aacab2 Merge pull request 'Update Power Switch IF' (#743) from eive/fsfw:update_power_switch_if into development 
Reviewed-on: fsfw/fsfw#743
 2023-05-08 15:00:47 +02:00
mohr 0042f92fdf Merge pull request 'bump ETL version' (#748) from KSat/fsfw:bump_etl_dep into development 
Reviewed-on: fsfw/fsfw#748
 2023-05-08 14:53:02 +02:00
mohr 656faf8169 Merge remote-tracking branch 'upstream/development' into update_power_switch_if 2023-05-08 14:44:27 +02:00
mohr f84431e965 Merge pull request 'bugfix and changelog for Linux getUptime' (#745) from eive/fsfw:important_bugfix_linux_get_uptime into development 
Reviewed-on: fsfw/fsfw#745
 2023-05-08 14:29:55 +02:00
mohr 0cec9ebb73 Merge pull request 'small tweak for version getter' (#744) from eive/fsfw:small_version_getter_tweak into development 
Reviewed-on: fsfw/fsfw#744
 2023-05-08 14:13:06 +02:00
mohr a440b7c394 Merge pull request 'add CFDP subsystem ID' (#742) from eive/fsfw:add_cfdp_subsystem_id into development 
Reviewed-on: fsfw/fsfw#742
 2023-05-08 14:09:04 +02:00
mohr bbfc1b2b34 Merge pull request 'FixedArrayList compile time assert' (#740) from eive/fsfw:container_additional_assert into development 
Reviewed-on: fsfw/fsfw#740
 2023-05-08 14:04:56 +02:00
mohr f0bddfcb21 Modes: reusing submode for mode mask, more unittests 2023-03-09 16:43:45 +01:00
mohr dc7afc5415 Version bump, CHANGELOG update, format 2023-02-23 13:38:24 +01:00
mohr 9bf3ff95b7 Merge pull request 'Add Health Service Announce All Health Info' (#725) from eive/fsfw:add_health_service_announce_all into development 
Reviewed-on: fsfw/fsfw#725
 2023-02-23 13:13:56 +01:00
mohr 61562b18ab Merge branch 'development' into add_health_service_announce_all 2023-02-23 12:56:12 +01:00
mohr d76d97a36b changed health table parameter to objectId 2023-02-23 12:44:42 +01:00
mohr 76b377c4c0 Merge pull request 'Mode Service: Add allowed subservice' (#739) from eive/fsfw:small_mode_service_fix into development 
Reviewed-on: fsfw/fsfw#739
 2023-02-20 13:40:53 +01:00
mohr 3562bf11b9 CHANGELOG update 2023-02-10 11:06:46 +01:00
mohr fffb2b61e5 release check helper 2023-02-10 11:06:30 +01:00
mohr 0a9c563bbc format 2023-02-09 15:58:48 +01:00
mohr 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
mohr 3a2393885f more style 2023-02-09 15:44:39 +01:00
mohr 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
mohr 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
mohr 010509efb4 removed unneeded find_package parameter for etl 2023-02-09 13:50:16 +01:00
mohr dfb1633f00 Merge branch 'development' into mode_service_fixes 2023-02-09 13:46:19 +01:00
mohr 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
mohr 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
mohr 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
mohr 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
mohr 8c712441ab Making fetch Catch2 quiet as well. 2023-02-09 11:34:58 +01:00
mohr ba62c28b64 adding linux ci and fixing problems 2023-01-12 15:40:52 +01:00
mohr 7ef69c839c Merge pull request 'small fix to allow teardown handling' (#713) from eive/fsfw:mueller/shutdown_for_failed_to_on_transition into development 
Reviewed-on: fsfw/fsfw#713
 2022-11-28 14:30:15 +01:00
mohr bddc7a7ca6 minimal first version 2022-10-26 13:22:16 +02:00
mohr 11a22577be defaultconfig did not build anymore 2022-10-25 11:28:13 +02:00
mohr 6ec18171a8 Merge pull request 'now that doc server is up, remove markdown files' (#688) from mueller/remove-markdown-docs into development 
Reviewed-on: fsfw/fsfw#688
 2022-10-10 15:04:11 +02:00
mohr d9730032fd Merge pull request 'DHB Countdown Bug' (#693) from eive/fsfw:mueller/dhb-countdown-bug into development 
Reviewed-on: fsfw/fsfw#693
 2022-10-10 14:55:43 +02:00
mohr 176f243194 Merge pull request 'Switch to new documentation server' (#694) from mohr/documentation_ci into development 
Reviewed-on: fsfw/fsfw#694
 2022-09-30 15:05:16 +02:00
mohr d964fa2107 Merge branch 'development' into mohr/documentation_ci 2022-09-30 14:50:20 +02:00
mohr 7b5ae6a445 done? 2022-09-30 14:40:59 +02:00
mohr 8e362a000c Revert "one last check" 
This reverts commit 7877776e24.
 2022-09-30 14:36:25 +02:00
mohr 7877776e24 one last check 2022-09-30 14:34:25 +02:00
mohr 775d5632de update to ssh connection to doc server 2022-09-23 20:26:45 +02:00
mohr 4f3361eb2b another ci check 2022-09-23 18:33:47 +02:00
mohr 9e6c1d60e5 another ci check 2022-09-23 17:54:41 +02:00
mohr 12d0c23c13 Revert "testing deployment of documentation" 
This reverts commit 5488ee715f.
 2022-09-23 17:31:17 +02:00
mohr 5c3bb13834 Revert "testing deployment of both development and master doc" 
This reverts commit c0000a8635.
 2022-09-23 17:31:07 +02:00
mohr 292fe3e5e4 forgot epilog file 2022-09-23 17:11:57 +02:00
mohr 33530f2819 adding Impressum and Datenschutz to lcov output 2022-09-23 17:04:35 +02:00
mohr c0000a8635 testing deployment of both development and master doc 2022-09-23 14:14:10 +02:00
mohr 5488ee715f testing deployment of documentation 2022-09-23 14:07:12 +02:00
mohr 0fea22d031 switching to rsync and deploying to web documentation 2022-09-23 14:06:28 +02:00
mohr 3b8ca09299 prepared docker for documentation rsync 2022-09-23 13:46:03 +02:00
mohr 9a2146fa2d added impressum and datenschutz in sphinx documentation 2022-09-23 11:36:29 +02:00
mohr bd594123a2 Merge remote-tracking branch 'upstream/development' into mohr/merge-upstream 2022-09-14 12:54:15 +02:00
mohr 6970068d56 small fix in README 2022-09-13 18:19:35 +02:00
mohr af282c7d3e reverting to only publish development 2022-09-13 18:17:56 +02:00
mohr 21a9d89fb3 pushing code coverage report to documentation server 2022-09-13 18:14:26 +02:00
mohr 3257935150 fixing scp yet again again 2022-09-13 18:06:16 +02:00
mohr f34cf9095d fixing scp yet again 2022-09-13 18:02:38 +02:00
mohr 24ecf125a3 fixing scp command again 2022-09-13 17:55:12 +02:00
mohr 6451a16888 fixing scp command 2022-09-13 17:51:01 +02:00
mohr fa5605c959 testing Jenkinsfile 2022-09-13 14:50:37 +02:00
mohr 8e835be55f testing Jenkinsfile 2022-09-13 14:46:12 +02:00
mohr 9bd600c488 testing Jenkinsfile 2022-09-13 14:32:10 +02:00
mohr 9c7248e78e typo in Dockerfile 2022-09-13 14:20:30 +02:00
mohr ecf51b2913 testing Jenkinsfile 2022-09-13 14:09:08 +02:00
mohr 8bbde05413 add jenkins user in docker so that ssh will work 2022-09-13 14:08:04 +02:00
mohr d79b5348d8 testing Jenkinsfile 2022-09-13 14:00:36 +02:00
mohr 92e3ab04f3 testing Jenkinsfile 2022-09-13 13:54:23 +02:00
mohr 003a6d00fa Documentation build tools in docker 2022-09-13 13:13:18 +02:00
mohr 9ee1896553 Merge pull request 'Refactor Local Pool API' (#667) from mueller/refactor-local-pool-api into development 
Reviewed-on: fsfw/fsfw#667
 2022-09-12 14:32:08 +02:00
mohr a5b5523111 Merge pull request 'Refactor TMTC Stack, improve test framework' (#655) from mueller/refactor-tmtc-stack into development 
Reviewed-on: fsfw/fsfw#655
 2022-09-12 14:31:22 +02:00
mohr 62cd39e573 Merge pull request 'SerialBufferAdapter refactoring' (#677) from mueller/refactor-serial-buffer-adapter into development 
Reviewed-on: fsfw/fsfw#677
 2022-09-12 14:30:51 +02:00
mohr 278ed36db8 Merge pull request 'bump catch2 version' (#678) from mueller/bump-catch2 into development 
Reviewed-on: fsfw/fsfw#678
 2022-09-12 14:24:28 +02:00
mohr aed30d54ef Merge pull request 'remove bsp specific code' (#679) from mueller/remove-bsp-specific-code into development 
Reviewed-on: fsfw/fsfw#679
 2022-09-12 14:23:48 +02:00
mohr 1126db2c8a Merge pull request 'remove user includes' (#675) from mueller/remove-user-includes into development 
Reviewed-on: fsfw/fsfw#675
 2022-09-12 14:15:18 +02:00
mohr a64a04d7fe Merge branch 'development' into mueller/refactor-tmtc-stack 2022-09-12 14:14:49 +02:00
mohr 7e379d2159 Merge pull request 'provide a weak print char impl' (#674) from mueller/provide-weak-print-char into development 
Reviewed-on: fsfw/fsfw#674
 2022-09-12 14:10:31 +02:00
mohr d52f335455 sif::buffer: if disabeld do not print 2022-09-08 11:47:40 +02:00
mohr eb8e236cd4 Merge pull request 'Bugfix for Space Packet Parser' (#673) from eive/fsfw:mueller/fixes-tmtc-server-sp-parser into development 
Reviewed-on: fsfw/fsfw#673
 2022-09-01 14:12:16 +02:00
mohr 7dec45ccf2 Merge pull request 'Service 11 regression' (#670) from eive/fsfw:mueller/service-11-issues into development 
Reviewed-on: fsfw/fsfw#670
 2022-09-01 11:59:18 +02:00
mohr 2b01e86f9c one small additional precaution 2022-09-01 11:56:07 +02:00
mohr 60fd3d43c0 Merge pull request 'DHB TM handler alternative API raw buffer' (#671) from mueller/dhb-handle-device-tm-2 into development 
Reviewed-on: fsfw/fsfw#671
 2022-09-01 11:22:17 +02:00
mohr 3010f2f925 Merge pull request 'DHB set action commander before buildCommandFromCommand' (#672) from eive/fsfw:mueller/dhb-set-action-commander-before-building-cmd into development 
Reviewed-on: fsfw/fsfw#672
 2022-09-01 11:18:32 +02:00
mohr 6605ffb6b1 Fixing check in Srv 11 Filer 2022-08-29 14:55:50 +02:00
mohr e2e0190cae Revert "additional safety check" 
This reverts commit fd278e410b.
 2022-08-29 14:51:14 +02:00
mohr 217276d50c renamed returnvalue header 2022-08-16 12:48:22 +02:00
mohr d2ac3603a5 some more occurences 2022-08-16 12:29:53 +02:00
mohr f63f3fa564 more occurences in comments 2022-08-16 12:12:21 +02:00
mohr adcc375f25 Merge pull request 'New UnsignedByte Field class' (#660) from mueller/new-object-id-class into development 
Reviewed-on: fsfw/fsfw#660
 2022-08-15 15:22:30 +02:00
mohr 57ce5d1f34 Merge pull request 'Expand SerializeIF' (#656) from mueller/expand-serialize-if into development 
Reviewed-on: fsfw/fsfw#656
 2022-08-15 15:13:50 +02:00
mohr 90963b3940 Merge pull request 'group MGM data in local pool vectors' (#664) from eive/fsfw:mueller/group-mgm-data into development 
Reviewed-on: fsfw/fsfw#664
 2022-08-15 15:07:16 +02:00
mohr 0e7ec79af9 Merge pull request 'Add Linux HAL options' (#663) from eive/fsfw:mueller/cmake-linux-hal-options into development 
Reviewed-on: fsfw/fsfw#663
 2022-08-15 13:58:09 +02:00
mohr adbf375f38 some small fixes to dhb countdown addition 2022-07-13 21:58:07 +02:00
mohr 2e42f53682 Merge pull request 'New PoolEntry constructor' (#651) from eive/fsfw:mueller/new-pool-entry-ctor into development 
Reviewed-on: fsfw/fsfw#651
 2022-07-13 17:43:56 +02:00
mohr c519b70302 Merge pull request 'printout tweak' (#652) from mueller/printout-tweak-mq-linux-osal into development 
Reviewed-on: fsfw/fsfw#652
 2022-07-13 17:35:53 +02:00
mohr 45ee307bc4 Merge pull request 'remove duplicate CHANGELOG entries' (#649) from eive/fsfw:mueller/clean-changelog into development 
Reviewed-on: fsfw/fsfw#649
 2022-07-13 16:50:50 +02:00
mohr 8a2068aca6 Merge pull request 'clang-tidy changes for controller module' (#648) from clang-tidy-controllers into development 
Reviewed-on: fsfw/fsfw#648
 2022-07-13 16:49:15 +02:00
mohr aa60484111 Merge pull request 'clang-tidy changes for actions module' (#647) from clang-tidy-actions into development 
Reviewed-on: fsfw/fsfw#647
 2022-07-13 16:42:39 +02:00
mohr e99c7f3824 Merge pull request 'Install ETL library in CI/CD' (#645) from mueller/install-etl-cicd into development 
Reviewed-on: fsfw/fsfw#645
 2022-07-13 16:39:29 +02:00
mohr 2ee3ef1f1d Merge branch 'development' into mueller/install-etl-cicd 2022-07-13 16:38:30 +02:00