fsfw/fsfw
12
3
Fork 6
Code Issues 32 Pull Requests 4 Releases 10 Wiki Activity
3,258 Commits 28 Branches 22 Tags
03095776f16a216edc5d12c0dbc81b7205abb874
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Steffen Gaisser 03095776f1 Added a comment and corrected a mistake 2021-04-20 13:31:15 +02:00
Steffen Gaisser bad9f67c39 Merge remote-tracking branch 'origin/development' into gaisser_make_linux_realtime_optional 2021-04-20 13:06:11 +02:00
Steffen Gaisser 98add88d14 Makes linux realtime optional 
Adds new config variable FSFW_USE_REALTIME_FOR_LINUX
 2021-04-20 13:01:24 +02:00
gaisser b09119cd8d Merge pull request 'Small patch for CMakeLists file' (#397) from KSat/fsfw:mueller/cmake-lists-add-inc-paths into development 
Reviewed-on: #397
 2021-04-13 14:31:20 +02:00
gaisser 10bc568560 Merge branch 'development' into mueller/cmake-lists-add-inc-paths 2021-04-13 14:23:04 +02:00
gaisser 6e09e29ec2 Merge pull request 'added all coverity fixes' (#398) from KSat/fsfw:mueller/coverity-fixes into development 
Reviewed-on: #398
 2021-04-13 14:22:53 +02:00
gaisser e832487081 Merge branch 'development' into mueller/coverity-fixes 2021-04-13 14:02:03 +02:00
gaisser 01acbaa270 Merge branch 'development' into mueller/cmake-lists-add-inc-paths 2021-04-13 14:01:45 +02:00
gaisser 321de4e46b Merge pull request 'bumped version to 1.0.0' (#399) from KSat/fsfw:mueller/version-bump into development 
Reviewed-on: #399
 2021-04-12 17:04:14 +02:00
gaisser 2635ec3d56 Merge branch 'development' into mueller/cmake-lists-add-inc-paths 2021-04-12 16:10:03 +02:00
gaisser f4ac5c3844 Merge branch 'development' into mueller/version-bump 2021-04-12 16:09:30 +02:00
gaisser 922f145ffa Merge branch 'development' into mueller/coverity-fixes 2021-04-12 15:28:51 +02:00
gaisser 9731127eaf Merge pull request 'typo fix' (#396) from KSat/fsfw:mueller/destination-invalid-typo into development 
Reviewed-on: #396
 2021-04-12 15:28:38 +02:00
gaisser b4594e6f43 Merge pull request 'bugfix for RTEMS' (#395) from rtems/hotfix-mq into development 
Reviewed-on: #395
 2021-04-08 16:31:21 +02:00
gaisser 6e12f08965 Merge branch 'development' into rtems/hotfix-mq 2021-04-08 16:31:13 +02:00
gaisser 2dd2d8f133 Merge pull request 'Important bugfix for Linux MQ' (#394) from KSat/fsfw:linux/hotfix-mq into development 
Reviewed-on: #394
 2021-04-08 16:31:02 +02:00
gaisser c234da6f07 Merge pull request 'Linux Fix' (#393) from KSat/fsfw:mueller/linux-fix into development 
Reviewed-on: #393
 2021-04-06 14:09:59 +02:00
gaisser 8930be9f32 Merge branch 'development' into mueller/linux-fix 2021-04-06 14:09:24 +02:00
gaisser 32996338a0 Merge pull request 'CMake update' (#392) from mueller/cmake-update into development 
Reviewed-on: #392
 2021-04-06 14:09:14 +02:00
gaisser 2736ebbd19 Merge branch 'development' into mueller/cmake-update 2021-04-06 14:08:06 +02:00
gaisser b1c532078e Merge pull request 'OSAL update' (#391) from mueller/update-osal-package into development 
Reviewed-on: #391
 2021-03-23 15:01:39 +01:00
gaisser 37ac579f51 Merge branch 'development' into mueller/update-osal-package 2021-03-23 15:01:11 +01:00
gaisser d1265a55b4 Merge pull request 'UDP Hotfix' (#390) from mueller/udp-hotfix into development 
Reviewed-on: #390
 2021-03-23 14:21:43 +01:00
gaisser b542ed5c03 Merge branch 'development' into mueller/udp-hotfix 2021-03-23 14:20:14 +01:00
gaisser 8b42132cbe Merge pull request 'Bugfix validity buffer' (#389) from mueller/unit-test-bugfixes into development 
Reviewed-on: #389
 2021-03-23 14:20:03 +01:00
gaisser 2331188536 Merge pull request 'MSVC update' (#388) from mueller/msvc-update into development 
Reviewed-on: #388
 2021-03-16 15:47:04 +01:00
gaisser b757c5523c Merge pull request 'TCP/IP module updates for Linux and Windows' (#387) from mueller/tcpip-updates into development 
Reviewed-on: #387
 2021-03-16 15:19:40 +01:00
gaisser 5271375063 Merge branch 'development' into mueller/tcpip-updates 2021-03-16 15:19:30 +01:00
gaisser 4955015f3f Merge pull request 'Local Pool Test Updates' (#386) from mueller/lpool-test-updates into development 
Reviewed-on: #386
 2021-03-16 15:15:52 +01:00
gaisser d62dea442d Merge pull request 'Hotfixes for Renaming Update' (#384) from mueller/mutex-fixes into development 
Reviewed-on: #384
 2021-03-16 15:08:50 +01:00
gaisser 125dffcf28 Merge pull request 'ExtendedController Base and MSVC updates' (#382) from mueller/fsfw-update-3 into development 
Reviewed-on: #382
 2021-03-16 15:04:10 +01:00
gaisser c815905b5a Merge pull request 'Mutex Helper renamed' (#383) from KSat/fsfw:mueller/update-package-4 into development 
Reviewed-on: #383
 2021-03-09 15:35:58 +01:00
gaisser f5ac4368d8 Merge branch 'development' into mueller/fsfw-update-3 2021-03-09 14:19:01 +01:00
gaisser 6d0bc26624 Merge pull request 'Update package 2' (#380) from KSat/fsfw:mueller/update-package-2 into development 
Reviewed-on: #380
 2021-03-09 14:18:53 +01:00
gaisser baafeadcf4 Merge branch 'development' into mueller/update-package-2 2021-03-09 14:16:28 +01:00
gaisser dbda6fee82 Merge pull request 'Update Package' (#378) from KSat/fsfw:mueller/update-pack into development 
Reviewed-on: #378
 2021-03-09 14:16:13 +01:00
gaisser e64de87af7 Merge pull request 'FollowUp request' (#375) from KSat/fsfw:mueller/followup-pullrequest into development 
Reviewed-on: #375
 2021-03-02 15:03:34 +01:00
gaisser 6e43a70af5 Merge branch 'development' into mueller/followup-pullrequest 2021-03-02 14:50:42 +01:00
gaisser 559c8d0637 Merge pull request 'Localpool Updates' (#374) from KSat/fsfw:mueller/localpool-updates into development 
Reviewed-on: #374
 2021-03-02 14:48:24 +01:00
gaisser ef5c0d50f3 Merge branch 'development' into mueller/localpool-updates 2021-03-02 14:48:06 +01:00
gaisser 242a146f61 Merge pull request 'Unterminated preprocessor define' (#373) from eive/fsfw:mueller/hotfix into development 
Reviewed-on: #373
 2021-02-23 14:44:16 +01:00
gaisser 6cded300ae Merge pull request 'mutex helper printf support and nullptr check' (#372) from eive/fsfw:mueller/mutex-update into development 
Reviewed-on: #372
 2021-02-23 14:22:24 +01:00
gaisser 1bec19bdd7 Merge branch 'development' into mueller/mutex-update 2021-02-23 14:19:15 +01:00
gaisser 2fba1a6cfe Merge pull request 'No printout for missed deadline' (#371) from eive/fsfw:mueller/linux-no-deadline-missed-printout into development 
Reviewed-on: #371
 2021-02-23 14:18:57 +01:00
gaisser 8a1f043b39 Merge pull request 'Additional Update for Local Data Pools' (#367) from mueller/fsfw-update-2 into development 
Reviewed-on: #367
 2021-02-09 15:20:25 +01:00
gaisser 0416aaf3fe Merge pull request 'FSFW Update - Parameter Service (PUS 20)' (#365) from mueller/fsfw-update into development 
Reviewed-on: #365
 2021-02-09 14:55:54 +01:00
gaisser b9cb0495a9 Merge pull request 'RTEMS and DHB update' (#362) from mueller/rtems-update into development 
Reviewed-on: #362
 2021-02-09 14:25:49 +01:00
gaisser 48375a5221 Merge pull request 'RTEMS Updates and Bugfixes' (#363) from mueller/rtems-only into development 
Reviewed-on: #363
 2021-02-09 14:14:36 +01:00
gaisser 46e4816faf Merge branch 'development' into mueller/rtems-only 2021-02-09 14:13:38 +01:00
gaisser 85b92af777 Merge pull request 'ActionHelper: Better diagnostic output' (#370) from KSat/fsfw:mueller/action-diag-output into development 
Reviewed-on: #370
 2021-02-09 14:13:25 +01:00
gaisser cb2c66e256 Merge branch 'development' into mueller/action-diag-output 2021-02-09 14:10:45 +01:00
gaisser 36d1a36a74 Merge pull request 'CSB: Better diagnostic printout in case there are issues' (#369) from eive/fsfw:mueller/csb-diag-printout-request into development 
Reviewed-on: #369
 2021-02-09 14:10:16 +01:00
gaisser ae5d880406 Merge branch 'development' into mueller/csb-diag-printout-request 2021-02-09 14:06:59 +01:00
gaisser bcd51c0725 Merge pull request 'replaced tabs by spaces for some folders with sed script' (#364) from mueller/first-tabs-to-spaces into development 
Reviewed-on: #364
 2021-02-09 14:06:46 +01:00
gaisser 35d75bae56 Merge pull request 'FSFW Update' (#361) from KSat/fsfw:mueller/fsfw-update into development 
Reviewed-on: #361
 2021-01-26 14:29:20 +01:00
gaisser 86d0d5c4ee Merge pull request 'Arrayprinter, Event Manager update' (#355) from KSat/fsfw:mueller/comp_branch into development 
Reviewed-on: #355
 2021-01-26 14:24:56 +01:00
gaisser 38c7e050ab Merge branch 'development' into mueller/comp_branch 2021-01-25 14:44:06 +01:00
gaisser 7310d2b5fe Merge pull request 'improved options' (#359) from eive/fsfw:eive/shadow-local-warning into development 
Reviewed-on: #359
 2021-01-25 14:40:21 +01:00
gaisser d39c729a16 Merge branch 'development' into eive/shadow-local-warning 2021-01-25 14:40:06 +01:00
gaisser f11e7407d6 Merge pull request 'important bugfix' (#360) from KSat/fsfw:mueller/hk-bugfix into development 
Reviewed-on: #360
 2021-01-25 14:39:48 +01:00
gaisser 2f64c16a8a Merge pull request 'Warning on local shadowing can be disabled optionally for GCC' (#357) from eive/fsfw:eive/shadow-local-warning into development 
Reviewed-on: #357
 2021-01-19 16:28:56 +01:00
gaisser 543e0d4649 Merge pull request 'Local Pool Update' (#349) from KSat/fsfw:mueller/local-pool-update into development 
Reviewed-on: #349
 2021-01-19 15:38:07 +01:00
gaisser aea258cf5a Merge pull request 'important bugfix HasActionIF' (#353) from KSat/fsfw:mueller/action-bugfix into development 
Reviewed-on: #353
 2021-01-19 14:56:09 +01:00
gaisser 2469da757e Merge branch 'development' into mueller/action-bugfix 2021-01-19 14:52:58 +01:00
gaisser d77e356ce5 Merge pull request 'Added Service 3 to CMake sources' (#352) from mueller/added-hkservie3-cmake into development 
Reviewed-on: #352
 2021-01-19 14:52:42 +01:00
gaisser 6f3e90c2f0 Merge branch 'development' into mueller/added-hkservie3-cmake 2021-01-19 14:52:35 +01:00
gaisser 867fa577b6 Merge pull request 'updated defaultcfg' (#351) from KSat/fsfw:mueller/defaultcfg-update into development 
Reviewed-on: #351
 2021-01-19 14:52:22 +01:00
gaisser ff2c05012e Merge branch 'development' into mueller/defaultcfg-update 2021-01-19 14:52:05 +01:00
gaisser 6ef11678d0 Merge pull request 'pool entry update' (#350) from KSat/fsfw:mueller/pool-entry-update into development 
Reviewed-on: #350
 2021-01-19 14:51:55 +01:00
gaisser 8bb67cd919 Merge branch 'development' into mueller/pool-entry-update 2021-01-19 14:51:46 +01:00
gaisser fe09add0fe Merge pull request 'updated cmakelists' (#348) from KSat/fsfw:mueller/cmake-update into development 
Reviewed-on: #348
 2021-01-19 14:51:12 +01:00
gaisser d7220b7350 Merge branch 'development' into mueller/cmake-update 2021-01-19 14:50:25 +01:00
gaisser 9d179f90ad Merge pull request 'doc update' (#347) from KSat/fsfw:mueller/doc-update into development 
Reviewed-on: #347
 2021-01-19 14:50:14 +01:00
gaisser 5639273d9b Merge pull request 'C++ ostream made optional' (#342) from mueller/fsfw-printers into development 
Reviewed-on: #342
 2021-01-12 15:27:14 +01:00
gaisser 8332b348ee Merge branch 'development' into mueller/fsfw-printers 2021-01-12 15:25:52 +01:00
gaisser b42535dd2d Merge pull request 'TM storage convergence' (#327) from KSat/fsfw:mueller/tmstorage into development 
Reviewed-on: #327
 2021-01-12 15:09:14 +01:00
gaisser e30d020445 Merge branch 'development' into mueller/tmstorage 2021-01-12 15:09:00 +01:00
gaisser a89d9eab36 Merge branch 'development' into mueller/datapool-update 2021-01-12 15:07:06 +01:00
gaisser 4d6d951ae6 Merge pull request 'rtems stm32 init' (#341) from mueller/rtems-update-stm32 into development 
Reviewed-on: #341
 2021-01-12 15:06:46 +01:00
gaisser fa66fafd2c Merge branch 'development' into mueller/rtems-update-stm32 2021-01-12 15:01:33 +01:00
gaisser f81d3e81dc Merge pull request 'Bugfix Device Handler Base' (#339) from mueller/devicehandler-bugfix into development 
Reviewed-on: #339
 2021-01-12 14:45:11 +01:00
gaisser 67879bf12f Merge branch 'development' into mueller/devicehandler-bugfix 2021-01-12 13:28:10 +01:00
gaisser d281b56ce2 Merge pull request 'moved includes' (#335) from mueller/bugfix/defaultcfg into development 
Reviewed-on: #335
 2021-01-12 13:27:57 +01:00
gaisser ba9a604c93 Merge branch 'development' into mueller/bugfix/defaultcfg 2021-01-12 13:27:19 +01:00
gaisser 72e9a9516f Merge pull request 'cmake lists updates' (#336) from mueller/cmake-updates into development 
Reviewed-on: #336
 2021-01-12 13:26:39 +01:00
gaisser c5eae8c41b Merge branch 'development' into mueller/tmstorage 2020-12-23 23:51:54 +01:00
gaisser 426514b9a2 Merge pull request 'Move static constants to DeviceHandlerIF' (#331) from eive/fsfw:mueller/no-raw-command-moved-to-if into development 
Reviewed-on: #331
 2020-12-23 23:51:40 +01:00
gaisser bda9546f51 Merge branch 'development' into mueller/tmstorage 2020-12-22 17:35:26 +01:00
gaisser 52d9a55d06 Merge pull request 'better error handling' (#329) from KSat/fsfw:mueller/osal-windows-tweak into development 
Reviewed-on: #329
 2020-12-22 17:34:41 +01:00
gaisser c19b838657 Merge branch 'development' into mueller/osal-windows-tweak 2020-12-22 17:34:33 +01:00
gaisser f9e36d7268 Merge pull request 'include guards' (#330) from KSat/fsfw:mueller/tmtcpacket-tiny-tweak into development 
Reviewed-on: #330
 2020-12-22 17:31:35 +01:00
gaisser 0eff30e065 Merge branch 'development' into mueller/tmtcpacket-tiny-tweak 2020-12-22 17:31:25 +01:00
gaisser 27fe235700 Merge branch 'development' into mueller/osal-windows-tweak 2020-12-22 17:30:42 +01:00
gaisser bc8c3da1b7 Merge branch 'development' into mueller/tmstorage 2020-12-22 17:30:27 +01:00
gaisser 2706669011 Merge pull request 'time stamper ID added' (#328) from KSat/fsfw:mueller/fwObject-timestamper into development 
Reviewed-on: #328
 2020-12-22 17:28:49 +01:00
gaisser 83458c851e Merge pull request 'timemanager update' (#315) from KSat/fsfw:mueller/timeman-update into development 
Reviewed-on: #315
 2020-12-22 15:50:28 +01:00
gaisser c8ca680d5f Merge branch 'development' into mueller/timeman-update 2020-12-22 15:40:14 +01:00
gaisser d2a9b769eb Merge pull request 'tmtcservices update' (#309) from KSat/fsfw:mueller/tmtcservices-update into development 
Reviewed-on: #309
 2020-12-22 15:39:07 +01:00
gaisser 329cd8862a Merge branch 'development' into mueller/tmtcservices-update 2020-12-22 15:37:22 +01:00
gaisser fe26fc4824 Merge branch 'development' into mueller/timeman-update 2020-12-22 15:36:48 +01:00