Commit Graph

3786 Commits

Author SHA1 Message Date
0f609fdaba
thats a bit tricky
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-09-29 16:47:47 +02:00
ee6d13abcc Merge branch 'develop' into petri_dev
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-29 14:21:08 +02:00
0f081e52bd
bump tmtc
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-29 14:20:44 +02:00
660d42f615 Merge remote-tracking branch 'origin/develop' into scex-additions
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-29 14:10:29 +02:00
541b44cea7
re-run afmt
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-09-29 14:10:21 +02:00
b3f4eaa0f2
Merge remote-tracking branch 'origin/develop' into petri_dev
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-29 14:09:33 +02:00
2ad93f7735
Merge remote-tracking branch 'origin/develop' into mueller/em-sw-updates
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-29 14:09:02 +02:00
865ca46974
Merge remote-tracking branch 'origin/develop' into scex-additions
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-29 14:08:22 +02:00
e161eeb537
re-run generators and bump dependencies
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-09-29 14:06:46 +02:00
8a5248a46d
include fix
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-29 14:03:09 +02:00
a215657f4e
small bugfix
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-29 14:01:04 +02:00
92cf4580ca
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-09-29 13:57:39 +02:00
49efbc4725
some bugfixes
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-09-29 13:53:42 +02:00
96497df7ba
bump tmtc
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-09-29 13:49:39 +02:00
aa56c26e25
Merge remote-tracking branch 'origin/develop' into petri_dev
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-29 13:45:42 +02:00
151d27985f
Merge remote-tracking branch 'origin/develop' into scex-additions
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-09-29 13:43:58 +02:00
a152553d00
Merge remote-tracking branch 'origin/develop' into mueller/em-sw-updates
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-29 13:32:10 +02:00
ffb9e5e03c Merge pull request 'OBSW Update Commands' (#302) from mueller/obsw-update-cmds into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #302
Reviewed-by: Jakob Meier <meierj@irs.uni-stuttgart.de>
2022-09-29 13:24:16 +02:00
fcef7e42a5
some unittest fixes
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-29 13:23:55 +02:00
1463963532
unittest builds now
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-09-29 13:20:05 +02:00
6bdc0b23de
bump fsfw and tmtc
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-09-29 13:13:38 +02:00
b9f48a533a Merge remote-tracking branch 'origin/develop' into scex-additions
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-28 17:02:21 +02:00
97f02401fe bugfix for SCEX code
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-28 17:01:40 +02:00
02333d8267
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-09-28 10:13:53 +02:00
5d0c07467f
update changelog
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-09-28 10:05:36 +02:00
103d53181c
Merge remote-tracking branch 'origin/develop' into mueller/obsw-update-cmds
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-28 10:04:22 +02:00
c602d7bb28
clean up the dependency mess
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-09-28 00:19:29 +02:00
0bae128536
bump fsfw again
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-09-28 00:03:28 +02:00
e2b83f9222
update .cproject file
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-09-28 00:02:03 +02:00
6888df5c44
afmt
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
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
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-09-27 19:38:35 +02:00
Irini Kosmidou
a04372ff55 Merge remote-tracking branch 'origin/develop' into petri_dev
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-09-27 19:31:57 +02:00
Irini Kosmidou
f415adccc2 repoint fsfw
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-27 19:30:42 +02:00
269de1782a
Merge branch 'mueller/obsw-update-cmds' into mueller/acs-ss-init
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-09-27 19:26:23 +02:00
Irini Kosmidou
c7e06f8878 changelog update
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
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
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
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
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-09-27 19:17:24 +02:00
aab2dc6367 Merge branch 'develop' into scex-additions
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
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
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
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
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-09-27 19:06:55 +02:00
Irini Kosmidou
308a855d8c bugfix for scex testcode
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-09-27 18:54:48 +02:00
Irini Kosmidou
a1cc5b0ca7 Merge remote-tracking branch 'origin/develop' into irini
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-09-27 17:36:19 +02:00
5813c5dd43
bump fsfw
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
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
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-09-27 14:56:32 +02:00
3c746e954b
updates on same image are problematic..
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-27 14:29:39 +02:00