eive/fsfw
15
1
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases 1 Wiki Activity
4,712 Commits 28 Branches 1 Tag
f63f3fa5645bbdec8bd5dfd7823c9bfd0df784cb
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
mohr f63f3fa564 more occurences in comments 2022-08-16 12:12:21 +02:00
mohr adcc375f25 Merge pull request 'New UnsignedByte Field class' (#660) from mueller/new-object-id-class into development 
Reviewed-on: fsfw/fsfw#660
 2022-08-15 15:22:30 +02:00
mohr 57ce5d1f34 Merge pull request 'Expand SerializeIF' (#656) from mueller/expand-serialize-if into development 
Reviewed-on: fsfw/fsfw#656
 2022-08-15 15:13:50 +02:00
mohr 90963b3940 Merge pull request 'group MGM data in local pool vectors' (#664) from eive/fsfw:mueller/group-mgm-data into development 
Reviewed-on: fsfw/fsfw#664
 2022-08-15 15:07:16 +02:00
mohr 0e7ec79af9 Merge pull request 'Add Linux HAL options' (#663) from eive/fsfw:mueller/cmake-linux-hal-options into development 
Reviewed-on: fsfw/fsfw#663
 2022-08-15 13:58:09 +02:00
mohr adbf375f38 some small fixes to dhb countdown addition 2022-07-13 21:58:07 +02:00
mohr 2e42f53682 Merge pull request 'New PoolEntry constructor' (#651) from eive/fsfw:mueller/new-pool-entry-ctor into development 
Reviewed-on: fsfw/fsfw#651
 2022-07-13 17:43:56 +02:00
mohr c519b70302 Merge pull request 'printout tweak' (#652) from mueller/printout-tweak-mq-linux-osal into development 
Reviewed-on: fsfw/fsfw#652
 2022-07-13 17:35:53 +02:00
mohr 45ee307bc4 Merge pull request 'remove duplicate CHANGELOG entries' (#649) from eive/fsfw:mueller/clean-changelog into development 
Reviewed-on: fsfw/fsfw#649
 2022-07-13 16:50:50 +02:00
mohr 8a2068aca6 Merge pull request 'clang-tidy changes for controller module' (#648) from clang-tidy-controllers into development 
Reviewed-on: fsfw/fsfw#648
 2022-07-13 16:49:15 +02:00
mohr aa60484111 Merge pull request 'clang-tidy changes for actions module' (#647) from clang-tidy-actions into development 
Reviewed-on: fsfw/fsfw#647
 2022-07-13 16:42:39 +02:00
mohr e99c7f3824 Merge pull request 'Install ETL library in CI/CD' (#645) from mueller/install-etl-cicd into development 
Reviewed-on: fsfw/fsfw#645
 2022-07-13 16:39:29 +02:00
mohr 2ee3ef1f1d Merge branch 'development' into mueller/install-etl-cicd 2022-07-13 16:38:30 +02:00
mohr 93933dee02 Merge pull request 'delete run configs' (#646) from mueller/del-cmake-run-cfgs into development 
Reviewed-on: fsfw/fsfw#646
 2022-07-13 15:37:55 +02:00
mohr 4499c9bf04 Merge pull request 'Added new functions to add sequences and tables' (#606) from eive/fsfw:mueller/new-ss-adder-functions into development 
Reviewed-on: fsfw/fsfw#606
 2022-05-10 09:35:16 +02:00
mohr 64274acbeb Merge pull request 'Add ETL dependency' (#592) from KSat/fsfw:mueller/add-etl-dependency into development 
Reviewed-on: fsfw/fsfw#592
 2022-04-25 15:08:05 +02:00
mohr 126ac52975 Merge pull request 'Allow passing a MqArgs struct to the MQ creation' (#583) from eive/fsfw:mueller/ipc-pass-arbitrary-args-to-mq into development 
Reviewed-on: fsfw/fsfw#583
 2022-04-25 14:43:52 +02:00
mohr df3794dfd8 Merge pull request 'delete code which is not required anymore' (#587) from eive/fsfw:mueller/small-mgmlis3-tweak into development 
Reviewed-on: fsfw/fsfw#587
 2022-03-28 15:08:22 +02:00
mohr d43caa8296 Merge pull request 'Using enums to configure baudrate and bits per word in Linux HAL UART' (#585) from mohr/hal_uart into development 
Reviewed-on: fsfw/fsfw#585
 2022-03-28 14:47:04 +02:00
mohr 916ed3f56a added function to add component to a periodic task by pointer 2022-03-28 13:50:42 +02:00
mohr c60aa68d00 changed hal linux uart baudrate and bits per word to enums 2022-03-24 15:44:32 +01:00
mohr 8704b9ab06 Merge pull request 'Fixed test issue with overflow of times' (#574) from gaisser/fsfw:gaisser_ccsds_time_tests into development 
Reviewed-on: fsfw/fsfw#574
 2022-03-14 14:23:35 +01:00
mohr 5a1585bd00 Merge pull request 'SPI HAL improvement' (#573) from eive/fsfw:mueller/spi-initialize-line-state into development 
Reviewed-on: fsfw/fsfw#573
 2022-03-14 14:18:03 +01:00
mohr 378c6c8006 Merge pull request 'HAL: Update for GPIO code' (#572) from eive/fsfw:mueller/gpio-update into development 
Reviewed-on: fsfw/fsfw#572
 2022-03-14 14:13:33 +01:00
mohr f4922a8686 Merge pull request 'small test device handler fixes' (#571) from eive/fsfw:mueller/small-dh-test-foxes into development 
Reviewed-on: fsfw/fsfw#571
 2022-03-14 14:11:44 +01:00
mohr 117747970d some forgotten size_t 2022-03-05 22:03:25 +01:00
mohr f659f13759 Changing build to -j4 from -j to lessen load on build server 2022-03-03 16:03:06 +01:00
mohr 89327463e3 Merge pull request 'HkSwitchHelper should not be needed anymore' (#557) from eive/fsfw:mueller/delete-obsolete-module into development 
Reviewed-on: fsfw/fsfw#557
 2022-02-28 15:03:09 +01:00
mohr bbacdc5cac Merge pull request 'Linux HAL: Add I2C wiretapping option' (#559) from eive/fsfw:mueller/hal-i2c-wiretapping into development 
Reviewed-on: fsfw/fsfw#559
 2022-02-28 14:55:21 +01:00
mohr a274d6598e Merge pull request 'Release v4.0.0' (#554) from development into master 
Reviewed-on: fsfw/fsfw#554
 2022-02-14 16:49:15 +01:00
mohr c3d78120ea preparing 4.0.0 2022-02-14 16:42:40 +01:00
mohr f24de22e9b Merge pull request 'Some DHB docs' (#551) from eive/fsfw:mueller/dhb-docs into development 
Reviewed-on: fsfw/fsfw#551
 2022-02-14 16:35:10 +01:00
mohr 918783774f Merge branch 'development' into mueller/dhb-docs 2022-02-14 16:34:47 +01:00
mohr a5adeb333c Merge pull request 'Fixed valgrind python script' (#553) from gaisser/fsfw:gaisser_build_script into development 
Reviewed-on: fsfw/fsfw#553
 2022-02-14 15:27:04 +01:00
mohr 7788cada54 Merge branch 'development' into gaisser_build_script 2022-02-14 15:26:06 +01:00
mohr d4f059d639 Merge pull request 'increase test limit' (#552) from eive/fsfw:mueller/increase-test-limit into development 
Reviewed-on: fsfw/fsfw#552
 2022-02-14 15:18:17 +01:00
mohr 9e958e752e applied clang format 2022-02-14 14:54:20 +01:00
mohr 805538ec6e Merge pull request 'meier/uioMapper' (#543) from meier/uioMapper into development 
Reviewed-on: fsfw/fsfw#543
 2022-02-14 14:50:52 +01:00
mohr bc0100ee08 Merge pull request 'Update CHANGELOG' (#539) from mueller/update-changelog into development 
Reviewed-on: fsfw/fsfw#539
 2022-02-07 17:13:41 +01:00
mohr c6d152a01d updated changelog 2022-02-07 17:11:04 +01:00
mohr f4f1174849 Merge branch 'development' into mueller/update-changelog 2022-02-07 17:06:16 +01:00
mohr 9df8722c10 Merge pull request 'Switching to a static docker image' (#549) from mohr/static_docker into development 
Reviewed-on: fsfw/fsfw#549
 2022-02-07 17:02:00 +01:00
mohr 7208139630 Jenkinsfile another typo 2022-02-07 16:50:59 +01:00
mohr 54f3d7bd2d Jenkinsfile typo 2022-02-07 16:49:42 +01:00
mohr 7a83289b3d using prebuild, static docker image 2022-02-07 16:48:41 +01:00
mohr 136524424f Merge pull request 'Fix for Catch2 build regression' (#548) from mohr/catch2workaround into development 
Reviewed-on: fsfw/fsfw#548
 2022-02-07 16:45:47 +01:00
mohr 793b97f651 Merge branch 'development' into mohr/catch2workaround 2022-02-07 16:40:13 +01:00
mohr 2e4cd80556 workaround for build regression catch2-v3.0.0-preview4 2022-02-07 15:51:06 +01:00
mohr a4f57a38fa Merge branch 'mueller/update-changelog' of egit.irs.uni-stuttgart.de:fsfw/fsfw into mueller/update-changelog 2022-02-07 15:42:00 +01:00
mohr 6dc34fc1f0 removed cmake warning as I have a workaround 2022-02-07 15:41:10 +01:00
mohr 9e6948a8d7 Merge pull request 'virtual function to print datasets' (#544) from meier/printDataSet into development 
Reviewed-on: fsfw/fsfw#544
 2022-02-07 14:42:17 +01:00
mohr 9b17b282c6 Merge pull request 'do send read hook' (#545) from meier/doSendReadHook into development 
Reviewed-on: fsfw/fsfw#545
 2022-02-07 14:42:05 +01:00
mohr baddbf7340 Updated changelog for v4.0.0 2022-02-07 13:44:25 +01:00
mohr 80a610141a added v3.0.1 to changelog 2022-02-04 13:45:09 +01:00
mohr f93c173715 Merge pull request 'Update development to master v3.0.1' (#546) from master into development 
Reviewed-on: fsfw/fsfw#546
 2022-02-04 13:29:59 +01:00
mohr 620841a9e5 Merge pull request 'bump version' (#542) from mueller/bump-version into master 
Reviewed-on: fsfw/fsfw#542
 2022-02-04 13:23:24 +01:00
mohr 02ac92a6b3 Merge pull request 'CMake optimization' (#533) from mueller/cmake-optimization into development 
Reviewed-on: fsfw/fsfw#533
 2022-01-31 15:41:09 +01:00
mohr b83b2e8f89 Merge pull request 'Catch 2 Update' (#538) from mueller/catch2-update into development 
Reviewed-on: fsfw/fsfw#538
 2022-01-31 15:18:42 +01:00
mohr 8a39971a1c oops, wrong language 2022-01-31 15:11:37 +01:00
mohr 1ead156c64 added --pull to the docker build 2022-01-31 15:08:52 +01:00
mohr 5b968f7e5a Can't use env variables in top leve agent section 2022-01-31 15:01:45 +01:00
mohr b98127cea6 Updated CI Build 
- Always clean and rebuild docker image.
- Use single docker container
 2022-01-31 14:59:45 +01:00
mohr eba9abfc9a Jenkinsfile syntax is weird, maybe this works... 2022-01-28 14:10:24 +01:00
mohr 2a268e14d1 Merge pull request 'Release v3.0.0' (#532) from development into master 
Reviewed-on: fsfw/fsfw#532
 2022-01-10 14:52:31 +01:00
mohr 2bd1e6acbd Merge pull request 'Added formatting scripts' (#527) from KSat/fsfw:mueller/clang-shell-script into development 
Reviewed-on: fsfw/fsfw#527
 2021-12-13 14:26:22 +01:00
mohr fbeb578d1c Merge pull request 'introducing valgrind' (#521) from mohr_ci into development 
Reviewed-on: fsfw/fsfw#521
 2021-10-27 21:49:57 +02:00
mohr 58d4525e8a Merge branch 'development' into mohr_ci 2021-10-27 21:35:17 +02:00
mohr 8d004e9621 Merge pull request 'Out of bound reads and writes in unittests' (#519) from mohr_valgrind into development 
Reviewed-on: fsfw/fsfw#519
 2021-10-27 21:35:01 +02:00
mohr a53992fdc9 introducing valgrind 2021-10-27 21:32:40 +02:00
mohr c6bbc19b85 Merge pull request 'Adding code for CI with docker and jenkins' (#520) from mohr_ci into development 
Reviewed-on: fsfw/fsfw#520
 2021-10-27 20:52:57 +02:00
mohr 36aaf3d758 say hi to my new friend valgrind 2021-10-27 20:41:04 +02:00
mohr da42edcc0c Jenkinsfile: added stage to be more verbose 2021-10-26 20:58:34 +02:00
mohr b02f737418 jenkins cosmetics 2021-10-26 20:53:08 +02:00
mohr 1923b339e9 I can not jenkins 2021-10-26 20:47:53 +02:00
mohr 3c41472649 tweaking Jenkinsfile 2021-10-26 20:30:22 +02:00
mohr da19764232 Merge pull request 'Unittest and Integration test hotfix' (#516) from KSat/fsfw:mueller/unittest-hotfix into development 
Reviewed-on: fsfw/fsfw#516
 2021-10-26 17:36:40 +02:00
mohr e263f2fbdc Merge pull request 'added integration test code' (#508) from mueller/example-code-as-test into development 
Reviewed-on: fsfw/fsfw#508
 2021-10-25 15:30:53 +02:00
mohr 19f9b0280c added jenkins integration 2021-10-25 14:59:16 +02:00
mohr e86319707f Merge branch 'development' into mueller/example-code-as-test 2021-10-25 14:52:43 +02:00
mohr 0e653378c3 Merge pull request 'Arrayprinter format improvements' (#514) from KSat/fsfw:mueller/arrayprinter-improvements into development 
Reviewed-on: fsfw/fsfw#514
 2021-10-25 14:09:25 +02:00
mohr a506b94d7e Merge branch 'development' into mueller/arrayprinter-improvements 2021-10-25 14:09:08 +02:00
mohr 7bff632042 Merge pull request 'updated function names' (#509) from eive/fsfw:mueller/constexpr-func-name into development 
Reviewed-on: fsfw/fsfw#509
 2021-10-25 14:05:14 +02:00
mohr 084a3daec6 Merge pull request 'more printouts for rejected TC packets' (#505) from eive/fsfw:mueller/packet-check-printout into development 
Reviewed-on: fsfw/fsfw#505
 2021-10-18 14:44:40 +02:00
mohr 9d7d22510b Merge pull request 'Tests can now be built as part of FSFW and versioning moved to CMake' (#500) from KSat/fsfw:mueller/integrated-unittests into development 
Reviewed-on: fsfw/fsfw#500
 2021-10-18 14:42:52 +02:00
mohr cee42f9b70 one } was on the wrong side of an #endif 2021-10-18 14:34:11 +02:00
mohr 5d31a54fba Merge pull request 'small bugfix for LIS3 handler' (#504) from eive/fsfw:mueller/lis3-small-bugfix into development 
Reviewed-on: fsfw/fsfw#504
 2021-10-15 17:20:55 +02:00
mohr cadf97de88 Merge pull request 'Add feature to open GPIO by line name' (#506) from eive/fsfw:feature/open-gpio-by-line-name into development 
Reviewed-on: fsfw/fsfw#506
 2021-10-15 17:19:42 +02:00
mohr f8e9042943 Merge pull request 'Merge v2.0.1 into development' (#503) from master into development 
Reviewed-on: fsfw/fsfw#503
 2021-10-11 18:19:46 +02:00
mohr e6a7108614 Merge pull request 'Increased TM stack robustness' (#501) from eive/fsfw:mueller/tm-stack-robustness-cherry-picked into master 
Reviewed-on: fsfw/fsfw#501
Reviewed-by: Ulrich Mohr <mohr@irs.uni-stuttgart.de>
 2021-10-11 18:00:45 +02:00
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: fsfw/fsfw#502
Reviewed-by: Ulrich Mohr <mohr@irs.uni-stuttgart.de>
 2021-10-11 17:51:58 +02:00
mohr 12983a7143 Merge pull request 'minor updates for PUS services' (#498) from KSat/fsfw:mueller/pus-tweaks into development 
Reviewed-on: fsfw/fsfw#498
 2021-10-08 12:59:04 +02:00
mohr 27a3598526 Merge pull request 'better naming for parameter' (#499) from KSat/fsfw:mueller/retval-better-naming into development 
Reviewed-on: fsfw/fsfw#499
 2021-10-08 12:58:43 +02:00
mohr ab906fa534 Merge pull request 'Merge development into master for v2.0.0' (#493) from development into master 
Reviewed-on: fsfw/fsfw#493
 2021-10-04 14:49:43 +02:00
mohr 146e1e3282 bumped version to 2.0.0 for next release 2021-10-04 14:47:32 +02:00
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
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
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