Commit Graph

3829 Commits

Author SHA1 Message Date
Ulrich Mohr e6a7108614 Merge pull request 'Increased TM stack robustness' (#501) from eive/fsfw:mueller/tm-stack-robustness-cherry-picked into master
Reviewed-on: #501
Reviewed-by: Ulrich Mohr <mohr@irs.uni-stuttgart.de>
2021-10-11 18:00:45 +02:00
Robin Müller 08926f9b70
Merge remote-tracking branch 'upstream/master' into mueller/tm-stack-robustness-cherry-picked 2021-10-11 17:57:33 +02:00
Ulrich Mohr 52f0c29e99 Merge pull request 'Using correct version number now for PUS C' (#502) from eive/fsfw:mueller/fix-for-pus-c-version-number-cherry-picked into master
Reviewed-on: #502
Reviewed-by: Ulrich Mohr <mohr@irs.uni-stuttgart.de>
2021-10-11 17:51:58 +02:00
Robin Müller d2371b3e71 removed unneeded static constexpr 2021-10-11 16:47:57 +02:00
Robin Müller ffa38a81b7 using pus version enum now 2021-10-11 16:47:37 +02:00
Robin Müller ae689408f3 using correct version number now 2021-10-11 16:47:28 +02:00
Robin Müller 155432663b moved store failure to separate function 2021-10-11 16:37:14 +02:00
Robin Müller ecdbf98ca4 added printouts for PUS A 2021-10-11 16:37:04 +02:00
Robin Müller 54a6c1b0aa bugfix for PUS A 2021-10-11 16:36:49 +02:00
Robin Müller 9efe9e78d8 Increased TM stack robustness
1. More nullptr check
2. returnvalue for inititalize function which can fail
2021-10-11 16:36:28 +02:00
Ulrich Mohr ab906fa534 Merge pull request 'Merge development into master for v2.0.0' (#493) from development into master
Reviewed-on: #493
2021-10-04 14:49:43 +02:00
Ulrich Mohr 146e1e3282 bumped version to 2.0.0 for next release 2021-10-04 14:47:32 +02:00
Ulrich Mohr f11957d827 Merge pull request 'Updated Countdown and removed Timer' (#486) from gaisser_countdown_timer into development
Reviewed-on: #486
2021-10-04 14:44:55 +02:00
Ulrich Mohr a977302a53 Merge pull request 'out of bounds access in DLE encoder' (#492) from mueller/dle-possible-bugfix into development
Reviewed-on: #492
2021-10-04 14:43:54 +02:00
Steffen Gaisser 53400c8bfa Merge branch 'development' into mueller/dle-possible-bugfix 2021-10-04 14:40:47 +02:00
Robin Müller 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
Steffen 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: #484
2021-10-04 14:38:46 +02:00
Robin Müller 2439613f21 preserve STX char 2021-10-04 14:38:46 +02:00
Steffen Gaisser 1c8f86364d Merge branch 'development' into mueller/increase-absolute-packet-stored-limit 2021-10-04 14:37:09 +02:00
Robin Müller 4e1c52f465 Merge branch 'development' into gaisser_countdown_timer 2021-10-02 15:50:49 +02:00
Robin Müller 9f856761e2 Merge branch 'development' into mueller/dle-possible-bugfix 2021-10-02 12:24:38 +02:00
Robin Müller 2f119f102d Merge pull request 'return meaningful error code for empty PST' (#485) from eive/fsfw:mueller/check-for-empty-pst into development
Reviewed-on: #485
2021-10-02 12:24:03 +02:00
Robin Müller afb472996c refactoring, code more understandable 2021-09-30 16:51:07 +02:00
Robin Müller f76f462022
test added 2021-09-30 11:27:14 +02:00
Robin Müller 0f90d50065 Merge remote-tracking branch 'origin/development' into mueller/dle-possible-bugfix 2021-09-30 11:27:07 +02:00
Robin Müller b0cbd40e64
possible bugfix for DLE encoder 2021-09-30 11:25:42 +02:00
Robin Müller 1c1433e797 Merge branch 'development' into mueller/increase-absolute-packet-stored-limit 2021-09-29 16:17:22 +02:00
Robin Müller 7671c93095 Merge branch 'development' into mueller/check-for-empty-pst 2021-09-29 16:16:57 +02:00
Steffen Gaisser ba4249d658 Merge branch 'development' into gaisser_countdown_timer 2021-09-29 14:27:48 +02:00
Robin Müller de7542c9c1 Merge pull request 'Minor fixes for device handler' (#489) from mueller/dev-handler-fixes into development
Reviewed-on: #489
2021-09-29 14:27:48 +02:00
Robin Müller 5a30dd969f Merge branch 'development' into mueller/dev-handler-fixes 2021-09-29 14:27:37 +02:00
Robin Müller 0a2c912f29 Merge pull request 'small fix for DLE unittest' (#490) from mueller/dle-encoder-test-fix into development
Reviewed-on: #490
2021-09-29 14:27:10 +02:00
Robin Müller 2b15f9e644 Merge branch 'development' into mueller/dle-encoder-test-fix 2021-09-29 11:51:05 +02:00
Robin Müller 42b5f8a79d
small fix for DLE unittest 2021-09-29 11:49:45 +02:00
Robin Müller 358ee0fbf2 removed C++14 featue 2021-09-28 15:47:12 +02:00
Robin Müller 4f08b2d342 removed include 2021-09-28 15:47:01 +02:00
Steffen Gaisser 4b62c8aa81 Added tests 2021-09-27 21:53:27 +02:00
Steffen Gaisser 1b38f84edc Merge remote-tracking branch 'origin/development' into gaisser_countdown_timer 2021-09-27 21:06:20 +02:00
Steffen Gaisser 5064d44999 Removed Timer.cpp from CMakeLists 2021-09-27 20:45:44 +02:00
Steffen Gaisser 322c14d4bb Merge remote-tracking branch 'origin/development' into gaisser_countdown_timer 2021-09-27 20:01:01 +02:00
Steffen Gaisser 8ec35f158c Removed Timer and updated Countdown 2021-09-27 19:57:42 +02:00
Robin Müller 9a25f08fef
Merge remote-tracking branch 'upstream/development' into mueller/check-for-empty-pst 2021-09-27 15:37:49 +02:00
Robin Müller f3caa122ae Merge branch 'development' into mueller/increase-absolute-packet-stored-limit 2021-09-27 15:32:54 +02:00
Ulrich Mohr 6e88f8f400 Merge pull request 'Added missing devicehandlers' (#482) from eive/fsfw:mueller/added-missing-devicehandlers into development
Reviewed-on: #482
2021-09-27 15:27:27 +02:00
Ulrich Mohr 01762ad222 Merge pull request 'SPI Updates for Linux' (#480) from eive/fsfw:mueller/spi-fix into development
Reviewed-on: #480
2021-09-27 15:21:15 +02:00
Ulrich Mohr 71d66c406f Merge pull request 'GPIO code update' (#479) from eive/fsfw:mueller/gpio-update into development
Reviewed-on: #479
2021-09-27 15:18:58 +02:00
Robin Müller 42df77ff32
check for empty PST
and return appropriate returnvalue
2021-09-27 11:16:27 +02:00
Robin Müller 85c04dee23
increase limit of packets stored 2021-09-27 11:12:38 +02:00
Robin Müller 4c96db847d Merge branch 'development' into mueller/gpio-update 2021-09-27 09:54:10 +02:00
Robin Müller 0246dccbe9 Merge remote-tracking branch 'upstream/development' into mueller/spi-fix 2021-09-27 09:52:49 +02:00