KSat
/
fsfw
forked from fsfw/fsfw
15
4
Fork 0
Code Issues Pull Requests Releases Wiki Activity
4,522 Commits 12 Branches 1 Tag 16 MiB
Commit Graph

4522 Commits

Author SHA1 Message Date
Robin Müller 1d4fd70101 Merge branch 'mueller/tc-packet-pus-improvement' into mueller/cfdp-state-machine 2022-06-13 16:23:44 +02:00
Robin Müller 15d69e64f3
renamed new class, small tweak 2022-06-13 16:20:37 +02:00
Robin Müller d74bcbb1f8 Merge branch 'mueller/tc-packet-pus-improvement' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/tc-packet-pus-improvement 2022-06-13 16:14:37 +02:00
Robin Müller c00cb1680d
removed unneeded function 2022-06-13 16:14:30 +02:00
Robin Müller 7109422e2c Merge branch 'development' into mueller/tc-packet-pus-improvement 2022-06-13 16:13:42 +02:00
Robin Müller efd12544df
this should get the job done 2022-06-13 16:13:15 +02:00
Robin Müller 90bccc744e Merge pull request 'Fix SPI ComIF shadowing warning' (#639) from KSat/fsfw:mueller/spi-com-if-shadowing into development 
Reviewed-on: fsfw/fsfw#639
 2022-06-13 14:35:46 +02:00
Robin Müller ab89108c55 Merge pull request 'some fixes for TC Map printout function' (#640) from KSat/fsfw:mueller/pus-11-printout-fixes into development 
Reviewed-on: fsfw/fsfw#640
 2022-06-13 14:29:36 +02:00
Robin Müller f512d98c08 Merge branch 'mueller/spi-com-if-shadowing' into mueller/cfdp-state-machine 2022-06-13 11:00:50 +02:00
Robin Müller 29c4fc33da Merge branch 'mueller/pus-11-printout-fixes' into mueller/cfdp-state-machine 2022-06-13 11:00:41 +02:00
Robin Müller e67fc2ab0d
some fixes for TC Map printout function 2022-06-13 10:56:37 +02:00
Robin Müller 71ce966531 Merge branch 'mueller/spi-com-if-shadowing' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/spi-com-if-shadowing 2022-06-13 10:54:25 +02:00
Robin Müller 6b0f4a159f Merge remote-tracking branch 'upstream/development' into mueller/spi-com-if-shadowing 2022-06-13 10:54:20 +02:00
Robin Müller 4a06b558c1 Fix SPI ComIF shadowing warning 2022-06-13 10:53:04 +02:00
Robin Müller 6d921f03fd Fix SPI ComIF shadowing warning 2022-06-13 10:50:49 +02:00
Robin Müller e760f5ab75 Merge branch 'mueller/tc-packet-pus-improvement' into mueller/cfdp-state-machine 2022-06-13 09:41:48 +02:00
Robin Müller b069ed0fec Merge remote-tracking branch 'upstream/development' into mueller/cfdp-state-machine 2022-06-13 09:38:59 +02:00
Robin Müller 72c7bd5e03
Merge remote-tracking branch 'upstream/development' into mueller/cfdp-state-machine 2022-06-13 09:28:39 +02:00
Robin Müller 17f54006b8 Merge pull request 'rtems fixes' (#635) from mueller/rtems-fixes into development 
Reviewed-on: fsfw/fsfw#635
 2022-06-08 16:12:53 +02:00
Robin Müller e03f55604a rtems fixes 2022-06-08 12:11:26 +02:00
Robin Müller 12046a2db6 Merge pull request 'bump etl to 20.28.0' (#634) from mueller/bump-etl into development 
Reviewed-on: fsfw/fsfw#634
 2022-06-08 11:09:42 +02:00
Robin Müller c697d0f8ab
bump etl to 20.28.0 2022-05-30 10:34:03 +02:00
Robin Müller b9fbb4fd4c Merge branch 'development' into mueller/tc-packet-pus-improvement 2022-05-27 15:15:39 +02:00
Steffen Gaisser c7cf8e710d Merge pull request 'return end iterator instead of crashing' (#633) from mueller/possible-fix-ccsds-distrib into development 
Reviewed-on: fsfw/fsfw#633
 2022-05-25 13:59:35 +02:00
Robin Müller 7dddcdfd55 Merge branch 'development' into mueller/possible-fix-ccsds-distrib 2022-05-25 09:52:33 +02:00
Steffen Gaisser 261eea381e Merge pull request 'PUS11 TC sched update and bugfixes' (#632) from mueller/tc-11-tweaks into development 
Reviewed-on: fsfw/fsfw#632
 2022-05-24 17:48:06 +02:00
Robin Müller e59f1f26bf
return end iterator instead of crashing 2022-05-24 14:33:18 +02:00
Robin Müller f7cde80088
added missing delete 2022-05-24 14:32:35 +02:00
Robin Müller e60a665de4
added 3 new subservices 2022-05-24 11:52:29 +02:00
Robin Müller 34658ef7db
afmt 2022-05-24 10:40:25 +02:00
Robin Müller 9368ae81e5 Merge branch 'development' into mueller/tc-packet-pus-improvement 2022-05-23 15:56:26 +02:00
Robin Müller f288d5120d Merge branch 'development' into mueller/tc-11-tweaks 2022-05-23 15:34:00 +02:00
Steffen Gaisser 5a425a1c58 Merge pull request 'cache the TCP client address now' (#630) from eive/fsfw:mueller/tcp-server-cache-client-addr into development 
Reviewed-on: fsfw/fsfw#630
 2022-05-23 14:42:12 +02:00
Steffen Gaisser 5e62258aa6 Merge branch 'development' into mueller/tcp-server-cache-client-addr 2022-05-23 14:38:05 +02:00
Robin Müller 0b53b4873f
bugfix for srv11 2022-05-20 11:20:31 +02:00
Robin Müller 8e2597f609
clang-format 2022-05-20 11:09:03 +02:00
Robin Müller dac700b80a
static STORE renamed 2022-05-20 08:59:06 +02:00
Robin Müller d0fc360697
apply afmt 2022-05-20 08:34:14 +02:00
Robin Müller 576414438c Merge pull request 'Apply cmake-format and auto-format script on all CMakeLists.txt file' (#628) from eive/fsfw:mueller/apply-clang-format-on-all-files into development 
Reviewed-on: fsfw/fsfw#628
 2022-05-18 13:14:18 +02:00
Robin Müller 13cda86d23
remove commented code 2022-05-18 13:13:24 +02:00
Robin Müller e1dd27b9dd cache the TCP client address now 2022-05-17 13:16:36 +02:00
Robin Müller 618f76ae78
improved TcPacketPus API 2022-05-17 10:14:34 +02:00
Robin Müller ee2f8d6956 Merge pull request 'Update FSFW from Upstream' (#27) from mueller/update-from-upstream into develop 
Reviewed-on: #27
 2022-05-17 10:06:58 +02:00
Robin Müller 7fee852dbd
re-apply updated auto-formatter 2022-05-16 14:55:15 +02:00
Robin Müller 1e7032f89c
minor improvements for auto-formatter 2022-05-16 14:54:43 +02:00
Robin Müller f0debecbbc Merge pull request 'Extend version handling and class' (#601) from eive/fsfw:mueller/extend-version-class into development 
Reviewed-on: fsfw/fsfw#601
 2022-05-16 14:52:15 +02:00
Robin Müller ef9d7aa7d3 Merge branch 'development' into mueller/extend-version-class 2022-05-16 14:42:23 +02:00
Robin Müller b8fd2db434 Merge pull request 'Add PUS TC scheduler service' (#594) from KSat/fsfw:mueller/add-tc-scheduler-pus-11 into development 
Reviewed-on: fsfw/fsfw#594
 2022-05-16 14:32:19 +02:00
Robin Müller 878e32cbe8 Merge branch 'development' into mueller/add-tc-scheduler-pus-11 2022-05-16 14:29:02 +02:00
Robin Müller 4821706561 Merge branch 'development' into mueller/extend-version-class 2022-05-16 14:16:53 +02:00