Commit Graph

400 Commits

Author SHA1 Message Date
Jakob Meier b0b75b85a9 Merge branch 'meier/sequenceCount' into meier/develop 2022-05-11 16:54:06 +02:00
Jakob Meier bc994595da sequence count init value 2022-05-11 14:31:49 +02:00
Robin Müller de2d4da161 Merge branch 'eive/develop' into meier/develop 2022-05-05 12:28:34 +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
Robin Müller 7f6c8b8b12
Merge remote-tracking branch 'upstream/development' into eive/develop 2022-05-02 16:15:27 +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 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 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
Robin Müller 07155e2546
extend version handling with git describe 2022-04-22 14:04:18 +02:00
Robin Müller 8c6c8ad3c0
exntend version class to allow add info 2022-04-22 11:58:44 +02:00
Robin Müller af4f002a25 Merge branch 'eive/develop' into meier/develop 2022-04-21 14:30:11 +02:00
Jakob Meier 9f7b9be800 space packet default length 0 2022-04-21 14:24:20 +02:00
Jakob Meier 2c0f3b52e9 Merge pull request 'Space Packet Default Length' (#65) from meier/develop into eive/develop
Reviewed-on: #65
2022-04-21 14:11:09 +02:00
Robin Müller b128ef9da9
Merge remote-tracking branch 'upstream/development' into merge-upstream 2022-04-21 10:37:01 +02:00
Jakob Meier 613dbe9592 default argument 2022-04-21 09:33:06 +02:00
Robin Müller 5ff88129b8
added DLE parser 2022-04-13 14:45:36 +02:00
Jakob Meier ce17be63f4 Merge pull request 'Pool Entry Update V2' (#60) from mueller/pool-entry-update-v2 into eive/develop
Reviewed-on: #60
2022-04-12 19:28:01 +02:00
Robin Müller 97e98eae24 Merge branch 'development' into mueller/ipc-pass-arbitrary-args-to-mq 2022-04-12 17:06:30 +02:00
Robin Müller afce942bf8 Merge branch 'development' into mueller/compiler-warning-fixes-upstream-2 2022-04-11 17:33:04 +02:00
Robin Müller a1d7a56dfa
small fix 2022-04-11 17:14:43 +02:00
Robin Müller cb78fefbb3
afmt 2022-04-11 17:14:04 +02:00
Robin Müller 82f46992f6 Merge branch 'development' into mueller/ipc-pass-arbitrary-args-to-mq 2022-04-11 16:11:57 +02:00
Robin Müller 9947a648df fix compiler warnings 2022-04-11 16:06:13 +02:00
Robin Müller c45328b34d Merge branch 'eive/develop' into mueller/compiler-warning-fixes-upstream 2022-04-11 16:03:52 +02:00
Robin Müller 478b305fbe fix compiler warnings 2022-04-11 16:02:20 +02:00
Robin Müller 942d1e5e4b
Merge remote-tracking branch 'origin/eive/develop' into mueller/ipc-pass-arbitrary-args-to-mq-eive 2022-04-11 14:40:43 +02:00
Robin Müller c0f80680ef Merge branch 'mueller/propagate-pool-manage-retval' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/propagate-pool-manage-retval 2022-04-11 14:35:28 +02:00