Commit Graph

4550 Commits

Author SHA1 Message Date
Robin Müller b00d83cb1a
bump ETL revision 2022-04-27 09:41:16 +02:00
Robin Müller 17e609c3a5
some more var replacements 2022-04-27 09:37:11 +02:00
Robin Müller 64f0166b64
hotfix for new ETL dependency 2022-04-27 09:16:52 +02:00
Robin Müller c80f06fbcb
hotfix for ETL lib dep 2022-04-27 09:08:17 +02:00
Robin Müller 70eb8325a0 Merge remote-tracking branch 'upstream/development' into mueller/compiler-warning-fixes-upstream-2 2022-04-27 08:47:45 +02:00
Robin Müller e796f82203 Merge pull request 'gpio bug fix' (#602) from KSat/fsfw:hoffmann/gpioBugfix into development
Reviewed-on: fsfw/fsfw#602
2022-04-27 08:41:54 +02:00
Robin Müller 5b7ca8c13c
update CHANGELOG.md, apply afmt 2022-04-27 08:39:21 +02:00
Jakob Meier d61fe7db93 Merge pull request 'Update FSFW' (#70) from mueller/update-fsfw into eive/develop
Reviewed-on: #70
2022-04-27 07:48:56 +02:00
Robin Müller c1be1fe232
update CMakeLists.txt etl handling 2022-04-26 20:06:26 +02:00
Robin Müller ec2e274f22
find_package call for Catch2 quiet 2022-04-26 16:31:45 +02:00
Robin Müller c5a7b98a7d
name correction 2022-04-26 16:24:14 +02:00
Robin Müller 6a8da303fb
exporting etl target 2022-04-26 14:06:30 +02:00
Robin Müller 3d047f9629
trying to export ETL lib 2022-04-26 11:15:24 +02:00
Robin Müller 1739edd9b0
warning fix for modern compilers 2022-04-26 10:32:37 +02:00
Robin Müller 466a3639a5
Merge remote-tracking branch 'upstream/development' into mueller/update-fsfw 2022-04-26 10:02:43 +02:00
Jakob Meier 900ef5b912 option to use coutdwon object to time out replies 2022-04-26 09:07:03 +02:00
Robin Müller 031739ef51 Merge branch 'development' into hoffmann/gpioBugfix 2022-04-25 15:45:21 +02:00
Robin Müller 80be937d9d Merge remote-tracking branch 'upstream/development' into mueller/compiler-warning-fixes-upstream-2 2022-04-25 15:24:17 +02:00
Steffen Gaisser b8516b15cb Merge pull request 'Added an additional conversion function' (#584) from eive/fsfw:mueller/clock-addition into development
Reviewed-on: fsfw/fsfw#584
2022-04-25 15:22:07 +02:00
Steffen Gaisser ac5a54b5da Merge branch 'development' into mueller/clock-addition 2022-04-25 15:12:24 +02:00
Robin Müller 29015b340b
update changelog 2022-04-25 15:10:50 +02:00
Ulrich 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
Robin Müller ff98c42514 Merge branch 'development' into mueller/clock-addition 2022-04-25 14:54:22 +02:00
Ulrich 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
Philipp 70d3197212 gpio init bug fix
Return values from configureGpios were not checked
2022-04-25 14:32:05 +02:00
Philipp dd90980520 push test 2022-04-25 14:19:03 +02:00
Jakob Meier 280b641cbc Merge pull request 'mueller/extend-version-class-fork' (#69) from mueller/extend-version-class-fork into eive/develop
Reviewed-on: #69
2022-04-22 20:06:49 +02:00
Robin Müller 24ef96d1b8 Merge branch 'eive/develop' into mueller/extend-version-class-fork 2022-04-22 16:04:55 +02:00
Robin Müller 18f9958332
add git CST and sha info to version ctor 2022-04-22 15:39:44 +02:00
Robin Müller 68231db9a1
changelog typo 2022-04-22 15:37:14 +02:00
Robin Müller 85e849ca00
small remaining fix 2022-04-22 15:10:08 +02:00
Robin Müller 617d41c7d5
maybe this fixed CI/CD issues 2022-04-22 15:08:16 +02:00
Robin Müller cccdced74d
unique helper file name 2022-04-22 15:00:04 +02:00
Robin Müller 750369b0a6
small addition and possible fix 2022-04-22 14:55:17 +02:00
Robin Müller 539e01deee
minor form change 2022-04-22 14:53:12 +02:00
Robin Müller 4079edc80e
update changelog 2022-04-22 14:52:55 +02:00
Robin Müller a569990ca2
fix tests 2022-04-22 14:50:50 +02:00
Robin Müller 9c7eba4431
git version handler more robust now 2022-04-22 14:47:28 +02:00
Robin Müller 513ae9dc10
prefixed git info variable 2022-04-22 14:38:32 +02:00
Robin Müller effecd4662
include cmake-modules manually instead
- Instead of using FetchContent
- Separate folder for easier update and for distintion
- LICENSE file included
2022-04-22 14:33:34 +02:00
Robin Müller b951cb736a
add fsfw specific cmake message prefix 2022-04-22 14:08:26 +02:00
Robin Müller 7e1aed6ad9
apply afmt 2022-04-22 14:04:30 +02:00
Robin Müller 07155e2546
extend version handling with git describe 2022-04-22 14:04:18 +02:00
Robin Müller 8c6c8ad3c0
exntend version class to allow add info 2022-04-22 11:58:44 +02:00
Robin Müller befaca78c6 Merge pull request 'space packet default length' (#66) from meier/develop into eive/develop
Reviewed-on: #66
2022-04-21 14:30:34 +02:00
Robin Müller af4f002a25 Merge branch 'eive/develop' into meier/develop 2022-04-21 14:30:11 +02:00
Jakob Meier 9f7b9be800 space packet default length 0 2022-04-21 14:24:20 +02:00
Jakob Meier 2c0f3b52e9 Merge pull request 'Space Packet Default Length' (#65) from meier/develop into eive/develop
Reviewed-on: #65
2022-04-21 14:11:09 +02:00
Jakob Meier aa1ea33647 Merge pull request 'LIS3 handler nullptr check' (#64) from mueller/lis3-handler-nullptr-check into eive/develop
Reviewed-on: #64
2022-04-21 13:55:06 +02:00
Jakob Meier 9798b6b4ab Merge pull request 'Merge upstream and apply auto-formatter' (#63) from merge-upstream into eive/develop
Reviewed-on: #63
2022-04-21 13:54:20 +02:00