Commit Graph

419 Commits

Author SHA1 Message Date
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 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 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
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 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
Robin Müller 281f91ec5d Merge remote-tracking branch 'origin/development' into mueller/health-srv-bugfix 2022-05-09 15:41:10 +02:00
Robin Müller 16e55a98ce
important bugfix for TCP server 2022-05-09 10:57:23 +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 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 de2d4da161 Merge branch 'eive/develop' into meier/develop 2022-05-05 12:28:34 +02:00
Robin Müller f59b05c86c
use warning instead of error 2022-05-05 02:00:41 +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
Steffen Gaisser 3332f68ce7 Tested only std::numeric_limits in MSVC 2022-05-02 17:22:13 +02:00
Robin Müller 7f6c8b8b12
Merge remote-tracking branch 'upstream/development' into eive/develop 2022-05-02 16:15:27 +02:00
Steffen Gaisser 54feb77770 Proposed fix for gcc and clang 2022-05-02 16:14:23 +02:00
Steffen Gaisser 3e9d6bdbb9 Merge branch 'development' into gaisser_cuc_tests 2022-05-02 15:24:32 +02:00
Robin Müller cddf16f941 Merge branch 'development' into mueller/mac-os 2022-05-02 15:15:53 +02:00
Robin Müller 7801c6effe Merge remote-tracking branch 'upstream/development' into mueller/new-ss-adder-functions 2022-05-02 15:09:09 +02:00
Robin Müller daffb6b666 Merge branch 'development' into gaisser_cuc_tests 2022-05-02 14:45:33 +02:00
Robin Müller 4c65109ac0 Merge branch 'development' into meier/spacePacketBugFix 2022-05-02 14:36:24 +02:00
Steffen Gaisser 16714ceb40 Merge branch 'development' into gaisser_cuc_tests 2022-05-02 13:58:17 +02:00
Robin Müller 28015c4735 it compiles and runs 2022-05-01 17:48:49 +02:00
Robin Müller 7d61e67d20 more macos changes 2022-04-30 19:02:41 +02:00
Robin Müller afcbc8be0a changes for MacOS 2022-04-30 18:40:22 +02:00
Robin Müller 7a2269262b Merge branch 'development' into meier/spacePacketBugFix 2022-04-29 08:45:10 +02:00
Jakob Meier 9731dc1e61 space packet bug fix 2022-04-29 07:47:23 +02:00
Jakob Meier 43aad11859 space packet bugfix 2022-04-29 07:43:52 +02:00
Robin Müller bf2e0f2d73 added option to change initial submode 2022-04-28 16:49:13 +02:00
Robin Müller 3225a8e350
added option to change initial submode 2022-04-28 16:48:14 +02:00
Robin Müller 1c4ea6dd0d Merge branch 'eive/develop' into mueller/new-ss-adder-functions-eive 2022-04-28 14:34:20 +02:00
Robin Müller 29b0a352fc
added new functions to add sequences and tables 2022-04-28 14:26:00 +02:00
Jakob Meier 41682aab3f Merge branch 'eive/develop' into meier/develop 2022-04-28 11:45:27 +02:00
Robin Müller 70eb8325a0 Merge remote-tracking branch 'upstream/development' into mueller/compiler-warning-fixes-upstream-2 2022-04-27 08:47:45 +02:00
Robin Müller 5b7ca8c13c
update CHANGELOG.md, apply afmt 2022-04-27 08:39:21 +02:00
Robin Müller 1739edd9b0
warning fix for modern compilers 2022-04-26 10:32:37 +02:00
Robin Müller 466a3639a5
Merge remote-tracking branch 'upstream/development' into mueller/update-fsfw 2022-04-26 10:02:43 +02:00
Jakob Meier 900ef5b912 option to use coutdwon object to time out replies 2022-04-26 09:07:03 +02:00
Robin Müller 80be937d9d Merge remote-tracking branch 'upstream/development' into mueller/compiler-warning-fixes-upstream-2 2022-04-25 15:24:17 +02:00
Robin Müller ff98c42514 Merge branch 'development' into mueller/clock-addition 2022-04-25 14:54:22 +02:00
Robin Müller 24ef96d1b8 Merge branch 'eive/develop' into mueller/extend-version-class-fork 2022-04-22 16:04:55 +02:00
Robin Müller 18f9958332
add git CST and sha info to version ctor 2022-04-22 15:39:44 +02:00
Robin Müller 7e1aed6ad9
apply afmt 2022-04-22 14:04:30 +02:00