Commit Graph

3955 Commits

Author SHA1 Message Date
de0e687cbb Merge pull request 'Update FSFW' (#24) from mueller/master into master
Reviewed-on: #24
2021-09-26 22:54:36 +02:00
6e3f690852 Merge remote-tracking branch 'eive/mueller/master' into mueller/master 2021-09-26 22:47:09 +02:00
57d03bbd92 Merge remote-tracking branch 'upstream/mueller/master' into mueller/master 2021-09-26 22:47:01 +02:00
36607c8764 Merge branch 'mueller/added-missing-devicehandlers' into mueller/master 2021-09-26 22:45:58 +02:00
423f7c8281
missing include and printer compatbility fixes 2021-09-26 22:45:32 +02:00
b88e6c0713
Merge branch 'mueller/added-missing-devicehandlers' into mueller/master 2021-09-26 22:39:36 +02:00
59feaa4b5c
moved class id and subsystem ID 2021-09-26 22:38:47 +02:00
3353bca882
Merge remote-tracking branch 'upstream/mueller/master' into mueller/master 2021-09-26 22:32:25 +02:00
42fc637314
resolved merge conflict 2021-09-26 22:31:43 +02:00
e31a06e702
Merge remote-tracking branch 'eive/mueller/added-missing-devicehandlers' into mueller/master 2021-09-26 22:28:26 +02:00
a84e60a37a
Added missing devicehandlers
These devicehandlers were missing from the last PR
2021-09-26 22:22:55 +02:00
6ee2c65187 Merge remote-tracking branch 'upstream/development' into mueller/master 2021-09-26 22:21:22 +02:00
9f40718824 Merge remote-tracking branch 'upstream/development' into mueller/master 2021-09-26 22:14:59 +02:00
061d79bb62 Merge pull request 'Devicehandler Package' (#481) from eive/fsfw:mueller/devicehandler-package into development
Reviewed-on: fsfw/fsfw#481
2021-09-25 16:49:53 +02:00
2b6c996364
Merge branch 'mueller/devicehandler-package' into mueller/master 2021-09-25 16:42:49 +02:00
a37b6184fc
fix dataset sizes 2021-09-25 16:40:22 +02:00
Jakob Meier
f6b03dee6a removed unused variable switchId from GyroL3GD20Handler class 2021-09-24 12:11:12 +02:00
e0671a395e
indentation 2021-09-23 18:14:40 +02:00
a6bd7c0d6e
added missing defines for debug output 2021-09-23 18:13:51 +02:00
f2bc374f0f
Device handler updates 2021-09-23 18:12:59 +02:00
665be0d417
better name for wiretapping define 2021-09-23 18:05:17 +02:00
dd610f0d7e Merge branch 'mueller/master' into eive/develop 2021-09-23 17:34:24 +02:00
0987a160c9 new retval for empty slot list 2021-09-23 17:33:45 +02:00
ceeb0c5388 Merge branch 'eive/develop' of https://egit.irs.uni-stuttgart.de/eive/fsfw into eive/develop 2021-09-23 17:14:31 +02:00
91f7184ebb Merge branch 'mueller/master' into eive/develop 2021-09-23 17:14:25 +02:00
e1a85b47c5 tiny tweaks 2021-09-23 17:13:53 +02:00
a3eb870ba0 Corrected comment 2021-09-23 16:45:37 +02:00
ed2263b5f7 Merge pull request 'Improvements for devices' (#17) from mueller/acs-board-improvements into eive/develop
Reviewed-on: eive/fsfw#17
2021-09-23 15:59:20 +02:00
dccc2f0ba7 printout fix SpiComIF 2021-09-23 15:57:50 +02:00
350fbc385c small tweak 2021-09-23 15:22:27 +02:00
c9b343ebcd op divider fixes 2021-09-23 15:20:10 +02:00
81c33d2dc6 added functions to set x,y,z limits 2021-09-23 14:56:20 +02:00
29c74283f1 sanity checks 2021-09-22 18:36:53 +02:00
c51d2df43d printout fix 2021-09-22 16:00:18 +02:00
d3b83f3cf9 API made more consistent 2021-09-22 15:02:34 +02:00
60229da670 Merge pull request 'GPIO Refactoring' (#16) from mueller/gpio-refactoring into eive/develop
Reviewed-on: eive/fsfw#16
2021-09-22 14:39:53 +02:00
5c56eda610 fix for raspberry pi code 2021-09-22 12:19:30 +02:00
3d1be94e12 more checks and printouts 2021-09-21 19:27:33 +02:00
8e65d2d3fc refactored GPIO components 2021-09-21 17:31:03 +02:00
8374d495fa Merge remote-tracking branch 'origin/eive/develop' into mueller/master 2021-09-21 16:02:41 +02:00
e02879184b Merge pull request 'added option to open gpio by label instead of gpiochip*' (#15) from meier/gpioOpenByLabel into eive/develop
Reviewed-on: eive/fsfw#15
2021-09-21 16:01:28 +02:00
Jakob Meier
70a3749dbe added option to open gpio by label instead of gpiochip* 2021-09-20 18:38:18 +02:00
87b68e84be Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/master 2021-09-20 18:33:03 +02:00
7000ba05c5 Merge pull request 'Update EIVE FSFW' (#14) from mueller/master into eive/develop
Reviewed-on: eive/fsfw#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