Commit Graph

3890 Commits

Author SHA1 Message Date
7000ba05c5 Merge pull request 'Update EIVE FSFW' (#14) from mueller/master into eive/develop
Reviewed-on: #14
2021-09-20 18:32:47 +02:00
9948c4f31d Merge branch 'eive/develop' into mueller/master 2021-09-20 18:32:28 +02:00
784a0140f4 tweak op divider divisor 2021-09-20 18:31:52 +02:00
635432d7ba missing return 2021-09-20 18:29:57 +02:00
9429f6b868 Merge pull request 'Use better defines in internal unit tester' (#465) from mueller/int-unittest-osal-defines-update into development
Reviewed-on: fsfw/fsfw#465
2021-09-20 15:28:55 +02:00
39c909946b Merge pull request 'Some changes and improvements for DHB' (#474) from eive/fsfw:mueller/dhb-improvements into development
Reviewed-on: fsfw/fsfw#474
2021-09-20 15:23:24 +02:00
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: fsfw/fsfw#475
2021-09-20 13:56:47 +02:00
e8050183f4
better printout 2021-09-17 16:52:31 +02:00
7d44aab98e some tweaks for op divider 2021-09-17 13:07:43 +02:00
4489a61a00 Merge pull request 'Update FSFW' (#13) from mueller/update-fsfw into eive/develop
Reviewed-on: #13
2021-09-17 07:55:57 +02:00
b1a56a71cd Added LIS3MDL to FSFW, per op divider tweak 2021-09-16 18:50:20 +02:00
6d0d04ac23 minor bugfix 2021-09-16 17:33:37 +02:00
8f3edc90ba Merge branch 'eive/develop' into mueller/update-fsfw 2021-09-16 11:43:30 +02:00
7b5334ccec
Merge remote-tracking branch 'upstream/development' into eive/develop 2021-09-16 11:40:12 +02:00
a58016859b Merge branch 'develop' into mueller/master 2021-09-16 11:38:56 +02:00
0df8d35802
comment format 2021-09-16 11:36:32 +02:00
823c6ec5fc
added RM3100 handler 2021-09-16 11:33:50 +02:00
7c21980ece Merge branch 'development' into mueller/hal-spi-improvement 2021-09-16 11:05:14 +02:00
599ff6b45a Merge pull request 'Service 1 packet doc was wrong' (#477) from eive/fsfw:mueller/srv1-packet-doc-fix into development
Reviewed-on: fsfw/fsfw#477
2021-09-16 10:55:05 +02:00
0ddce61175 Merge branch 'development' into mueller/srv1-packet-doc-fix 2021-09-16 10:50:46 +02:00
576a7293cb Merge pull request 'improvements for L3GD20H device handler' (#476) from eive/fsfw:hal/l3gd20h-improvements into development
Reviewed-on: fsfw/fsfw#476
2021-09-16 08:52:51 +02:00
bc6b29e652 use warning instead of debug 2021-09-15 18:48:09 +02:00
d986ab7720 bugfix for TM packet stored PUS C 2021-09-15 18:37:44 +02:00
1732359f72 doc was wrong 2021-09-15 17:23:26 +02:00
3e3c38e459 Merge branch 'development' into mueller/int-unittest-osal-defines-update 2021-09-15 17:20:08 +02:00
a6e4eb9ad4 improvements for L3GD20H device handler 2021-09-15 17:18:47 +02:00
e5db64cbb9 set transfer size to 0, better name 2021-09-15 17:15:18 +02:00
21b5eaa891 Some changes and improvements for DHB
1. Renamed getCommanderId to getCommanderQueueId.
2. Some indentation
3. Correct preprocessor define for warning printout used now
2021-09-15 17:09:42 +02:00
bdd7d59d82 reverted some changes 2021-09-15 17:05:52 +02:00
edf33cc10a Merge remote-tracking branch 'upstream/development' into mueller/master 2021-09-15 16:57:42 +02:00
6db5011b14 spi and gyro l3g updates 2021-09-15 16:55:24 +02:00
23c562bb67 Merge pull request 'DLE Encoder Improvements' (#467) from KSat/fsfw:mueller/dle-improvements into development
Reviewed-on: fsfw/fsfw#467
2021-09-13 15:25:01 +02:00
5193294d25 Merge branch 'development' into mueller/dle-improvements 2021-09-13 15:24:53 +02:00
a986b22345 Merge pull request 'queue nullptr check in action helper' (#458) from meier/ActionHelperQueueCheck into development
Reviewed-on: fsfw/fsfw#458
2021-09-13 15:24:35 +02:00
646b1139a6 Merge branch 'development' into mueller/dle-improvements 2021-09-13 15:18:22 +02:00
d9e2fd92fb Merge branch 'development' into meier/ActionHelperQueueCheck 2021-09-13 15:17:47 +02:00
ca65daab1a Merge branch 'development' into mueller/int-unittest-osal-defines-update 2021-09-13 15:10:11 +02:00
b3e0eeb14e Merge pull request 'printout fixes for UnixFileGuard' (#468) from eive/fsfw:mueller/unix-file-guard-fix into development
Reviewed-on: fsfw/fsfw#468
2021-09-13 15:09:59 +02:00
2837d6e0dd Merge branch 'development' into mueller/unix-file-guard-fix 2021-09-13 15:08:21 +02:00
cd82bebe78 Merge pull request 'cmakedefine for OSAL type' (#464) from mueller/conf-file-update into development
Reviewed-on: fsfw/fsfw#464
2021-09-13 15:06:32 +02:00
1148adb43d Merge branch 'development' into mueller/conf-file-update 2021-09-13 15:03:08 +02:00
ae27a4bb6c Merge pull request 'fsfw version update' (#463) from mueller/version-update into development
Reviewed-on: fsfw/fsfw#463
2021-09-13 15:01:50 +02:00
741d96d7ed Merge branch 'development' into mueller/version-update 2021-09-13 15:01:28 +02:00
596a056622 Merge pull request 'Cleaning up TCP and UDP code' (#459) from eive/fsfw:mueller/tcp-udp-tweaks into development
Reviewed-on: fsfw/fsfw#459
2021-09-13 14:57:07 +02:00
9c9b251322 Merge branch 'development' into mueller/tcp-udp-tweaks 2021-09-13 14:56:30 +02:00
0e0989db95 Merge branch 'development' into mueller/unix-file-guard-fix 2021-09-13 14:54:09 +02:00
ba7acac215 Merge branch 'development' into mueller/dle-improvements 2021-09-13 14:37:32 +02:00
97494a84df Merge remote-tracking branch 'upstream/development' into mueller/master 2021-09-13 10:59:26 +02:00
af133a2928 Merge pull request 'Possible bugfix in DHB' (#469) from eive/fsfw:mueller/dhb-periodoc-reply-fix into development
Reviewed-on: fsfw/fsfw#469
2021-09-13 10:58:33 +02:00
abacfbf2d5 added setting of readLen according to review 2021-09-13 10:38:36 +02:00