Commit Graph

563 Commits

Author SHA1 Message Date
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 8e4ad10627 Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class 2022-04-27 08:46:18 +02:00
Robin Müller 496bc665d6 Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11 2022-04-27 08:45:47 +02:00
Robin Müller 2c8531ea48 Merge remote-tracking branch 'upstream/development' into mueller/refactor-power-switch-if-etc 2022-04-27 08:45:04 +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 88051c9302 Merge remote-tracking branch 'upstream/development' into mueller/refactor-power-switch-if-etc 2022-04-25 15:37: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 d62ee6a611 Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class 2022-04-25 15:23:46 +02:00
Robin Mueller 91ef4ff30b Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11 2022-04-25 15:23:15 +02:00
Robin Müller 4032228005
Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class 2022-04-25 15:15:54 +02:00
Robin Müller 50ce13d596 Merge branch 'development' into mueller/power-switcher-component-upstream 2022-04-25 15:14:38 +02:00
Robin Mueller 68302e7c5e
Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11 2022-04-25 15:14:13 +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 Mueller 35f257800e Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11 2022-04-12 17:10:55 +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 4ed9cc933f Merge branch 'development' into mueller/refactor-power-switch-if-etc 2022-04-11 16:11:27 +02:00
Robin Müller 7af1c86f1c
use default call 2022-04-11 16:10:17 +02:00
Robin Müller bd0b7aa230 Merge branch 'mueller/power-switcher-component-upstream' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/power-switcher-component-upstream 2022-04-11 16:09:32 +02:00
Robin Müller 72e0938f9a
use size instead of capacity on sanity check 2022-04-11 16:09:15 +02:00
Robin Müller dd1b0a9380 Merge branch 'development' into mueller/power-switcher-component-upstream 2022-04-11 16:08:27 +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
Robin Müller 7761b66fe2
delete data from ipc store if reply fails 2022-04-11 14:35:16 +02:00
Robin Müller acc4c8d975
check serialize result as well 2022-04-11 14:33:28 +02:00
Robin Müller fe739aa81a Merge branch 'development' into mueller/propagate-pool-manage-retval 2022-04-11 14:26:34 +02:00
Robin Müller 95f018a0b0
update IF method 2022-04-11 14:07:02 +02:00
Robin Müller 8c2105ae0a
correct init value for object ID 2022-04-11 14:00:37 +02:00
Robin Müller ed2c2af4a0
take upstream impl of local data pool manager 2022-04-11 13:59:38 +02:00
Robin Müller 17771c0497
progagate reply returnvalue 2022-04-11 13:57:18 +02:00
Robin Müller 82df132e7d
tests running again 2022-04-11 13:54:43 +02:00
Robin Müller a02619e5a2
strongly simplified and streamlined IPC MQ Impl
- Generic code was duplicated across all OSALs.
  Is contained in generic base class now
