KSat/fsfw
19
6
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests 1 Releases Wiki Activity

Base to stage pull requests from #23

Closed
muellerr wants to merge 95 commits from mueller/master into development
pull from: mueller/master
merge into: KSat:development
Conversation 0 Commits 95 Files Changed 69 +1440 -692
muellerr commented 2021-04-11 20:43:51 +02:00
Owner
Copy Link
No description provided.
muellerr added 38 commits 2021-04-11 20:43:52 +02:00
added missing include d1a256cbf6
minor improvements for PUS distributor 0e76333d33
improvements for ccsds distributor 7322a7d0f5
disabled debugging mode 3ff5484415
Merge remote-tracking branch 'upstream/development' into mueller/master 9f8a345e35
fixed temperature sensor object 43ddb44573
super evil bug 80aab5f461
Merge branch 'development' into mueller/master cbeb78f089
now fixed properly 9ee1bd15c4
bugfix for RTEMS e799e45198
coverity fixes 38d929c2a8
coverity fixes f988271be4
more coverity fixes 00d9a4f3ed
another coverity fix bddd8720b2
coverity action helper fix efb7c8760a
coverity fix b30a3aaa38
coverity: initialize member 8f4ab6d7ed
coverity: initialize entry dd367bf083
coverity fix for event message e6a1a7cc2d
small fix DHB 905d525aa2
Merge remote-tracking branch 'origin/development' into mueller/master 9e881b6a16
implemented mq properly 2b84ab018c
typo fix c1f4ae08fb
coverity d92a20a669
this should work 40cc3c383b
bumped version number d3c3a9147a
coverity fix b8c7a65709
coverity d9a0a4f2ea
coverity e0d39b1feb
coverity fix 6db0725aa4
coverity 316310e993
coverity 2e417c787d
Coveritx fixes 83e7dbb1f0
Merge remote-tracking branch 'origin/mueller/host-osal-vector-mq' into mueller/master 7e249db15e
Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw into mueller/master d4b26825af
additional inc path now in IF 5144cbd789
refactored addr print, using AI_PASSIVE now fbe860c6a5
missing include for windows 924ea420a9
muellerr added 36 commits 2021-04-20 15:13:39 +02:00
typo fix 5676969fe3
Small patch for CMakeLists file 01d0bd6c64 
This adds the additional includes to the interface as well
so libraries linking again fsfw get the additional includes
as well.
bumped version to 1.0.0 e50d0738ab
added all coverity fixes b786b53c35
UDP and TCPIP smaller tweaks 06d34efa74 
Using AI_PASSIVE now so the UDP server listens to all
addresses (0.0.0.0) instead of just localhost.
Also implemented address print function properly
proper MQ implementation 547538fbc5
updated distributor modules 5124f314f4
Merge pull request 'typo fix' (#396) from KSat/fsfw:mueller/destination-invalid-typo into development 9731127eaf 
Reviewed-on: fsfw/fsfw#396
Merge branch 'development' into mueller/coverity-fixes 922f145ffa
Merge branch 'development' into mueller/version-bump f4ac5c3844
Merge branch 'development' into mueller/udp-ai-passive-opt f87a10891a
Merge branch 'development' into mueller/tmtcservices-update 3f7915fe49
Merge branch 'development' into mueller/cmake-lists-add-inc-paths 2635ec3d56
Merge pull request 'bumped version to 1.0.0' (#399) from KSat/fsfw:mueller/version-bump into development 321de4e46b 
Reviewed-on: fsfw/fsfw#399
Merge branch 'development' into mueller/udp-ai-passive-opt a8b5fec725
Merge branch 'development' into mueller/cmake-lists-add-inc-paths 01acbaa270
Merge branch 'development' into mueller/coverity-fixes e832487081
Merge pull request 'added all coverity fixes' (#398) from KSat/fsfw:mueller/coverity-fixes into development 6e09e29ec2 
Reviewed-on: fsfw/fsfw#398
Merge branch 'development' into mueller/cmake-lists-add-inc-paths 10bc568560
Merge pull request 'Small patch for CMakeLists file' (#397) from KSat/fsfw:mueller/cmake-lists-add-inc-paths into development b09119cd8d 
Reviewed-on: fsfw/fsfw#397
Merge branch 'development' into mueller/host-osal-vector-mq 4479a2628d
Merge branch 'development' into mueller/tmtcservices-update e1b595d620
Makes linux realtime optional 98add88d14 
Adds new config variable FSFW_USE_REALTIME_FOR_LINUX
Merge remote-tracking branch 'origin/development' into gaisser_make_linux_realtime_optional bad9f67c39
Added a comment and corrected a mistake 03095776f1
Merge remote-tracking branch 'origin/development' into mueller/udp-ai-passive-opt 29cebab790
Merge pull request 'proper MQ implementation' (#401) from mueller/host-osal-vector-mq into development ea8d887a6b 
Reviewed-on: fsfw/fsfw#401
Merge branch 'development' into mueller/udp-ai-passive-opt 32f0131973
Merge pull request 'UDP and TCPIP smaller tweaks' (#400) from mueller/udp-ai-passive-opt into development a62bda97a0 
Reviewed-on: fsfw/fsfw#400
Merge branch 'development' into mueller/tmtcservices-update ec69076652
Merge pull request 'Updating TC Distributor modules' (#403) from mueller/tmtcservices-update into development 69788e1279 
Reviewed-on: fsfw/fsfw#403
Merge branch 'development' into gaisser_make_linux_realtime_optional 91c3692f6d
refixed spelling 153c44601b
Merge remote-tracking branch 'my_fork/gaisser_make_linux_realtime_optional' into gaisser_make_linux_realtime_optional 0ec83afa13
Merge pull request 'Makes linux realtime optional' (#406) from gaisser/fsfw:gaisser_make_linux_realtime_optional into development 1cbeb54b8d 
Reviewed-on: fsfw/fsfw#406
Merge remote-tracking branch 'origin/development' into mueller/master 5471030c32
muellerr added 1 commit 2021-04-20 15:31:23 +02:00
config define moved, better warning a66fc53396
muellerr added 20 commits 2021-04-20 15:50:00 +02:00
small bugfix f1ffa88e07
Merge remote-tracking branch 'upstream/mueller/master' into mueller/master 8b266aa542
Merge remote-tracking branch 'upstream/mueller/master' into mueller/master 7b8928ef47
last coverity fixes 6e6fb62b3c
another coverity fix 438049bb80
another coverity fix 5d93cf12f7
added new option d7d52439d7
refactoring to allow PUS c implementation 9a5f717169
sth broke ae1dab1fce
fixes 4faa5b0685
error found 07f1216316
refactoring continued 9a2fbefc9f
addes pus packet c implementation f906605097
finalized PUS C TM support ed186b04df
pus c working fc7e401ddc
added new test stub cf8a9996a7
doc fix 62e409a9f2
fix for warning print 770356f8b6
Merge remote-tracking branch 'upstream/development' into mueller/master 534b4850df
Merge remote-tracking branch 'ksat/mueller/master' into mueller/master 8c4381eca6
muellerr closed this pull request 2021-04-20 15:50:22 +02:00

Pull request closed

This pull request cannot be reopened because the branch was deleted.
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
Clear labels
bug
Something is not working
duplicate
This issue or pull request already exists
enhancement
New feature
help wanted
Need some help
invalid
Something is wrong
question
More information is needed
wontfix
This won't be fixed
No Label
Milestone
No items
No Milestone
Assignees
Clear assignees
ahinkel dwoodward fbalassa gaisser jgerhards lrajer mdemke meggert meierj mluz mohr msenger mspahr mtompert muellerr nehlichp phoffmann PScheurenbrand taheran tbaumgartl
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: KSat/fsfw#23
No description provided.
Delete Branch "mueller/master"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?