eive/fsfw
eive
/
fsfw
forked from fsfw/fsfw
14
1
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity
5,227 Commits 28 Branches 1 Tag 24 MiB
Commit Graph

791 Commits

Author SHA1 Message Date
Robin Müller 4989bd0f02
fixes for Linux OSAL clock 2022-07-25 10:56:19 +02:00
Robin Müller 832367fb30
replace some API components with references 2022-07-25 10:50:52 +02:00
Robin Müller 63ee88af17
added base for tm store test 2022-07-25 10:38:44 +02:00
Robin Müller 4921527022
replace c include 2022-07-25 10:31:49 +02:00
Robin Müller f0c8fd2688
some renaming 2022-07-25 10:24:43 +02:00
Robin Müller d474c4a7ee
store helper 2022-07-23 11:43:48 +02:00
Robin Müller f629d60aaf
Merge branch 'mueller/expand-serialize-if' into mueller/refactor-tmtc-stack 2022-07-23 11:15:20 +02:00
Robin Müller b809f90e72
added unittests for new helpers 2022-07-23 11:10:44 +02:00
Robin Müller b66fd63cb4
remove doubly defines 2022-07-23 10:29:19 +02:00
Robin Müller fd55de9e95 Merge branch 'mueller/expand-serialize-if' into mueller/refactor-tmtc-stack 2022-07-23 10:28:13 +02:00
Robin Müller 8e05fc0417
added a few more methods 2022-07-23 10:28:01 +02:00
Robin Müller 55a238d553
extended serialize if further 2022-07-23 10:24:56 +02:00
Robin Müller 9ccd9fd775
Merge branch 'mueller/expand-serialize-if' into mueller/refactor-tmtc-stack 2022-07-23 10:07:10 +02:00
Robin Müller ddad97033d
expand serialize IF further 2022-07-23 10:06:42 +02:00
Robin Müller 99aaf7068d
some tests 2022-07-23 10:05:57 +02:00
Robin Müller c9d37e8d62 Merge branch 'mueller/expand-serialize-if' into mueller/refactor-tmtc-stack 2022-07-23 10:05:14 +02:00
Robin Müller 42a1d6cccd
default implementation of simple serialize/deserialize 2022-07-23 10:03:42 +02:00
Robin Müller 133894f4ba
add basic CCSDS tests 2022-07-22 18:46:58 +02:00
Robin Müller b350018cad
completed basic test set 2022-07-22 18:22:35 +02:00
Robin Müller cecaec6007
PUS TM creator tests done 2022-07-22 17:09:44 +02:00
Robin Müller f28b9ea61b
APID getter bugfix 2022-07-22 16:41:32 +02:00
Robin Müller 9275ccb79b
added some missing implementations 2022-07-22 16:09:18 +02:00
Robin Müller 67776241de
verify successfull TM serialization 2022-07-22 16:06:31 +02:00
Robin Müller 0dfaba81f9
finished basic TC unittests 2022-07-21 19:10:15 +02:00
Robin Müller affde6bad5
rename namespace 2022-07-21 18:21:10 +02:00
Robin Müller 0981ee6f7e
minor changes, virtual dtors added 2022-07-21 18:17:37 +02:00
Robin Müller 61bc867bed
delete code which is not used anymore 2022-07-21 17:57:31 +02:00
Robin Müller 5af3138e81
fnished PUS TC creator unittests 2022-07-21 17:48:11 +02:00
Robin Müller 08e0b0f1a0
added sp reader unittests 2022-07-21 14:40:00 +02:00
Robin Müller 23f264096c
delete a few old classes 2022-07-21 14:05:31 +02:00
Robin Müller e5ee96259d
some fixes 2022-07-21 13:48:58 +02:00
Robin Müller 9bbe1dc716 Merge branch 'development' into mueller/possible-ring-buffer-fix 2022-07-21 13:23:44 +02:00
Robin Müller d8b6cb39ac
various bugfixes and improvements 2022-07-21 11:34:11 +02:00
Robin Müller be35bd53a6
switched to new tmtc stack API 2022-07-20 22:21:15 +02:00
Robin Müller 9860061fc6
create new TmSendHelper 2022-07-20 11:45:50 +02:00
Robin Müller d80941514f
start refactoring PUS TM handling 2022-07-20 11:43:16 +02:00
Robin Müller 6c636661b6
a lot of refactoring 2022-07-19 18:13:25 +02:00
Robin Müller 5fffbd4a90
start PUS TC refactoring 2022-07-18 18:36:41 +02:00
Robin Müller 74794bb71b
apply auto-formatter 2022-07-18 16:08:06 +02:00
Robin Müller ddf38b65c3
apply auto-formatter 2022-07-18 16:07:26 +02:00
Robin Müller 490a80e49f
Merge remote-tracking branch 'origin/development' into mueller/refactor-tmtc-stack 2022-07-18 15:26:31 +02:00
Robin Müller 4da18172b3 Merge branch 'development' into mueller/possible-ring-buffer-fix 2022-07-18 14:37:56 +02:00
Robin Müller 7e2fdc06cd
hmm this is problematic 2022-07-18 14:05:43 +02:00
Robin Müller 3c72a42ce1
added basic sp creator test 2022-07-18 13:51:02 +02:00
Robin Müller 78b09ed0c9
fixes includes 2022-07-18 11:58:55 +02:00
Robin Müller fdf35232ee
some fixes 2022-07-18 11:47:00 +02:00
Robin Müller 8465670374
separate unittest folder 2022-07-18 11:42:51 +02:00
Robin Müller 0c5f623780
additional ctor for space packet creator 2022-07-18 10:53:55 +02:00
Robin Müller d7a2eada94
add space packet creator class 2022-07-18 10:42:56 +02:00
Robin Müller 546e173cef
add new PUS TC IF 2022-07-18 10:29:39 +02:00
Robin Müller 0a7f2c6646
refactored space packet interface 2022-07-18 10:20:26 +02:00
Robin Müller 3b23fb77b4
add obsolete add_subdirectory calls 2022-07-18 09:01:45 +02:00
Robin Müller 6f7be281ef
move HAL and tests folder 2022-07-18 08:59:40 +02:00
Jakob Meier ecac08814e better naming for functions which reset states of replies 2022-07-14 09:15:13 +02:00
Jakob Meier e8b8fff0b5 Merge branch 'development' into meier/dhbReplyTimeout 2022-07-14 09:01:28 +02:00
Jakob Meier 4d34f93cfc missing reset of timedOut value in loop of decrementDeviceReplyMap 2022-07-14 08:58:23 +02:00
Ulrich Mohr adbf375f38 some small fixes to dhb countdown addition 2022-07-13 21:58:07 +02:00
Ulrich Mohr 2e42f53682 Merge pull request 'New PoolEntry constructor' (#651) from eive/fsfw:mueller/new-pool-entry-ctor into development 
Reviewed-on: fsfw/fsfw#651
 2022-07-13 17:43:56 +02:00
Ulrich Mohr c519b70302 Merge pull request 'printout tweak' (#652) from mueller/printout-tweak-mq-linux-osal into development 
Reviewed-on: fsfw/fsfw#652
 2022-07-13 17:35:53 +02:00
Ulrich Mohr 8a2068aca6 Merge pull request 'clang-tidy changes for controller module' (#648) from clang-tidy-controllers into development 
Reviewed-on: fsfw/fsfw#648
 2022-07-13 16:49:15 +02:00
Robin Müller 32fea9838e
add new pool entry constructor 
- This constructor allows to simply specify the length.
  This is also the new default constructor for scalar values
  which are initially invalid
 2022-07-08 17:56:44 +02:00
Robin Müller 904ae2cc0e Merge remote-tracking branch 'origin/irini' into develop 2022-07-08 16:34:24 +02:00
Robin Müller 14bac9a418
clang-tidy changes for controller module 2022-07-04 11:48:36 +02:00
Robin Müller 3bef73708f
clang-tidy changes for actions module 2022-07-04 11:44:26 +02:00
Robin Müller a4247cd723
Merge remote-tracking branch 'upstream/development' into mueller/update-from-upstream 2022-07-04 10:53:52 +02:00
Jakob Meier df97bbc691 run auto-formatter 2022-06-23 11:56:46 +02:00
Jakob Meier 2d2f65bf89 moved activation of periodic replies to updatePeriodicReply 2022-06-23 11:54:51 +02:00
Robin Müller 3e9ae62b28 Merge branch 'development' into meier/dhbReplyTimeout 2022-06-21 10:49:06 +02:00
Robin Müller 2ebefdffae
Merge remote-tracking branch 'upstream/development' into mueller/possible-ring-buffer-fix 2022-06-21 10:49:03 +02:00
Robin Müller 45792e86b9 Merge remote-tracking branch 'upstream/development' into mueller/possible-ring-buffer-fix 2022-06-21 10:48:04 +02:00
Robin Müller 5abbf42e9f
some form updates 2022-06-21 00:49:58 +02:00
Robin Müller 687700cee8 Merge branch 'development' into gaisser_storage_accessor_fix 2022-06-20 16:36:49 +02:00
Robin Müller 394ce2ec3e Merge pull request 'LocalDataPoolManager Warning Text' (#642) from meier/debug-info into development 
Reviewed-on: fsfw/fsfw#642
 2022-06-20 16:15:30 +02:00
Steffen Gaisser b60e4bcb90 Fix StorageAccessor move assignment 
* Added Unittest for this
* Fixed missing include in test
 2022-06-20 15:15:33 +02:00
Steffen Gaisser 7f57a8784a Fixed deadline missed call on linux 2022-06-20 15:02:16 +02:00
Irini Kosmidou 1910a7838c compile DleParser 2022-06-20 11:04:06 +02:00
Robin Müller d47a908117 Merge branch 'development' into mueller/task-if-refactoring 2022-06-20 09:40:31 +02:00
Jakob Meier af890c6218 corrected warning text 2022-06-16 07:55:57 +02:00
Jakob Meier fc742e4270 Merge branch 'development' into meier/debug-info 2022-06-16 07:22:43 +02:00
Jakob Meier b5183a19fc minor change in debug text 2022-06-16 07:03:58 +02:00
Robin Müller 69859fdbc9
rerun afmt 2022-06-13 16:21:20 +02:00
Robin Müller a682bbe400
remove static missed deadline 2022-06-13 14:23:56 +02:00
Robin Müller e67fc2ab0d
some fixes for TC Map printout function 2022-06-13 10:56:37 +02:00
Robin Müller a0ee86ace8
use override instead of virtual as recommended 2022-06-08 17:36:20 +02:00
Robin Müller cb8a4bbbec
Merge remote-tracking branch 'origin/development' into mueller/task-if-refactoring 2022-06-08 17:33:12 +02:00
Robin Müller ad53b48fcb explicitely ignore returnvalue in linux OSAL 2022-06-08 12:12:09 +02:00
Robin Müller dee40f9079 fixed unittests 2022-06-08 12:12:09 +02:00
Robin Müller 92ec24352f fix unit test 2022-06-08 12:12:09 +02:00
Robin Müller 3f9e459f48 update changelog 2022-06-08 12:12:09 +02:00
Robin Müller e0c7f8d51d apply afmt 2022-06-08 12:12:09 +02:00
Robin Müller eb79386c92 new addSlot function taking executable pointer 2022-06-08 12:12:09 +02:00
Robin Müller 4542f31c40 improved custom checker API 
- More clang-tidy improvements
 2022-06-08 12:12:09 +02:00
Robin Müller 689fb378d8 a regular set should suffice here 2022-06-08 12:12:09 +02:00
Robin Müller 7c0ba59993 remove include 2022-06-08 12:12:09 +02:00
Robin Müller 28873fc87b refactores rtems task module 2022-06-08 12:12:09 +02:00
Robin Müller d8985c141e some clang tidy stuff and bugfixes 2022-06-08 12:12:09 +02:00
Robin Müller 7602b15256 important bugfix 2022-06-08 12:12:09 +02:00
Robin Müller d1a82bceed rtems fixes 2022-06-08 12:12:09 +02:00
Robin Müller 7292b02907 refactor freeRTOS task components 2022-06-08 12:12:09 +02:00
Robin Müller 347714d53a refactored and tested hosted and linux task IF 2022-06-08 12:12:09 +02:00
Robin Müller f230fa1617 continued refactoring 2022-06-08 12:12:09 +02:00
Robin Müller 93615b100c continued refactoring 2022-06-08 12:12:09 +02:00
Robin Müller e18d3d559e refactoring host osal 2022-06-08 12:12:09 +02:00
Robin Müller 08ff061d07 minor bugfix 2022-06-08 12:12:09 +02:00
Robin Müller cc351c1066 new base class for periodic tasks 2022-06-08 12:12:09 +02:00
Robin Müller e9895559a3 vector as core container is ok 2022-06-08 12:12:09 +02:00
Robin Müller eda5b8f593 refactor task IF 2022-06-08 12:12:09 +02:00
Robin Müller e03f55604a rtems fixes 2022-06-08 12:11:26 +02:00
Jakob Meier ae2f7219fd run auto-formatter 2022-06-06 11:55:42 +02:00
Jakob Meier 161dbde0d7 fixed merge conflicts 2022-06-06 10:30:17 +02:00
Jakob Meier bf673c56c6 unit test for dhb 2022-06-05 12:52:55 +02:00
Robin Müller 1d1d91f591 Merge branch 'develop' into meier/dhb-disable-pending-commands 2022-05-27 14:40:18 +02:00
Jakob Meier 95a64e1da3 wrong initialization order 2022-05-27 13:04:21 +02:00
Jakob Meier ab68817e9a removed debugging printout 2022-05-26 02:06:05 +02:00
Jakob Meier 36652e6fce Merge branch 'develop' into meier/dhb-disable-pending-commands 2022-05-26 02:04:33 +02:00
Jakob Meier 3749f31ab4 disable pending commands and replies in MODE_OFF transition 2022-05-26 02:03:39 +02:00
Jakob Meier ebbe08639c Merge pull request 'TaskIF refactoring continued' (#91) from mueller/task-if-refactoring-eive into develop 
Reviewed-on: #91
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
 2022-05-25 16:11:22 +02:00
Jakob Meier d286fc1855 Merge pull request 'service 3 and local HK man improvements' (#92) from mueller/hk-improvements into develop 
Reviewed-on: #92
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
 2022-05-25 16:10:32 +02:00
Robin Müller cf35cca923
Merge remote-tracking branch 'origin/develop' into mueller/task-if-refactoring-eive 2022-05-25 15:41:07 +02:00
Robin Müller c328891030 Merge remote-tracking branch 'origin/develop' into mueller/task-if-refactoring-eive 2022-05-25 15:38:14 +02:00
Jakob Meier 76a459a02c Merge pull request 'use better type for stored limit' (#93) from mueller/tmtc-bridge-tweaks into develop 
Reviewed-on: #93
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
 2022-05-25 15:24:57 +02:00
Robin Müller c4fa7281ae
Merge remote-tracking branch 'upstream/development' into mueller/update-from-upstream 2022-05-25 14:44:21 +02:00
Robin Müller ac62443f31
use better type for stored limit 2022-05-25 14:30:58 +02:00
Robin Müller 8cfe848dfe
service 3 and local HK man improvements 2022-05-25 14:30:00 +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
Robin Müller 24069dfd78
removed [[maybe_unused]] 2022-05-24 16:22:27 +02:00
Robin Müller 40cc557978
Merge remote-tracking branch 'upstream/mueller/task-if-refactoring' into mueller/task-if-refactoring-eive 2022-05-24 15:42:08 +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
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 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
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 3a16290707
refactored and tested hosted and linux task IF 2022-05-19 00:44:34 +02:00
Robin Müller 08f1ebf9fc
continued refactoring 2022-05-18 23:45:38 +02:00
Robin Müller 64e7d4bb5e
continued refactoring 2022-05-18 18:15:31 +02:00
Robin Müller 1886da0d3f
refactoring host osal 2022-05-18 15:42:18 +02:00
Robin Müller b47eb0a7ff
minor bugfix 2022-05-18 14:40:54 +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 e87b5a0207
new base class for periodic tasks 2022-05-18 14:32:35 +02:00
Robin Müller d504589c3c Merge remote-tracking branch 'upstream/development' into mueller/task-if-refactoring 2022-05-18 13:20:39 +02:00
Robin Müller 13cda86d23
remove commented code 2022-05-18 13:13:24 +02:00
Robin Müller 18b342e94b vector as core container is ok 2022-05-17 18:12:37 +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 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
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 d871f55a89
Merge remote-tracking branch 'upstream/development' into mueller/possible-ring-buffer-fix 2022-05-16 15:13:47 +02:00
Robin Müller 7fee852dbd
re-apply updated auto-formatter 2022-05-16 14:55: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 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 dba08fed7a
refactor task IF 2022-05-14 09:40:31 +02:00
Robin Müller 7df1922633
refactor task IF 2022-05-14 09:38:59 +02:00
Robin Müller 4841d5d92d
doc update 2022-05-13 17:24:55 +02:00
Robin Müller 970f039e85
Merge remote-tracking branch 'origin/development' into mueller/extend-version-class 2022-05-13 13:21:01 +02:00
Robin Müller ff40a71582
Merge remote-tracking branch 'upstream/development' into mueller/possible-ring-buffer-fix 2022-05-13 11:30:32 +02:00
Robin Müller 271057ca6b
Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class 2022-05-13 11:28:54 +02:00
Robin Müller 861335212e Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11 2022-05-13 00:30:18 +02:00
Robin Müller 038e47a46e
better returncode handling 2022-05-13 00:30:01 +02:00
Robin Müller 02473a0cd7
Merge remote-tracking branch 'origin/develop' into mueller/health-if-extension-eive 2022-05-12 20:11:45 +02:00
Robin Müller ab45aa1296
HasHealthIF additions 2022-05-12 20:06:10 +02:00
Robin Müller 171c48495c Merge remote-tracking branch 'upstream/development' into mueller/power-switcher-component-upstream 2022-05-12 19:07:12 +02:00
Robin Müller b8cfb36426
added additional explicit returnvalues 2022-05-12 17:05:58 +02:00
Robin Müller c4c340fde1
lot of refactoring 2022-05-12 16:56:06 +02:00
Robin Müller 9a4c7589cc Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11 2022-05-12 15:52:47 +02:00
Robin Müller d11f898f70
update dummy power switcher docs 2022-05-12 15:02:06 +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 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 e1604b292c Merge branch 'development' into mueller/possible-ring-buffer-fix 2022-05-11 11:34:32 +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 dd986fefd3
experimenting with PRE_BUILD command 2022-05-10 11:51:25 +02:00
Robin Müller b38329aa0e Merge branch 'development' into mueller/extend-version-class 2022-05-10 11:19:48 +02:00
Robin Müller c5b4499d98
Merge remote-tracking branch 'upstream/development' into mueller/refactor-power-switch-if-etc 2022-05-10 09:58:21 +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
Robin Müller be6a492022 Merge branch 'development' into mueller/extend-version-class 2022-05-09 22:34:09 +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 eb494707af Merge remote-tracking branch 'upstream/development' into mueller/power-switcher-component-upstream 2022-05-09 15:51:28 +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
Jakob Meier 7afe30ea88 fixed merge conflict 2022-05-09 12:56:22 +02:00
Robin Müller 80a5ed3c5b
added back fsfw namespace 2022-05-09 11:06:45 +02:00
Robin Müller 5d5a355110 Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class 2022-05-09 11:04:15 +02:00
Robin Müller c78b7c432b Merge branch 'development' into mueller/refactor-power-switch-if-etc 2022-05-09 11:02:45 +02:00