Commit Graph

4341 Commits

Author SHA1 Message Date
5064d44999 Removed Timer.cpp from CMakeLists 2021-09-27 20:45:44 +02:00
322c14d4bb Merge remote-tracking branch 'origin/development' into gaisser_countdown_timer 2021-09-27 20:01:01 +02:00
8ec35f158c Removed Timer and updated Countdown 2021-09-27 19:57:42 +02:00
9a25f08fef
Merge remote-tracking branch 'upstream/development' into mueller/check-for-empty-pst 2021-09-27 15:37:49 +02:00
f3caa122ae Merge branch 'development' into mueller/increase-absolute-packet-stored-limit 2021-09-27 15:32:54 +02:00
6e88f8f400 Merge pull request 'Added missing devicehandlers' (#482) from eive/fsfw:mueller/added-missing-devicehandlers into development
Reviewed-on: fsfw/fsfw#482
2021-09-27 15:27:27 +02:00
01762ad222 Merge pull request 'SPI Updates for Linux' (#480) from eive/fsfw:mueller/spi-fix into development
Reviewed-on: fsfw/fsfw#480
2021-09-27 15:21:15 +02:00
71d66c406f Merge pull request 'GPIO code update' (#479) from eive/fsfw:mueller/gpio-update into development
Reviewed-on: fsfw/fsfw#479
2021-09-27 15:18:58 +02:00
42df77ff32
check for empty PST
and return appropriate returnvalue
2021-09-27 11:16:27 +02:00
85c04dee23
increase limit of packets stored 2021-09-27 11:12:38 +02:00
4c96db847d Merge branch 'development' into mueller/gpio-update 2021-09-27 09:54:10 +02:00
0246dccbe9 Merge remote-tracking branch 'upstream/development' into mueller/spi-fix 2021-09-27 09:52:49 +02:00
423f7c8281
missing include and printer compatbility fixes 2021-09-26 22:45:32 +02:00
59feaa4b5c
moved class id and subsystem ID 2021-09-26 22:38:47 +02:00
a84e60a37a
Added missing devicehandlers
These devicehandlers were missing from the last PR
2021-09-26 22:22:55 +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
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
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
52b3d9473e Merge remote-tracking branch 'upstream/development' into mueller/spi-fix 2021-09-23 18:10:12 +02:00
fc9b85d5db
update FSFW.h.in 2021-09-23 18:06:54 +02:00
bfae25ff2d
Updates for SPI
1. Better names for functions
2. Reply size is set to 0
2021-09-23 18:06:04 +02:00
ea3812fbbd Merge branch 'development' into mueller/gpio-update 2021-09-23 18:00:31 +02:00
f40f783cb4
GPIO code update
Adds capability to define GPIO by label and by chip
for Linux systems
2021-09-23 17:58:44 +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
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
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
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