eive/fsfw
15
1
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases 1 Wiki Activity
3,716 Commits 28 Branches 1 Tag
abacfbf2d5550c189e5c0b48f3eb794eb8525f02
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Steffen Gaisser 9d0155d9ae Added a returnvalue 2021-05-11 15:30:49 +02:00
Steffen Gaisser d807998f4d Added Missing includes in Host Osal 
Updated correct defaults for Host MessageQueues
 2021-05-11 15:25:38 +02:00
Steffen Gaisser 8b17c40aa6 Added Network Byte Order 2021-05-11 15:02:04 +02:00
gaisser 08b9e92d25 Merge pull request 'PUS C Telemetry implementation' (#414) from mueller/pus-c-support into development 
Reviewed-on: fsfw/fsfw#414
 2021-05-04 14:43:39 +02:00
gaisser 0a76c5b0b5 Merge pull request 'use timestamp size from FSFWConfig.h' (#418) from mueller/use-config-timestamp-size into development 
Reviewed-on: fsfw/fsfw#418
 2021-04-29 20:54:45 +02:00
gaisser 2f511523cb Merge pull request 'Apollo Sojus Test Project Version 1.0.0' (#408) from development into master 
Reviewed-on: fsfw/fsfw#408
 2021-04-27 14:20:06 +02:00
gaisser 9f83739771 Merge pull request 'dhb multiple replies support' (#416) from eive/fsfw:meier/multipleRepliesDhb into development 
Reviewed-on: fsfw/fsfw#416
 2021-04-27 14:18:15 +02:00
gaisser 20e7fe6cb1 Merge branch 'development' into meier/multipleRepliesDhb 2021-04-26 16:19:57 +02:00
gaisser f8cd8e1e7d Merge pull request 'ParameterHelper: Returnvalue not checked' (#417) from KSat/fsfw:mueller/parameter-bugfix into development 
Reviewed-on: fsfw/fsfw#417
 2021-04-26 16:19:31 +02:00
Steffen Gaisser 4fd443f70b Merge remote-tracking branch 'origin/gaisser_fixes_subsystem' into gaisser_fixes_subsystem 2021-04-20 22:03:52 +02:00
Steffen Gaisser 06631d06a5 Added comments in AssemblyBase and SubsystemBase 2021-04-20 22:01:56 +02:00
gaisser 9244a96e7b Merge branch 'development' into gaisser_fixes_subsystem 2021-04-20 21:07:31 +02:00
Steffen Gaisser 03ef63302b Replaced Magic Numbers 2021-04-20 20:45:15 +02:00
gaisser c50796b785 Merge pull request 'calling empty ctor now for SerializeElement (coverity)' (#413) from mueller/serialiize-element-coverity into development 
Reviewed-on: fsfw/fsfw#413
 2021-04-20 17:57:00 +02:00
gaisser a0caa92a8a Merge branch 'development' into mueller/serialiize-element-coverity 2021-04-20 17:52:01 +02:00
gaisser a91139be76 Merge pull request 'small fix for linux printf printout in TCP/IP code' (#411) from mueller/linuxtcpip-printout-fix into development 
Reviewed-on: fsfw/fsfw#411
 2021-04-20 17:51:48 +02:00
gaisser fee2ac0eb9 Merge branch 'development' into mueller/linuxtcpip-printout-fix 2021-04-20 17:50:10 +02:00
gaisser 2878f21c93 Merge pull request 'Possible bugfix found by coverity in TimeMessage' (#412) from mueller/timemessage-override-fix into development 
Reviewed-on: fsfw/fsfw#412
 2021-04-20 17:49:44 +02:00
gaisser 4caf906d96 Merge branch 'development' into mueller/timemessage-override-fix 2021-04-20 17:44:07 +02:00
gaisser b38e9ede0c Merge branch 'development' into mueller/linuxtcpip-printout-fix 2021-04-20 17:43:44 +02:00
gaisser 17b3672330 Merge pull request 'heater tweaks + coverity fix' (#410) from mueller/heater-coverity into development 
Reviewed-on: fsfw/fsfw#410
 2021-04-20 17:43:19 +02:00
Steffen Gaisser 629814bc9b Just comments 2021-04-20 17:35:28 +02:00
Steffen Gaisser 4fb792447e Small rearragenment in Heater.cpp 2021-04-20 17:29:56 +02:00
gaisser 40dae8c961 Merge branch 'development' into mueller/heater-coverity 2021-04-20 16:38:52 +02:00
gaisser 9e1f3ee585 Merge pull request 'small coverity tweak for Health Device' (#409) from mueller/health-coverity-fix into development 
Reviewed-on: fsfw/fsfw#409
 2021-04-20 16:38:37 +02:00
gaisser 0038c1dc53 Merge branch 'development' into mueller/health-coverity-fix 2021-04-20 16:38:16 +02:00
gaisser e4efc01e34 Merge pull request 'thermal sensor update' (#402) from mueller/thermal-handler into development 
Reviewed-on: fsfw/fsfw#402
 2021-04-20 16:10:20 +02:00
gaisser c455fc1417 Merge branch 'development' into mueller/thermal-handler 2021-04-20 16:10:14 +02:00
gaisser 17adb2cc3e Merge pull request 'small improvements for Linux' (#407) from mueller/linux-small-improvements into development 
Reviewed-on: fsfw/fsfw#407
 2021-04-20 15:46:34 +02:00
gaisser 1af7870b15 Merge branch 'development' into mueller/thermal-handler 2021-04-20 15:11:19 +02:00
gaisser 1cbeb54b8d Merge pull request 'Makes linux realtime optional' (#406) from gaisser/fsfw:gaisser_make_linux_realtime_optional into development 
Reviewed-on: fsfw/fsfw#406
 2021-04-20 15:10:44 +02:00
Steffen Gaisser 0ec83afa13 Merge remote-tracking branch 'my_fork/gaisser_make_linux_realtime_optional' into gaisser_make_linux_realtime_optional 2021-04-20 15:06:40 +02:00
Steffen Gaisser 153c44601b refixed spelling 2021-04-20 15:04:42 +02:00
gaisser 91c3692f6d Merge branch 'development' into gaisser_make_linux_realtime_optional 2021-04-20 14:39:56 +02:00
gaisser 69788e1279 Merge pull request 'Updating TC Distributor modules' (#403) from mueller/tmtcservices-update into development 
Reviewed-on: fsfw/fsfw#403
 2021-04-20 14:39:07 +02:00
gaisser ec69076652 Merge branch 'development' into mueller/tmtcservices-update 2021-04-20 14:38:59 +02:00
gaisser a62bda97a0 Merge pull request 'UDP and TCPIP smaller tweaks' (#400) from mueller/udp-ai-passive-opt into development 
Reviewed-on: fsfw/fsfw#400
 2021-04-20 14:38:16 +02:00
gaisser 32f0131973 Merge branch 'development' into mueller/udp-ai-passive-opt 2021-04-20 14:38:01 +02:00
gaisser 9784d5123b Merge branch 'development' into mueller/thermal-handler 2021-04-20 14:37:04 +02:00
gaisser ea8d887a6b Merge pull request 'proper MQ implementation' (#401) from mueller/host-osal-vector-mq into development 
Reviewed-on: fsfw/fsfw#401
 2021-04-20 14:36:47 +02:00
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 e1b595d620 Merge branch 'development' into mueller/tmtcservices-update 2021-04-20 11:38:42 +02:00
gaisser 39940823d1 Merge branch 'development' into mueller/thermal-handler 2021-04-13 14:44:43 +02:00
gaisser 4479a2628d Merge branch 'development' into mueller/host-osal-vector-mq 2021-04-13 14:32:18 +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: fsfw/fsfw#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: fsfw/fsfw#398
 2021-04-13 14:22:53 +02:00
gaisser 43fb05ac5d Merge branch 'development' into mueller/thermal-handler 2021-04-13 14:02:24 +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: fsfw/fsfw#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 3f7915fe49 Merge branch 'development' into mueller/tmtcservices-update 2021-04-12 16:09:56 +02:00
gaisser f87a10891a Merge branch 'development' into mueller/udp-ai-passive-opt 2021-04-12 16:09:42 +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: fsfw/fsfw#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: fsfw/fsfw#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: fsfw/fsfw#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: fsfw/fsfw#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: fsfw/fsfw#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: fsfw/fsfw#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: fsfw/fsfw#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