eive/fsfw
15
1
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases 1 Wiki Activity
4,395 Commits 28 Branches 1 Tag
e949368b062e8703c35d2043ece8d7258cd2608b
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Steffen Gaisser 7e61ce1ed2 Merge pull request 'cmake lists update to suppress large warning' (#588) from eive/fsfw:mueller/catch2-find-package-quiet into development 
Reviewed-on: fsfw/fsfw#588
 2022-04-04 14:07:38 +02:00
Steffen Gaisser 4be45adae6 Merge branch 'development' into mueller/catch2-find-package-quiet 2022-03-28 16:44:23 +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 
Reviewed-on: fsfw/fsfw#591
 2022-03-28 15:23:26 +02:00
Steffen Gaisser cde184f428 Merge branch 'development' into mohr/task 2022-03-28 15:18:23 +02:00
Steffen Gaisser febecd4b30 Merge pull request 'small tweaks for local datapool code' (#582) from eive/fsfw:mueller/localpool-tweaks into development 
Reviewed-on: fsfw/fsfw#582
 2022-03-28 14:49:42 +02:00
Steffen Gaisser 964e311d8b Merge branch 'development' into mueller/localpool-tweaks 2022-03-28 14:48:34 +02:00
Steffen Gaisser e08bdd3e35 Merge pull request 'Always define FSFW_DISABLE_PRINTOUT' (#576) from eive/fsfw:mueller/define-fsfw-disabled-printout-upstream into development 
Reviewed-on: fsfw/fsfw#576
 2022-03-14 15:20:40 +01:00
Steffen Gaisser d2dd16aef3 Merge branch 'development' into mueller/define-fsfw-disabled-printout-upstream 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 
Reviewed-on: fsfw/fsfw#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 
Reviewed-on: fsfw/fsfw#577
 2022-03-14 15:04:57 +01:00
Steffen Gaisser 6998626ad4 Merge branch 'development' into mueller/define-fsfw-disabled-printout-upstream 2022-03-14 15:02:07 +01:00
Steffen Gaisser 24ad858b64 Merge branch 'development' into mueller/countdown-improvement-upstream 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 
Reviewed-on: fsfw/fsfw#575
 2022-03-14 14:44:37 +01:00
Steffen Gaisser 445d5dd6f0 Added Checks for CDSShort in unittests 2022-03-09 18:56:08 +01:00
Steffen Gaisser a4f97a7ba7 Fixed another issue of time checks 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 
Reviewed-on: fsfw/fsfw#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 
Reviewed-on: fsfw/fsfw#570
 2022-03-07 14:19:59 +01:00
Steffen Gaisser 14b44f8bb2 Merge branch 'development' into gaisser_compiler_flags 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 
Reviewed-on: fsfw/fsfw#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 
Reviewed-on: fsfw/fsfw#560
 2022-02-28 15:50:06 +01:00
Steffen Gaisser 2d12618c96 Merge branch 'development' into mueller/test-task-one-shot-flag-not-static 2022-02-28 15:42:08 +01:00
Steffen Gaisser 68ca6fd122 Merge branch 'development' into gaisser_compiler_flags 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 
Reviewed-on: fsfw/fsfw#563
 2022-02-28 15:26:00 +01:00
Steffen Gaisser 20928732ec Merge branch 'development' into gaisser_unit_test_internal_error 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 
Reviewed-on: fsfw/fsfw#564
 2022-02-28 15:13:39 +01:00
Steffen Gaisser 2635f39344 Merge branch 'development' into mueller/update-helper-script 2022-02-28 15:05:02 +01:00
Steffen Gaisser 0e8328fca3 Fixed include based on Feedback 2022-02-24 11:22:51 +01:00
Steffen Gaisser 1ef3dae72e Fixed an missing include 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 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 
Reviewed-on: fsfw/fsfw#558
 2022-02-23 12:36:24 +01:00
Steffen Gaisser e75155c329 Merge branch 'development' into mueller/apply-clang-format 2022-02-23 12:30:40 +01:00
Steffen Gaisser d4e48006f2 Merge branch 'development' into mueller/update-helper-script 2022-02-23 12:28:12 +01:00
Steffen Gaisser d6508e23b6 Added more coverage and Documentation 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 
Reviewed-on: fsfw/fsfw#562
 2022-02-23 10:08:49 +01:00
Steffen Gaisser e5e85bcff9 still clang 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 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 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 
Reviewed-on: fsfw/fsfw#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 
Reviewed-on: fsfw/fsfw#529
 2021-12-13 14:20:50 +01:00
Steffen Gaisser c3a0aabfb8 Merge branch 'development' into mueller/cfdp-pdus 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 
Reviewed-on: fsfw/fsfw#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 
Reviewed-on: fsfw/fsfw#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 
Reviewed-on: fsfw/fsfw#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 
Reviewed-on: fsfw/fsfw#510
 2021-11-15 14:24:15 +01:00
Steffen Gaisser e688105073 Merge branch 'development' into mueller/unittests-op-divider-bitutil 2021-11-15 14:23:34 +01:00
Steffen Gaisser f7c6ec329b Merge pull request 'Filesystem Base Interface: Use IF instead of void pointer' (#511) from KSat/fsfw:mueller/filesystem-api-update into development 
Reviewed-on: fsfw/fsfw#511
 2021-11-15 14:23:04 +01:00
Steffen Gaisser 9a38106b57 Merge pull request 'STM32 SPI Updates' (#518) from mueller/stm32-spi-updates into development 
Reviewed-on: fsfw/fsfw#518
 2021-11-08 14:52:28 +01:00
Steffen Gaisser 75e16e0b7b Merge branch 'development' into mueller/stm32-spi-updates 2021-11-08 14:51:02 +01:00
Steffen Gaisser 87a15910fe Merge pull request 'CMakeLists fixes' (#517) from mueller/cmake-fixes into development 
Reviewed-on: fsfw/fsfw#517

LGTM
 2021-11-08 14:44:39 +01:00
Steffen Gaisser dacec0c1f6 Merge pull request 'Keep Open TCP Implementation' (#496) from eive/fsfw:mueller/tcp-keep-open-pr into development 
Reviewed-on: fsfw/fsfw#496
 2021-10-18 15:13:08 +02:00
gaisser 53400c8bfa Merge branch 'development' into mueller/dle-possible-bugfix 2021-10-04 14:40:47 +02:00
gaisser 9e12f59707 Merge pull request 'TMTC Bridge: Increase limit of packets stored' (#484) from eive/fsfw:mueller/increase-absolute-packet-stored-limit into development 
Reviewed-on: fsfw/fsfw#484
 2021-10-04 14:38:46 +02:00
gaisser 1c8f86364d Merge branch 'development' into mueller/increase-absolute-packet-stored-limit 2021-10-04 14:37:09 +02:00
gaisser ba4249d658 Merge branch 'development' into gaisser_countdown_timer 2021-09-29 14:27:48 +02:00
Steffen Gaisser 4b62c8aa81 Added tests 2021-09-27 21:53:27 +02:00
Steffen Gaisser 1b38f84edc Merge remote-tracking branch 'origin/development' into gaisser_countdown_timer 2021-09-27 21:06:20 +02:00
Steffen Gaisser 5064d44999 Removed Timer.cpp from CMakeLists 2021-09-27 20:45:44 +02:00
Steffen Gaisser 322c14d4bb Merge remote-tracking branch 'origin/development' into gaisser_countdown_timer 2021-09-27 20:01:01 +02:00
Steffen Gaisser 8ec35f158c Removed Timer and updated Countdown 2021-09-27 19:57:42 +02:00
gaisser a986b22345 Merge pull request 'queue nullptr check in action helper' (#458) from meier/ActionHelperQueueCheck into development 
Reviewed-on: fsfw/fsfw#458
 2021-09-13 15:24:35 +02:00
gaisser d9e2fd92fb Merge branch 'development' into meier/ActionHelperQueueCheck 2021-09-13 15:17:47 +02:00
gaisser 7b500eb0ed Merge pull request 'EventManager printout fixes and tweaks' (#447) from KSat/fsfw:mueller/event-manager-tweaks-printf-fix into development 
Reviewed-on: fsfw/fsfw#447
 2021-07-26 15:25:54 +02:00
gaisser f427c87270 Merge pull request 'FreeRTOS OSAL update and minor tweaks' (#442) from mueller/freertos-updates-minor-tweaks into development 
Reviewed-on: fsfw/fsfw#442
 2021-07-13 14:18:02 +02:00
gaisser b00bfe4bda Merge pull request 'ASTP 1.1.0 Merge Development in Master' (#441) from development into master 
Reviewed-on: fsfw/fsfw#441
 2021-06-29 14:11:46 +02:00
gaisser 2b2899e100 Merge pull request 'Missing function for TC Constructor' (#440) from KSat/fsfw:mueller/master into development 
Reviewed-on: fsfw/fsfw#440
 2021-06-22 14:36:05 +02:00
gaisser cae69d5400 Merge pull request 'added missing include' (#439) from mueller/missing-include into development 
Reviewed-on: fsfw/fsfw#439
 2021-06-17 12:35:20 +02:00
Steffen Gaisser bd7c13ff7e NO_COMMANDER was not using NO_QUEUE in DHB 2021-06-15 16:47:24 +02:00
gaisser 2684e82c7f Merge pull request 'PUS C support for Telecommands and first FSFW.h file' (#432) from KSat/fsfw:mueller/update-package into development 
Reviewed-on: fsfw/fsfw#432
 2021-06-15 16:37:40 +02:00
gaisser 66d1d14ae3 Merge branch 'development' into mueller/update-package 2021-06-15 16:33:26 +02:00
gaisser 5f9a6bb155 Merge pull request 'Removed wrong static' (#437) from gaisser/fsfw:gaisser_clock_leap_seconds_move into development 
Reviewed-on: fsfw/fsfw#437
 2021-06-15 16:13:55 +02:00
gaisser 8a5a3c0243 Merge branch 'development' into gaisser_clock_leap_seconds_move 2021-06-15 16:13:35 +02:00
Steffen Gaisser 2ccc0dbb00 Removed wrong static 2021-06-15 16:12:25 +02:00
Steffen Gaisser ee89a2f00d Removed author tag 2021-06-15 16:05:12 +02:00
Steffen Gaisser dbfcf8b271 Removed old check 2021-06-15 16:03:11 +02:00
Steffen Gaisser 717971f69c Fixed wrong namespace qualifier 2021-06-15 16:01:28 +02:00
Steffen Gaisser b0a69d4c9d Merge remote-tracking branch 'my_fork/gaisser_clock_leap_seconds_move' into gaisser_clock_leap_seconds_move 2021-06-15 16:00:23 +02:00
Steffen Gaisser ecb03b8a6d Moved Code to own cpp 2021-06-15 15:59:20 +02:00
gaisser b1f6252e30 Merge branch 'development' into gaisser_clock_leap_seconds_move 2021-06-15 15:53:16 +02:00
Steffen Gaisser 0cde65f5a1 Added some precautions in DHB::replyToReply 2021-06-15 15:33:52 +02:00
gaisser fbbc640f4d Merge pull request 'DHB tweak and class ID for GPIO HAL' (#434) from eive/fsfw:mueller/dhb-tweak into development 
Reviewed-on: fsfw/fsfw#434
 2021-06-15 15:23:23 +02:00
gaisser 398250c959 Merge pull request 'added generic file system message' (#428) from KSat/fsfw:mueller/generic-filesyste-message into development 
Reviewed-on: fsfw/fsfw#428
 2021-06-15 14:08:24 +02:00
Steffen Gaisser 21d213f35f Merge branch 'development' into gaisser_clock_leap_seconds_move 2021-06-14 15:27:37 +02:00
gaisser 3076c423c0 Merge branch 'development' into mueller/generic-filesyste-message 2021-06-14 15:14:37 +02:00
Steffen Gaisser eead2a8a49 Moved leap second management 2021-06-14 14:40:40 +02:00
gaisser 7030d3e108 Merge pull request 'Make Object Manager a Singleton and Refactored Linux Error Printing' (#424) from KSat/fsfw:mueller/master into development 
Reviewed-on: fsfw/fsfw#424
 2021-06-08 15:01:00 +02:00
gaisser b6b144bcdb Merge pull request 'FreeRTOS Queue Map Manager' (#423) from KSat/fsfw:mueller/freertos-queue-map-manager into development 
Reviewed-on: fsfw/fsfw#423
 2021-06-08 14:03:45 +02:00
gaisser 5ac68f731e Merge pull request 'Doc Update + PUS IDs' (#422) from mueller/another-update-package into development 
Reviewed-on: fsfw/fsfw#422
 2021-05-25 14:49:10 +02:00
gaisser 7fa0443725 Merge branch 'development' into mueller/another-update-package 2021-05-25 14:48:58 +02:00
gaisser f4cb63c53c Merge pull request 'TCP Server Update' (#421) from KSat/fsfw:mueller/tcp-server into development 
Reviewed-on: fsfw/fsfw#421
 2021-05-25 14:13:49 +02:00
gaisser 0cde6f317d Merge branch 'development' into mueller/tcp-server 2021-05-25 14:10:46 +02:00
gaisser 2737bc390c Merge pull request 'Update Package' (#420) from KSat/fsfw:mueller/update-package into development 
Reviewed-on: fsfw/fsfw#420
 2021-05-25 14:10:33 +02:00