Commit Graph

2519 Commits

Author SHA1 Message Date
67ab265645 Merge pull request 'Version bump - v1.10.1' (#227) from mueller/version-fix into main
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #227
2022-04-22 16:17:24 +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
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
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
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
850722eae5
include improvements
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-19 17:24:04 +02:00
1fb5b48455
fix initializer list order
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-19 17:18:31 +02:00
f5d88a4b6a
bugfix for inverse copying
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-14 18:27:11 +02:00
23730349b0
repoint fsfw again
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-14 11:26:26 +02:00
500c54e430 Merge pull request 'Extend Power Switch Handling' (#212) from mueller/extend-power-switch-handling into develop
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
Reviewed-on: #212
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-04-14 11:21:34 +02:00
cf575f0d70
repoint fsfw
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop Build queued...
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-04-14 11:19:31 +02:00
1db5d278f6
switcher handling extension
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop Build started...
2022-04-14 11:17:07 +02:00
9fa745cfb2
update fsfwgen deps 2022-04-14 11:02:29 +02:00
aefd8b696d Merge pull request 'Add Empty Subsystem Impls' (#211) from mueller/add-subsystem-impls into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #211
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-04-14 10:17:07 +02:00
Jakob Meier
0f7f17b591 Merge branch 'develop' into mueller/add-subsystem-impls
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build queued...
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-14 10:16:34 +02:00
6fdf7f704d Merge pull request 'Assign power switcher to IMTQ and Star Tracker' (#210) from mueller/assign-more-power-switches into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #210
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-04-14 10:13:16 +02:00
17aa70f5e0 Merge pull request 'submodule and obj factory updates' (#209) from mueller/fsfw-update into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #209
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-04-14 10:12:40 +02:00
fd9fbe4543 Merge remote-tracking branch 'origin/mueller/fsfw-update' into mueller/add-subsystem-impls
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-14 09:54:14 +02:00
6c63356edc
add subsystem impls 2022-04-14 09:54:07 +02:00
94896c9e74
update submodules
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-04-14 09:44:25 +02:00
655497934b
apply afmt
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-13 18:55:49 +02:00
fd3313fc62
assign power switcher for imtq and star tracker
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
2022-04-13 18:55:07 +02:00
a72c2f7b7d
submodule and obj factory 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-04-13 18:51:22 +02:00
9b6f254954 Merge pull request 'Release build warning fixes' (#208) from mueller/release-warning-fixes into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #208
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-04-13 12:15:04 +02:00
Jakob Meier
42b7b4a7c4 Merge branch 'develop' into mueller/release-warning-fixes
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-13 12:04:08 +02:00
435f8164a1 Merge pull request 'Split up PDU1 and PDU2 sets' (#205) from mueller/split-pdu1-pdu2-sets into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #205
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-04-13 12:02:07 +02:00
Jakob Meier
a807aab97e fsfw update
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build queued...
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-13 12:01:39 +02:00
52885919d0 Merge branch 'develop' into mueller/release-warning-fixes
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-13 08:43:29 +02:00
b618302db0 Merge pull request 'Development fixes' (#207) from mueller/develop-fixes into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #207
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-04-12 19:30:33 +02:00
a14ca283cc
using vector for convert enables
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-12 16:36:04 +02:00
2529ed905c
some important bugfixes
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-12 16:11:04 +02:00
2cd5450333
bugfix for pool ID 2022-04-12 16:00:54 +02:00
6e33af7a75
repoint fsfw again
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-11 17:17:58 +02:00
e2e85c19e1
repoint fsfw
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
2022-04-11 17:16:43 +02:00
df38903fe9
some warning fixes for release build 2022-04-11 17:16:25 +02:00
d96ff72635
bump fsfw and tmtc deps
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-04-11 15:02:04 +02:00