Commit Graph

390 Commits

Author SHA1 Message Date
5fe0ea5fc9 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
647126863c fixed merge conflict 2020-12-28 11:16:58 +01:00
2b09baad4f merged mueller/tmtc-dh-update 2020-12-28 11:14:08 +01:00
abf53527b3 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
aa33d23563 added polling sequence table slot for PERFORM_OPERATION 2020-12-28 11:02:24 +01:00
d97f0aaed0 adapted GomspaceDeviceHandler to new DeviceHandlerBase 2020-12-28 09:49:50 +01:00
de433e06a1 now compiling 2020-12-27 17:31:38 +01:00
13a83a2f16 Merge branch 'hotfix/fsfwconfig' into mueller/master 2020-12-27 17:16:53 +01:00
4e90612d34 fix 2020-12-27 17:15:59 +01:00
c60457cf57 another fix 2020-12-27 17:14:26 +01:00
cb01bcd97d Merge branch 'hotfix/fsfwconfig' into meier/pcduhandler 2020-12-27 17:07:37 +01:00
9c42b40cc1 tmtc update 2020-12-27 17:04:15 +01:00
4737fc4f6e Merge remote-tracking branch 'origin/hotfix/fsfwconfig' into mueller/master 2020-12-27 17:01:57 +01:00
64972f1e43 more fixes 2020-12-27 17:00:38 +01:00
c3833c4a4c Merge branch 'hotfix/fsfwconfig' into meier/pcduhandler 2020-12-27 16:57:55 +01:00
3df7a6d23e another fix 2020-12-27 16:56:51 +01:00
86b36352dc Merge branch 'hotfix/fsfwconfig' into meier/pcduhandler 2020-12-27 16:48:34 +01:00
d359222b45 another fix 2020-12-27 16:46:01 +01:00
025337227c fsfwconfig fix 2020-12-27 16:45:37 +01:00
52a2973291 updated config 2020-12-27 16:29:49 +01:00
6dbafec3ad fixed merge conflict 2020-12-27 15:32:16 +01:00
14ae300363 Merge branch 'develop' into mueller/master 2020-12-27 15:31:01 +01:00
4636a809f4 tmtc p60dock 2020-12-27 15:27:16 +01:00
fdf72f2fb3 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
0a86fab520 valid fsfw now 2020-12-23 20:26:37 +01:00
8421c5de0d fsfw update 2020-12-23 20:20:22 +01:00
7e0c56edcb gyro handler finished 2020-12-23 20:17:39 +01:00
76a6db18ab started with l3dg20h definitions 2020-12-22 13:44:32 +01:00
2203b8ed53 started gyro handler, renamed 2020-12-22 13:41:01 +01:00
7aceb6a658 added top comment block 2020-12-22 13:36:10 +01:00
421ac0e1fe added top comment 2020-12-22 13:32:40 +01:00
e817a38f92 replaced last sent command with
getPendingCommand()
2020-12-22 00:36:39 +01:00
de0f8f5c41 added gps handler stub 2020-12-22 00:32:11 +01:00
88d357fe4d added gyro handler stub 2020-12-22 00:30:50 +01:00
f692993954 rm3100 finished, lis3 set normal datapool entries
invalid removed, will be replaced by default implementation
2020-12-22 00:24:19 +01:00
8ecd0ec551 rm3100 continued 2020-12-21 23:09:35 +01:00
24cf9a661f rm3100 continued 2020-12-21 19:52:00 +01:00
1e33f810cf type correction 2020-12-21 19:50:50 +01:00
1cf278e23e started rm3100 handler 2020-12-21 19:50:01 +01:00
bb1735d0fe updated project file 2020-12-21 18:15:27 +01:00
b0434a3d72 reparied arduino stuff 2020-12-21 18:14:03 +01:00
2372ddef78 makefile hosted update 2020-12-21 17:52:53 +01:00
042d014148 disabled LTO for host release build on windows 2020-12-21 17:32:51 +01:00
dce00e9b53 resolved merge conflict 2020-12-21 10:29:44 +01:00
f330650b55 cspcomif removed commented lines 2020-12-21 10:27:29 +01:00
f573d15830 p60dock, acu and pdu handler completed 2020-12-21 10:26:28 +01:00
c9fbd2c048 working pdu2handler 2020-12-20 17:35:03 +01:00
23fd408e08 issue with makefile 2020-12-20 13:31:44 +01:00
208fd889f7 added eclipse project and launch files 2020-12-17 19:50:11 +01:00
39ff3f6c9b deleted linux bsp arduino files 2020-12-17 19:47:21 +01:00