Commit Graph
54 Commits
Author SHA1 Message Date
meierj 2c0f3b52e9 Merge pull request 'Space Packet Default Length' (#65) from meier/develop into eive/develop
Reviewed-on: eive/fsfw#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: eive/fsfw#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: eive/fsfw#63
2022-04-21 13:54:20 +02:00
meierj e949368b06 Merge pull request 'uart cookie API change' (#62) from mueller/uart-com-if-tweaks into eive/develop
Reviewed-on: eive/fsfw#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: eive/fsfw#61
2022-04-13 15:03:27 +02:00
meierj ce17be63f4 Merge pull request 'Pool Entry Update V2' (#60) from mueller/pool-entry-update-v2 into eive/develop
Reviewed-on: eive/fsfw#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: eive/fsfw#59
2022-04-12 19:27:37 +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: eive/fsfw#58
2022-04-11 14:55:54 +02:00
meierj 6ce09e968d Merge pull request 'Update from FSFW upstream' (#56) from mueller/update-from-upstream into eive/develop
Reviewed-on: eive/fsfw#56
2022-04-11 09:03:08 +02:00
meierj 85a6e4b129 Merge pull request 'improve clock error handler' (#55) from mueller/clock-update into eive/develop
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
Reviewed-on: eive/fsfw#55
2022-04-07 19:29:49 +02:00
meierj 51e7f1c2f2 Merge pull request 'FSFW Update' (#54) from mueller/clock-update into eive/develop
Reviewed-on: eive/fsfw#54
2022-04-07 11:33:06 +02:00
meierj 7df51f7202 Merge pull request 'add power switcher component' (#52) from mueller/power-switcher-component into eive/develop
Reviewed-on: eive/fsfw#52
2022-04-04 15:51:18 +02:00
meierj 318cd8e244 Merge pull request 'Update FSFW' (#51) from mueller/master into eive/develop
Reviewed-on: eive/fsfw#51
2022-04-01 14:51:31 +02:00
meierj 29cf8c9009 fix in getReplyLength 2022-03-31 11:42:39 +02:00
meierj 61d0815de8 Merge pull request 'Refactor Power Module' (#49) from mueller/refactor-power-switch-if-etc-eive into eive/develop
Reviewed-on: eive/fsfw#49
2022-03-31 09:01:24 +02:00
meierj e6130263ef Merge pull request 'Update FSFW' (#45) from mueller/master into eive/develop
fsfw/fsfw/pipeline/pr-development This commit looks good
Reviewed-on: eive/fsfw#45
2022-03-25 14:56:19 +01:00
meierj d5ff6da40b Merge pull request 'function to get fsfw version' (#43) from mueller/version-getter into eive/develop
Reviewed-on: eive/fsfw#43
2022-03-08 12:04:13 +01:00
meierj e498136273 Merge pull request 'call setTimeout' (#44) from mueller/countdown-improvement into eive/develop
Reviewed-on: eive/fsfw#44
2022-03-08 12:03:13 +01:00
meierj 73f0b9c0dc Merge pull request 'define FSFW_DISABLE_PRINTOUT in any case' (#42) from mueller/define-fsfw-disabled-printout into eive/develop
Reviewed-on: eive/fsfw#42
2022-03-08 10:11:45 +01:00
meierj b5e55f64b0 Merge pull request 'Another HasModesIF improvement' (#41) from mueller/master into eive/develop
Reviewed-on: eive/fsfw#41
2022-03-08 10:11:05 +01:00
meierj 6de4798805 Merge pull request 'better name of invalid mode retval' (#40) from mueller/master into eive/develop
Reviewed-on: eive/fsfw#40
2022-03-08 09:37:58 +01:00
meierj 5f23f709cc Merge pull request 'Update for Assembly Base' (#38) from mueller/master into eive/develop
Reviewed-on: eive/fsfw#38
2022-03-08 07:53:04 +01:00
meierj 75c56280ad Merge pull request 'GPIO HAL Updates' (#36) from mueller/gpio-hal-updates into eive/develop
Reviewed-on: eive/fsfw#36
2022-03-03 09:44:42 +01:00
meierj 09c1918c1f Merge pull request 'Update FSFW' (#34) from mueller/master into eive/develop
Reviewed-on: eive/fsfw#34
2022-02-25 11:38:11 +01:00
meierj 19f8e41c7f Merge pull request 'Update FSFW' (#33) from mueller/master into eive/develop
Reviewed-on: eive/fsfw#33
2022-02-21 11:00:17 +01:00
meierj 83635d3667 Merge pull request 'Fix for event definitions' (#31) from mueller/fix-events into eive/develop
Reviewed-on: eive/fsfw#31
2022-02-03 18:20:48 +01:00
meierj 061d79bb62 Merge pull request 'Devicehandler Package' (#481) from eive/fsfw:mueller/devicehandler-package into development
Reviewed-on: #481
2021-09-25 16:49:53 +02:00
meierj 01c833f001 Merge pull request 'HAL Linux SPI: set transfer size to 0, better name' (#475) from eive/fsfw:mueller/hal-spi-improvement into development
Reviewed-on: #475
2021-09-20 13:56:47 +02:00
meierj 576a7293cb Merge pull request 'improvements for L3GD20H device handler' (#476) from eive/fsfw:hal/l3gd20h-improvements into development
Reviewed-on: #476
2021-09-16 08:52:51 +02:00
meierj 38afa494ce Merge pull request 'UART bugfixes and improvements' (#471) from eive/fsfw:mueller/uart-improvements into development
Reviewed-on: #471
2021-09-08 17:19:29 +02:00
Jakob.Meier 20adc1c981 queue nullptr check in action helper 2021-08-07 14:28:12 +02:00
Jakob.Meier 3d80d5d036 added proposed changes 2021-07-27 12:59:21 +02:00
Jakob.Meier ebc9d99022 Merge branch 'meier/ColeredDebugOutput' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw into meier/ColeredDebugOutput 2021-07-27 10:10:25 +02:00
Jakob.Meier 2489276350 removed double include 2021-07-27 10:05:56 +02:00
Jakob.Meier a918c672a5 fixed merge conflicts 2021-07-24 07:15:24 +02:00
Jakob.Meier 5e960f118f renamed freertos includes 2021-07-06 18:17:24 +02:00
meierj a993872884 Merge pull request 'EIVE FSFW Update' (#430) from eive/fsfw:eive/develop into development
Reviewed-on: #430
2021-06-12 15:44:31 +02:00
meierj 87fee9bd0e dhb multiple replies support 2021-04-25 11:40:04 +02:00
meierj e7c00b5633 Merge branch 'mueller/master' into meier/dhbMultipleReplies 2021-04-25 10:49:56 +02:00
meierj 52b549b97c adapted object factory to fsfw changes 2021-04-24 22:54:18 +02:00
meierj 10e7e42388 Merge branch 'development' into meier/dhbMultipleReplies 2021-04-24 18:05:00 +02:00
meierj fc34e7fd75 Merge branch 'development' of https://egit.irs.uni-stuttgart.de/eive/fsfw into development 2021-04-24 18:04:43 +02:00
meierj 18a9729c75 added multiple reply support 2021-04-24 13:52:06 +02:00
meierj 42720e6f7d Merge branch 'development' of https://egit.irs.uni-stuttgart.de/eive/fsfw into development 2021-03-26 12:25:20 +01:00
meierj 32b289cbec Merge pull request 'FSFW Update' (#4) from mueller/master into eive/develop
Reviewed-on: eive/fsfw#4
2021-03-19 15:40:15 +01:00
meierj fa108f0a3b Merge branch 'development' of https://egit.irs.uni-stuttgart.de/eive/fsfw into development 2021-03-19 15:38:06 +01:00
meierj 41e30dcb6c Merge branch 'development' of https://egit.irs.uni-stuttgart.de/eive/fsfw into development 2021-03-04 19:14:12 +01:00
meierj 227ec25e89 some minor corrections in readme 2020-11-27 11:44:11 +01:00
meierj 520409822e now all debug output removed 2020-11-10 15:06:51 +01:00
meierj bc81b5893c removed debug output 2020-11-09 17:34:53 +01:00
meierj 3eefcd3a2d fsfw.mk adjusted to upstream master 2020-11-07 20:45:00 +01:00
meierj 210d2de11e fetched fsfw.mk from upstream master 2020-11-07 20:40:01 +01:00
meierj 83568e11d1 removed unwanted changes 2020-11-07 20:37:48 +01:00
meierj 113397c6c6 udp bridge for embedded linux 2020-11-07 20:30:42 +01:00