eive/fsfw
eive
/
fsfw
forked from fsfw/fsfw
14
1
Fork 0
Code Issues Pull Requests 1 Releases 1 Wiki Activity
4,903 Commits 29 Branches 1 Tag 24 MiB
Commit Graph

4903 Commits

Author SHA1 Message Date
Robin Müller 1e8ff8d02c
tweak changelog 2022-07-08 17:38:43 +02:00
Robin Müller 0df27fdc71
Merge branch 'develop' into mueller/update-cmd-reply-maps-refactoring 2022-07-08 17:35:43 +02:00
Robin Müller 4789200750
Merge remote-tracking branch 'upstream/development' into mueller/update-cmd-reply-maps-refactoring 2022-07-08 17:29:21 +02:00
Robin Müller 904ae2cc0e Merge remote-tracking branch 'origin/irini' into develop 2022-07-08 16:34:24 +02:00
Robin Müller 4a2012ac30 Merge branch 'irini' into develop 2022-07-08 16:31:57 +02:00
Jakob Meier 6a62cf7f1e Merge pull request 'Update FSFW from upstream' (#102) from mueller/update-from-upstream into develop 
Reviewed-on: #102
Reviewed-by: Jakob Meier <meierj@irs.uni-stuttgart.de>
 2022-07-04 13:04:00 +02:00
Robin Müller c5eb09314f
delete run configs 2022-07-04 11:04:37 +02:00
Robin Müller 682abd1b5b
new clion folder in misc for .run configs 2022-07-04 10:55:09 +02:00
Robin Müller a4247cd723
Merge remote-tracking branch 'upstream/development' into mueller/update-from-upstream 2022-07-04 10:53:52 +02:00
Robin Müller 39881e7671 Merge pull request 'some form updates' (#100) from mueller/afmt-gen-tweaks into develop 
Reviewed-on: #100
 2022-06-21 10:37:03 +02:00
Robin Müller 541f563683 Merge pull request 'Fix StorageAccessor move assignment' (#643) from gaisser/fsfw:gaisser_storage_accessor_fix into development 
Reviewed-on: fsfw/fsfw#643
 2022-06-21 10:31:36 +02:00
Robin Müller 5abbf42e9f
some form updates 2022-06-21 00:49:58 +02:00
Robin Müller 28ea71a077 Merge branch 'development' into gaisser_storage_accessor_fix 2022-06-20 17:56:58 +02:00
Steffen Gaisser a044d7d724 Merge pull request 'new cmake options for CICD build' (#623) from mueller/new-cicd-cmake-opts into development 
Reviewed-on: fsfw/fsfw#623
 2022-06-20 17:56:29 +02:00
Robin Müller 687700cee8 Merge branch 'development' into gaisser_storage_accessor_fix 2022-06-20 16:36:49 +02:00
Steffen Gaisser 732b615cb3 Merge branch 'development' into mueller/new-cicd-cmake-opts 2022-06-20 16:34:13 +02:00
Robin Müller 394ce2ec3e Merge pull request 'LocalDataPoolManager Warning Text' (#642) from meier/debug-info into development 
Reviewed-on: fsfw/fsfw#642
 2022-06-20 16:15:30 +02:00
Robin Müller dde96ae220 Merge branch 'development' into gaisser_storage_accessor_fix 2022-06-20 16:15:05 +02:00
Steffen Gaisser c3aaab4b93 Merge pull request 'Task IF refactoring' (#636) from mueller/task-if-refactoring into development 
Reviewed-on: fsfw/fsfw#636
 2022-06-20 16:08:03 +02:00
Steffen Gaisser edf1d5ae8d Added more test cases 2022-06-20 16:02:35 +02:00
Robin Müller 690991b4b5
include fix 2022-06-20 15:42:08 +02:00
Robin Müller 1a294e6a13
include TestsConfig.h 2022-06-20 15:40:15 +02:00
Robin Müller 8c4e34153b
README updates 2022-06-20 15:36:48 +02:00
Steffen Gaisser b60e4bcb90 Fix StorageAccessor move assignment 
* Added Unittest for this
* Fixed missing include in test
 2022-06-20 15:15:33 +02:00
Steffen Gaisser b18410aa63 Merge remote-tracking branch 'refs/remotes/origin/mueller/task-if-refactoring' into mueller/task-if-refactoring 2022-06-20 15:02:38 +02:00
Steffen Gaisser 7f57a8784a Fixed deadline missed call on linux 2022-06-20 15:02:16 +02:00
Robin Müller 4b33aa8262 bump ETL version 2022-06-20 14:25:39 +02:00
Irini Kosmidou 1910a7838c compile DleParser 2022-06-20 11:04:06 +02:00
Irini Kosmidou ba3a99466a Merge remote-tracking branch 'origin/develop' into irini 2022-06-20 11:03:12 +02:00
Robin Müller d47a908117 Merge branch 'development' into mueller/task-if-refactoring 2022-06-20 09:40:31 +02:00
Robin Müller fce95e04a8 Merge branch 'development' into mueller/new-cicd-cmake-opts 2022-06-20 09:39:58 +02:00
Robin Müller 438efe074e Merge pull request 'LocalDataPoolManager Warning Text' (#99) from meier/eive-debug-info into develop 
Reviewed-on: #99
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
 2022-06-20 09:35:31 +02:00
Robin Müller 1759700b6a Merge branch 'develop' into meier/eive-debug-info 2022-06-20 09:35:14 +02:00
Robin Müller c7618294ac Merge pull request 'HK Generation for L3GD20, LIS3MDL, RM3100' (#97) from meier/device-hk into develop 
Reviewed-on: #97
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
 2022-06-20 09:34:16 +02:00
Jakob Meier af890c6218 corrected warning text 2022-06-16 07:55:57 +02:00
Jakob Meier 7f3e5e42bb Merge branch 'develop' into meier/device-hk 2022-06-16 07:44:58 +02:00
Jakob Meier fc742e4270 Merge branch 'development' into meier/debug-info 2022-06-16 07:22:43 +02:00
Jakob Meier b5183a19fc minor change in debug text 2022-06-16 07:03:58 +02:00
Robin Müller ca453a8f16 Merge pull request 'run auto formatters' (#641) from KSat/fsfw:mueller/reapply-fmt into development 
Reviewed-on: fsfw/fsfw#641
 2022-06-13 17:04:11 +02:00
Robin Müller b7c0c07141
Merge remote-tracking branch 'origin/development' into mueller/new-cicd-cmake-opts 2022-06-13 16:28:01 +02:00
Robin Müller 0158102f11 Merge pull request 'apply afmt, basic CLion support' (#625) from mueller/apply-afmt into development 
Reviewed-on: fsfw/fsfw#625
 2022-06-13 16:27:02 +02:00
Robin Müller 69859fdbc9
rerun afmt 2022-06-13 16:21:20 +02:00
Robin Müller 90bccc744e Merge pull request 'Fix SPI ComIF shadowing warning' (#639) from KSat/fsfw:mueller/spi-com-if-shadowing into development 
Reviewed-on: fsfw/fsfw#639
 2022-06-13 14:35:46 +02:00
Robin Müller ab89108c55 Merge pull request 'some fixes for TC Map printout function' (#640) from KSat/fsfw:mueller/pus-11-printout-fixes into development 
Reviewed-on: fsfw/fsfw#640
 2022-06-13 14:29:36 +02:00
Robin Müller a682bbe400
remove static missed deadline 2022-06-13 14:23:56 +02:00
Robin Müller e67fc2ab0d
some fixes for TC Map printout function 2022-06-13 10:56:37 +02:00
Robin Müller 71ce966531 Merge branch 'mueller/spi-com-if-shadowing' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/spi-com-if-shadowing 2022-06-13 10:54:25 +02:00
Robin Müller 6b0f4a159f Merge remote-tracking branch 'upstream/development' into mueller/spi-com-if-shadowing 2022-06-13 10:54:20 +02:00
Robin Müller 4a06b558c1 Fix SPI ComIF shadowing warning 2022-06-13 10:53:04 +02:00
Robin Müller 6d921f03fd Fix SPI ComIF shadowing warning 2022-06-13 10:50:49 +02:00