|
d184f7487e
|
post merge cleanup
EIVE/eive-obsw/pipeline/head There was a failure building this commit
|
2022-11-04 14:54:23 +01:00 |
|
|
895d03a35c
|
Merge branch 'develop' into eggert/acs
# Conflicts:
# dummies/CMakeLists.txt
# mission/controller/AcsController.cpp
# mission/controller/AcsController.h
|
2022-11-04 14:19:43 +01:00 |
|
|
beb99d53f7
|
pus test service has higher prio now
|
2022-11-02 19:35:35 +01:00 |
|
|
70092b348a
|
pdec handler has higher priority now
|
2022-11-02 19:15:07 +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
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-11-02 14:16:14 +01:00 |
|
|
b1f7c66066
|
Merge remote-tracking branch 'origin/develop' into mueller/pdec_irq_handling
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
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2022-11-02 10:37:15 +01:00 |
|
|
76283e0e49
|
refactored TM funnels to allow multiple TM recipients
|
2022-11-02 10:26:45 +01:00 |
|
|
e5fd62a121
|
some updates for pdec and EM syrlinks tests
|
2022-10-31 18:45:39 +01:00 |
|
|
51572208a9
|
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-10-27 16:59:32 +02:00 |
|
|
655c38a210
|
Merge remote-tracking branch 'origin/develop' into mueller/pdec_irq_handling
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-10-27 15:34:54 +02:00 |
|
|
23da59fec5
|
bugfixes and improvements
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
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-10-27 14:04:55 +02:00 |
|
|
82af8e00df
|
bufixes for PDEC
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-10-27 14:02:34 +02:00 |
|
|
95d2bc0887
|
first IRQ impl
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
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
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-10-27 09:18:12 +02:00 |
|
|
35f9869861
|
tab replacements
EIVE/eive-obsw/pipeline/head Build queued...
|
2022-10-27 09:01:09 +02:00 |
|
|
ae16dcc4a7
|
afmt + changelog
EIVE/eive-obsw/pipeline/head Build started...
|
2022-10-27 09:00:21 +02:00 |
|
|
f24ea413c8
|
Merge branch 'develop' into mueller/uio-updates
EIVE/eive-obsw/pipeline/pr-develop Build started...
|
2022-10-27 08:53:08 +02:00 |
|
|
8dd1d81e0d
|
consistent dev names
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-10-27 08:51:49 +02:00 |
|
|
23238a1e58
|
reenable core ctrl + minor fm fix
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-10-27 08:48:46 +02:00 |
|
|
592cbf6fad
|
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
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
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-10-27 08:29:49 +02:00 |
|
|
451581e1aa
|
enable IP core components for both EM and FM
EIVE/eive-obsw/pipeline/head There was a failure building this commit
|
2022-10-26 17:18:23 +02:00 |
|
|
5173a0c9cb
|
its the rad sensor
EIVE/eive-obsw/pipeline/head There was a failure building this commit
|
2022-10-26 17:11:57 +02:00 |
|
|
d7ff74b6bd
|
better configurability for PDEC/PTME usage
EIVE/eive-obsw/pipeline/head There was a failure building this commit
|
2022-10-26 16:11:34 +02:00 |
|
|
3475e167ee
|
perform SD card check more often for 2-3 cycles
EIVE/eive-obsw/pipeline/head There was a failure building this commit
|
2022-10-26 15:57:07 +02:00 |
|
|
00059251f0
|
further clean up em and general code
EIVE/eive-obsw/pipeline/head There was a failure building this commit
|
2022-10-26 15:47:23 +02:00 |
|
|
c2845aefaf
|
further reduce EM SW
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-10-26 15:31:04 +02:00 |
|
|
d25e883e65
|
further reduce EM obj factory
|
2022-10-26 15:30:04 +02:00 |
|
|
4a8096998d
|
added two todos and new uio file names
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-10-25 18:21:48 +02:00 |
|
|
1c9c2aba5b
|
Merge pull request 'safety mechanism on reboots' (#308) from mueller/sdc-safety-mechanism-on-reboot into develop
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #308
Reviewed-by: Jakob Meier <meierj@irs.uni-stuttgart.de>
|
2022-10-25 14:33:58 +02:00 |
|
|
9b8d2f3097
|
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-10-25 13:13:41 +02:00 |
|
|
4af8c85a84
|
small fix
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-10-25 11:39:57 +02:00 |
|
|
0135bebc70
|
impl bugfix
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-10-25 11:33:21 +02:00 |
|
|
b1e8be2ba5
|
checked FS usage
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-10-25 11:31:06 +02:00 |
|
|
f198a401f2
|
this should work as well
|
2022-10-25 11:22:31 +02:00 |
|
|
a9096a46c0
|
safety mechanism on reboots
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-10-25 11:04:24 +02:00 |
|
|
dd7521cc4b
|
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-10-21 15:37:25 +02:00 |
|
|
83b8cf3198
|
Merge remote-tracking branch 'origin/develop' into mueller/imtq-updates
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-10-21 15:33:47 +02:00 |
|
|
b9b850f621
|
object ID corrections
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-10-21 14:49:54 +02:00 |
|
|
b6a5c8c854
|
added TODO, remove obsolete code
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2022-10-21 11:54:14 +02:00 |
|
|
dc45c53e38
|
add new CFDP and PUS TM funnel
EIVE/eive-obsw/pipeline/head There was a failure building this commit
|
2022-10-21 11:51:44 +02:00 |
|
|
b2688c5ac0
|
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-10-21 11:18:39 +02:00 |
|
|
5abbaeddb0
|
update EM obj factory
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-10-20 17:16:37 +02:00 |
|
|
ab273a8a59
|
re-use dipole set in IMTQ handler
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-10-20 10:32:17 +02:00 |
|
|
386fc60441
|
new static variables to make torque status available
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-10-19 18:52:16 +02:00 |
|
|
ed7bba2cf5
|
renaming
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-10-17 10:34:57 +02:00 |
|