3896 Commits

Author SHA1 Message Date
a215657f4e
small bugfix 2022-09-29 14:01:04 +02:00
92cf4580ca
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init 2022-09-29 13:57:39 +02:00
49efbc4725
some bugfixes 2022-09-29 13:53:42 +02:00
96497df7ba
bump tmtc 2022-09-29 13:49:39 +02:00
aa56c26e25
Merge remote-tracking branch 'origin/develop' into petri_dev 2022-09-29 13:45:42 +02:00
151d27985f
Merge remote-tracking branch 'origin/develop' into scex-additions 2022-09-29 13:43:58 +02:00
a152553d00
Merge remote-tracking branch 'origin/develop' into mueller/em-sw-updates 2022-09-29 13:32:10 +02:00
ffb9e5e03c Merge pull request 'OBSW Update Commands' () from mueller/obsw-update-cmds into develop
Reviewed-on: 
Reviewed-by: Jakob Meier <meierj@irs.uni-stuttgart.de>
2022-09-29 13:24:16 +02:00
fcef7e42a5
some unittest fixes 2022-09-29 13:23:55 +02:00
1463963532
unittest builds now 2022-09-29 13:20:05 +02:00
6bdc0b23de
bump fsfw and tmtc 2022-09-29 13:13:38 +02:00
b9f48a533a Merge remote-tracking branch 'origin/develop' into scex-additions 2022-09-28 17:02:21 +02:00
97f02401fe bugfix for SCEX code 2022-09-28 17:01:40 +02:00
02333d8267
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init 2022-09-28 10:13:53 +02:00
5d0c07467f
update changelog 2022-09-28 10:05:36 +02:00
103d53181c
Merge remote-tracking branch 'origin/develop' into mueller/obsw-update-cmds 2022-09-28 10:04:22 +02:00
c602d7bb28
clean up the dependency mess 2022-09-28 00:19:29 +02:00
0bae128536
bump fsfw again 2022-09-28 00:03:28 +02:00
e2b83f9222
update .cproject file 2022-09-28 00:02:03 +02:00
6888df5c44
afmt 2022-09-27 23:59:38 +02:00
0c75997ba0
now it compiles for windows again 2022-09-27 23:59:17 +02:00
1aa3cc3595
cant build GW SW of windows 2022-09-27 21:45:22 +02:00
Irini Kosmidou
26dc4ba56e fixes for compilation 2022-09-27 19:38:35 +02:00
Irini Kosmidou
a04372ff55 Merge remote-tracking branch 'origin/develop' into petri_dev 2022-09-27 19:31:57 +02:00
Irini Kosmidou
f415adccc2 repoint fsfw 2022-09-27 19:30:42 +02:00
269de1782a
Merge branch 'mueller/obsw-update-cmds' into mueller/acs-ss-init 2022-09-27 19:26:23 +02:00
Irini Kosmidou
c7e06f8878 changelog update 2022-09-27 19:22:06 +02:00
Irini Kosmidou
5f2a0e107d Merge branch 'scex-additions' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into scex-additions 2022-09-27 19:18:19 +02:00
Irini Kosmidou
3fd8230f03 Merge branch 'irini' into scex-additions 2022-09-27 19:18:12 +02:00
Irini Kosmidou
071e00e0ef dog fixed 2022-09-27 19:17:24 +02:00
aab2dc6367 Merge branch 'develop' into scex-additions 2022-09-27 19:14:40 +02:00
Irini Kosmidou
3240c843a1 Merge branch 'scex-additions' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into scex-additions 2022-09-27 19:09:31 +02:00
Irini Kosmidou
d3c7bae087 Merge branch 'irini' into scex-additions 2022-09-27 19:08:40 +02:00
Irini Kosmidou
32c2b2038c constructor correction 2022-09-27 19:06:55 +02:00
Irini Kosmidou
308a855d8c bugfix for scex testcode 2022-09-27 18:54:48 +02:00
Irini Kosmidou
a1cc5b0ca7 Merge remote-tracking branch 'origin/develop' into irini 2022-09-27 17:36:19 +02:00
5813c5dd43
bump fsfw 2022-09-27 14:58:40 +02:00
2b41b3ee26 Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init 2022-09-27 14:57:01 +02:00
24062071c0
bump json dependency to concrete version v3.11.2 2022-09-27 14:56:32 +02:00
3c746e954b
updates on same image are problematic.. 2022-09-27 14:29:39 +02:00
ff243fa46c
some bugfixes 2022-09-27 12:19:42 +02:00
2c3c3c76af
check out explicit json version 2022-09-27 12:14:33 +02:00
51976730aa
important bugfix 2022-09-27 11:14:54 +02:00
caca7f5da8
small bugfix 2022-09-27 10:55:00 +02:00
8c0fd8d9e2
some informative docs 2022-09-27 10:51:56 +02:00
90962c9f8e
rudimentary SD commanding interface 2022-09-27 10:51:07 +02:00
9b6636fe31
rerun generators 2022-09-27 09:33:34 +02:00
2614239fe4
this should work for the same chip/copy as well 2022-09-27 09:27:40 +02:00
d87baa8da9
successfull SW update 2022-09-26 23:17:12 +02:00
9d440838e9
set correct owner for SW update procedure 2022-09-26 18:40:31 +02:00