Commit Graph

831 Commits

Author SHA1 Message Date
2965ab53f9 Merge remote-tracking branch 'origin/develop' into mueller/master 2021-06-24 18:10:47 +02:00
17024cd420
set id is now 0 2021-06-24 18:05:41 +02:00
72c9ca08b2 fixed merge conflicts 2021-06-24 18:01:09 +02:00
f772c18c08
added assembly index 2021-06-24 17:52:09 +02:00
2cc93c5fef fixed merge conflicts 2021-06-24 17:49:23 +02:00
e29939ff27 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
31f9265338 get temperature and status of reaction wheel 2021-06-24 17:32:42 +02:00
525445823b
logical addresses fix 2021-06-24 16:50:36 +02:00
4d2e7fe8da
moved some object ids 2021-06-24 16:49:36 +02:00
7b71a96a93
updated object IDs again 2021-06-24 16:43:15 +02:00
8aba720bf6
update dev handler IDs 2021-06-24 16:39:46 +02:00
240bce5d2f
added bus descriptors 2021-06-24 16:36:42 +02:00
e8ad502289
tmtc update 2021-06-24 16:35:04 +02:00
f190ad6f71
updated object IDs 2021-06-24 16:17:38 +02:00
08ab507440
removed unused code 2021-06-24 14:19:25 +02:00
a965a80d94
lis3 minor form changes 2021-06-24 14:17:24 +02:00
74b320d8e4
gps contd 2021-06-24 13:55:51 +02:00
Martin Zietz
d05b1913ab rw wip 2021-06-24 12:04:36 +02:00
9f795e3a3e
continued gps handler 2021-06-24 11:42:40 +02:00
29989e7ae5
small README fix 2021-06-24 11:24:19 +02:00
f73e7cd4b1
added ninja scripts 2021-06-24 11:23:49 +02:00
f9ba20b877
fsfw update 2021-06-24 11:17:36 +02:00
fb29723728
fsfw update, rm3100 update 2021-06-24 11:16:08 +02:00
142dc29c75 Merge branch 'develop' into mueller/update-branch 2021-06-24 11:02:07 +02:00
00ee82956e
fsfw update 2021-06-24 08:51:49 +02:00
6ba3f6918d
split up PSTs and add contd GPS handler 2021-06-24 08:50:46 +02:00
cea1494649
split up psts 2021-06-23 15:18:31 +02:00
Martin Zietz
88181d8fb4 rw enable wip 2021-06-22 13:48:30 +02:00
d88b920dea
tmtc update 2021-06-21 18:40:26 +02:00
ae3e0894b5
test 2021-06-21 18:11:07 +02:00
49c7b3fd45 fixed conflicts 2021-06-21 18:01:23 +02:00
ddbfe7529d 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
a2255e2cfe 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
ba5832d30e fixed merge conflicts 2021-06-21 17:51:08 +02:00
1046334c0c Merge remote-tracking branch 'origin/develop' into mueller/master 2021-06-21 17:48:03 +02:00
3f91973637 Merge pull request 'meier/ImtqHandler' (#44) from meier/ImtqHandler into develop
Reviewed-on: #44
2021-06-21 17:47:21 +02:00
0bcfafc76d
Merge remote-tracking branch 'origin/develop' into meier/ImtqHandler 2021-06-21 17:45:56 +02:00
1d98fa9bfa
tmtc update 2021-06-21 17:44:01 +02:00
0407aad611 Merge pull request 'Update Package' (#45) from mueller/update-package into develop
Reviewed-on: #45
2021-06-21 17:38:56 +02:00
0c92a9a941
tmtc update 2021-06-21 17:35:30 +02:00
26cad171df added tmtc 2021-06-21 17:27:54 +02:00
c23f1fc762 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
4b4ac7902f applied changes according to pr comments 2021-06-21 17:25:13 +02:00
0ada1d8dfc
tmtc update 2021-06-21 17:19:12 +02:00
8d8bb41334 rw chip select decoding 2021-06-21 17:15:19 +02:00
ec2f9d243b
hosted build fixes 2021-06-21 17:09:49 +02:00
9097438cc2
script correction 2021-06-21 17:05:20 +02:00
89dc521e04
small q7s fix 2021-06-21 17:00:34 +02:00
85c3300e0b
hal update 2021-06-21 16:57:36 +02:00
5bbf0255ef
fixes for updated fsfw 2021-06-21 16:54:33 +02:00