Commit Graph

6187 Commits

Author SHA1 Message Date
muellerr 8c6c8ad3c0 exntend version class to allow add info 2022-04-22 11:58:44 +02:00
muellerr befaca78c6 Merge pull request 'space packet default length' (#66) from meier/develop into eive/develop
Reviewed-on: #66
2022-04-21 14:30:34 +02:00
muellerr af4f002a25 Merge branch 'eive/develop' into meier/develop 2022-04-21 14:30:11 +02:00
Jakob Meier 9f7b9be800 space packet default length 0 2022-04-21 14:24:20 +02:00
meierj 2c0f3b52e9 Merge pull request 'Space Packet Default Length' (#65) from meier/develop into eive/develop
Reviewed-on: #65
2022-04-21 14:11:09 +02:00
meierj aa1ea33647 Merge pull request 'LIS3 handler nullptr check' (#64) from mueller/lis3-handler-nullptr-check into eive/develop
Reviewed-on: #64
2022-04-21 13:55:06 +02:00
meierj 9798b6b4ab Merge pull request 'Merge upstream and apply auto-formatter' (#63) from merge-upstream into eive/develop
Reviewed-on: #63
2022-04-21 13:54:20 +02:00
muellerr f0d7eaf35a Merge branch 'merge-upstream' into mueller/lis3-handler-nullptr-check 2022-04-21 10:38:43 +02:00
muellerr b128ef9da9 Merge remote-tracking branch 'upstream/development' into merge-upstream 2022-04-21 10:37:01 +02:00
muellerr 085213c60f add nullptr check 2022-04-21 10:30:46 +02:00
Jakob Meier 613dbe9592 default argument 2022-04-21 09:33:06 +02:00
meierj e949368b06 Merge pull request 'uart cookie API change' (#62) from mueller/uart-com-if-tweaks into eive/develop
Reviewed-on: #62
2022-04-13 15:04:03 +02:00
meierj 4d49cb6a3c Merge pull request 'added DLE parser' (#61) from mueller/dle-parser into eive/develop
Reviewed-on: #61
2022-04-13 15:03:27 +02:00
muellerr e0c9bf5871 Merge branch 'mueller/dle-parser' into irini 2022-04-13 15:00:39 +02:00
muellerr 935a8e13a5 uart cookie API change 2022-04-13 14:57:43 +02:00
muellerr 5ff88129b8 added DLE parser 2022-04-13 14:45:36 +02:00
meierj ce17be63f4 Merge pull request 'Pool Entry Update V2' (#60) from mueller/pool-entry-update-v2 into eive/develop
Reviewed-on: #60
2022-04-12 19:28:01 +02:00
meierj 2734d9d758 Merge pull request 'fix compiler warnings' (#59) from mueller/compiler-warning-fixes-upstream into eive/develop
Reviewed-on: #59
2022-04-12 19:27:37 +02:00
Robin Mueller 352ab43c1f Merge remote-tracking branch 'upstream/development' into mueller/add-etl-dependency 2022-04-12 17:11:41 +02:00
Robin Mueller 35f257800e Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11 2022-04-12 17:10:55 +02:00
muellerr 07f5dbb9ac Merge branch 'development' into mueller/compiler-warning-fixes-upstream-2 2022-04-12 17:08:56 +02:00
muellerr 97e98eae24 Merge branch 'development' into mueller/ipc-pass-arbitrary-args-to-mq 2022-04-12 17:06:30 +02:00
Steffen Gaisser 5ac88f2b15 Merge pull request 'added missing empty implementation in STM32 SPI HAL' (#599) from mueller/small-stm32-hal-bugifx into development
Reviewed-on: fsfw/fsfw#599
2022-04-11 17:48:48 +02:00
muellerr 7a5ce57bbc Merge branch 'development' into mueller/possible-ring-buffer-fix 2022-04-11 17:35:42 +02:00
muellerr b03a6684f9 Merge branch 'development' into mueller/small-stm32-hal-bugifx 2022-04-11 17:34:39 +02:00
muellerr afce942bf8 Merge branch 'development' into mueller/compiler-warning-fixes-upstream-2 2022-04-11 17:33:04 +02:00
Robin Mueller 7c2e50b665 added related PR in changelog 2022-04-11 17:32:01 +02:00
Steffen Gaisser c04ca704d2 Merge pull request 'progagate reply returnvalue' (#597) from eive/fsfw:mueller/propagate-pool-manage-retval into development
Reviewed-on: fsfw/fsfw#597
2022-04-11 17:31:54 +02:00
Robin Mueller 6aa54fe1d4 added missing empty implementation 2022-04-11 17:30:27 +02:00
muellerr a1d7a56dfa small fix 2022-04-11 17:14:43 +02:00
muellerr cb78fefbb3 afmt 2022-04-11 17:14:04 +02:00
Robin Mueller c55925959b Merge branch 'mueller/add-etl-dependency' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/add-etl-dependency 2022-04-11 16:44:30 +02:00
Robin Mueller 4f0669c574 doc update 2022-04-11 16:44:20 +02:00
muellerr f0d996ffd2 Merge branch 'development' into mueller/add-etl-dependency 2022-04-11 16:17:46 +02:00
Robin Mueller d0b7c22afc Merge branch 'mueller/add-tc-scheduler-pus-11' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/add-tc-scheduler-pus-11 2022-04-11 16:17:05 +02:00
Robin Mueller a18bc15cbb update changelog 2022-04-11 16:16:56 +02:00
muellerr f4d05c2c9c Merge branch 'mueller/ipc-pass-arbitrary-args-to-mq' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/ipc-pass-arbitrary-args-to-mq 2022-04-11 16:13:55 +02:00
muellerr d1151ca707 changelog update 2022-04-11 16:13:47 +02:00
muellerr 82f46992f6 Merge branch 'development' into mueller/ipc-pass-arbitrary-args-to-mq 2022-04-11 16:11:57 +02:00
muellerr 4ed9cc933f Merge branch 'development' into mueller/refactor-power-switch-if-etc 2022-04-11 16:11:27 +02:00
muellerr 7af1c86f1c use default call 2022-04-11 16:10:17 +02:00
muellerr bd0b7aa230 Merge branch 'mueller/power-switcher-component-upstream' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/power-switcher-component-upstream 2022-04-11 16:09:32 +02:00
muellerr 72e0938f9a use size instead of capacity on sanity check 2022-04-11 16:09:15 +02:00
muellerr dd1b0a9380 Merge branch 'development' into mueller/power-switcher-component-upstream 2022-04-11 16:08:27 +02:00
muellerr 9947a648df fix compiler warnings 2022-04-11 16:06:13 +02:00
muellerr c45328b34d Merge branch 'eive/develop' into mueller/compiler-warning-fixes-upstream 2022-04-11 16:03:52 +02:00
muellerr 478b305fbe fix compiler warnings 2022-04-11 16:02:20 +02:00
meierj 28e93696df Merge pull request 'IPC Pass Arbitrary Args to MQ IF' (#58) from mueller/ipc-pass-arbitrary-args-to-mq-eive into eive/develop
Reviewed-on: #58
2022-04-11 14:55:54 +02:00
muellerr 942d1e5e4b Merge remote-tracking branch 'origin/eive/develop' into mueller/ipc-pass-arbitrary-args-to-mq-eive 2022-04-11 14:40:43 +02:00
muellerr c0f80680ef Merge branch 'mueller/propagate-pool-manage-retval' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/propagate-pool-manage-retval 2022-04-11 14:35:28 +02:00