Commit Graph

61 Commits

Author SHA1 Message Date
253aa30263 fixing merge 2022-09-14 16:31:24 +02:00
eae7bfc935 Merge branch 'mohr/merge-upstream' into mohr/introspection 2022-09-14 16:23:23 +02:00
bd594123a2 Merge remote-tracking branch 'upstream/development' into mohr/merge-upstream 2022-09-14 12:54:15 +02:00
c7f300671f
update header 2022-09-01 10:45:10 +02:00
7d3223d766
add comment blocks 2022-09-01 10:44:57 +02:00
2fa76d3663 Merge remote-tracking branch 'upstream/mueller/dhb-handle-device-tm-2' into develop 2022-08-31 00:02:52 +02:00
158007fa7f
const correct API 2022-08-31 00:02:25 +02:00
726f44cafe
Merge remote-tracking branch 'upstream/mueller/dhb-handle-device-tm-2' into develop 2022-08-30 23:53:16 +02:00
ab719a3e59
alternative solution 2022-08-30 23:38:55 +02:00
eedf57624f
Merge remote-tracking branch 'upstream/mueller/dhb-handle-device-tm' into develop 2022-08-30 15:40:52 +02:00
3a47062f2a
refactored dhb TM handler 2022-08-30 13:39:21 +02:00
2a75440b32
allow device tm in raw format 2022-08-27 01:01:29 +02:00
c7e6f01f9b Merge remote-tracking branch 'sidestream/mohr_introspection' into mohr/introspection 2022-08-26 15:52:14 +02:00
bc593c938d some more mode introspection 2022-08-26 10:31:45 +02:00
8353964635 Merge remote-tracking branch 'sidestream/mohr_introspection' into mohr/introspection 2022-08-25 22:41:25 +02:00
d367baa42c stupid idea 2022-08-24 18:47:25 +02:00
d634bdb775 Merge remote-tracking branch 'sidestream/mohr_introspection' into mohr/introspection 2022-08-24 17:49:29 +02:00
59f8dd1322 preparing DHB::buildCommandFromCommand for retirement 2022-08-24 17:49:16 +02:00
f91ad84bdc
Merge remote-tracking branch 'upstream/mueller/refactor-tmtc-stack' into mueller/refactor-tmtc-stack-retval-merged 2022-08-24 17:13:41 +02:00
31f59f915c Merge commit 'd9759581' into mohr/introspection 2022-08-18 12:20:20 +02:00
217276d50c renamed returnvalue header 2022-08-16 12:48:22 +02:00
f63f3fa564 more occurences in comments 2022-08-16 12:12:21 +02:00
62fe75ee40
perform renaming 2022-08-15 20:28:16 +02:00
8970a7379a
Merge remote-tracking branch 'upstream/development' into mueller/update-from-upstream 2022-08-12 12:21:50 +02:00
cfdbe0f6cb Merge remote-tracking branch 'sidestream/mohr_introspection' into mohr/introspection 2022-07-28 16:32:24 +02:00
f9e9ff320f Small fixes 2022-07-28 14:55:43 +02:00
f56646d2c3 changed action handling slightly 2022-07-20 16:59:42 +02:00
b08d127e11 Merge remote-tracking branch 'sidestream/mohr_introspection' into mohr_other_introspection 2022-07-14 15:59:22 +02:00
ecac08814e better naming for functions which reset states of replies 2022-07-14 09:15:13 +02:00
ef18377cef new Actions 2022-06-29 23:36:45 +02:00
ae2f7219fd run auto-formatter 2022-06-06 11:55:42 +02:00
161dbde0d7 fixed merge conflicts 2022-06-06 10:30:17 +02:00
Jakob Meier
3749f31ab4 disable pending commands and replies in MODE_OFF transition 2022-05-26 02:03:39 +02:00
4841d5d92d
doc update 2022-05-13 17:24:55 +02:00
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
Jakob Meier
7afe30ea88 fixed merge conflict 2022-05-09 12:56:22 +02:00
80a5ed3c5b
added back fsfw namespace 2022-05-09 11:06:45 +02:00
de2d4da161 Merge branch 'eive/develop' into meier/develop 2022-05-05 12:28:34 +02:00
2220120d54
improved i2c error printout 2022-05-03 16:43:15 +02:00
15eb22f9ee Merge remote-tracking branch 'origin/eive/develop' into meier/develop 2022-05-03 13:03:44 +02:00
7f6c8b8b12
Merge remote-tracking branch 'upstream/development' into eive/develop 2022-05-02 16:15:27 +02:00
28015c4735 it compiles and runs 2022-05-01 17:48:49 +02:00
Jakob Meier
951c077abc option to use Countdown object to time out replies 2022-04-26 10:03:04 +02:00
Jakob Meier
900ef5b912 option to use coutdwon object to time out replies 2022-04-26 09:07:03 +02:00
8e26e287c3 Merge remote-tracking branch 'origin/eive/develop' into mueller/master 2022-04-01 14:07:26 +02:00
Jakob Meier
6c1db8473b get alternative reply from device command info 2022-03-31 14:36:45 +02:00
Jakob Meier
532607bf8f extended command info 2022-03-30 09:21:03 +02:00
3ea9f999b7
apply auto-formatter 2022-03-28 12:59:51 +02:00
543daaa95a
various tweaks and improvements 2022-03-17 19:19:02 +01:00
d6c1041133
Merge remote-tracking branch 'upstream/development' into eive/develop 2022-03-07 15:34:11 +01:00