3788 Commits

Author SHA1 Message Date
53214f0019
hosted build works again 2022-11-02 14:03:54 +01:00
e1526f712e
bump changelog 2022-11-02 10:58:40 +01:00
14b8b00880
small logic fix 2022-11-02 10:55:40 +01:00
39778f9663
Merge remote-tracking branch 'origin/develop' into mueller/tm_funnel_improvements 2022-11-02 10:37:15 +01:00
a0c784113b Merge pull request 'ACS Subsystem Init' () from mueller/acs-ss-init into develop
Reviewed-on: 
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
7dcc00312f
bump fsfw 2022-10-28 10:11:42 +02:00
51572208a9 Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init 2022-10-27 16:59:32 +02:00
745fad2a19 use baudrate 115200 for SCEX now 2022-10-27 16:37:16 +02:00
09642eb6bf
fixes for bash script 2022-10-27 14:11:09 +02:00
23da59fec5
bugfixes and improvements 2022-10-27 14:09:55 +02:00
833f7c6885
syrlink sim flag now EM/FM dependent 2022-10-27 14:04:55 +02:00
82af8e00df
bufixes for PDEC 2022-10-27 14:02:34 +02:00
59bfa2526e Merge pull request 'v1.15.0' () from develop into main
Reviewed-on: 
v1.15.0
2022-10-27 11:28:45 +02:00
890fba18e1
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init 2022-10-27 09:18:12 +02:00
d6adde92fc
add dates to changelog 2022-10-27 09:11:10 +02:00
1d6b5cbda4
add missing changelog entry 2022-10-27 09:08:26 +02:00
b54c40db11
missing define renaming 2022-10-27 09:06:34 +02:00
cd1eb02f02
re-run generators 2022-10-27 09:03:39 +02:00
b059e831c0
complete changelog 2022-10-27 09:02:55 +02:00
35f9869861
tab replacements 2022-10-27 09:01:09 +02:00
ae16dcc4a7
afmt + changelog 2022-10-27 09:00:21 +02:00
0f60c7f356
bump minor version 2022-10-27 08:57:47 +02:00
e1c0a451ee
update changelog 2022-10-27 08:56:20 +02:00
4e1df940d9 Merge pull request 'New UIO file names' () from mueller/uio-updates into develop
Reviewed-on: 
2022-10-27 08:53:21 +02:00
f24ea413c8 Merge branch 'develop' into mueller/uio-updates 2022-10-27 08:53:08 +02:00
921f413888
small bugfix 2022-10-27 08:53:03 +02:00
8dd1d81e0d
consistent dev names 2022-10-27 08:51:49 +02:00
23238a1e58
reenable core ctrl + minor fm fix 2022-10-27 08:48:46 +02:00
592cbf6fad
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init 2022-10-27 08:31:21 +02:00
cace1217df Merge remote-tracking branch 'origin/develop' into mueller/uio-updates 2022-10-27 08:29:49 +02:00
e200e2d0df
remove boolean which does not exist anymore 2022-10-27 08:28:43 +02:00
2256ffecbe scex speed is now set from cfg 2022-10-26 18:32:53 +02:00
e86831fb40 initialize value 2022-10-26 17:21:35 +02:00
451581e1aa enable IP core components for both EM and FM 2022-10-26 17:18:23 +02:00
5173a0c9cb its the rad sensor 2022-10-26 17:11:57 +02:00
d7ff74b6bd better configurability for PDEC/PTME usage 2022-10-26 16:11:34 +02:00
3475e167ee perform SD card check more often for 2-3 cycles 2022-10-26 15:57:07 +02:00
00059251f0 further clean up em and general code 2022-10-26 15:47:23 +02:00
c2845aefaf further reduce EM SW 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 2022-10-25 18:21:48 +02:00
1c9c2aba5b Merge pull request 'safety mechanism on reboots' () from mueller/sdc-safety-mechanism-on-reboot into develop
Reviewed-on: 
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 2022-10-25 13:13:41 +02:00
5204afb9bd Merge pull request 'IMTQ Updates' () from mueller/imtq-updates into develop
Reviewed-on: 
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2022-10-25 13:12:14 +02:00
4af8c85a84
small fix 2022-10-25 11:39:57 +02:00
0135bebc70
impl bugfix 2022-10-25 11:33:21 +02:00
b1e8be2ba5
checked FS usage 2022-10-25 11:31:06 +02:00
f198a401f2
this should work as well 2022-10-25 11:22:31 +02:00