Commit Graph

4594 Commits

Author SHA1 Message Date
Jakob Meier 9986b91ac7 Merge branch 'develop' into mueller/spi-speed-mode-getter 2022-05-11 16:28:41 +02:00
Jakob Meier c0ff84bb9d Merge pull request 'SPI refactoring' (#80) from mueller/spi-cache-spi-dev-in-com-if into develop
Reviewed-on: #80
2022-05-11 16:28:08 +02:00
Robin Müller dafcaa6007 Merge remote-tracking branch 'origin/develop' into mueller/spi-cache-spi-dev-in-com-if 2022-05-11 15:44:45 +02:00
Robin Müller 5eb52133ac Merge pull request 'sequence count init value' (#81) from meier/sequenceCount into develop
Reviewed-on: #81
2022-05-11 15:43:49 +02:00
Robin Müller 025e7647d3 Merge branch 'develop' into meier/sequenceCount 2022-05-11 15:43:35 +02:00
Robin Müller 0a97077a0e
hotfix 2022-05-11 15:42:52 +02:00
Jakob Meier bc994595da sequence count init value 2022-05-11 14:31:49 +02:00
Robin Müller ab2d7ca98f
update changelog and docs 2022-05-11 11:29:28 +02:00
Robin Müller 56e4fca06f
Some improvements
- Rename mutex to csMutex to better represent its purpose
- Move the empty transfer to update the line polarity to separate function
2022-05-11 11:24:06 +02:00
Robin Müller e06c457743
Cache SPI device name in ComIF
- Architecturally, this makes a lot more sense because
  each ComIF should be responsible for one SPI bus
2022-05-11 11:11:39 +02:00
Robin Müller 5941c21adf
Merge remote-tracking branch 'origin/develop' into mueller/spi-speed-mode-getter 2022-05-11 10:58:13 +02:00
Robin Müller 0e880de0d0
update changelog 2022-05-11 10:54:39 +02:00
Robin Müller 29c3a43760
getter functions for speed and mode 2022-05-11 10:54:13 +02:00
Ulrich Mohr 4499c9bf04 Merge pull request 'Added new functions to add sequences and tables' (#606) from eive/fsfw:mueller/new-ss-adder-functions into development
Reviewed-on: fsfw/fsfw#606
2022-05-10 09:35:16 +02:00
Steffen Gaisser d45cda93b2 Merge pull request 'important bugfix for TCP server' (#618) from mueller/tcp-server-bugfix into development
Reviewed-on: fsfw/fsfw#618
2022-05-09 16:59:54 +02:00
Steffen Gaisser 3448292e8a Merge branch 'development' into mueller/tcp-server-bugfix 2022-05-09 16:56:07 +02:00
Robin Müller c83cc492c0 Merge pull request 'Compile Time Size Check fixed' (#614) from gaisser/fsfw:gaisser_fix_compile_check into development
Reviewed-on: fsfw/fsfw#614
2022-05-09 16:14:44 +02:00
Robin Müller ece32f88f4 Merge remote-tracking branch 'origin/development' into mueller/tcp-server-bugfix 2022-05-09 16:14:17 +02:00
Steffen Gaisser 46cfe65321 Merge pull request 'Health Service Bugfix' (#617) from mueller/health-srv-bugfix into development
Reviewed-on: fsfw/fsfw#617
2022-05-09 16:08:28 +02:00
Robin Müller 96eb8fc21f Merge branch 'development' into gaisser_fix_compile_check 2022-05-09 15:59:44 +02:00
Robin Müller 88fa4f1d9d Merge remote-tracking branch 'origin/development' into mueller/tcp-server-bugfix 2022-05-09 15:55:07 +02:00
Robin Müller 281f91ec5d Merge remote-tracking branch 'origin/development' into mueller/health-srv-bugfix 2022-05-09 15:41:10 +02:00
Steffen Gaisser 118f1da8dd Merge pull request 'Bump C++ standard to C++17' (#622) from mueller/cpp17-update into development
Reviewed-on: fsfw/fsfw#622
2022-05-09 15:33:52 +02:00
Robin Müller 8b0508d50a Merge branch 'development' into gaisser_fix_compile_check 2022-05-09 15:17:28 +02:00
Steffen Gaisser 83de5b4ec1 Merge branch 'development' into mueller/cpp17-update 2022-05-09 15:13:50 +02:00
Steffen Gaisser fe1c51ae6d Merge pull request 'CMake move some directives up top' (#621) from mueller/cmake-fixes into development
Reviewed-on: fsfw/fsfw#621
2022-05-09 15:13:02 +02:00
Robin Müller 10cc954d27 update changelog 2022-05-09 15:09:07 +02:00
Robin Müller 73ff9b97db bump CMAKE_CXX_STANDARD to C++17 2022-05-09 15:07:46 +02:00
Robin Müller b0d71597f0 update changelog 2022-05-09 14:58:39 +02:00
Robin Müller 226f28dc7b Move some directives up top 2022-05-09 14:53:52 +02:00
Robin Müller 6bfdace512
update changelog 2022-05-09 11:00:31 +02:00
Robin Müller 16e55a98ce
important bugfix for TCP server 2022-05-09 10:57:23 +02:00
Robin Müller 79f17843d8
update changelog 2022-05-09 10:50:29 +02:00
Robin Müller e5e163bdbf
mark unused function 2022-05-09 10:47:56 +02:00
Robin Müller 4e4820af05
bugfix for prepareHealthSetReply function 2022-05-09 10:47:23 +02:00
Robin Müller d72b212fa6
cmakelists.txt hotfix 2022-05-06 10:36:01 +02:00
Jakob Meier 43f0841d0a Merge pull request 'Fixed Seq Task use warning' (#78) from mueller/fixed-seq-task-use-warning into eive/develop
Reviewed-on: #78
2022-05-05 13:10:07 +02:00
Robin Müller 9e5fb64d0e Merge branch 'eive/develop' into mueller/fixed-seq-task-use-warning 2022-05-05 12:31:12 +02:00
Robin Müller 71f704c980
remove the dot 2022-05-05 12:29:46 +02:00
Robin Müller a72cc487df Merge pull request 'DHB Reply Timeout' (#74) from meier/develop into eive/develop
Reviewed-on: #74
2022-05-05 12:28:48 +02:00
Robin Müller de2d4da161 Merge branch 'eive/develop' into meier/develop 2022-05-05 12:28:34 +02:00
Jakob Meier 19bd26d998 Merge branch 'meier/develop' of https://egit.irs.uni-stuttgart.de/eive/fsfw into meier/develop 2022-05-05 09:15:23 +02:00
Robin Müller f59b05c86c
use warning instead of error 2022-05-05 02:00:41 +02:00
Jakob Meier 80cb0e682f Merge pull request 'Update GPIO API' (#76) from mueller/update-gpio-api into eive/develop
Reviewed-on: #76
2022-05-04 14:03:28 +02:00
Jakob Meier 8ee26f81f9 dedicated returnvalue for line get failure 2022-05-04 10:36:32 +02:00
Jakob Meier 3556eca8e8 error check on line getter 2022-05-04 10:33:55 +02:00
Jakob Meier a9041b84a3 update read gpio API 2022-05-04 10:27:20 +02:00
Jakob Meier 83d9dbc052 Merge pull request 'improved i2c error printout' (#75) from mueller/i2c-error-handling-improvement into eive/develop
Reviewed-on: #75
2022-05-03 16:50:48 +02:00
Robin Müller 2220120d54
improved i2c error printout 2022-05-03 16:43:15 +02:00
Robin Müller 15eb22f9ee Merge remote-tracking branch 'origin/eive/develop' into meier/develop 2022-05-03 13:03:44 +02:00