730 Commits

Author SHA1 Message Date
38f435d1ae
update for new FSFW code 2022-09-16 11:43:11 +02:00
8ebc62cbe6
new ACS preproc defines 2022-09-15 13:03:22 +02:00
57331380c3
small fix for ACS task 2022-09-15 11:38:29 +02:00
4649a75d40
update to new API 2022-09-12 17:23:43 +02:00
31b3de784b
stuff 2022-09-12 17:00:49 +02:00
86d3732f65
retval replacements 2022-08-29 15:57:26 +02:00
aa86bc722f
retval corrections 2022-08-29 15:56:18 +02:00
3ad7a35f0e
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init 2022-08-29 15:53:57 +02:00
975f202ddb
Merge remote-tracking branch 'origin/develop' into mueller/pl-ss 2022-08-29 15:50:55 +02:00
8c110460a6
added test to retrieve pdu config 2022-08-26 14:28:06 +02:00
0f553e3431
Merge remote-tracking branch 'origin/develop' into mueller/update-p60-module-code 2022-08-26 13:45:53 +02:00
a7482b657a
changed all table parsing to use gom space API 2022-08-26 13:42:58 +02:00
efb0bce718
finally it works 2022-08-26 03:20:44 +02:00
447c4d5c88
all retval replacements 2022-08-24 17:27:47 +02:00
6ead94b5f4
this is even better 2022-08-16 17:49:50 +02:00
7e3517d309
it compiles again 2022-08-15 18:34:26 +02:00
c99cb4a81e
schedule ACS controller 2022-08-15 09:58:18 +02:00
4649c97205
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init 2022-08-08 17:12:12 +02:00
89b3b2ff42
Merge remote-tracking branch 'origin/develop' into mueller/pl-ss 2022-08-08 17:08:56 +02:00
722d7a67f5
important bugfix for FM SW 2022-08-04 01:45:49 +02:00
b133a0538c
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init 2022-07-04 10:47:23 +02:00
9e89a0689f
Merge remote-tracking branch 'origin/develop' into mueller/pl-ss 2022-07-04 10:46:47 +02:00
a2e7c6cca6 moved ccsds object creation back to core object factory and run auto formatter 2022-06-27 10:58:46 +02:00
95da2372c9 run generators 2022-06-27 09:15:29 +02:00
89757c447c run auto-formatter 2022-06-17 08:31:36 +02:00
Jakob Meier
1ebae7f938 fixes for te0720 build 2022-06-08 07:16:12 +02:00
Jakob Meier
8c850614e5 fixed merge conflicts 2022-06-05 10:54:46 +02:00
Jakob Meier
52d94f44d4 device temeprature set 2022-06-01 10:48:18 +02:00
593cc68b84 rtd dataset 2022-05-31 16:44:57 +02:00
0e6d2354fc thermal set fix 2022-05-30 14:32:50 +02:00
Jakob Meier
8106722a08 replaced EM preprocessor define 2022-05-27 16:24:41 +02:00
Jakob Meier
9e93f1c814 adaptions for EM 2022-05-27 13:44:40 +02:00
5b0f1efefd
Merge remote-tracking branch 'origin/develop' into mueller/pl-ss 2022-05-25 15:48:00 +02:00
95121b5120
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init 2022-05-25 15:47:21 +02:00
ad679a810e Merge pull request 'add and schedule PUS11' () from mueller/add-schedule-pus-11 into develop
Reviewed-on: 
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-05-25 15:21:25 +02:00
bb1e1d80cc
resolve merge conflict 2022-05-25 11:00:18 +02:00
01bac87afb
update reset pin handling 2022-05-25 10:59:20 +02:00
5d2a70b6c6 Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init 2022-05-25 10:28:06 +02:00
ffdd6bbc3c Merge branch 'develop' into mueller/add-schedule-pus-11 2022-05-25 10:27:36 +02:00
c86e000f09
Update PL SS 2022-05-25 10:25:40 +02:00
e537080166 Merge branch 'mueller/acs-ss-init' into mueller/pl-ss 2022-05-25 10:14:09 +02:00
83c7ec8067
solve merge conflicts 2022-05-25 10:12:37 +02:00
581423a40e
Merge branch 'mueller/acs-ss-init' into mueller/pl-ss 2022-05-25 10:09:24 +02:00
e1ed532f91
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init 2022-05-25 10:01:53 +02:00
3eca96fef5
Merge remote-tracking branch 'origin/develop' into mueller/core-controller-remount-sd-handling 2022-05-25 09:58:06 +02:00
43fc1ab780
Merge remote-tracking branch 'origin/develop' into mueller/add-schedule-pus-11 2022-05-25 09:57:34 +02:00
3fff3ba21e
add and schedule PUS11 2022-05-24 15:21:37 +02:00
633fe00cd6
run afmt, minor improvements 2022-05-24 01:14:04 +02:00
f7075a1397 Merge remote-tracking branch 'origin/develop' into mueller/reboot-cmd 2022-05-24 00:54:39 +02:00
2ebdb5c797
tweak sd card check countdown 2022-05-24 00:53:29 +02:00