Commit Graph

1923 Commits

Author SHA1 Message Date
f9c8b544ba Merge pull request 'v1.9.1' (#178) from develop into main
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #178
2022-03-09 09:34:13 +01:00
3dd6fcc75a Merge pull request 'Hotfixes, bump to v1.9.1' (#176) from mueller/hotfixes into develop
Some checks are pending
EIVE/eive-obsw/pipeline/pr-main Build queued...
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #176
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-03-08 17:47:34 +01:00
15151e0400
bump revision
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-03-08 11:59:06 +01:00
b992058e00
hotfix for countdown in SDC manager
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
2022-03-08 11:58:13 +01:00
48f972f7a2 Merge pull request 'v1.9.0' (#175) from develop into main
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #175
2022-03-08 10:32:40 +01:00
b6c34d11d2 Merge branch 'develop' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw 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-03-08 10:26:00 +01:00
a73710088d
bump minor version 2022-03-08 10:25:47 +01:00
3dad3f311b Merge branch 'main' into develop
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2022-03-08 10:25:01 +01:00
6b2d6609a3
fsfw update
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2022-03-08 10:24:36 +01:00
7b4f45b082 Merge pull request 'enabled more GCC warnings' (#174) from mueller/additional-gcc-warnings into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-main This commit looks good
Reviewed-on: #174
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-03-08 10:12:47 +01:00
d799e3768d
repoint tmtc
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head Build started...
2022-03-08 09:50:47 +01:00
10a2973dc7
minor update in fsfw
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-08 09:48:18 +01:00
6ccf16f56d
enabled more GCC warnings
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-08 09:37:23 +01:00
a145a868dc Merge pull request 'move archive folder' (#170) from mueller/move-archive-folder into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #170
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-03-08 07:51:26 +01:00
7134401570 Merge branch 'develop' into mueller/move-archive-folder
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-03-07 15:39:12 +01:00
21d7d5b6f9 Merge pull request 'keeping unittests running' (#173) from mohr/unittests into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #173
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2022-03-07 15:38:58 +01:00
afb1c875da
fsfw update
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-07 15:34:19 +01:00
2ef1befb9c
common gpioIds.h file
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-07 15:29:27 +01:00
4e8ce4eb0a keeping unittests running
Some checks failed
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-07 11:47:44 +01:00
e1e6657b48 Merge pull request 'update for generator scripts' (#171) from mueller/gen-update-formatter into develop
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
Reviewed-on: #171
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-03-04 16:19:33 +01:00
909a0e1c16 Merge pull request 'Payload PCDU' (#172) from mueller/plpcdu into develop
Reviewed-on: #172
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-03-04 16:18:54 +01:00
926888308d Merge branch 'develop' into mueller/plpcdu
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-03-04 15:31:21 +01:00
e7c0066d5d
added last small fixes for successfull compilation
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop Build queued...
2022-03-04 15:28:47 +01:00
7f42de1c82
added PL PCDU code 2022-03-04 15:26:36 +01:00
8054694763
update for generator scripts
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
- Generators will now copy csv files into tmtc folder
- Bump fsfwgen dependency, some bugfixes
- Rerun formatter
- Rerun generator scripts
2022-03-04 15:14:02 +01:00
f419ac8fd7 Merge branch 'develop' into mueller/move-archive-folder
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-04 15:05:27 +01:00
392faa6664 Merge pull request 'building with -j4 instead of -j to limit load on buildserver' (#167) from mohr/slowbuild into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #167
2022-03-04 15:05:07 +01:00
b71ea7c4c7
move archive folder
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-04 15:00:14 +01:00
f39a755815 Merge branch 'develop' into mohr/slowbuild
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build queued...
2022-03-04 14:53:18 +01:00
535a2eea84 Merge pull request 'doge' (#169) from mueller/doge into develop
Some checks reported errors
EIVE/eive-obsw/pipeline/head Something is wrong with the build of this commit
Reviewed-on: #169
2022-03-04 14:53:05 +01:00
e2d6202d56 Merge branch 'develop' into mueller/doge
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build queued...
2022-03-04 14:50:48 +01:00
7b9023cb6f Merge pull request 'Update for generator scripts' (#163) from mueller/generators-update into develop
Some checks reported errors
EIVE/eive-obsw/pipeline/head Something is wrong with the build of this commit
Reviewed-on: #163
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-03-04 09:56:08 +01:00
6c51553f71 Merge pull request 'ADIS Gyro Handler: Use OSAL define instead of dedicated define' (#162) from mueller/adis-optimization into develop
Reviewed-on: #162
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-03-04 09:55:43 +01:00
b6de685ea2 Merge pull request 'Update for memory management' (#159) from mueller/sdcman-mg into develop
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
Reviewed-on: #159
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-03-04 09:55:06 +01:00
f6a69e2eca Merge pull request 'added try catch for more safety' (#168) from mueller/catch-nlohmann-json into develop
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
Reviewed-on: #168
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-03-04 09:54:17 +01:00
74c1bba814
doge
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-03 19:21:56 +01:00
ebdd3914f4
added try catch for more safety
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-03-03 19:13:43 +01:00
bb20b470ec building with -j4 instead of -j to limit strain on buildserver
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-03 15:59:44 +01:00
714167f112 Merge remote-tracking branch 'origin/develop' into mueller/sdcman-mg
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head Build queued...
2022-03-03 13:38:39 +01:00
5ce46beebf Merge remote-tracking branch 'origin/develop' into mueller/adis-optimization
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-03-03 13:38:21 +01:00
0f60d82c06 Merge remote-tracking branch 'origin/develop' into mueller/generators-update
Some checks reported errors
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head Something is wrong with the build of this commit
2022-03-03 13:37:51 +01:00
e07713a6f7 Merge pull request 'Adding Catch2 for unittests, reworked CI' (#165) from mohr/catch2 into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #165
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2022-03-03 13:34:24 +01:00
fd368343c4
submodule updates
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-03 10:36:53 +01:00
97a0662adc
submodule updates
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-03 10:36:33 +01:00
3f7fb259c9
submodule updates
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build queued...
2022-03-03 10:36:10 +01:00
458b33e5fd
submodule updates
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-03-03 10:34:49 +01:00
221d7b408a using new docker container name
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-03-02 18:01:21 +01:00
f413ed6f7d Merge branch 'mohr/buildfix' into mohr/catch2 2022-03-02 17:52:41 +01:00
05bd1cc8c6 forgot one
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-02 17:47:48 +01:00
2f51f58c7e Merge branch 'develop' into mohr/catch2
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-03-02 17:12:24 +01:00