Commit Graph

7067 Commits

Author SHA1 Message Date
7bd2fce86f
Merge branch 'tm-store-task-base-bugfix' into update-ptme-code-2 2023-05-23 19:40:17 +02:00
28beb006b2
thats an annoying bug
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
2023-05-23 19:37:01 +02:00
7222475985
changelog, remove unnecessary logic 2023-05-23 19:18:42 +02:00
f5a7fd2ffe Merge branch 'oh-no-no-no-bug' into update-ptme-code-2 2023-05-23 19:16:36 +02:00
6bfb0d4fb0
changelog
All checks were successful
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
2023-05-23 19:14:03 +02:00
7ac2271eab
buuuug
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
2023-05-23 19:12:35 +02:00
8efbdf8279 Merge branch 'v2.2.0-dev' into update-ptme-code-2
All checks were successful
EIVE/eive-obsw/pipeline/pr-v2.2.0-dev This commit looks good
2023-05-23 18:30:00 +02:00
631a1aec42 Merge branch 'v2.1.0-dev' into gyr-confg-rework-2
All checks were successful
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
2023-05-23 15:42:30 +02:00
7eeece6934 Merge branch 'v2.1.0-dev' into acs-ptg-ctrl-fixes-2
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
2023-05-23 15:37:16 +02:00
04571bbd7a Merge branch 'v2.1.0-dev' into acs-params-fix
All checks were successful
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
2023-05-23 15:08:56 +02:00
32a4aa48d9 frmt
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
2023-05-23 15:07:23 +02:00
62ae7ff482 frmt 2023-05-23 15:04:43 +02:00
5390e947ca changelog
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
2023-05-23 15:02:35 +02:00
9ff154cedc added missing parameter 2023-05-23 14:56:04 +02:00
4763ec84fa
Merge remote-tracking branch 'origin/v2.1.0-dev' into v2.2.0-dev
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-05-23 14:46:44 +02:00
e4fc6e3d2a
Merge branch 'v2.2.0-dev' into update-ptme-code-2
All checks were successful
EIVE/eive-obsw/pipeline/pr-v2.2.0-dev This commit looks good
2023-05-22 11:46:48 +02:00
2543cdf5b7
changelog
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-05-22 11:44:42 +02:00
72b5c7d053 Merge pull request 'ze batteri wos add' (#641) from add_ze_betteri into v2.1.0-dev
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #641
2023-05-22 11:42:34 +02:00
d23082283d
changelog
Some checks are pending
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev Build queued...
2023-05-22 11:42:08 +02:00
cd514e8125
ze batteri wos add
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev Build started...
2023-05-22 11:40:33 +02:00
ea9f72b9c4 Merge branch 'v2.2.0-dev' into update-ptme-code-2
All checks were successful
EIVE/eive-obsw/pipeline/pr-v2.2.0-dev This commit looks good
2023-05-22 10:48:47 +02:00
148a876fc9 Merge branch 'v2.1.0-dev' into v2.2.0-dev
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-05-22 10:48:30 +02:00
9804898d05 Merge remote-tracking branch 'origin/v2.2.0-dev' into update-ptme-code-2 2023-05-22 10:48:22 +02:00
e04f349e77 Merge pull request 'CFDP Bugfix' (#639) from cfdp-bugfix into v2.2.0-dev
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #639
2023-05-22 10:47:29 +02:00
8cc4431e22 Merge branch 'v2.2.0-dev' into update-ptme-code-2
All checks were successful
EIVE/eive-obsw/pipeline/pr-v2.2.0-dev This commit looks good
2023-05-22 10:46:25 +02:00
22dcf10207 Merge branch 'v2.1.0-dev' into update-ptme-code-2 2023-05-22 10:46:14 +02:00
fa4a40da6e Merge pull request 'PLOC MPSoC read file, fix write file' (#633) from ploc_mpsoc_read_file_2 into v2.1.0-dev
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #633
2023-05-19 10:05:40 +02:00
a814746c53 Merge branch 'ploc_mpsoc_read_file_2' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into ploc_mpsoc_read_file_2
All checks were successful
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
2023-05-19 09:41:51 +02:00
ed74367f01
changelog 2023-05-19 09:41:44 +02:00
3f37c52f67 Merge branch 'v2.1.0-dev' into ploc_mpsoc_read_file_2
All checks were successful
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
2023-05-17 19:01:05 +02:00
a0e305fe1f
changelog
All checks were successful
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
2023-05-17 18:55:53 +02:00
d28bc3f74d
bugfix
All checks were successful
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
2023-05-17 18:51:53 +02:00
b9afeb9c19
fix some regressions
Some checks failed
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev There was a failure building this commit
2023-05-17 18:44:12 +02:00
7f115303ae
everything is working now
All checks were successful
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
2023-05-17 18:33:48 +02:00
e03df2ebca
almost done
All checks were successful
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
2023-05-17 17:33:14 +02:00
f9e8dc6e60
D'OH
All checks were successful
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
2023-05-17 16:33:52 +02:00
0179c04472
that did not help
All checks were successful
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
2023-05-17 12:59:29 +02:00
c3b6b0a7ee
pure chaos
All checks were successful
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
2023-05-16 18:46:13 +02:00
90b7f069dc
it is getting annoying again 2023-05-16 18:41:04 +02:00
4ba9ebf58f
kenning west alder 2023-05-16 13:34:06 +02:00
8b467ec69e
dock hk improvements
Some checks are pending
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/-/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-v4.0.0-dev This commit looks good
2023-05-16 11:36:19 +02:00
468fa01650
bugfix 2023-05-16 11:08:33 +02:00
b39e448ab5
correction for flashfclose cmd
Some checks failed
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev There was a failure building this commit
2023-05-16 08:19:30 +02:00
8ed3bdc95c Merge pull request 'add ACU dummy when adding all dummies' (#640) from dummy-bugfix-host-build into v2.1.0-dev
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #640
2023-05-15 17:34:21 +02:00
04b9ed4504
add ACU dummy as well
Some checks are pending
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
EIVE/eive-obsw/pipeline/head Build queued...
2023-05-15 16:53:18 +02:00
ab6a0c3e4d
fix host build
All checks were successful
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
2023-05-15 16:49:16 +02:00
97a7087827
bump tmtc
All checks were successful
EIVE/eive-obsw/pipeline/pr-v2.2.0-dev This commit looks good
2023-05-15 16:45:14 +02:00
a615ed2d21
bump fsfw
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-v2.2.0-dev This commit looks good
2023-05-15 16:18:44 +02:00
3d7d01d6ab
bump tmtc
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-05-15 16:17:08 +02:00
78972cd173
remove some more printouts
Some checks failed
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev There was a failure building this commit
2023-05-15 16:16:17 +02:00