Commit Graph

2798 Commits

Author SHA1 Message Date
Jakob Meier
322db3d617 removed ploc updater 2022-05-06 19:52:43 +02:00
Jakob Meier
6dd57a3f5e fixed merge conflicts
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-05-06 19:44:18 +02:00
Jakob Meier
4ba26f057d Merge branch 'meier/ploc' into meier/plocSupv
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-06 19:36:03 +02:00
Jakob Meier
97222cafd9 increased mram dump execution timeout
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-06 19:34:12 +02:00
Jakob Meier
cbb3c92885 tmtc update 2022-05-06 19:31:09 +02:00
Jakob Meier
132751893b bugfix in missed reply hanling of supervsior MRAM dump 2022-05-06 19:30:20 +02:00
576f71304c
updated eclipse launch files
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-06 10:45:53 +02:00
385d8df466
fix .cproject file
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-06 10:43:04 +02:00
bfd7d9d82d
bump fsfw (hotfix)
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-06 10:37:54 +02:00
9918aae94a Merge pull request 'install Catch2 for CI/CD' (#247) from mueller/install-catch2-docker into develop
Reviewed-on: #247
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-05-06 10:00:12 +02:00
31425877b4
apparently python3 is needed
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-06 01:09:25 +02:00
09f80f63b5
small dockerfile fix
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-06 01:01:56 +02:00
a945b3cae0
Merge remote-tracking branch 'origin/develop' into mueller/install-catch2-docker
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-05 20:19:53 +02:00
81b29cfda6
lets hope this works
Some checks reported errors
EIVE/eive-obsw/pipeline/pr-develop Something is wrong with the build of this commit
2022-05-05 20:16:42 +02:00
a7b696884c Merge pull request 'Rename sun sensors' (#245) from mueller/rename-sus into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #245
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-05-05 19:52:30 +02:00
e98563d834
update changelog
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-05-05 19:51:25 +02:00
a920f60c61
use newer docker container d5
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build queued...
2022-05-05 19:50:53 +02:00
b54641a2a1
install catch2 for CI/CD
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-05 19:48:04 +02:00
a2a7313016
Merge remote-tracking branch 'origin/develop' into mueller/rename-sus
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-05 19:47:17 +02:00
6893b895e3 Merge pull request 'Build unittest by default in host build' (#244) from mueller/ci-cd-build-host-and-unittest-by-default into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #244
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-05-05 19:46:04 +02:00
8f9d84c293
Merge remote-tracking branch 'origin/develop' into mueller/ci-cd-build-host-and-unittest-by-default
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-05 19:42:24 +02:00
0c82d06ec4
Merge remote-tracking branch 'origin/develop' into mueller/rename-sus
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-05 19:41:36 +02:00
5c7c5b468a tmtc update
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-05 19:21:42 +02:00
fabd81365b supervisor do startup set time 2022-05-05 19:20:14 +02:00
5911ca79b5 nvm enable command 2022-05-05 19:18:39 +02:00
a3419412cc Merge pull request 'Rename RTDs' (#246) from mueller/rename-rtds into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #246
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-05-05 17:13:11 +02:00
cc662738f2
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-05-05 16:55:51 +02:00
b426475ca4
better RTD names 2022-05-05 16:55:08 +02:00
957c8f5298
bump submodules
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
2022-05-05 16:50:16 +02:00
4445ac34ca
update changelog
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-05 16:49:10 +02:00
b9535f46d9
bump tmtc again
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-05 16:48:30 +02:00
a232b9bf98
assign better sus names
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-05 16:46:04 +02:00
165963ed2d
bump submodules 2022-05-05 16:35:53 +02:00
9bd5595999 no time command sent during startup of supervisor 2022-05-05 10:50:23 +02:00
Jakob Meier
e5fdf23dd7 tmtc update
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-05-05 09:15:05 +02:00
Jakob Meier
8832d06d03 improvements for mram dump
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-05 08:55:45 +02:00
Jakob Meier
5441520369 tmtc update
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-05-04 19:11:01 +02:00
Jakob Meier
8aacbc2b40 cam cmd reply handling 2022-05-04 19:08:37 +02:00
54a50beacb Merge remote-tracking branch 'origin/main' into mueller/ci-cd-build-host-and-unittest-by-default
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-04 17:46:19 +02:00
c24d5c05f0 Merge branch 'mueller/ci-cd-build-host-and-unittest-by-default' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into mueller/ci-cd-build-host-and-unittest-by-default 2022-05-04 17:46:09 +02:00
a2e22302fb
update changelog 2022-05-04 17:46:01 +02:00
1a6fb52e1d Merge branch 'develop' into mueller/ci-cd-build-host-and-unittest-by-default
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-04 17:40:19 +02:00
c83a177061
Build unittest by default in host build
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
- Also update CI/CD to build host build
2022-05-04 17:38:08 +02:00
4589b3b696 Merge pull request 'v1.11.0' (#243) from develop into main
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #243
2022-05-04 17:19:56 +02:00
0271b4970c Merge branch 'main' into develop
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-04 17:13:09 +02:00
4db35e8641
bump tmtc submodule
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2022-05-04 17:08:25 +02:00
8315a03efc Merge pull request 'Building new EM config' (#238) from mueller/refactoring-conf-handling into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #238
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-05-04 15:08:18 +02:00
2cf1da5478 Merge remote-tracking branch 'origin/develop' into mueller/refactoring-conf-handling
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-04 14:51:55 +02:00
e06f459333
changelog correction
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-04 14:43:27 +02:00
535da53093 Merge remote-tracking branch 'origin/develop' into mueller/refactoring-conf-handling
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-04 14:34:07 +02:00