3577 Commits

Author SHA1 Message Date
74f053ae5d
bump subversion 2022-10-10 17:44:58 +02:00
964e0a3d8e
re-run afmt 2022-10-10 17:41:52 +02:00
4f7ad7154b Merge pull request 'scex code' () from scex-additions into develop
Reviewed-on: 
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2022-10-10 17:36:36 +02:00
12feb989ae
small tweaks 2022-10-10 17:36:01 +02:00
5b4f97358f bump fsfw 2022-10-10 15:32:03 +02:00
57dff4258a disable parity bit 2022-10-10 15:21:41 +02:00
c82c4cf9d1
Merge remote-tracking branch 'origin/develop' into scex-additions 2022-10-10 11:16:19 +02:00
bba3ba7944 Merge pull request 'EM SW Update' () from mueller/em-sw-updates into develop
Reviewed-on: 
Reviewed-by: Jakob Meier <meierj@irs.uni-stuttgart.de>
2022-10-10 11:00:18 +02:00
f4cceeb21e
fix one merge conflict 2022-10-10 10:26:26 +02:00
fd1d53aa23
Merge remote-tracking branch 'origin/develop' into scex-additions 2022-10-10 10:18:29 +02:00
50d41215fa
Merge remote-tracking branch 'origin/develop' into mueller/em-sw-updates 2022-10-10 10:15:55 +02:00
7cf91a8ac3 Merge pull request 'Global Config Handler' () from petri_dev into develop
Reviewed-on: 
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2022-10-10 10:14:21 +02:00
4d97a82206
Merge remote-tracking branch 'origin/develop' into scex-additions 2022-10-06 18:09:44 +02:00
9173c4d2cb
missing commandActive reset 2022-10-06 18:05:06 +02:00
36c9feaf3f parity helps for some reason 2022-10-06 17:01:04 +02:00
f20acf417e some fixes 2022-10-06 16:58:43 +02:00
6d9999292c
Merge branch 'mueller/scex-em-tests' into scex-additions 2022-10-06 15:36:26 +02:00
8b35bbd241
use new SCEX uart dev name 2022-10-06 15:08:33 +02:00
0341865e98
this seems to work 2022-10-06 11:15:55 +02:00
adbece25aa add code to get frame, parity and overrun errors 2022-10-05 19:18:25 +02:00
9e81384c5e two stop bits and even parity helps 2022-10-05 18:44:52 +02:00
c5e5df03d9
new Uart16550 for SCEX, try stop bits 2022-10-05 18:13:49 +02:00
3fa2c63a03
add EM code 2022-10-05 14:38:48 +02:00
1a192cd8fb
found the bug 2022-10-04 23:04:50 +02:00
a44141c476
something is still wrong 2022-10-04 21:17:54 +02:00
b930af52b0
simplified DLE parser 2022-10-04 20:52:11 +02:00
0c389177e3
refactor DLE parsing and move semaphore release up top 2022-10-04 18:38:53 +02:00
526ddd0208 Merge branch 'develop' into petri_dev 2022-10-04 13:18:34 +02:00
Irini Kosmidou
68fdb68fe6 Merge branch 'irini' into scex-additions 2022-09-29 23:38:59 +02:00
Irini Kosmidou
612426ce3b Merge branch 'scex-additions' into irini 2022-09-29 23:36:15 +02:00
Irini Kosmidou
9c07a26615 commets removed 2022-09-29 19:50:12 +02:00
Irini Kosmidou
43cda300e3 scex directory 2022-09-29 19:38:19 +02:00
3e5a717845
bump fsfw 2022-09-29 17:22:09 +02:00
ee6d13abcc Merge branch 'develop' into petri_dev 2022-09-29 14:21:08 +02:00
0f081e52bd
bump tmtc 2022-09-29 14:20:44 +02:00
660d42f615 Merge remote-tracking branch 'origin/develop' into scex-additions 2022-09-29 14:10:29 +02:00
541b44cea7
re-run afmt 2022-09-29 14:10:21 +02:00
b3f4eaa0f2
Merge remote-tracking branch 'origin/develop' into petri_dev 2022-09-29 14:09:33 +02:00
2ad93f7735
Merge remote-tracking branch 'origin/develop' into mueller/em-sw-updates 2022-09-29 14:09:02 +02:00
865ca46974
Merge remote-tracking branch 'origin/develop' into scex-additions 2022-09-29 14:08:22 +02:00
e161eeb537
re-run generators and bump dependencies 2022-09-29 14:06:46 +02:00
a215657f4e
small bugfix 2022-09-29 14:01:04 +02:00
49efbc4725
some bugfixes 2022-09-29 13:53:42 +02:00
96497df7ba
bump tmtc 2022-09-29 13:49:39 +02:00
aa56c26e25
Merge remote-tracking branch 'origin/develop' into petri_dev 2022-09-29 13:45:42 +02:00
151d27985f
Merge remote-tracking branch 'origin/develop' into scex-additions 2022-09-29 13:43:58 +02:00
a152553d00
Merge remote-tracking branch 'origin/develop' into mueller/em-sw-updates 2022-09-29 13:32:10 +02:00
ffb9e5e03c Merge pull request 'OBSW Update Commands' () from mueller/obsw-update-cmds into develop
Reviewed-on: 
Reviewed-by: Jakob Meier <meierj@irs.uni-stuttgart.de>
2022-09-29 13:24:16 +02:00
fcef7e42a5
some unittest fixes 2022-09-29 13:23:55 +02:00
1463963532
unittest builds now 2022-09-29 13:20:05 +02:00