Commit Graph

3897 Commits

Author SHA1 Message Date
1afd34b450
Merge remote-tracking branch 'origin/develop' into dhb2normal 2022-11-02 19:17:42 +01:00
a2c1ca97b8 Merge pull request 'PDEC IRQ Handling' (#310) from mueller/pdec_irq_handling into develop
Reviewed-on: #310
2022-11-02 18:16:18 +01:00
70092b348a
pdec handler has higher priority now 2022-11-02 19:15:07 +01:00
2d821ef8df
irq working 2022-11-02 18:58:29 +01:00
b2e3bc7e7a some more tests 2022-11-02 16:32:00 +01:00
ddc68669fc bump deps 2022-11-02 16:08:44 +01:00
098f69b1bc dummy fix 2022-11-02 15:56:05 +01:00
3995b15ccf bugfixes for dummies 2022-11-02 15:55:40 +01:00
a45e7d7561
debug printout 2022-11-02 15:33:54 +01:00
8297bca969
small EM fix 2022-11-02 15:22:05 +01:00
964f9dc688
Merge remote-tracking branch 'origin/develop' into mueller/pdec_irq_handling
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-02 14:16:14 +01:00
ce743e238b
Merge branch 'mueller/tm_funnel_improvements' into dhb2normal
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-02 14:07:15 +01:00
53214f0019
hosted build works again
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head Build started...
2022-11-02 14:03:54 +01:00
004e79580e Merge pull request 'refactored TM funnels to allow multiple TM recipients' (#312) from mueller/tm_funnel_improvements into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #312
Reviewed-by: Jakob Meier <meierj@irs.uni-stuttgart.de>
2022-11-02 13:10:42 +01:00
802b851924
bump changelog
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-02 10:59:21 +01:00
e1526f712e
bump changelog
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-11-02 10:58:40 +01:00
14b8b00880
small logic fix
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-11-02 10:55:40 +01:00
621966b6f3
Merge remote-tracking branch 'origin/develop' into dhb2normal
Some checks failed
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-11-02 10:47:49 +01:00
b6cde9e8fc Merge remote-tracking branch 'origin/develop' into mueller/pl-ss
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-02 10:39:50 +01:00
b1f7c66066
Merge remote-tracking branch 'origin/develop' into mueller/pdec_irq_handling
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-02 10:37:52 +01:00
39778f9663
Merge remote-tracking branch 'origin/develop' into mueller/tm_funnel_improvements
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-11-02 10:37:15 +01:00
a0c784113b Merge pull request 'ACS Subsystem Init' (#228) from mueller/acs-ss-init into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #228
2022-11-02 10:34:38 +01:00
0c549dd1ce
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init 2022-11-02 10:33:34 +01:00
76283e0e49
refactored TM funnels to allow multiple TM recipients 2022-11-02 10:26:45 +01:00
97fd35fe7b
bump fsfw 2022-11-02 10:25:42 +01:00
191d5f1268
refactored TM funnels to allow multiple TM recipients 2022-11-02 10:20:14 +01:00
e5fd62a121 some updates for pdec and EM syrlinks tests 2022-10-31 18:45:39 +01:00
3f3162fb36 Merge remote-tracking branch 'origin/develop' into mueller/pdec_irq_handling 2022-10-31 18:13:34 +01:00
885a7b0c6a bump submodules 2022-10-31 18:13:29 +01:00
7dcc00312f
bump fsfw
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-28 10:11:42 +02:00
d19ddaa46c Merge branch 'mueller/acs-ss-init' into mueller/pl-ss
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-27 17:00:14 +02:00
51572208a9 Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-27 16:59:32 +02:00
745fad2a19 use baudrate 115200 for SCEX now
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-27 16:37:16 +02:00
655c38a210
Merge remote-tracking branch 'origin/develop' into mueller/pdec_irq_handling
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-27 15:34:54 +02:00
09642eb6bf
fixes for bash script
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-27 14:11:09 +02:00
23da59fec5
bugfixes and improvements
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-27 14:09:55 +02:00
833f7c6885
syrlink sim flag now EM/FM dependent
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-27 14:04:55 +02:00
82af8e00df
bufixes for PDEC
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-27 14:02:34 +02:00
e5ccc6473e Merge remote-tracking branch 'origin/main' into mueller/pdec_irq_handling
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-27 11:32:01 +02:00
59bfa2526e Merge pull request 'v1.15.0' (#311) from develop into main
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #311
2022-10-27 11:28:45 +02:00
24c050765b
countdown to ensure periodic lock checking
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-27 10:51:34 +02:00
95d2bc0887
first IRQ impl
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-27 10:49:52 +02:00
bc277067ed
add PDEC IRQ uio file entry
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-10-27 09:20:41 +02:00
890fba18e1
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-27 09:18:12 +02:00
a3a9bc8b39 Merge remote-tracking branch 'origin/develop' into mueller/pdec_irq_handling
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-27 09:17:01 +02:00
d6adde92fc
add dates to changelog
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-27 09:11:10 +02:00
1d6b5cbda4
add missing changelog entry
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2022-10-27 09:08:26 +02:00
b54c40db11
missing define renaming
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2022-10-27 09:06:34 +02:00
cd1eb02f02
re-run generators
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2022-10-27 09:03:39 +02:00
b059e831c0
complete changelog
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
2022-10-27 09:02:55 +02:00