Commit Graph

2039 Commits

Author SHA1 Message Date
Robin Müller a74c606307
moved some archive files
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit Details
2022-03-04 10:38:39 +01:00
Robin Müller 38e5a97015
regenerate returnvalues 2022-03-04 10:29:56 +01:00
Robin Müller bc310c9dfb
regenerated events 2022-03-04 10:26:29 +01:00
Robin Müller 60f9bf8fe5
Merge branch 'mueller/system-subsystems' into mueller/master
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit Details
2022-03-04 09:40:53 +01:00
Robin Müller 120153e9c7
added some missing acs board ass code
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit Details
2022-03-04 00:55:51 +01:00
Robin Müller 0595e29100
finished most of sus handler
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
2022-03-03 20:11:12 +01:00
Robin Müller a7c1dafce5
added mutex protection for power switches
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
2022-03-03 19:39:36 +01:00
Robin Müller 90972cf2f5
Merge branch 'mueller/plpcdu' into mueller/master
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit Details
2022-03-03 19:11:44 +01:00
Robin Müller cc9a2dab50 Merge remote-tracking branch 'origin/develop' into mueller/master
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit Details
2022-03-03 19:35:15 +01:00
Robin Müller b44442b282 some fixes for pl pcdu 2022-03-03 19:34:52 +01:00
Robin Müller bf10fe4cdb
Merge remote-tracking branch 'origin/develop' into mueller/plpcdu
EIVE/eive-obsw/pipeline/head There was a failure building this commit Details
2022-03-03 19:10:00 +01:00
Robin Müller 42d3ebe1b0 update .h.in config
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit Details
2022-03-03 17:19:23 +01:00
Robin Müller 63c4095d4d Merge remote-tracking branch 'origin/develop' into mueller/system-subsystems
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
2022-03-03 15:50:31 +01:00
Robin Müller 261b4a808d
completed switcher switch case
EIVE/eive-obsw/pipeline/head There was a failure building this commit Details
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit Details
2022-03-03 15:43:21 +01:00
Robin Müller ff0da65662
started SUS assembly
EIVE/eive-obsw/pipeline/head There was a failure building this commit Details
fixes for PCDU code and switcher list handling
2022-03-03 15:37:36 +01:00
Robin Müller 1586c3e69a
submodule update 2022-03-03 13:43:52 +01:00
Robin Müller e07713a6f7 Merge pull request 'Adding Catch2 for unittests, reworked CI' (#165) from mohr/catch2 into develop
EIVE/eive-obsw/pipeline/head This commit looks good Details
Reviewed-on: #165
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2022-03-03 13:34:24 +01:00
Robin Müller 458b33e5fd
submodule updates
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
EIVE/eive-obsw/pipeline/head This commit looks good Details
2022-03-03 10:34:49 +01:00
Robin Müller c7183b730e
check children state on implementation
EIVE/eive-obsw/pipeline/head There was a failure building this commit Details
2022-03-03 10:28:55 +01:00
Robin Müller 5255e7d2ed
finished ACS board ASS
EIVE/eive-obsw/pipeline/head There was a failure building this commit Details
2022-03-03 10:12:59 +01:00
Ulrich Mohr 221d7b408a using new docker container name
EIVE/eive-obsw/pipeline/head There was a failure building this commit Details
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit Details
2022-03-02 18:01:21 +01:00
Robin Müller 5873371d36
continued acs board assembly
EIVE/eive-obsw/pipeline/head There was a failure building this commit Details
2022-03-02 17:56:54 +01:00
Ulrich Mohr f413ed6f7d Merge branch 'mohr/buildfix' into mohr/catch2 2022-03-02 17:52:41 +01:00
Ulrich Mohr 05bd1cc8c6 forgot one
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit Details
2022-03-02 17:47:48 +01:00
Ulrich Mohr 2f51f58c7e Merge branch 'develop' into mohr/catch2
EIVE/eive-obsw/pipeline/head There was a failure building this commit Details
2022-03-02 17:12:24 +01:00
Ulrich Mohr 182b90ee6d small fixes
EIVE/eive-obsw/pipeline/head There was a failure building this commit Details
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit Details
2022-03-02 17:04:58 +01:00
Uli 606da48861 changing fs.mqueue.msg_max for docker to be able to run unit tests
EIVE/eive-obsw/pipeline/head This commit looks good Details
2022-03-02 16:02:23 +01:00
Robin Müller 0b200cd296
Merge remote-tracking branch 'origin/develop' into mueller/system-subsystems
EIVE/eive-obsw/pipeline/head There was a failure building this commit Details
2022-03-02 15:09:14 +01:00
Robin Müller 566c7913c9
update tmtc submodule
EIVE/eive-obsw/pipeline/head There was a failure building this commit Details
2022-03-02 10:33:27 +01:00
Robin Müller d8240881cc
catch exception in NVM param base
EIVE/eive-obsw/pipeline/head There was a failure building this commit Details
2022-03-01 19:43:40 +01:00
Robin Müller e1b8debb27
Merge remote-tracking branch 'origin/develop' into mueller/plpcdu
EIVE/eive-obsw/pipeline/head There was a failure building this commit Details
2022-03-01 18:09:48 +01:00
Robin Müller 200b92bb15
Merge remote-tracking branch 'origin/develop' into mueller/master
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit Details
2022-03-01 18:00:51 +01:00
Jakob Meier b8a4384c91 Merge pull request 'use new cmake option' (#160) from mueller/small-rpi-fix into develop
EIVE/eive-obsw/pipeline/head There was a failure building this commit Details
Reviewed-on: #160
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-03-01 17:56:17 +01:00
Jakob Meier 6faea8a33b Merge pull request 'updated API to take reference instead of pointer' (#161) from mueller/nvm-json-base-update into develop
Reviewed-on: #161
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-03-01 17:55:45 +01:00
Robin Müller e0e0554fea
update Q7S test task for API change
EIVE/eive-obsw/pipeline/head There was a failure building this commit Details
2022-03-01 17:54:43 +01:00
Robin Müller b8bd211d8e
updated API to take reference instead of pointer
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit Details
2022-03-01 17:52:39 +01:00
Robin Müller 54fb646ea1 Merge remote-tracking branch 'origin/develop' into mueller/small-rpi-fix
EIVE/eive-obsw/pipeline/pr-develop Build started... Details
EIVE/eive-obsw/pipeline/head There was a failure building this commit Details
2022-03-01 17:50:33 +01:00
Robin Müller dae901a45e Merge pull request 'progress printer' (#158) from meier/startracker into develop
EIVE/eive-obsw/pipeline/head There was a failure building this commit Details
Reviewed-on: #158
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2022-03-01 17:50:11 +01:00
Robin Müller 27f9c0223c
use new cmake option
EIVE/eive-obsw/pipeline/head Build queued... Details
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit Details
2022-03-01 17:48:05 +01:00
Robin Müller 20f1cb4ef9
deleted old str handler
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit Details
2022-03-01 17:35:20 +01:00
Robin Müller 6e0c708a81
Merge remote-tracking branch 'origin/develop' into mueller/master
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit Details
2022-03-01 17:34:35 +01:00
Robin Müller 58e4b9f347
smaller fixes and separate pl pcdu adc speed conf
EIVE/eive-obsw/pipeline/head There was a failure building this commit Details
2022-03-01 17:34:07 +01:00
Jakob Meier f8942cd6c6 Merge branch 'develop' into meier/startracker
EIVE/eive-obsw/pipeline/pr-develop Build queued... Details
EIVE/eive-obsw/pipeline/head Build started... Details
2022-03-01 17:25:05 +01:00
Jakob Meier 81915f1772 Merge pull request 'Reboot File Handling' (#154) from mueller/reboot-file-handling into develop
EIVE/eive-obsw/pipeline/head There was a failure building this commit Details
Reviewed-on: #154
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-03-01 17:24:27 +01:00
Jakob Meier 033bdb93ad fixed conflict
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit Details
2022-03-01 17:22:55 +01:00
Jakob Meier 57b815c8ee progress printer
EIVE/eive-obsw/pipeline/head This commit looks good Details
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
2022-03-01 17:17:15 +01:00
Robin Müller c569900968
added complete parameter handling for PL PCDU
EIVE/eive-obsw/pipeline/head There was a failure building this commit Details
2022-03-01 16:38:56 +01:00
Robin Müller 7ab26362f1
Merge remote-tracking branch 'origin/develop' into mueller/master
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit Details
EIVE/eive-obsw/pipeline/head There was a failure building this commit Details
2022-03-01 15:30:29 +01:00
Robin Müller 23e2c5ffc8
repoint fsfw
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit Details
EIVE/eive-obsw/pipeline/head There was a failure building this commit Details
2022-03-01 15:23:01 +01:00
Robin Müller 66ece6544e Merge remote-tracking branch 'origin/develop' into mueller/reboot-file-handling 2022-03-01 15:22:43 +01:00