Commit Graph

1220 Commits

Author SHA1 Message Date
5b99199b6c
changed back some configuration 2021-07-26 12:02:40 +02:00
eee7ab98cb Merge branch 'mueller/readme-update-cp-script' into mueller/master 2021-07-26 11:58:39 +02:00
4093b2cff2
updating README 2021-07-26 11:58:28 +02:00
3f509ce472
updated port forwarding scripts 2021-07-26 11:56:39 +02:00
cffd6af1e1 Merge pull request 'README update and utility host scripts' (#62) from mueller/readme-update-cp-script into develop
Reviewed-on: #62
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2021-07-26 11:55:20 +02:00
2a5f824161
UDP remains default for now 2021-07-26 11:47:45 +02:00
be6ae6b7ae
added TCP support 2021-07-26 11:33:38 +02:00
10507904e8
small update 2021-07-26 11:07:41 +02:00
e82ca9e749
update README 2021-07-26 11:05:43 +02:00
84ce7d22bf
added logo 2021-07-26 11:04:56 +02:00
29da8d9fd5 Merge pull request 'v1.5.0 Release' (#61) from develop into main
Reviewed-on: #61
2021-07-26 10:48:13 +02:00
7ff133687e
README update 2021-07-26 10:46:50 +02:00
0ff837baa1
updated port script 2021-07-26 10:15:44 +02:00
474054f4d8
updated cp script 2021-07-26 01:21:37 +02:00
4645b8d35b
added script folder 2021-07-26 00:47:55 +02:00
4b4b75085c
added helper script 2021-07-26 00:45:52 +02:00
9b2ab66c0a
readme update 2021-07-26 00:42:33 +02:00
Jakob.Meier
0cd814db76 ploc supervisor update available command, wip 2021-07-25 20:42:24 +02:00
Jakob.Meier
8c1a5bd9ad Merge branch 'develop' into meier/plocSupervisorHandler 2021-07-25 16:24:34 +02:00
Jakob.Meier
f6d43cdf46 typo in PlocSupervisorDefinitions.h 2021-07-25 16:24:10 +02:00
8b14e1a31e Merge pull request 'v1.5.0' (#60) from mueller/v1.5.0-staging into develop
Reviewed-on: #60
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2021-07-25 16:23:06 +02:00
bbc8a3eeef
README update 2021-07-24 17:20:39 +02:00
07f531a044
update core controller 2021-07-24 17:08:26 +02:00
733a89a97a
arcsec star tracker update 2021-07-24 15:30:34 +02:00
0e3b67383d
arcsec_star_tracker 2021-07-24 15:29:15 +02:00
2b45c1d407
another minor fix 2021-07-24 15:17:54 +02:00
082e820e92
minor fix 2021-07-24 15:15:49 +02:00
2554afd503
Merge remote-tracking branch 'origin/develop' into mueller/master 2021-07-24 15:13:56 +02:00
a12fa4c42b
fsfw update 2021-07-24 15:06:21 +02:00
6d48f70269
all versions written to version.txt file now 2021-07-24 15:00:07 +02:00
Jakob.Meier
c4616e3633 get boot status report wip 2021-07-24 13:57:05 +02:00
9caa9451e1
printing FSFW version now 2021-07-24 13:47:09 +02:00
cb006c84d3
fsfw update 2021-07-24 13:36:45 +02:00
de1f61a804 Merge branch 'develop' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into develop 2021-07-23 18:32:06 +02:00
8f070cdb44 subversion change 2021-07-23 18:31:53 +02:00
7bab6e6c15 Merge pull request 'fixes for file system' (#57) from mueller/fs-fixes into develop
Reviewed-on: #57
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2021-07-23 18:27:23 +02:00
1cc6a52a3a deleted fsfw_hal 2021-07-23 18:22:50 +02:00
d419e31296 fixes for file system 2021-07-23 18:20:01 +02:00
54d8233395 Merge pull request 'meier/plocSupervisorHandler' (#56) from meier/plocSupervisorHandler into develop
Reviewed-on: #56
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2021-07-23 18:15:34 +02:00
Jakob.Meier
ad9938cb4a readme update 2021-07-23 18:12:32 +02:00
Jakob.Meier
d1c891638b fsfw update 2021-07-23 18:07:50 +02:00
Jakob.Meier
0ce55d5e62 fixed conflicts 2021-07-23 18:04:51 +02:00
Jakob.Meier
a2e62b28c3 fixed merge conflicts 2021-07-23 17:48:11 +02:00
Jakob.Meier
0cc454d891 Merge remote-tracking branch 'origin' into meier/plocSupervisorHandler 2021-07-23 17:25:28 +02:00
Jakob.Meier
b66661d7dc updated submodules 2021-07-23 17:25:24 +02:00
62fe0571b1 Merge pull request 'Update before changing history' (#55) from mueller/staging-1-before-history-change into develop
Reviewed-on: #55
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2021-07-23 17:20:19 +02:00
46e2e40cb1
various bugfixes 2021-07-23 17:06:10 +02:00
Jakob.Meier
80665a3cc5 fixed merge conflicts 2021-07-23 14:36:15 +02:00
Jakob.Meier
ac62735b57 fsfw_hal update 2021-07-23 14:13:12 +02:00
Jakob.Meier
fab8a75839 added uart flush in ploc supervisor handler 2021-07-23 13:27:58 +02:00