Commit Graph

3930 Commits

Author SHA1 Message Date
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
35f9869861
tab replacements
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
2022-10-27 09:01:09 +02:00
ae16dcc4a7
afmt + changelog
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
2022-10-27 09:00:21 +02:00
0f60c7f356
bump minor version
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
2022-10-27 08:57:47 +02:00
ffb93dacd7
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 08:57:24 +02:00
e1c0a451ee
update changelog
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-27 08:56:20 +02:00
4e1df940d9 Merge pull request 'New UIO file names' (#309) from mueller/uio-updates into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #309
2022-10-27 08:53:21 +02:00
f24ea413c8 Merge branch 'develop' into mueller/uio-updates
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build started...
2022-10-27 08:53:08 +02:00
921f413888
small bugfix
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build queued...
2022-10-27 08:53:03 +02:00
8dd1d81e0d
consistent dev names
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-27 08:51:49 +02:00
23238a1e58
reenable core ctrl + minor fm fix
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-27 08:48:46 +02:00
7799e3477f
pdec handler now compiles
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-27 08:34:45 +02:00
115c6a6a57 Merge remote-tracking branch 'origin/develop' into mueller/pdec_irq_handling
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-10-27 08:31:58 +02:00
db47e56474 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 08:31:47 +02:00
592cbf6fad
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 08:31:21 +02:00
cace1217df Merge remote-tracking branch 'origin/develop' into mueller/uio-updates
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-27 08:29:49 +02:00
e200e2d0df
remove boolean which does not exist anymore
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-27 08:28:43 +02:00
2256ffecbe scex speed is now set from cfg
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-10-26 18:32:53 +02:00