Commit Graph

3817 Commits

Author SHA1 Message Date
mohr f11957d827 Merge pull request 'Updated Countdown and removed Timer' (#486) from gaisser_countdown_timer into development
Reviewed-on: fsfw/fsfw#486
2021-10-04 14:44:55 +02:00
mohr a977302a53 Merge pull request 'out of bounds access in DLE encoder' (#492) from mueller/dle-possible-bugfix into development
Reviewed-on: fsfw/fsfw#492
2021-10-04 14:43:54 +02:00
gaisser 53400c8bfa Merge branch 'development' into mueller/dle-possible-bugfix 2021-10-04 14:40:47 +02:00
muellerr f2d0a0d9ee Merge branch 'mueller/dle-possible-bugfix' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw into mueller/dle-possible-bugfix 2021-10-04 14:38:51 +02:00
gaisser 9e12f59707 Merge pull request 'TMTC Bridge: Increase limit of packets stored' (#484) from eive/fsfw:mueller/increase-absolute-packet-stored-limit into development
Reviewed-on: fsfw/fsfw#484
2021-10-04 14:38:46 +02:00
muellerr 2439613f21 preserve STX char 2021-10-04 14:38:46 +02:00
gaisser 1c8f86364d Merge branch 'development' into mueller/increase-absolute-packet-stored-limit 2021-10-04 14:37:09 +02:00
muellerr 4e1c52f465 Merge branch 'development' into gaisser_countdown_timer 2021-10-02 15:50:49 +02:00
muellerr 9f856761e2 Merge branch 'development' into mueller/dle-possible-bugfix 2021-10-02 12:24:38 +02:00
muellerr 2f119f102d Merge pull request 'return meaningful error code for empty PST' (#485) from eive/fsfw:mueller/check-for-empty-pst into development
Reviewed-on: fsfw/fsfw#485
2021-10-02 12:24:03 +02:00
muellerr afb472996c refactoring, code more understandable 2021-09-30 16:51:07 +02:00
muellerr f76f462022 test added 2021-09-30 11:27:14 +02:00
muellerr 0f90d50065 Merge remote-tracking branch 'origin/development' into mueller/dle-possible-bugfix 2021-09-30 11:27:07 +02:00
muellerr b0cbd40e64 possible bugfix for DLE encoder 2021-09-30 11:25:42 +02:00
muellerr 1c1433e797 Merge branch 'development' into mueller/increase-absolute-packet-stored-limit 2021-09-29 16:17:22 +02:00
muellerr 7671c93095 Merge branch 'development' into mueller/check-for-empty-pst 2021-09-29 16:16:57 +02:00
gaisser ba4249d658 Merge branch 'development' into gaisser_countdown_timer 2021-09-29 14:27:48 +02:00
muellerr de7542c9c1 Merge pull request 'Minor fixes for device handler' (#489) from mueller/dev-handler-fixes into development
Reviewed-on: fsfw/fsfw#489
2021-09-29 14:27:48 +02:00
muellerr 5a30dd969f Merge branch 'development' into mueller/dev-handler-fixes 2021-09-29 14:27:37 +02:00
muellerr 0a2c912f29 Merge pull request 'small fix for DLE unittest' (#490) from mueller/dle-encoder-test-fix into development
Reviewed-on: fsfw/fsfw#490
2021-09-29 14:27:10 +02:00
muellerr 2b15f9e644 Merge branch 'development' into mueller/dle-encoder-test-fix 2021-09-29 11:51:05 +02:00
muellerr 42b5f8a79d small fix for DLE unittest 2021-09-29 11:49:45 +02:00
muellerr 358ee0fbf2 removed C++14 featue 2021-09-28 15:47:12 +02:00
muellerr 4f08b2d342 removed include 2021-09-28 15:47:01 +02:00
gaisser 4b62c8aa81 Added tests 2021-09-27 21:53:27 +02:00
gaisser 1b38f84edc Merge remote-tracking branch 'origin/development' into gaisser_countdown_timer 2021-09-27 21:06:20 +02:00
gaisser 5064d44999 Removed Timer.cpp from CMakeLists 2021-09-27 20:45:44 +02:00
gaisser 322c14d4bb Merge remote-tracking branch 'origin/development' into gaisser_countdown_timer 2021-09-27 20:01:01 +02:00
gaisser 8ec35f158c Removed Timer and updated Countdown 2021-09-27 19:57:42 +02:00
muellerr 9a25f08fef Merge remote-tracking branch 'upstream/development' into mueller/check-for-empty-pst 2021-09-27 15:37:49 +02:00
muellerr f3caa122ae Merge branch 'development' into mueller/increase-absolute-packet-stored-limit 2021-09-27 15:32:54 +02:00
mohr 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
mohr 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
mohr 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
muellerr 42df77ff32 check for empty PST
and return appropriate returnvalue
2021-09-27 11:16:27 +02:00
muellerr 85c04dee23 increase limit of packets stored 2021-09-27 11:12:38 +02:00
muellerr 4c96db847d Merge branch 'development' into mueller/gpio-update 2021-09-27 09:54:10 +02:00
muellerr 0246dccbe9 Merge remote-tracking branch 'upstream/development' into mueller/spi-fix 2021-09-27 09:52:49 +02:00
muellerr 423f7c8281 missing include and printer compatbility fixes 2021-09-26 22:45:32 +02:00
muellerr 59feaa4b5c moved class id and subsystem ID 2021-09-26 22:38:47 +02:00
muellerr a84e60a37a Added missing devicehandlers
These devicehandlers were missing from the last PR
2021-09-26 22:22:55 +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 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
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 52b3d9473e Merge remote-tracking branch 'upstream/development' into mueller/spi-fix 2021-09-23 18:10:12 +02:00
muellerr fc9b85d5db update FSFW.h.in 2021-09-23 18:06:54 +02:00
muellerr bfae25ff2d Updates for SPI
1. Better names for functions
2. Reply size is set to 0
2021-09-23 18:06:04 +02:00
muellerr ea3812fbbd Merge branch 'development' into mueller/gpio-update 2021-09-23 18:00:31 +02:00