Commit Graph
100 Commits
Author SHA1 Message Date
Steffen Gaisser a044d7d724 Merge pull request 'new cmake options for CICD build' (#623) from mueller/new-cicd-cmake-opts into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #623
2022-06-20 17:56:29 +02:00
Steffen Gaisser 732b615cb3 Merge branch 'development' into mueller/new-cicd-cmake-opts
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-06-20 16:34:13 +02:00
Steffen Gaisser c3aaab4b93 Merge pull request 'Task IF refactoring' (#636) from mueller/task-if-refactoring into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #636
2022-06-20 16:08:03 +02:00
Steffen Gaisser edf1d5ae8d Added more test cases
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-06-20 16:02:35 +02:00
Steffen Gaisser b60e4bcb90 Fix StorageAccessor move assignment
fsfw/fsfw/pipeline/pr-development This commit looks good
* Added Unittest for this
* Fixed missing include in test
2022-06-20 15:15:33 +02:00
Steffen Gaisser b18410aa63 Merge remote-tracking branch 'refs/remotes/origin/mueller/task-if-refactoring' into mueller/task-if-refactoring
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-06-20 15:02:38 +02:00
Steffen Gaisser 7f57a8784a Fixed deadline missed call on linux 2022-06-20 15:02:16 +02:00
Steffen Gaisser c7cf8e710d Merge pull request 'return end iterator instead of crashing' (#633) from mueller/possible-fix-ccsds-distrib into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #633
2022-05-25 13:59:35 +02:00
Steffen Gaisser 261eea381e Merge pull request 'PUS11 TC sched update and bugfixes' (#632) from mueller/tc-11-tweaks into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #632
2022-05-24 17:48:06 +02:00
Steffen Gaisser 5a425a1c58 Merge pull request 'cache the TCP client address now' (#630) from eive/fsfw:mueller/tcp-server-cache-client-addr into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #630
2022-05-23 14:42:12 +02:00
Steffen Gaisser 5e62258aa6 Merge branch 'development' into mueller/tcp-server-cache-client-addr
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-23 14:38:05 +02:00
Steffen Gaisser 99c72fd00b Merge pull request 'Auto-Formatter Script Improvements' (#626) from mueller/amft-cmakelists into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #626
2022-05-13 12:01:40 +02:00
Steffen Gaisser b6b3221b22 Merge pull request 'run auto-formatter over cmakelists.txt' (#619) from mueller/amft-cmakelists into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #619
2022-05-13 11:44:48 +02:00
Steffen Gaisser a83b86ccd2 Merge pull request 'refactor power module' (#590) from eive/fsfw:mueller/refactor-power-switch-if-etc into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #590
2022-05-12 18:37:45 +02:00
Steffen Gaisser b99160e850 Merge pull request 'Add LTO support' (#616) from mueller/add-lto-support into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #616
2022-05-12 16:56:54 +02:00
Steffen Gaisser 0410ecd9e3 Merge branch 'development' into mueller/add-lto-support
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-10 11:51:39 +02:00
Steffen Gaisser d45cda93b2 Merge pull request 'important bugfix for TCP server' (#618) from mueller/tcp-server-bugfix into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #618
2022-05-09 16:59:54 +02:00
Steffen Gaisser 3448292e8a Merge branch 'development' into mueller/tcp-server-bugfix
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-09 16:56:07 +02:00
Steffen Gaisser d983305ea5 Merge branch 'development' into mueller/amft-cmakelists
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-09 16:34:22 +02:00
Steffen Gaisser 46cfe65321 Merge pull request 'Health Service Bugfix' (#617) from mueller/health-srv-bugfix into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #617
2022-05-09 16:08:28 +02:00
Steffen Gaisser 118f1da8dd Merge pull request 'Bump C++ standard to C++17' (#622) from mueller/cpp17-update into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #622
2022-05-09 15:33:52 +02:00
Steffen Gaisser 83de5b4ec1 Merge branch 'development' into mueller/cpp17-update
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-09 15:13:50 +02:00
Steffen Gaisser fe1c51ae6d Merge pull request 'CMake move some directives up top' (#621) from mueller/cmake-fixes into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #621
2022-05-09 15:13:02 +02:00
Steffen Gaisser 3332f68ce7 Tested only std::numeric_limits in MSVC
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-05-02 17:22:13 +02:00
Steffen Gaisser 54feb77770 Proposed fix for gcc and clang
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-02 16:14:23 +02:00
Steffen Gaisser 3e9d6bdbb9 Merge branch 'development' into gaisser_cuc_tests
fsfw/fsfw/pipeline/pr-development Build queued...
2022-05-02 15:24:32 +02:00
Steffen Gaisser c295539c79 Merge pull request 'Fixes to allow compilation on MacOS' (#611) from mueller/mac-os into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #611
2022-05-02 15:22:19 +02:00
Steffen Gaisser 8edf4c3c8d Merge branch 'development' into meier/spacePacketBugFix
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-02 15:10:32 +02:00
Steffen Gaisser 8cc94a55ab Merge pull request 'Bump Catch2 dependency & Catch2 pre-installed for CI/CD' (#605) from mueller/bump-catch2 into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #605
2022-05-02 15:03:08 +02:00
Steffen Gaisser cc36baff78 Merge pull request 'Hotfix CMake & ETL' (#604) from mueller/hotfix-etl into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #604
2022-05-02 14:36:29 +02:00
Steffen Gaisser 7b979eadff Merge pull request 'fix compiler warnings and auto-formatting' (#598) from eive/fsfw:mueller/compiler-warning-fixes-upstream-2 into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #598
2022-05-02 14:17:00 +02:00
Steffen Gaisser 16714ceb40 Merge branch 'development' into gaisser_cuc_tests
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-02 13:58:17 +02:00
Steffen Gaisser b8516b15cb Merge pull request 'Added an additional conversion function' (#584) from eive/fsfw:mueller/clock-addition into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #584
2022-04-25 15:22:07 +02:00
Steffen Gaisser ac5a54b5da Merge branch 'development' into mueller/clock-addition
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-25 15:12:24 +02:00
Steffen Gaisser 5ac88f2b15 Merge pull request 'added missing empty implementation in STM32 SPI HAL' (#599) from mueller/small-stm32-hal-bugifx into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #599
2022-04-11 17:48:48 +02:00
Steffen Gaisser c04ca704d2 Merge pull request 'progagate reply returnvalue' (#597) from eive/fsfw:mueller/propagate-pool-manage-retval into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #597
2022-04-11 17:31:54 +02:00
Steffen Gaisser afe006e234 Merge pull request 'Alternative reply ID activation' (#595) from meier/alternativeReply into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #595
2022-04-11 14:18:52 +02:00
Steffen Gaisser c05184e1c4 Merge branch 'development' into meier/alternativeReply
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-04 14:25:08 +02:00
Steffen Gaisser 7e61ce1ed2 Merge pull request 'cmake lists update to suppress large warning' (#588) from eive/fsfw:mueller/catch2-find-package-quiet into development
fsfw/fsfw/pipeline/head There was a failure building this commit
Reviewed-on: #588
2022-04-04 14:07:38 +02:00
Steffen Gaisser a3930dafc5 Moved unused constructors
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-03-28 21:37:25 +02:00
Steffen Gaisser 4f9797af3b Updated CCSDS CuC Functions
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-03-28 21:24:33 +02:00
Steffen Gaisser b4effe7a46 Clang format
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-03-28 18:33:24 +02:00
Steffen Gaisser e6e71436c2 Added more tests 2022-03-28 18:32:51 +02:00
Steffen Gaisser 4be45adae6 Merge branch 'development' into mueller/catch2-find-package-quiet
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-03-28 16:44:23 +02:00
Steffen Gaisser a887f852c8 Merge branch 'development' into mueller/clock-addition
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-03-28 15:45:58 +02:00
Steffen Gaisser 0d7d2203d2 Merge pull request 'Added function to add component to a periodic task by pointer' (#591) from mohr/task into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #591
2022-03-28 15:23:26 +02:00
Steffen Gaisser cde184f428 Merge branch 'development' into mohr/task
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-03-28 15:18:23 +02:00
Steffen Gaisser 0b3255e463 Fixed tests
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-03-28 15:17:59 +02:00
Steffen Gaisser 631a531212 Merge branch 'development' into mueller/clock-addition
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-03-28 14:51:23 +02:00
Steffen Gaisser febecd4b30 Merge pull request 'small tweaks for local datapool code' (#582) from eive/fsfw:mueller/localpool-tweaks into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #582
2022-03-28 14:49:42 +02:00
Steffen Gaisser 964e311d8b Merge branch 'development' into mueller/localpool-tweaks
fsfw/fsfw/pipeline/pr-development Build queued...
2022-03-28 14:48:34 +02:00
Steffen Gaisser 665d8cd479 Applied clang format
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-03-25 18:48:53 +01:00
Steffen Gaisser 10398855a9 Added more unittest coverage
fsfw/fsfw/pipeline/pr-development This commit looks good
Added Mutex for gmtime functions
Moved Statics used in ClockCommon to ClockCommon
2022-03-25 18:47:31 +01:00
Steffen Gaisser e08bdd3e35 Merge pull request 'Always define FSFW_DISABLE_PRINTOUT' (#576) from eive/fsfw:mueller/define-fsfw-disabled-printout-upstream into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #576
2022-03-14 15:20:40 +01:00
Steffen Gaisser d2dd16aef3 Merge branch 'development' into mueller/define-fsfw-disabled-printout-upstream
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-03-14 15:12:37 +01:00
Steffen Gaisser b7a617dab3 Merge pull request 'minor event changes' (#578) from eive/fsfw:mueller/event-update into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #578
2022-03-14 15:12:21 +01:00
Steffen Gaisser b694aea100 Merge pull request 'call setTimeout in Countdown ctor' (#577) from eive/fsfw:mueller/countdown-improvement-upstream into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #577
2022-03-14 15:04:57 +01:00
Steffen Gaisser 6998626ad4 Merge branch 'development' into mueller/define-fsfw-disabled-printout-upstream
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-03-14 15:02:07 +01:00
Steffen Gaisser 24ad858b64 Merge branch 'development' into mueller/countdown-improvement-upstream
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-03-14 14:46:54 +01:00
Steffen Gaisser 288d453978 Merge pull request 'Version Getter Function' (#575) from eive/fsfw:mueller/version-getter-upstream into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #575
2022-03-14 14:44:37 +01:00
Steffen Gaisser 445d5dd6f0 Added Checks for CDSShort in unittests
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-03-09 18:56:08 +01:00
Steffen Gaisser a4f97a7ba7 Fixed another issue of time checks
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-03-07 18:33:24 +01:00
Steffen Gaisser 8b1af232c3 Added Tests for CCSDS Time, fixed LPM Test
Changed behaviour of Host and Linux Clock
2022-03-07 18:22:10 +01:00
Steffen Gaisser 7db11588b4 Merge branch 'development' into gaisser_compiler_flags 2022-03-07 14:39:01 +01:00
Steffen Gaisser c88b931ef1 Merge pull request 'HAL Devicehandlers: Periodic printouts are runtime configurable now' (#561) from eive/fsfw:mueller/dev-printout-runtime-configurable into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #561
2022-03-07 14:36:25 +01:00
Steffen Gaisser dbe31dd339 Merge pull request 'some forgotten size_t' (#570) from eive/fsfw:mohr/sizes into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #570
2022-03-07 14:19:59 +01:00
Steffen Gaisser 14b44f8bb2 Merge branch 'development' into gaisser_compiler_flags
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-03-07 13:09:21 +01:00
Steffen Gaisser c6540650e2 Merge pull request 'Changing build to -j4 from -j to lessen load on build server' (#569) from mohr/slowbuild into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #569
2022-03-04 15:16:25 +01:00
Steffen Gaisser 8920255565 Merge pull request 'one shot flag not static anymore' (#560) from eive/fsfw:mueller/test-task-one-shot-flag-not-static into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #560
2022-02-28 15:50:06 +01:00
Steffen Gaisser 2d12618c96 Merge branch 'development' into mueller/test-task-one-shot-flag-not-static
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-02-28 15:42:08 +01:00
Steffen Gaisser 68ca6fd122 Merge branch 'development' into gaisser_compiler_flags
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-02-28 15:29:57 +01:00
Steffen Gaisser 33e9592659 Merge pull request 'Unit test for Internal Error Reporter' (#563) from gaisser/fsfw:gaisser_unit_test_internal_error into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #563
2022-02-28 15:26:00 +01:00
Steffen Gaisser 20928732ec Merge branch 'development' into gaisser_unit_test_internal_error
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-02-28 15:19:44 +01:00
Steffen Gaisser a8426750f2 Merge pull request 'display run commands in helper script' (#564) from eive/fsfw:mueller/update-helper-script into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #564
2022-02-28 15:13:39 +01:00
Steffen Gaisser 2635f39344 Merge branch 'development' into mueller/update-helper-script
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-02-28 15:05:02 +01:00
Steffen Gaisser 0e8328fca3 Fixed include based on Feedback
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-02-24 11:22:51 +01:00
Steffen Gaisser 1ef3dae72e Fixed an missing include
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-02-23 22:36:29 +01:00
Steffen Gaisser 32381a7872 Fixed an issue with wrong buffer size 2022-02-23 21:20:22 +01:00
Steffen Gaisser 09815f5cce Clang format 2022-02-23 18:24:07 +01:00
Steffen Gaisser f6357b4531 WIP compiler Flags and new unit tests for fixes 2022-02-23 18:23:22 +01:00
Steffen Gaisser d6d13eec95 Merge branch 'development' into gaisser_unit_test_internal_error
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-02-23 12:37:55 +01:00
Steffen Gaisser 457bc6609e Merge pull request 'apply clang format' (#558) from eive/fsfw:mueller/apply-clang-format into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #558
2022-02-23 12:36:24 +01:00
Steffen Gaisser e75155c329 Merge branch 'development' into mueller/apply-clang-format
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-02-23 12:30:40 +01:00
Steffen Gaisser d4e48006f2 Merge branch 'development' into mueller/update-helper-script
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-02-23 12:28:12 +01:00
Steffen Gaisser d6508e23b6 Added more coverage and Documentation
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-02-23 12:12:49 +01:00
Steffen Gaisser 2cb254a556 Removed unused code 2022-02-23 11:53:48 +01:00
Steffen Gaisser 5ff0f8ea10 Merge pull request 'README tweak' (#562) from eive/fsfw:mueller/readme-tweak into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #562
2022-02-23 10:08:49 +01:00
Steffen Gaisser e5e85bcff9 still clang
fsfw/fsfw/pipeline/pr-master This commit looks good
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-02-22 13:43:25 +01:00
Steffen Gaisser 4862edfdb5 Clang format 2022-02-22 13:42:56 +01:00
Steffen Gaisser a50b52df51 Fixed an issue in host OSAL and added more coverage to IER
fsfw/fsfw/pipeline/pr-master This commit looks good
2022-02-22 13:37:28 +01:00
Steffen Gaisser 45ea09291a Still test for InternalError Reporter 2022-02-18 19:57:36 +01:00
Steffen Gaisser b7f3eff742 WIP unit tests 2022-02-18 19:08:06 +01:00
Steffen Gaisser 074ef29b86 Fixed valgrind python script
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-02-14 15:19:47 +01:00
Steffen Gaisser bd64a43819 Merge pull request 'simplified test controller and added docs gitignore' (#530) from mueller/controller-update into development
fsfw/fsfw/pipeline/head This commit looks good
fsfw/fsfw/pipeline/pr-master manual fix for jenkins bug
Reviewed-on: #530
2021-12-20 14:15:37 +01:00
Steffen Gaisser cec44ad44c Merge pull request 'improved win32 define' (#529) from KSat/fsfw:woodward/define-improvement into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #529
2021-12-13 14:20:50 +01:00
Steffen Gaisser c3a0aabfb8 Merge branch 'development' into mueller/cfdp-pdus
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2021-12-06 15:07:51 +01:00
Steffen Gaisser 32ba4301e4 Merge pull request 'Introducing documentation with Sphinx' (#526) from mueller/sphinx-docs into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #526
2021-12-06 15:05:29 +01:00
Steffen Gaisser bf31248a50 Merge pull request 'Update SerializeAdapter' (#513) from KSat/fsfw:mueller/serializeif-update into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #513
2021-11-29 14:37:40 +01:00
Steffen Gaisser 8c17c7e1a7 Merge pull request 'update unittest helper scripts' (#525) from eive/fsfw:mueller/update-scripts into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #525
2021-11-29 14:35:07 +01:00
Steffen Gaisser 186b3565e0 Merge pull request 'Unittests for Op Divider and Bitutility' (#510) from KSat/fsfw:mueller/unittests-op-divider-bitutil into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #510
2021-11-15 14:24:15 +01:00