Commit Graph

6766 Commits

Author SHA1 Message Date
7ca2cb417c Merge pull request 'CMake update' (#11) from mueller/cmake-update into develop
Reviewed-on: eive/eive_obsw#11
2020-12-29 17:55:34 +01:00
cc883c30f4 reamde update 2020-12-29 15:04:08 +01:00
4545236f7f added launch config 2020-12-29 14:59:14 +01:00
9d40006f45 added linux release launch config 2020-12-29 14:57:19 +01:00
cab9c2dd14 deleted make luanch config 2020-12-29 14:55:10 +01:00
25de1438ce some fixes, launch configs added 2020-12-29 14:53:34 +01:00
45ef1abc9d includes formal correction 2020-12-29 14:39:03 +01:00
56f45e3fb1 include fix 2020-12-29 14:37:39 +01:00
a19c9342a6 added cmake launch config 2020-12-29 14:31:10 +01:00
6ba84caaf8 renamed launch configs for clear distrinction 2020-12-29 14:29:38 +01:00
96293ebdf1 updated project files 2020-12-29 14:28:38 +01:00
bacf50f663 restructured build system support 2020-12-29 14:21:52 +01:00
e42cbc3116 fsfw points to eive/develop now 2020-12-29 14:14:11 +01:00
d8185c0611 added cmake support for csp lib 2020-12-29 13:59:31 +01:00
aa3168b2c7 Merge remote-tracking branch 'origin/develop' into mueller/master 2020-12-29 12:37:03 +01:00
eba9fac100 Merge pull request 'meier/pcduhandler' (#10) from meier/pcduhandler into develop
Reviewed-on: eive/eive_obsw#10
2020-12-29 12:35:44 +01:00
12785da87e small bugfix 2020-12-29 12:22:35 +01:00
4070780543 fsfw update 2020-12-29 12:16:38 +01:00
944ea76382 fsfw points to devel now 2020-12-29 12:15:55 +01:00
892a6f61b3 correction in factoryx 2020-12-29 02:16:39 +01:00
1f95ad9b42 project name corrected 2020-12-29 02:15:04 +01:00
a3139c1b52 added q7s xcompile file 2020-12-29 01:40:47 +01:00
73cc2ded21 including taspbery pi bsp 2020-12-29 01:28:21 +01:00
97331100a8 added rpi support 2020-12-29 01:26:22 +01:00
a817f43ae9 bugfix 2020-12-29 01:15:35 +01:00
b3047c4ab6 added cmake support 2020-12-29 01:09:59 +01:00
039c813b0d Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/eive/eive_obsw into mueller/master 2020-12-28 23:54:16 +01:00
4043b1a513 fixed merge conflict 2020-12-28 11:16:58 +01:00
39e4bea0d2 merged mueller/tmtc-dh-update 2020-12-28 11:14:08 +01:00
f251ff6df2 Merge pull request 'Device Handler Updates' (#9) from mueller/tmtc-dh-update into develop
Reviewed-on: eive/eive_obsw#9
2020-12-28 11:09:08 +01:00
3dcd8f09af added polling sequence table slot for PERFORM_OPERATION 2020-12-28 11:02:24 +01:00
50996ef04b adapted GomspaceDeviceHandler to new DeviceHandlerBase 2020-12-28 09:49:50 +01:00
6bca9af809 now compiling 2020-12-27 17:31:38 +01:00
23b212a0e9 Merge branch 'hotfix/fsfwconfig' into mueller/master 2020-12-27 17:16:53 +01:00
e475cc408b fix 2020-12-27 17:15:59 +01:00
f447a1bdef another fix 2020-12-27 17:14:26 +01:00
810eec0031 Merge branch 'hotfix/fsfwconfig' into meier/pcduhandler 2020-12-27 17:07:37 +01:00
3688b2b465 tmtc update 2020-12-27 17:04:15 +01:00
a851a19c59 Merge remote-tracking branch 'origin/hotfix/fsfwconfig' into mueller/master 2020-12-27 17:01:57 +01:00
90d1b601be more fixes 2020-12-27 17:00:38 +01:00
7af1cede48 Merge branch 'hotfix/fsfwconfig' into meier/pcduhandler 2020-12-27 16:57:55 +01:00
804871ee27 another fix 2020-12-27 16:56:51 +01:00
c9e1db9373 Merge branch 'hotfix/fsfwconfig' into meier/pcduhandler 2020-12-27 16:48:34 +01:00
2f91a1e881 another fix 2020-12-27 16:46:01 +01:00
4c5febe71f fsfwconfig fix 2020-12-27 16:45:37 +01:00
615ca908de updated config 2020-12-27 16:29:49 +01:00
668d4c0674 fixed merge conflict 2020-12-27 15:32:16 +01:00
0fe1c2e3f6 Merge branch 'develop' into mueller/master 2020-12-27 15:31:01 +01:00
afec8e7b2d tmtc p60dock 2020-12-27 15:27:16 +01:00
7604091dc6 Merge pull request 'TMTC updated' (#7) from mueller/tmtc-update into develop
Reviewed-on: eive/eive_obsw#7
2020-12-27 15:22:45 +01:00