Commit Graph

1029 Commits

Author SHA1 Message Date
b7ca1606f7 fixed merge conflicts 2021-06-24 18:01:09 +02:00
675cd29df3 added assembly index 2021-06-24 17:52:09 +02:00
bd7f15ebb6 fixed merge conflicts 2021-06-24 17:49:23 +02:00
1eae885aa4 Merge pull request 'Update PSTs & Contd GPS Handler' (#48) from mueller/update-branch into develop
Reviewed-on: #48
2021-06-24 17:33:25 +02:00
b5fdeb93bb get temperature and status of reaction wheel 2021-06-24 17:32:42 +02:00
d0dd39986c logical addresses fix 2021-06-24 16:50:36 +02:00
a167b53096 moved some object ids 2021-06-24 16:49:36 +02:00
cd395aa9c4 updated object IDs again 2021-06-24 16:43:15 +02:00
32c23ae2de update dev handler IDs 2021-06-24 16:39:46 +02:00
fe65099b58 added bus descriptors 2021-06-24 16:36:42 +02:00
ff8fd518ba tmtc update 2021-06-24 16:35:04 +02:00
ed0aafa543 updated object IDs 2021-06-24 16:17:38 +02:00
bc087e2a7a removed unused code 2021-06-24 14:19:25 +02:00
136c859c90 lis3 minor form changes 2021-06-24 14:17:24 +02:00
0d12a92569 gps contd 2021-06-24 13:55:51 +02:00
Martin Zietz
8284ebec9f rw wip 2021-06-24 12:04:36 +02:00
1e3b91789c continued gps handler 2021-06-24 11:42:40 +02:00
a30483b37e small README fix 2021-06-24 11:24:19 +02:00
2a01de731f added ninja scripts 2021-06-24 11:23:49 +02:00
a076c7d593 fsfw update 2021-06-24 11:17:36 +02:00
fdd76fb600 fsfw update, rm3100 update 2021-06-24 11:16:08 +02:00
b5a0770cfc Merge branch 'develop' into mueller/update-branch 2021-06-24 11:02:07 +02:00
3fe66b6e43 fsfw update 2021-06-24 08:51:49 +02:00
2331637350 split up PSTs and add contd GPS handler 2021-06-24 08:50:46 +02:00
56cabbc117 split up psts 2021-06-23 15:18:31 +02:00
Martin Zietz
cbdcc50cc9 rw enable wip 2021-06-22 13:48:30 +02:00
941e34ea0d tmtc update 2021-06-21 18:40:26 +02:00
c46b41c249 test 2021-06-21 18:11:07 +02:00
0eb47967b5 fixed conflicts 2021-06-21 18:01:23 +02:00
0c1b00bb8b Merge pull request 'Release v1.2.0' (#47) from develop into master
Reviewed-on: #47
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2021-06-21 17:58:40 +02:00
87b9d2d82a Merge pull request 'Small fix for hosted BSP' (#46) from mueller/update into develop
Reviewed-on: #46
2021-06-21 17:57:53 +02:00
7795ad19d3 fixed merge conflicts 2021-06-21 17:51:08 +02:00
69ea33e015 Merge remote-tracking branch 'origin/develop' into mueller/master 2021-06-21 17:48:03 +02:00
d8bd396645 Merge pull request 'meier/ImtqHandler' (#44) from meier/ImtqHandler into develop
Reviewed-on: #44
2021-06-21 17:47:21 +02:00
865f152bc6 Merge remote-tracking branch 'origin/develop' into meier/ImtqHandler 2021-06-21 17:45:56 +02:00
c3f5e07cf3 tmtc update 2021-06-21 17:44:01 +02:00
5a0e31afbe Merge pull request 'Update Package' (#45) from mueller/update-package into develop
Reviewed-on: #45
2021-06-21 17:38:56 +02:00
3749caa8c3 tmtc update 2021-06-21 17:35:30 +02:00
a4483014f5 added tmtc 2021-06-21 17:27:54 +02:00
3b9f0049a3 Merge branch 'meier/ImtqHandler' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into meier/ImtqHandler 2021-06-21 17:26:01 +02:00
72f7d6c88f applied changes according to pr comments 2021-06-21 17:25:13 +02:00
f02f019cb2 tmtc update 2021-06-21 17:19:12 +02:00
51dba9f2e9 rw chip select decoding 2021-06-21 17:15:19 +02:00
1c538eea19 hosted build fixes 2021-06-21 17:09:49 +02:00
c141bf4794 script correction 2021-06-21 17:05:20 +02:00
257a1611d0 small q7s fix 2021-06-21 17:00:34 +02:00
f87d9c09e0 hal update 2021-06-21 16:57:36 +02:00
19269a6052 fixes for updated fsfw 2021-06-21 16:54:33 +02:00
9d91141bd2 fsfw hal update 2021-06-21 16:51:27 +02:00
bf5e3b1b7d Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/eive/eive_obsw into mueller/master 2021-06-21 16:46:56 +02:00