fsfw/fsfw
fsfw
/
fsfw
10
3
Fork 6
Code Issues 31 Pull Requests 4 Releases 10 Wiki Activity
3,423 Commits 27 Branches 22 Tags 31 MiB
Commit Graph

3423 Commits

Author SHA1 Message Date
Robin Müller 5273ffa721 Merge remote-tracking branch 'origin/meier/dhbMultipleReplies' into mueller/master 2021-04-25 11:08:54 +02:00
Jakob Meier e7c00b5633 Merge branch 'mueller/master' into meier/dhbMultipleReplies 2021-04-25 10:49:56 +02:00
Robin Müller f2ab07c782 Merge branch 'meier/dhbMultipleReplies' into mueller/master 2021-04-24 23:55:37 +02:00
Robin Müller ff33a1274d deleted old bridge 2021-04-24 23:54:13 +02:00
Robin Müller e7cfd324ae Merge branch 'mueller/master' into meier/dhbMultipleReplies 2021-04-24 23:43:53 +02:00
Jakob Meier 52b549b97c adapted object factory to fsfw changes 2021-04-24 22:54:18 +02:00
Robin Müller cac9a0eecd Merge remote-tracking branch 'upstream/mueller/master' into mueller/master 2021-04-24 22:48:43 +02:00
Robin Müller 56d43f5b49 better output 2021-04-24 22:46:12 +02:00
Jakob Meier 10e7e42388 Merge branch 'development' into meier/dhbMultipleReplies 2021-04-24 18:05:00 +02:00
Jakob Meier fc34e7fd75 Merge branch 'development' of https://egit.irs.uni-stuttgart.de/eive/fsfw into development 2021-04-24 18:04:43 +02:00
Jakob Meier 18a9729c75 added multiple reply support 2021-04-24 13:52:06 +02:00
Robin Müller 1ff52e43a0 Merge remote-tracking branch 'origin/development' into mueller/master 2021-04-22 19:52:44 +02:00
Robin Müller 6a40b8244d Merge pull request 'Subsystems replaced Magic Numbers' (#415) from gaisser_fixes_subsystem into development 
Reviewed-on: #415
 2021-04-22 19:52:08 +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
Steffen 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
Robin Müller 3f91803422
fixes from code review 2021-04-20 18:35:11 +02:00
Robin Müller 5759c2cbe6
Merge remote-tracking branch 'origin/development' into mueller/pus-c-support 2021-04-20 18:03:49 +02:00
Steffen Gaisser c50796b785 Merge pull request 'calling empty ctor now for SerializeElement (coverity)' (#413) from mueller/serialiize-element-coverity into development 
Reviewed-on: #413
 2021-04-20 17:57:00 +02:00
Steffen Gaisser a0caa92a8a Merge branch 'development' into mueller/serialiize-element-coverity 2021-04-20 17:52:01 +02:00
Steffen 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: #411
 2021-04-20 17:51:48 +02:00
Steffen Gaisser fee2ac0eb9 Merge branch 'development' into mueller/linuxtcpip-printout-fix 2021-04-20 17:50:10 +02:00
Steffen Gaisser 2878f21c93 Merge pull request 'Possible bugfix found by coverity in TimeMessage' (#412) from mueller/timemessage-override-fix into development 
Reviewed-on: #412
 2021-04-20 17:49:44 +02:00
Steffen Gaisser 4caf906d96 Merge branch 'development' into mueller/timemessage-override-fix 2021-04-20 17:44:07 +02:00
Steffen Gaisser b38e9ede0c Merge branch 'development' into mueller/linuxtcpip-printout-fix 2021-04-20 17:43:44 +02:00
Steffen Gaisser 17b3672330 Merge pull request 'heater tweaks + coverity fix' (#410) from mueller/heater-coverity into development 
Reviewed-on: #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
Steffen Gaisser 40dae8c961 Merge branch 'development' into mueller/heater-coverity 2021-04-20 16:38:52 +02:00
Steffen Gaisser 9e1f3ee585 Merge pull request 'small coverity tweak for Health Device' (#409) from mueller/health-coverity-fix into development 
Reviewed-on: #409
 2021-04-20 16:38:37 +02:00
Robin Müller e851d8a46c Merge branch 'development' into mueller/heater-coverity 2021-04-20 16:38:33 +02:00
Steffen Gaisser 0038c1dc53 Merge branch 'development' into mueller/health-coverity-fix 2021-04-20 16:38:16 +02:00
Robin Müller 1a3bb5bada Merge branch 'development' into mueller/serialiize-element-coverity 2021-04-20 16:38:08 +02:00
Robin Müller e45b8bc739 Merge remote-tracking branch 'origin/development' into mueller/pus-c-support 2021-04-20 16:31:35 +02:00
Robin Müller dcd72d421e Merge branch 'mueller/master' into mueller/pus-c-support 2021-04-20 16:19:04 +02:00
Robin Müller cc8c3aef3d
removed unused interface 2021-04-20 16:18:39 +02:00
Robin Müller 0055d34d9a
bugfix found by coverity 2021-04-20 16:17:37 +02:00
Robin Müller a2ba3181b9
small coverity tweak 2021-04-20 16:16:35 +02:00
Robin Müller 864621ee37
small fix for linux printout 2021-04-20 16:15:30 +02:00
Robin Müller 54ff8f9341
heater tweaks + coverity fix 2021-04-20 16:12:50 +02:00
Steffen Gaisser e4efc01e34 Merge pull request 'thermal sensor update' (#402) from mueller/thermal-handler into development 
Reviewed-on: #402
 2021-04-20 16:10:20 +02:00
Steffen Gaisser c455fc1417 Merge branch 'development' into mueller/thermal-handler 2021-04-20 16:10:14 +02:00
Robin Müller d792679d49
calling empty ctor now (coverity) 2021-04-20 16:09:50 +02:00
Robin Müller 9352e15405 Merge remote-tracking branch 'origin/development' into mueller/pus-c-support 2021-04-20 16:07:21 +02:00
Robin Müller 38a5e7e618
ctor variable better name 2021-04-20 16:00:01 +02:00
Robin Müller 1cceda8e63
Merge branch 'mueller/thermal-handler' into mueller/master 2021-04-20 15:59:44 +02:00
Robin Müller 0c342ad7fc
minor changes 2021-04-20 15:57:11 +02:00
Robin Müller 524e50a6dd
comment block corrected 2021-04-20 15:54:44 +02:00
Robin Müller 8c4381eca6 Merge remote-tracking branch 'ksat/mueller/master' into mueller/master 2021-04-20 15:49:55 +02:00