Commit Graph

2572 Commits

Author SHA1 Message Date
957b067eac Merge remote-tracking branch 'origin/develop' into mueller/obsw-config-infile-update 2022-04-23 12:28:51 +02:00
9fe2de5244 Merge pull request 'CMake git describe support' (#226) from mueller/cmake-git-describe-support into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #226
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-04-22 20:03:34 +02:00
177b4305bb Merge branch 'mueller/version-fix' into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-22 16:19:04 +02:00
ea139d0657
added new revision
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-main Build queued...
2022-04-22 16:16:25 +02:00
8bd7d00ab1
forgot to bump version
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
2022-04-22 16:15:04 +02:00
417a6d8ea0
added missing character
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-22 16:06:44 +02:00
17fd273d10
fix for toolchain file handling
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-04-22 16:01:10 +02:00
772a829333
small improvement
Some checks failed
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-04-22 15:58:15 +02:00
48e0718b76 Merge branch 'develop' into mueller/obsw-config-infile-update
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-22 15:55:12 +02:00
6f54129f60 Merge remote-tracking branch 'origin/develop' into mueller/cmake-git-describe-support
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-04-22 15:54:42 +02:00
32f2cd60bb Merge remote-tracking branch 'origin/main' into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-22 15:54:14 +02:00
0638c87f62
made version handling more robust
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-04-22 15:47:47 +02:00
0f80501467
rename helpers file 2022-04-22 15:42:13 +02:00
a416ca406b
git describe support finished
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-04-22 14:09:08 +02:00
aa84175382
pass power switcher for syrlinks handler creation
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-22 11:29:19 +02:00
737d18135f
test flag for RW
Some checks failed
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-04-22 11:09:06 +02:00
0da74f1bf9
bump submodules, add some more devices by default 2022-04-22 11:08:27 +02:00
d6532f8181 Merge pull request 'Update for new yocto rootfs' (#217) from mueller/yocto-rootfs into develop
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
Reviewed-on: #217
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-04-22 10:21:52 +02:00
a24464f13e Merge pull request 'v1.10.0' (#220) from develop into main
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #220
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-04-22 07:42:18 +02:00
e61fada99e Merge pull request 'MPSoC Handler Update' (#219) from meier/plocMPSoC 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
Reviewed-on: #219
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2022-04-21 16:36:02 +02:00
333155b1a0 Merge branch 'develop' into meier/plocMPSoC
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-21 14:32:22 +02:00
2c491b27c0
update CHANGELOG
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2022-04-21 14:21:02 +02:00
ae2cd52087
add changelog
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-21 14:18:41 +02:00
Jakob Meier
47b9576c24 decreased pst uart frequency again
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-21 14:04:46 +02:00
Jakob Meier
7ae8138a43 Merge branch 'develop' into meier/plocMPSoC
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
2022-04-21 14:03:27 +02:00
438957c466
update shell script to use default SDK sysroot
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-04-21 13:52:27 +02:00
4f4a8930c8
repoint fsfw
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-21 13:45:37 +02:00
20bb1d73f5 Merge remote-tracking branch 'origin/develop' into mueller/yocto-rootfs 2022-04-21 13:45:13 +02:00
4325eaa956 Merge pull request 'bugfix for inverse copying' (#213) from mueller/q7s-cp-bugfix into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #213
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-04-21 11:23:33 +02:00
daf50a83fd Merge pull request 'fix initializer list order' (#215) from mueller/imtq-order-fix into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #215
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-04-21 11:23:09 +02:00
34c0ac3f05 Merge pull request 'fix and improvement for include handling in OBSW watchdog' (#216) from mueller/watchdog-fixes into develop
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
Reviewed-on: #216
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-04-21 11:22:09 +02:00
b68c58fd37 Merge pull request 'fix out-of-bounds read in PCDU Handler' (#218) from mueller/hotfix-pcdu-handler into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #218
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-04-21 11:21:27 +02:00
707c318ab9
repoint fsfw again
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-21 10:41:29 +02:00
9c54696d91
fix out-of-bounds read
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-21 10:25:51 +02:00
Jakob Meier
0e9300b51c fsfw update
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-21 09:33:49 +02:00
Jakob Meier
73ba4a39b0 comments 2022-04-21 09:31:52 +02:00
Jakob Meier
77870468d9 cam commands
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-04-20 21:34:29 +02:00
Jakob Meier
38ecb9e055 cam commands
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-04-20 21:33:39 +02:00
17c440643f Merge branch 'mueller/master' into mueller/yocto-rootfs
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-04-20 13:44:07 +02:00
eb0e7c39e4
update README
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-04-20 01:27:16 +02:00
f23ba7ab7b
always build watchdog for arm q7s now 2022-04-20 01:25:56 +02:00
c4220b37e5
add option for external toolchain file 2022-04-20 00:57:37 +02:00
69f39b765b
curl cant use wildcards
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-19 18:30:21 +02:00
fa4ee7a84b
this is odd
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-04-19 18:23:38 +02:00
0263d3adb5
newline at end
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-04-19 18:20:07 +02:00
67fbabbd7c
update docker file and jenkins file 2022-04-19 18:18:07 +02:00
ec0a38ad25
update win q7s env script
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-04-19 17:54:32 +02:00
5d8e8a9841
delete commented code
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-04-19 17:52:43 +02:00
c3238ab154
update .cproject file
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-04-19 17:51:53 +02:00
4956161701
support both gps versions
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-04-19 17:47:05 +02:00