Commit Graph

4765 Commits

Author SHA1 Message Date
Robin Müller c4fa7281ae
Merge remote-tracking branch 'upstream/development' into mueller/update-from-upstream 2022-05-25 14:44:21 +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 c835525196
added cast for PUS11 2022-05-25 09:56:32 +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
Jakob Meier 4b128d2435 Merge pull request 'TaskIF refactor SPI refactor' (#89) from mueller/task-if-refactor-spi-refactor into develop
Reviewed-on: #89
2022-05-23 16:22:40 +02:00
Robin Müller f35b0ffbbd
Merge remote-tracking branch 'origin/develop' into mueller/task-if-refactor-spi-refactor 2022-05-23 16:10:49 +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 b8b7756a3e
fix host OSAL 2022-05-22 14:32:48 +02:00
Robin Müller 4cc108f3a1
Merge branch 'develop' of https://egit.irs.uni-stuttgart.de/eive/fsfw into develop 2022-05-20 20:53:48 +02:00
Robin Müller c0292f072e
warning printout correction 2022-05-20 20:52:36 +02:00
Jakob Meier 336ad9b7be Merge pull request 'PUS TC11 bugfix and upstream updates' (#88) from mueller/tc-11-tweaks-eive into develop
Reviewed-on: #88
2022-05-20 17:35:07 +02:00
Robin Müller 942bfafaa3
Merge remote-tracking branch 'upstream/mueller/tc-11-tweaks' into mueller/tc-11-tweaks-eive 2022-05-20 15:39:40 +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 b1e30ae9ff
minor bugfix 2022-05-18 14:39:37 +02:00
Robin Müller 86ca4f246b new base class for periodic tasks 2022-05-18 14:34:08 +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
Jakob Meier e758f0be2e Merge pull request 'TaskIF refactoring and SPI refactoring' (#86) from mueller/task-if-refactor-spi-refactor into develop
Reviewed-on: #86
2022-05-17 20:25:54 +02:00
Robin Müller f9c42d3583
vector as core container is ok 2022-05-17 18:12:05 +02:00
Robin Müller d267a3651b Merge remote-tracking branch 'origin/develop' into mueller/task-if-refactor-spi-refactor 2022-05-17 17:51:42 +02:00
Robin Müller e8023886f6
made auto-formatter even more usable 2022-05-17 13:31:56 +02:00
Robin Müller 14a1b4a7ac
made auto-formatter even more re-usable 2022-05-17 13:31:33 +02:00
Robin Müller e49de9422a Merge branch 'mueller/tcp-server-cache-client-addr' into develop 2022-05-17 13:20:55 +02:00
Robin Müller e1dd27b9dd cache the TCP client address now 2022-05-17 13:16:36 +02:00
Jakob Meier 0ea044c203 Merge pull request 'Update from upstream' (#85) from mueller/update-from-upstream into develop
Reviewed-on: #85
2022-05-16 22:08:28 +02:00
Robin Müller 4b323053ec
Merge remote-tracking branch 'upstream/development' into mueller/update-from-upstream 2022-05-16 15:27: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
Robin Müller 55ed7ab93e
important fix 2022-05-14 16:58:28 +02:00
Robin Müller bcd19045cc
refactored SPI mutex handling 2022-05-14 11:33:43 +02:00
Robin Müller dba08fed7a
refactor task IF 2022-05-14 09:40:31 +02:00
Robin Müller eed6a64597 Merge pull request 'Power Switcher Component' (#596) from eive/fsfw:mueller/power-switcher-component-upstream into development
Reviewed-on: fsfw/fsfw#596
2022-05-13 22:42:23 +02:00
Robin Müller 4841d5d92d
doc update 2022-05-13 17:24:55 +02:00
Robin Müller 5736023ffa Merge branch 'development' into mueller/extend-version-class 2022-05-13 17:22:57 +02:00
Jakob Meier ac78a79ca2 Merge pull request 'Command Executor Improvements' (#83) from mueller/cmd-executer-improvements into develop
Reviewed-on: #83
2022-05-13 14:57:18 +02:00