muellerr
6e3f690852
Merge remote-tracking branch 'eive/mueller/master' into mueller/master
2021-09-26 22:47:09 +02:00
muellerr
57d03bbd92
Merge remote-tracking branch 'upstream/mueller/master' into mueller/master
2021-09-26 22:47:01 +02:00
muellerr
36607c8764
Merge branch 'mueller/added-missing-devicehandlers' into mueller/master
2021-09-26 22:45:58 +02:00
muellerr
423f7c8281
missing include and printer compatbility fixes
2021-09-26 22:45:32 +02:00
muellerr
b88e6c0713
Merge branch 'mueller/added-missing-devicehandlers' into mueller/master
2021-09-26 22:39:36 +02:00
muellerr
59feaa4b5c
moved class id and subsystem ID
2021-09-26 22:38:47 +02:00
muellerr
3353bca882
Merge remote-tracking branch 'upstream/mueller/master' into mueller/master
2021-09-26 22:32:25 +02:00
muellerr
42fc637314
resolved merge conflict
2021-09-26 22:31:43 +02:00
muellerr
e31a06e702
Merge remote-tracking branch 'eive/mueller/added-missing-devicehandlers' into mueller/master
2021-09-26 22:28:26 +02:00
muellerr
a84e60a37a
Added missing devicehandlers
...
These devicehandlers were missing from the last PR
2021-09-26 22:22:55 +02:00
muellerr
6ee2c65187
Merge remote-tracking branch 'upstream/development' into mueller/master
2021-09-26 22:21:22 +02:00
muellerr
9f40718824
Merge remote-tracking branch 'upstream/development' into mueller/master
2021-09-26 22:14:59 +02:00
meierj
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
muellerr
2b6c996364
Merge branch 'mueller/devicehandler-package' into mueller/master
2021-09-25 16:42:49 +02:00
muellerr
a37b6184fc
fix dataset sizes
2021-09-25 16:40:22 +02:00
f6b03dee6a
removed unused variable switchId from GyroL3GD20Handler class
2021-09-24 12:11:12 +02:00
muellerr
e0671a395e
indentation
2021-09-23 18:14:40 +02:00
muellerr
a6bd7c0d6e
added missing defines for debug output
2021-09-23 18:13:51 +02:00
muellerr
f2bc374f0f
Device handler updates
2021-09-23 18:12:59 +02:00
muellerr
665be0d417
better name for wiretapping define
2021-09-23 18:05:17 +02:00
muellerr
dd610f0d7e
Merge branch 'mueller/master' into eive/develop
2021-09-23 17:34:24 +02:00
muellerr
0987a160c9
new retval for empty slot list
2021-09-23 17:33:45 +02:00
muellerr
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
muellerr
91f7184ebb
Merge branch 'mueller/master' into eive/develop
2021-09-23 17:14:25 +02:00
muellerr
e1a85b47c5
tiny tweaks
2021-09-23 17:13:53 +02:00
muellerr
a3eb870ba0
Corrected comment
2021-09-23 16:45:37 +02:00
meierj
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
muellerr
dccc2f0ba7
printout fix SpiComIF
2021-09-23 15:57:50 +02:00
muellerr
350fbc385c
small tweak
2021-09-23 15:22:27 +02:00
muellerr
c9b343ebcd
op divider fixes
2021-09-23 15:20:10 +02:00
muellerr
81c33d2dc6
added functions to set x,y,z limits
2021-09-23 14:56:20 +02:00
muellerr
29c74283f1
sanity checks
2021-09-22 18:36:53 +02:00
muellerr
c51d2df43d
printout fix
2021-09-22 16:00:18 +02:00
muellerr
d3b83f3cf9
API made more consistent
2021-09-22 15:02:34 +02:00
meierj
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
muellerr
5c56eda610
fix for raspberry pi code
2021-09-22 12:19:30 +02:00
muellerr
3d1be94e12
more checks and printouts
2021-09-21 19:27:33 +02:00
muellerr
8e65d2d3fc
refactored GPIO components
2021-09-21 17:31:03 +02:00
muellerr
8374d495fa
Merge remote-tracking branch 'origin/eive/develop' into mueller/master
2021-09-21 16:02:41 +02:00
muellerr
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
70a3749dbe
added option to open gpio by label instead of gpiochip*
2021-09-20 18:38:18 +02:00
muellerr
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
meierj
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
muellerr
9948c4f31d
Merge branch 'eive/develop' into mueller/master
2021-09-20 18:32:28 +02:00
muellerr
784a0140f4
tweak op divider divisor
2021-09-20 18:31:52 +02:00
muellerr
635432d7ba
missing return
2021-09-20 18:29:57 +02:00
mohr
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
mohr
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
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: fsfw/fsfw#475
2021-09-20 13:56:47 +02:00
muellerr
e8050183f4
better printout
2021-09-17 16:52:31 +02:00
muellerr
7d44aab98e
some tweaks for op divider
2021-09-17 13:07:43 +02:00
meierj
4489a61a00
Merge pull request 'Update FSFW' ( #13 ) from mueller/update-fsfw into eive/develop
...
Reviewed-on: eive/fsfw#13
2021-09-17 07:55:57 +02:00
muellerr
b1a56a71cd
Added LIS3MDL to FSFW, per op divider tweak
2021-09-16 18:50:20 +02:00
muellerr
6d0d04ac23
minor bugfix
2021-09-16 17:33:37 +02:00
muellerr
8f3edc90ba
Merge branch 'eive/develop' into mueller/update-fsfw
2021-09-16 11:43:30 +02:00
muellerr
7b5334ccec
Merge remote-tracking branch 'upstream/development' into eive/develop
2021-09-16 11:40:12 +02:00
muellerr
a58016859b
Merge branch 'develop' into mueller/master
2021-09-16 11:38:56 +02:00
muellerr
0df8d35802
comment format
2021-09-16 11:36:32 +02:00
muellerr
823c6ec5fc
added RM3100 handler
2021-09-16 11:33:50 +02:00
muellerr
7c21980ece
Merge branch 'development' into mueller/hal-spi-improvement
2021-09-16 11:05:14 +02:00
muellerr
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
muellerr
0ddce61175
Merge branch 'development' into mueller/srv1-packet-doc-fix
2021-09-16 10:50:46 +02:00
meierj
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
muellerr
bc6b29e652
use warning instead of debug
2021-09-15 18:48:09 +02:00
muellerr
d986ab7720
bugfix for TM packet stored PUS C
2021-09-15 18:37:44 +02:00
muellerr
1732359f72
doc was wrong
2021-09-15 17:23:26 +02:00
muellerr
3e3c38e459
Merge branch 'development' into mueller/int-unittest-osal-defines-update
2021-09-15 17:20:08 +02:00
muellerr
a6e4eb9ad4
improvements for L3GD20H device handler
2021-09-15 17:18:47 +02:00
muellerr
e5db64cbb9
set transfer size to 0, better name
2021-09-15 17:15:18 +02:00
muellerr
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
muellerr
bdd7d59d82
reverted some changes
2021-09-15 17:05:52 +02:00
muellerr
edf33cc10a
Merge remote-tracking branch 'upstream/development' into mueller/master
2021-09-15 16:57:42 +02:00
muellerr
6db5011b14
spi and gyro l3g updates
2021-09-15 16:55:24 +02:00
muellerr
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
muellerr
5193294d25
Merge branch 'development' into mueller/dle-improvements
2021-09-13 15:24:53 +02:00
gaisser
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
muellerr
646b1139a6
Merge branch 'development' into mueller/dle-improvements
2021-09-13 15:18:22 +02:00
gaisser
d9e2fd92fb
Merge branch 'development' into meier/ActionHelperQueueCheck
2021-09-13 15:17:47 +02:00
muellerr
ca65daab1a
Merge branch 'development' into mueller/int-unittest-osal-defines-update
2021-09-13 15:10:11 +02:00
muellerr
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
muellerr
2837d6e0dd
Merge branch 'development' into mueller/unix-file-guard-fix
2021-09-13 15:08:21 +02:00
muellerr
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
muellerr
1148adb43d
Merge branch 'development' into mueller/conf-file-update
2021-09-13 15:03:08 +02:00
muellerr
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
muellerr
741d96d7ed
Merge branch 'development' into mueller/version-update
2021-09-13 15:01:28 +02:00
muellerr
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
muellerr
9c9b251322
Merge branch 'development' into mueller/tcp-udp-tweaks
2021-09-13 14:56:30 +02:00
muellerr
0e0989db95
Merge branch 'development' into mueller/unix-file-guard-fix
2021-09-13 14:54:09 +02:00
muellerr
ba7acac215
Merge branch 'development' into mueller/dle-improvements
2021-09-13 14:37:32 +02:00
muellerr
97494a84df
Merge remote-tracking branch 'upstream/development' into mueller/master
2021-09-13 10:59:26 +02:00
muellerr
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
mohr
abacfbf2d5
added setting of readLen according to review
2021-09-13 10:38:36 +02:00
muellerr
ae07056c98
comment format improvement
2021-09-12 21:11:05 +02:00
muellerr
93fed4f751
form stuff
2021-09-12 21:05:34 +02:00
muellerr
a74c820548
enum type shorter name
2021-09-12 19:14:29 +02:00
muellerr
a00965dfa6
Merge branch 'mueller/dle-improvements' into mueller/master
2021-09-11 19:23:59 +02:00
muellerr
dae27a8e10
indentation
2021-09-11 19:22:51 +02:00
muellerr
d36d849e69
removed part which is now not necessary anymore
2021-09-11 19:21:21 +02:00
muellerr
7c7a8a5df7
added improvements from code review
2021-09-11 19:18:18 +02:00
muellerr
134deb3f43
renamed function
2021-09-11 17:43:58 +02:00
muellerr
11a3c8c21f
added option to disable it as well
2021-09-11 17:42:29 +02:00
muellerr
c9bfc8464a
added function to enable periodic reply
2021-09-11 17:39:42 +02:00
muellerr
a88e97bc09
Merge branch 'development' into mueller/dhb-periodoc-reply-fix
2021-09-11 17:15:28 +02:00
muellerr
831ab706f9
Merge branch 'mueller/dle-improvements' into mueller/master
2021-09-09 11:17:22 +02:00
muellerr
ea573b0523
a few more tests with faulty source data
2021-09-09 11:12:42 +02:00
muellerr
3d336c08f2
tests almost complete
2021-09-09 10:47:54 +02:00
muellerr
d05eb23ea7
debugged and tested non-escaped encoder
2021-09-09 01:28:21 +02:00
muellerr
35b53e9a17
continuing tests
2021-09-09 01:06:54 +02:00
muellerr
b5063117f6
added check to avoid seg fault
2021-09-09 00:02:17 +02:00
muellerr
29abef40a4
Merge remote-tracking branch 'upstream/development' into mueller/dle-improvements
2021-09-08 23:39:31 +02:00
muellerr
dfc44fce07
added DLE encoder test files
2021-09-08 23:33:10 +02:00
muellerr
40adca5f1d
set reply recipient
2021-09-08 17:24:33 +02:00
meierj
38afa494ce
Merge pull request 'UART bugfixes and improvements' ( #471 ) from eive/fsfw:mueller/uart-improvements into development
...
Reviewed-on: fsfw/fsfw#471
2021-09-08 17:19:29 +02:00
muellerr
a8167f5431
added another helper function
2021-09-08 17:02:08 +02:00
muellerr
41f3d7cf9a
better name for function
2021-09-08 16:58:30 +02:00
muellerr
e6e1936293
Merge remote-tracking branch 'origin/mueller/dhb-periodoc-reply-fix' into mueller/master
2021-09-08 16:21:13 +02:00
muellerr
15f35f200a
Merge remote-tracking branch 'origin/mueller/dhb-bugfixes-improvements' into mueller/master
2021-09-08 16:20:42 +02:00
muellerr
6b20bb197a
Merge branch 'development' into mueller/dhb-bugfixes-improvements
2021-09-08 16:20:04 +02:00
muellerr
c42eb59d2e
UART bugfixes and improvements
2021-09-08 16:10:18 +02:00
muellerr
215d01b3ca
Merge branch 'mueller/dhb-bugfixes-improvements' into mueller/master
2021-09-08 16:09:03 +02:00
muellerr
dfe49cc1e5
DHB improvements
2021-09-08 16:08:13 +02:00
muellerr
73eb11f4f1
bugfixes and improvements
2021-09-08 16:01:46 +02:00
muellerr
0a56441510
Merge branch 'development' into mueller/dhb-periodoc-reply-fix
2021-09-06 18:51:58 +02:00
muellerr
879d1f71c5
Merge branch 'development' into mueller/version-update
2021-09-06 18:50:26 +02:00
muellerr
e226f19ca8
Merge pull request 'Make FSFW tests accessable from outside' ( #461 ) from KSat/fsfw:mueller/tests-accessible-from-outside-squashed into development
...
Reviewed-on: fsfw/fsfw#461
2021-09-06 18:50:12 +02:00
muellerr
6ccf4bee49
Merge remote-tracking branch 'origin/development' into meier/ActionHelperQueueCheck
2021-09-06 18:48:13 +02:00
muellerr
7bf66dc401
Merge remote-tracking branch 'upstream/development' into mueller/dhb-periodoc-reply-fix
2021-09-06 12:10:12 +02:00
muellerr
a6d744c9c8
Possible bugfix in DHB
...
The delayCycles variables needs to be initialized differently
for periodic replies.
It is initialized to the maxDelayCycles value now
2021-09-06 12:08:54 +02:00
muellerr
924c150af2
Possible bugfix in DHB
...
The delayCycles variables needs to be initialized differently
for periodic replies.
It is initialized to the maxDelayCycles value now
2021-09-06 12:05:30 +02:00
muellerr
469eba3ce2
raised limit
2021-09-06 11:35:14 +02:00
muellerr
fd2916af11
moved TCP cfg
2021-08-23 09:40:02 +02:00
muellerr
afd375a7f8
minor fix for canonical read handling
2021-08-22 20:24:50 +02:00
muellerr
5454169e20
UartComIF: set O_NONBLOCK in canonical mode
...
When using the non-canonical mode, the file descriptor can be opened
in blocking mode because the VTIME and VMIN termios parameters are
used to configure non-blocking mode. However, in canonical mode, the fd needs to be opened with O_NONBLOCK
2021-08-22 19:48:35 +02:00
muellerr
7d0377845b
printout for unknown command
2021-08-20 15:46:34 +02:00
muellerr
98e3ed897c
small tweak
2021-08-19 17:17:19 +02:00
muellerr
882da68a2f
Merge branch 'mueller/unix-file-guard-fix' into mueller/master
2021-08-19 17:17:03 +02:00
muellerr
b6aebb3061
format adapted
2021-08-19 17:08:35 +02:00
muellerr
5dcf0e44b6
encoder functions split up
2021-08-18 13:33:31 +02:00
muellerr
3cec9f5f80
Made two functions private, small tweak
2021-08-18 13:18:42 +02:00
meierj
04a1fe7f10
Merge pull request 'Update FSFW' ( #12 ) from mueller/update-fsfw into eive/develop
...
Reviewed-on: eive/fsfw#12
2021-08-18 12:47:31 +02:00
muellerr
845c00044e
printout fixes for UnixFileGuard
2021-08-18 11:27:39 +02:00
muellerr
5f79f987ae
Merge branch 'eive/develop' into mueller/update-fsfw
2021-08-18 11:27:02 +02:00
muellerr
1183e5739d
using upstream action helper
...
Will be merged upstream soon
2021-08-18 11:23:45 +02:00
muellerr
e3697d6d8c
fixed printout
2021-08-17 19:50:01 +02:00
muellerr
406b77ea81
moved SPI wiretapping cfg
2021-08-17 16:34:25 +02:00
muellerr
92d3f0743b
moved change to another PR
2021-08-16 15:26:28 +02:00
muellerr
fa14ebbe1f
additional check
2021-08-16 15:19:03 +02:00
muellerr
db3284c2b8
subversion update
2021-08-16 14:52:11 +02:00
muellerr
a18706ec53
Make FSFW tests accessible from outside
...
1. Further reduces the amount of code the user needs to copy and paste
2. Makes FSFW tests more accessible. This can be used to simplify moving mission unit tests
to the FSFW
3. A lot of include improvements
2021-08-16 10:49:07 +02:00
meierj
8a9eb27458
Merge pull request 'FSFW Update' ( #11 ) from mueller/master into eive/develop
...
Reviewed-on: eive/fsfw#11
2021-08-11 13:13:11 +02:00
muellerr
1ac372cb89
getter function for UDP port
2021-08-09 18:22:22 +02:00
muellerr
fb36dc4501
More improvements for TCP/UDP port definition
2021-08-09 18:12:25 +02:00
muellerr
ba5e2ad8bb
Cleaning up TCP and UDP code
...
Same port number used as before, but some inconsistencies fixed
2021-08-09 16:57:24 +02:00
muellerr
5a6c81130d
Merge remote-tracking branch 'upstream/development' into mueller/master
2021-08-09 16:18:38 +02:00
muellerr
22e29144b6
Merge remote-tracking branch 'origin/eive/develop' into mueller/master
2021-08-09 11:12:37 +02:00
muellerr
52bff3985f
Merge pull request 'set sequence flags in space packet base' ( #9 ) from meier/spacePacketFlag into eive/develop
...
Reviewed-on: eive/fsfw#9
2021-08-09 11:11:46 +02:00
133820f463
Merge branch 'eive/develop' into meier/spacePacketFlag
2021-08-08 15:32:24 +02:00
8d3fceea8f
set sequence flags in space packet base
2021-08-08 15:26:18 +02:00
20adc1c981
queue nullptr check in action helper
2021-08-07 14:28:12 +02:00
meierj
47bec654a0
Merge pull request 'Update EIVE FSFW' ( #8 ) from mueller/master into eive/develop
...
Reviewed-on: eive/fsfw#8
2021-08-05 16:35:23 +02:00
muellerr
meierj
Jakob Meier
mohr
gaisser