- Remove duplicate documentation
2022-04-11 11:19:38 +02:00
Robin Müller 290db6ccad
Merge remote-tracking branch 'upstream/development' into mueller/update-from-upstream 2022-04-11 08:51:55 +02:00
Robin Müller 94ed582297 Merge branch 'eive/develop' of https://egit.irs.uni-stuttgart.de/eive/fsfw into eive/develop 2022-04-07 19:47:49 +02:00
Robin Müller 47ced1efac
pool entry takes const T* now 2022-04-07 19:47:37 +02:00
Robin Müller f94bc02b6c Merge branch 'eive/develop' into mueller/clock-update 2022-04-07 17:36:04 +02:00
Robin Müller 5bda877d97
improve clock error handler 2022-04-07 17:23:06 +02:00
Jakob Meier 51e7f1c2f2 Merge pull request 'FSFW Update' (#54) from mueller/clock-update into eive/develop
Reviewed-on: #54
2022-04-07 11:33:06 +02:00
Robin Müller 3325cc18fc Merge branch 'eive/develop' into mueller/pool-entry-update 2022-04-07 11:03:56 +02:00
Robin Müller 43917d98c0 Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/master 2022-04-07 11:01:49 +02:00
Robin Müller e3ffcae3e0
emit warning in linux clock 2022-04-07 11:01:39 +02:00
Robin Müller 0677de39aa
make reporting setter public 2022-04-07 00:15:42 +02:00
Robin Müller aded4fae1e
printout improvement 2022-04-04 20:34:31 +02:00
Robin Müller e4c6a69f77
this should also zero-init the pool entries 2022-04-04 15:44:03 +02:00
Robin Müller 761a0c9bac
new pool ctor which only takes len 2022-04-04 15:39:02 +02:00
Robin Müller 2d0e4ba951
applied afmt 2022-04-01 18:38:54 +02:00
Robin Müller 0d549b687d Merge branch 'mueller/refactor-power-switch-if-etc' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/refactor-power-switch-if-etc 2022-04-01 18:38:34 +02:00
Robin Müller 738f572043
added unit tests, minor API change 2022-04-01 18:38:25 +02:00
Robin Müller cab508fd64 Merge branch 'development' into mueller/refactor-power-switch-if-etc 2022-04-01 17:28:14 +02:00
Robin Müller c7daf697a8
add new power switcher component 2022-04-01 17:27:53 +02:00
Robin Müller 518666f822
add power switcher component 2022-04-01 17:01:56 +02:00
Robin Müller c20be13733
change switch type in header as well 2022-04-01 16:40:13 +02:00
Robin Müller 1bc7a91869
apply auto-formatter 2022-04-01 14:08:29 +02:00
Robin Müller 8e26e287c3 Merge remote-tracking branch 'origin/eive/develop' into mueller/master 2022-04-01 14:07:26 +02:00
Robin Müller b3d2d440d7 Merge remote-tracking branch 'origin/eive/develop' into mueller/master 2022-03-31 16:13:47 +02:00
Jakob Meier fbf9626fde Merge branch 'eive/develop' into meier/dhbAlternativeReply 2022-03-31 15:04:55 +02:00
Robin Müller fcb6437388 Merge branch 'development' into mueller/ipc-pass-arbitrary-args-to-mq 2022-03-31 14:42:15 +02:00
Jakob Meier 6c1db8473b get alternative reply from device command info 2022-03-31 14:36:45 +02:00
Jakob Meier 29cf8c9009 fix in getReplyLength 2022-03-31 11:42:39 +02:00
Robin Müller 127fbeb980 Merge branch 'mueller/refactor-power-switch-if-etc' into mueller/refactor-power-switch-if-etc-eive 2022-03-30 17:41:55 +02:00
Robin Müller b42987059a
make dummy power switcher a system object 2022-03-30 17:41:38 +02:00
Robin Müller c2581ff4f5 Merge remote-tracking branch 'origin/eive/develop' into mueller/master 2022-03-30 13:12:11 +02:00
Robin Müller 7b6f68c509
Merge remote-tracking branch 'origin/eive/develop' into mueller/refactor-power-switch-if-etc-eive 2022-03-30 12:14:57 +02:00
Jakob Meier 532607bf8f extended command info 2022-03-30 09:21:03 +02:00
Jakob Meier a230dc4313 command action default arguments 2022-03-30 09:20:46 +02:00
Robin Müller 82fc7f33a8
update afmt scripts to format *.tpp files 2022-03-29 15:11:41 +02:00
Robin Müller bfa77cf810
Add TC scheduler service
- Written by David Woodward as part of the SOURCE project
- Adaptions to make it more generic and compatible to FSFW
2022-03-29 15:07:29 +02:00
Steffen Gaisser a3930dafc5 Moved unused constructors 2022-03-28 21:37:25 +02:00
Steffen Gaisser 4f9797af3b Updated CCSDS CuC Functions 2022-03-28 21:24:33 +02:00
Steffen Gaisser a887f852c8 Merge branch 'development' into mueller/clock-addition 2022-03-28 15:45:58 +02:00
Steffen Gaisser cde184f428 Merge branch 'development' into mohr/task 2022-03-28 15:18:23 +02:00
Steffen Gaisser 631a531212 Merge branch 'development' into mueller/clock-addition 2022-03-28 14:51:23 +02:00
Ulrich Mohr 916ed3f56a added function to add component to a periodic task by pointer 2022-03-28 13:50:42 +02:00
Robin Müller 3ea9f999b7
apply auto-formatter 2022-03-28 12:59:51 +02:00
Robin Müller 79f3c7324a
tweaks for dummy power switcher 2022-03-28 12:59:32 +02:00
Robin Müller 23af170229
small tweaks 2022-03-28 12:59:03 +02:00
Robin Müller b32d1da421
this should compile 2022-03-28 12:57:11 +02:00
Robin Müller 6f0362b956
refactor power module 2022-03-28 12:48:15 +02:00
Robin Müller 60972228ef
reworked power switch interface 2022-03-28 12:47:09 +02:00
Robin Müller 6ea1eabb2d
small order change in DHB 2022-03-28 12:21:25 +02:00
Steffen Gaisser 665d8cd479 Applied clang format 2022-03-25 18:48:53 +01:00
Steffen Gaisser 10398855a9 Added more unittest coverage
Added Mutex for gmtime functions
Moved Statics used in ClockCommon to ClockCommon
2022-03-25 18:47:31 +01:00
Robin Müller 79615e47e4 Merge branch 'eive/develop' into meier/seqCount 2022-03-25 15:48:42 +01:00
Robin Müller d0fec93dc3
argument order inversion 2022-03-25 13:42:49 +01:00
Robin Müller 59ab54b2fb
call corrections 2022-03-25 13:41:37 +01:00
Robin Müller 7095999bd2
remove CCSDSTime function 2022-03-25 13:34:35 +01:00
Robin Müller 7ffb4107d2 added missing docs 2022-03-25 13:34:08 +01:00
Robin Müller 4b5e3e70f7
add option to directly check switch state 2022-03-22 20:35:04 +01:00
Robin Müller 9ce59d3c75
added an additional conversion function
- timeval to TimeOfDay_t
2022-03-22 17:54:09 +01:00
Robin Müller a0dfdfab2c
Allow passing a MqArgs struct to the MQ creation
The struct contains context information (which can be extended)
and an arbitrary user argument in form of a void pointer.
This makes the API a lot more flexible
2022-03-22 17:49:22 +01:00
Robin Müller 3e17011087
small tweaks for local datapool code 2022-03-22 17:42:56 +01:00
Robin Müller bbe21e7e89
doc additions 2022-03-22 16:14:23 +01:00
Robin Müller 2823420c46
more docs 2022-03-22 16:10:20 +01:00
Robin Müller 6dd6f28db0
added active function 2022-03-22 15:55:18 +01:00
Robin Müller d791fc87b7
some improvements for PowerSwitcher 2022-03-22 15:49:04 +01:00
Robin Müller 16f2fa9327
Merge remote-tracking branch 'upstream/development' into mueller/master 2022-03-21 10:12:06 +01:00
Robin Müller 927041209b
added override specifiers 2022-03-21 09:12:56 +01:00
Jakob Meier bac8b40880 Merge branch 'eive/develop' into meier/seqCount 2022-03-17 20:02:29 +01:00
Jakob Meier caf78835b2 added -- operator 2022-03-17 20:00:17 +01:00
Robin Müller b6ed45a85c
small form fix 2022-03-17 19:59:16 +01:00
Robin Müller ddc1cdb1f5
additional docs 2022-03-17 19:22:24 +01:00
Robin Müller 543daaa95a
various tweaks and improvements 2022-03-17 19:19:02 +01:00
Robin Müller 38c87fdeb2
Merge remote-tracking branch 'upstream/development' into eive/develop 2022-03-17 09:47:20 +01:00
Robin Müller 5ca5fe4040
Merge remote-tracking branch 'upstream/development' into eive/develop 2022-03-14 17:50:27 +01:00
Jakob Meier 1b7e0371c3 fixed merge conflict 2022-03-14 15:25:17 +01:00
Steffen Gaisser d2dd16aef3 Merge branch 'development' into mueller/define-fsfw-disabled-printout-upstream 2022-03-14 15:12:37 +01:00
Robin Müller bc95e7c886 Merge branch 'mueller/event-update' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/event-update 2022-03-14 15:08:54 +01:00
Robin Müller fca43b3d34
run auto-formatter 2022-03-14 15:08:45 +01:00
Robin Müller 48c5c3fbd5 Merge branch 'development' into mueller/event-update 2022-03-14 15:07:25 +01:00
Steffen Gaisser 6998626ad4 Merge branch 'development' into mueller/define-fsfw-disabled-printout-upstream 2022-03-14 15:02:07 +01:00
Jakob Meier d4ade5e885 sequence count operator overloading 2022-03-14 15:01:17 +01:00
Steffen Gaisser 24ad858b64 Merge branch 'development' into mueller/countdown-improvement-upstream 2022-03-14 14:46:54 +01:00
Robin Müller 522cbc7f3d
Merge remote-tracking branch 'upstream/development' into mueller/version-getter-upstream 2022-03-14 14:38:27 +01:00
Robin Müller ce5bcc5897
bugfix 2022-03-14 14:37:41 +01:00
Robin Müller 0bdcb40609 minor event changes 2022-03-11 14:25:34 +01:00
Robin Müller fec5f83f4f
minor event changes 2022-03-11 14:25:01 +01:00
Robin Müller 17262a1da9
Merge branch 'mueller/version-getter-upstream' into mueller/master 2022-03-10 09:59:18 +01:00
Robin Müller e684680d60
avoid namespace pollution 2022-03-10 09:58:37 +01:00
Robin Müller aa5d1042f0 undef major and minor 2022-03-10 09:57:37 +01:00
Robin Müller b5d6b9745f
undef major and minor 2022-03-10 09:56:23 +01:00
Robin Müller 60639f56dc Merge branch 'mueller/version-getter' into mueller/master 2022-03-10 09:47:32 +01:00
Robin Müller 7daa9812ff added tests 2022-03-10 09:35:10 +01:00
Robin Müller 97bc71a3ff
added tests 2022-03-10 09:34:29 +01:00
Robin Müller 06577ed78a Merge branch 'mueller/version-getter' into mueller/master 2022-03-09 19:11:57 +01:00
Robin Müller ca508bfe61 getter not required anymore 2022-03-09 19:10:33 +01:00
Robin Müller b27f3b84aa
getter not required anymore 2022-03-09 19:10:05 +01:00
Robin Müller 345a799031 improved version.h 2022-03-09 19:08:17 +01:00
Robin Müller 9509847b84 Merge branch 'mueller/version-getter' into mueller/master 2022-03-09 19:05:30 +01:00
Robin Müller 45b51f9ac8
improved version.h 2022-03-09 19:05:07 +01:00
Jakob Meier d5ff6da40b Merge pull request 'function to get fsfw version' (#43) from mueller/version-getter into eive/develop
Reviewed-on: #43
2022-03-08 12:04:13 +01:00
Robin Müller 238baa8597 call setTimeout 2022-03-08 11:54:20 +01:00
Robin Müller 47d158156b
call setTimeout 2022-03-08 11:52:33 +01:00
Robin Müller d63c01b96f
set timeout in countdown ctor 2022-03-08 11:50:47 +01:00
Robin Müller 3b497dbb8d Merge branch 'mueller/version-getter' into mueller/master 2022-03-08 10:16:56 +01:00
Robin Müller 7932afc315
small form change 2022-03-08 10:13:11 +01:00
Robin Müller d1e3dc4d49 define FSFW_DISABLE_PRINTOUT in any case 2022-03-08 10:12:02 +01:00
Jakob Meier 73f0b9c0dc Merge pull request 'define FSFW_DISABLE_PRINTOUT in any case' (#42) from mueller/define-fsfw-disabled-printout into eive/develop
Reviewed-on: #42
2022-03-08 10:11:45 +01:00
Robin Müller ca70c8c614 function to get fsfw version 2022-03-08 10:07:07 +01:00
Robin Müller 7ca6d1a695
function to get fsfw version 2022-03-08 10:05:18 +01:00
Robin Müller cc3210f366 Merge branch 'eive/develop' into mueller/define-fsfw-disabled-printout 2022-03-08 09:57:43 +01:00
Robin Müller 155d66e534 define FSFW_DISABLE_PRINTOUT in any case 2022-03-08 09:57:11 +01:00
Robin Müller dba3c27b99
define FSFW_DISABLE_PRINTOUT in any case 2022-03-08 09:56:24 +01:00
Robin Müller 84f95e8d76
this is better 2022-03-08 09:45:58 +01:00
Robin Müller 8b1c277c58
better name of invalid mode retval 2022-03-08 09:34:22 +01:00
Steffen Gaisser 8b1af232c3 Added Tests for CCSDS Time, fixed LPM Test
Changed behaviour of Host and Linux Clock
2022-03-07 18:22:10 +01:00
Robin Müller 7571987a1d
Merge branch 'eive/develop' into mueller/master 2022-03-07 15:43:52 +01:00
Robin Müller d6c1041133
Merge remote-tracking branch 'upstream/development' into eive/develop 2022-03-07 15:34:11 +01:00
Steffen Gaisser 7db11588b4 Merge branch 'development' into gaisser_compiler_flags 2022-03-07 14:39:01 +01:00
Robin Müller 10ffa2f44a Merge branch 'development' into mueller/dev-printout-runtime-configurable 2022-03-07 14:20:56 +01:00
Ulrich Mohr 117747970d some forgotten size_t 2022-03-05 22:03:25 +01:00
Robin Müller 3c53e2c259
renamed some ModeIF definitions 2022-03-05 03:01:43 +01:00
Robin Müller 45f0d7fd45
docs 2022-03-04 18:06:57 +01:00
Robin Müller aebab4c73c
Merge remote-tracking branch 'upstream/development' into mueller/master 2022-03-04 15:08:45 +01:00
Robin Müller c3c2e1c0dd
Merge remote-tracking branch 'upstream/development' into eive/develop 2022-03-04 15:08:07 +01:00
Robin Müller 4e6c1cb72a
docs 2022-03-04 00:55:41 +01:00
Robin Müller e2eb6a46b6
Merge branch 'eive/develop' into mueller/master 2022-03-03 13:43:15 +01:00
Robin Müller 0ccaf27fcb
better printout for parameter code 2022-03-01 19:43:21 +01:00
Robin Müller 95078e1103
Merge remote-tracking branch 'upstream/development' into mueller/dev-printout-runtime-configurable 2022-02-28 15:52:54 +01:00
Robin Müller e05e203c83
fix merge conflict 2022-02-28 15:50:27 +01:00
Robin Müller ac036b2a70
Merge remote-tracking branch 'origin/eive/develop' into mueller/gpio-hal-updates 2022-02-28 15:49:11 +01:00
Robin Müller 2d9216ba19
Merge branch 'mueller/gpio-hal-updates' into mueller/master 2022-02-28 15:37:03 +01:00
Robin Müller 2fed161eff
Merge branch 'eive/develop' into mueller/gpio-hal-updates 2022-02-28 15:34:48 +01:00
Steffen Gaisser 68ca6fd122 Merge branch 'development' into gaisser_compiler_flags 2022-02-28 15:29:57 +01:00
Robin Müller 19d217e3b9
Merge remote-tracking branch 'upstream/development' into mueller/dev-printout-runtime-configurable 2022-02-28 15:23:54 +01:00
Steffen Gaisser 20928732ec Merge branch 'development' into gaisser_unit_test_internal_error 2022-02-28 15:19:44 +01:00
Robin Müller cf45eca100
Merge remote-tracking branch 'upstream/development' into mueller/dev-printout-runtime-configurable 2022-02-28 15:00:38 +01:00
Robin Müller c0fa365f8f
Merge remote-tracking branch 'upstream/development' into mueller/delete-obsolete-module 2022-02-28 14:58:28 +01:00
Ulrich Mohr bbacdc5cac Merge pull request 'Linux HAL: Add I2C wiretapping option' (#559) from eive/fsfw:mueller/hal-i2c-wiretapping into development
Reviewed-on: fsfw/fsfw#559
2022-02-28 14:55:21 +01:00