Commit Graph

3586 Commits

Author SHA1 Message Date
214428295b
only do time file handling with mounted SD card
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-12 12:01:48 +02:00
bcf7fa216a
bump changelog
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-11 23:10:09 +02:00
5824b28993 Merge remote-tracking branch 'origin/main' into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-11 23:08:51 +02:00
f196838f6b
bump revision
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-11 23:08:37 +02:00
607822b413
fix in SDC manager
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-11 23:07:44 +02:00
21258c2d79
fix core controller
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-11 22:58:31 +02:00
cca96f2a96
scoped thermal ctrl locks
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-10 18:29:06 +02:00
7f3d827a6e
move finish action call
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-10 18:00:43 +02:00
28881b99d1 Merge pull request 'v1.14.0' (#304) from develop into main
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #304
2022-10-10 17:46:37 +02:00
74f053ae5d
bump subversion
Some checks are pending
EIVE/eive-obsw/pipeline/pr-main Build started...
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-10 17:44:58 +02:00
964e0a3d8e
re-run afmt
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-10 17:41:52 +02:00
4f7ad7154b Merge pull request 'scex code' (#303) from scex-additions into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #303
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2022-10-10 17:36:36 +02:00
12feb989ae
small tweaks
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build started...
2022-10-10 17:36:01 +02:00
5b4f97358f bump fsfw
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-10 15:32:03 +02:00
57dff4258a disable parity bit
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-10 15:21:41 +02:00
c82c4cf9d1
Merge remote-tracking branch 'origin/develop' into scex-additions
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-10 11:16:19 +02:00
bba3ba7944 Merge pull request 'EM SW Update' (#300) from mueller/em-sw-updates into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #300
Reviewed-by: Jakob Meier <meierj@irs.uni-stuttgart.de>
2022-10-10 11:00:18 +02:00
f4cceeb21e
fix one merge conflict
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-10 10:26:26 +02:00
fd1d53aa23
Merge remote-tracking branch 'origin/develop' into scex-additions
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-10 10:18:29 +02:00
50d41215fa
Merge remote-tracking branch 'origin/develop' into mueller/em-sw-updates
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-10-10 10:15:55 +02:00
7cf91a8ac3 Merge pull request 'Global Config Handler' (#271) from petri_dev into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #271
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
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-06 18:09:44 +02:00
9173c4d2cb
missing commandActive reset
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-06 18:05:06 +02:00
36c9feaf3f parity helps for some reason
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-06 17:01:04 +02:00
f20acf417e some fixes
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-06 16:58:43 +02:00
6d9999292c
Merge branch 'mueller/scex-em-tests' into scex-additions
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-06 15:36:26 +02:00
8b35bbd241
use new SCEX uart dev name
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-06 15:08:33 +02:00
0341865e98
this seems to work
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-06 11:15:55 +02:00
adbece25aa add code to get frame, parity and overrun errors
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-05 19:18:25 +02:00
9e81384c5e two stop bits and even parity helps
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-05 18:44:52 +02:00
c5e5df03d9
new Uart16550 for SCEX, try stop bits
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-05 18:13:49 +02:00
3fa2c63a03
add EM code
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-05 14:38:48 +02:00
1a192cd8fb
found the bug
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-04 23:04:50 +02:00
a44141c476
something is still wrong
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
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
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-04 18:38:53 +02:00
526ddd0208 Merge branch 'develop' into petri_dev
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-04 13:18:34 +02:00
Irini Kosmidou
68fdb68fe6 Merge branch 'irini' into scex-additions
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-09-29 23:38:59 +02:00
Irini Kosmidou
612426ce3b Merge branch 'scex-additions' into irini
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-09-29 23:36:15 +02:00
Irini Kosmidou
9c07a26615 commets removed
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-09-29 19:50:12 +02:00
Irini Kosmidou
43cda300e3 scex directory
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-09-29 19:38:19 +02:00
3e5a717845
bump fsfw
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-09-29 17:22:09 +02:00
ee6d13abcc Merge branch 'develop' into petri_dev
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-29 14:21:08 +02:00
0f081e52bd
bump tmtc
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-29 14:20:44 +02:00
660d42f615 Merge remote-tracking branch 'origin/develop' into scex-additions
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-29 14:10:29 +02:00
541b44cea7
re-run afmt
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-09-29 14:10:21 +02:00
b3f4eaa0f2
Merge remote-tracking branch 'origin/develop' into petri_dev
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-29 14:09:33 +02:00
2ad93f7735
Merge remote-tracking branch 'origin/develop' into mueller/em-sw-updates
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-29 14:09:02 +02:00
865ca46974
Merge remote-tracking branch 'origin/develop' into scex-additions
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-29 14:08:22 +02:00
e161eeb537
re-run generators and bump dependencies
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-09-29 14:06:46 +02:00