|
|
fc2b709148
|
resolve merge conflict
|
2022-05-12 20:48:50 +02:00 |
|
|
|
02473a0cd7
|
Merge remote-tracking branch 'origin/develop' into mueller/health-if-extension-eive
|
2022-05-12 20:11:45 +02:00 |
|
|
|
ab45aa1296
|
HasHealthIF additions
|
2022-05-12 20:06:10 +02:00 |
|
|
|
171c48495c
|
Merge remote-tracking branch 'upstream/development' into mueller/power-switcher-component-upstream
|
2022-05-12 19:07:12 +02:00 |
|
|
|
a83b86ccd2
|
Merge pull request 'refactor power module' (#590) from eive/fsfw:mueller/refactor-power-switch-if-etc into development
Reviewed-on: fsfw/fsfw#590
|
2022-05-12 18:37:45 +02:00 |
|
|
|
2e4b9bcd7c
|
Merge remote-tracking branch 'origin/development' into mueller/new-cicd-cmake-opts
|
2022-05-12 17:42:49 +02:00 |
|
|
|
3046822e88
|
run cmake-format
|
2022-05-12 17:27:39 +02:00 |
|
|
|
6442dd0c38
|
Merge branch 'mueller/amft-cmakelists' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw into mueller/amft-cmakelists
|
2022-05-12 17:16:15 +02:00 |
|
|
|
9b6fa646ed
|
Merge remote-tracking branch 'origin/development' into mueller/amft-cmakelists
|
2022-05-12 17:16:10 +02:00 |
|
|
|
e77bde459b
|
Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class
|
2022-05-12 17:12:26 +02:00 |
|
|
|
2d9d83a1c5
|
Merge branch 'development' into mueller/missing-preproc-defs
|
2022-05-12 17:10:54 +02:00 |
|
|
|
c561271070
|
Merge branch 'development' into mueller/refactor-power-switch-if-etc
|
2022-05-12 17:09:27 +02:00 |
|
|
|
70d4fc1e0a
|
Merge branch 'mueller/add-tc-scheduler-pus-11' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/add-tc-scheduler-pus-11
|
2022-05-12 17:06:12 +02:00 |
|
|
|
b8cfb36426
|
added additional explicit returnvalues
|
2022-05-12 17:05:58 +02:00 |
|
|
|
e5c140e0ae
|
Merge branch 'development' into mueller/add-tc-scheduler-pus-11
|
2022-05-12 16:59:01 +02:00 |
|
|
|
b99160e850
|
Merge pull request 'Add LTO support' (#616) from mueller/add-lto-support into development
Reviewed-on: fsfw/fsfw#616
|
2022-05-12 16:56:54 +02:00 |
|
|
|
c4c340fde1
|
lot of refactoring
|
2022-05-12 16:56:06 +02:00 |
|
|
|
9a4c7589cc
|
Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11
|
2022-05-12 15:52:47 +02:00 |
|
|
|
d11f898f70
|
update dummy power switcher docs
|
2022-05-12 15:02:06 +02:00 |
|
|
|
c0ff84bb9d
|
Merge pull request 'SPI refactoring' (#80) from mueller/spi-cache-spi-dev-in-com-if into develop
Reviewed-on: #80
|
2022-05-11 16:28:08 +02:00 |
|
|
|
d1ff32bf96
|
reset read vec values, add getter function
|
2022-05-11 16:12:24 +02:00 |
|
|
|
dafcaa6007
|
Merge remote-tracking branch 'origin/develop' into mueller/spi-cache-spi-dev-in-com-if
|
2022-05-11 15:44:45 +02:00 |
|
|
|
5eb52133ac
|
Merge pull request 'sequence count init value' (#81) from meier/sequenceCount into develop
Reviewed-on: #81
|
2022-05-11 15:43:49 +02:00 |
|
|
|
025e7647d3
|
Merge branch 'develop' into meier/sequenceCount
|
2022-05-11 15:43:35 +02:00 |
|
|
|
0a97077a0e
|
hotfix
|
2022-05-11 15:42:52 +02:00 |
|
Jakob Meier
|
bc994595da
|
sequence count init value
|
2022-05-11 14:31:49 +02:00 |
|
|
|
34e124f2db
|
Merge branch 'development' into mueller/amft-cmakelists
|
2022-05-11 11:30:40 +02:00 |
|
|
|
ab2d7ca98f
|
update changelog and docs
|
2022-05-11 11:29:28 +02:00 |
|
|
|
56e4fca06f
|
Some improvements
- Rename mutex to csMutex to better represent its purpose
- Move the empty transfer to update the line polarity to separate function
|
2022-05-11 11:24:06 +02:00 |
|
|
|
e06c457743
|
Cache SPI device name in ComIF
- Architecturally, this makes a lot more sense because
each ComIF should be responsible for one SPI bus
|
2022-05-11 11:11:39 +02:00 |
|
|
|
5941c21adf
|
Merge remote-tracking branch 'origin/develop' into mueller/spi-speed-mode-getter
|
2022-05-11 10:58:13 +02:00 |
|
|
|
0e880de0d0
|
update changelog
|
2022-05-11 10:54:39 +02:00 |
|
|
|
29c3a43760
|
getter functions for speed and mode
|
2022-05-11 10:54:13 +02:00 |
|
|
|
e05c72b062
|
minor formatting fix
|
2022-05-10 13:08:14 +02:00 |
|
|
|
377c3325d2
|
update cmake-modules file
|
2022-05-10 12:16:38 +02:00 |
|
|
|
2ca8523215
|
Merge branch 'mueller/add-lto-support' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw into mueller/add-lto-support
|
2022-05-10 11:57:01 +02:00 |
|
|
|
25775614de
|
only check IPO support if enabled
|
2022-05-10 11:56:51 +02:00 |
|
|
|
efb3d982f3
|
added missing prefix
|
2022-05-10 11:52:40 +02:00 |
|
|
|
0410ecd9e3
|
Merge branch 'development' into mueller/add-lto-support
|
2022-05-10 11:51:39 +02:00 |
|
|
|
dd986fefd3
|
experimenting with PRE_BUILD command
|
2022-05-10 11:51:25 +02:00 |
|
|
|
b38329aa0e
|
Merge branch 'development' into mueller/extend-version-class
|
2022-05-10 11:19:48 +02:00 |
|
|
|
0fe1b70bae
|
keep LTO option off by default
|
2022-05-10 11:19:29 +02:00 |
|
|
|
c5b4499d98
|
Merge remote-tracking branch 'upstream/development' into mueller/refactor-power-switch-if-etc
|
2022-05-10 09:58:21 +02:00 |
|
|
|
458aa5c265
|
Merge branch 'development' into mueller/missing-preproc-defs
|
2022-05-10 09:56:29 +02:00 |
|
|
|
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 |
|
|
|
eb0223bc51
|
Merge branch 'development' into mueller/add-lto-support
|
2022-05-09 22:34:28 +02:00 |
|
|
|
be6a492022
|
Merge branch 'development' into mueller/extend-version-class
|
2022-05-09 22:34:09 +02:00 |
|
|
|
d8bd08dd8c
|
Merge branch 'development' into mueller/amft-cmakelists
|
2022-05-09 17:22:40 +02:00 |
|
|
|
18c2847b08
|
Merge branch 'development' into mueller/missing-preproc-defs
|
2022-05-09 17:21:48 +02:00 |
|
|
|
d45cda93b2
|
Merge pull request 'important bugfix for TCP server' (#618) from mueller/tcp-server-bugfix into development
Reviewed-on: fsfw/fsfw#618
|
2022-05-09 16:59:54 +02:00 |
|
