Commit Graph

2624 Commits

Author SHA1 Message Date
1527b60fd6
Merge remote-tracking branch 'origin/develop' into mueller/rw-ass
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-28 18:26:34 +02:00
bbe1e996e6 Merge pull request 'Host Fixes and CMakeLists.txt update' (#229) from mueller/host-fixes-fsfw-update into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #229
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-04-28 17:16:03 +02:00
6d326137fb Merge pull request 'OBSW Config in file update' (#225) from mueller/obsw-config-infile-update into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #225
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-04-28 17:15:37 +02:00
b40ceafbe0 Merge pull request 'disable -Wformat-truncation error' (#223) from mueller/disable-warning-in-csp-lib into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #223
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-04-28 17:15:06 +02:00
a9e106bb71 Merge pull request 'Update README' (#222) from mueller/update-README into develop
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
Reviewed-on: #222
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-04-28 17:14:42 +02:00
199acec3b5 Merge pull request 'Improvement for PCDU Handler' (#221) from mueller/minor-tweaks-pcdu-handler into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #221
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-04-28 17:14:09 +02:00
4f72fb355c
update fsfwgen
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-28 13:08:44 +02:00
ca1365df5b Merge remote-tracking branch 'origin/develop' into mueller/rw-ass 2022-04-28 13:08:34 +02:00
ab85ebf83e
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-04-28 11:37:06 +02:00
b40302210f Merge remote-tracking branch 'origin/develop' into mueller/update-README
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-28 11:33:54 +02:00
713bfbd7dc Merge remote-tracking branch 'origin/develop' into mueller/minor-tweaks-pcdu-handler
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-28 11:33:35 +02:00
40168bcd5f Merge branch 'develop' into mueller/disable-warning-in-csp-lib
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-28 11:33:13 +02:00
9ce7a28cff Merge remote-tracking branch 'origin/develop' into mueller/obsw-config-infile-update
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-28 11:32:59 +02:00
9bb6c41134
Merge branch 'mueller/host-fixes-fsfw-update' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into mueller/host-fixes-fsfw-update
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-28 11:32:15 +02:00
e836ed8a2d
Merge remote-tracking branch 'origin/develop' into mueller/host-fixes-fsfw-update 2022-04-28 11:31:50 +02:00
a45f298505 Merge pull request 'GPSD test' (#230) from mueller/gps-test into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #230
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-04-28 11:12:52 +02:00
234a6b7ac3
switch gps ctrl to socket API
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-28 10:50:39 +02:00
584700a2ba
do not add ETL lib
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-28 10:21:04 +02:00
a1c3b1786f
bump submodules
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-04-28 10:07:42 +02:00
bed58a45e5
move catch2 load directive to bottom
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-27 09:02:12 +02:00
5b2239cee6
repoint fsfw
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-04-27 08:55:21 +02:00
b3f0d19bb9
CMakeLists.txt order fixes
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-04-26 20:20:56 +02:00
00bbc86d39
update CMakeLists.txt file
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-26 20:10:09 +02:00
49b3120ada
remove etl submodule , want to use the one provided by the fsfw
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-04-26 11:15:35 +02:00
2b33d8772c
fixes most warnings for host build
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-04-26 10:37:25 +02:00
6bdb13b6a0
submodule update
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-23 12:37:40 +02:00
9f3a56e5e6 Merge remote-tracking branch 'origin/develop' into mueller/rw-ass 2022-04-23 12:37:25 +02:00
ba2589c8d5
submodule updates
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-23 12:30:49 +02:00
f421fd4dde Merge remote-tracking branch 'origin/develop' into mueller/minor-tweaks-pcdu-handler 2022-04-23 12:30:45 +02:00
9ac5d0da67
submodule updates
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-23 12:30:20 +02:00
c5ae12e10b Merge remote-tracking branch 'origin/develop' into mueller/update-README 2022-04-23 12:30:11 +02:00
25570cc631 Merge branch 'develop' into mueller/disable-warning-in-csp-lib
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-23 12:29:51 +02:00
baf2e5fb39
submodule updates
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-23 12:29:29 +02:00
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
bf1f6887be Merge branch 'develop' into mueller/minor-tweaks-pcdu-handler
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-22 15:55:54 +02:00
3c2092926e Merge branch 'develop' into mueller/update-README
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-22 15:55:44 +02:00
f22644697e Merge branch 'develop' into mueller/disable-warning-in-csp-lib
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-22 15:55:35 +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