Update FSFW from Upstream #27
muellerr
commented 2022-05-17 10:06:21 +02:00
Owner
No description provided.
muellerr
added 523 commits 2022-05-17 10:06:24 +02:00
6d5eb5b387
Op Divider and bitutility updates
0176c07886
use IF instead of void pointer
30217aa42b
updated SerializeAdapter.h
f7c6ec329b
Merge pull request 'Filesystem Base Interface: Use IF instead of void pointer' (#511) from KSat/fsfw:mueller/filesystem-api-update into development
e688105073
Merge branch 'development' into mueller/unittests-op-divider-bitutil
186b3565e0
Merge pull request 'Unittests for Op Divider and Bitutility' (#510) from KSat/fsfw:mueller/unittests-op-divider-bitutil into development
05c4f4fadc
Bugfix for Packet ID getters
ab7117d81e
Merge pull request 'Bugfix for Packet ID getters' (#524) from eive/fsfw:mueller/bugfix-improvements-packet-id-functions into development
00dced31ee
update unittest helper scripts
ecc7f1d691
Merge branch 'development' into mueller/update-scripts
9c5e3565c6
Merge branch 'development' into mueller/serializeif-update
8c17c7e1a7
Merge pull request 'update unittest helper scripts' (#525) from eive/fsfw:mueller/update-scripts into development
9fadc9b830
Merge branch 'development' into mueller/serializeif-update
bf31248a50
Merge pull request 'Update SerializeAdapter' (#513) from KSat/fsfw:mueller/serializeif-update into development
c2bf09d506
Introducing documentation with Sphinx
fd7581f8ba
Added formatting scripts
15dddd7fc4
small README section for formatting
df45f02c39
script fixes, odd behaviour
5907f8ee9d
Added CFDP packet stack
4a5204d6f6
small fix for helper script
32ba4301e4
Merge pull request 'Introducing documentation with Sphinx' (#526) from mueller/sphinx-docs into development
cbcfa8fe56
Merge remote-tracking branch 'upstream/development' into mueller/clang-shell-script
c3a0aabfb8
Merge branch 'development' into mueller/cfdp-pdus
602fa3a956
Merge remote-tracking branch 'upstream/development' into mueller/cfdp-pdus
6a6f6011ba
Merge branch 'mueller/cfdp-pdus' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/cfdp-pdus
7a84dff7d6
maybe this fixes the build error?
e952a82b65
small tweaks and fixes
d39e0c8bb6
renamed test folder
661b7b44e0
improved win32 define
cec44ad44c
Merge pull request 'improved win32 define' (#529) from KSat/fsfw:woodward/define-improvement into development
9697575f50
Merge branch 'development' into mueller/clang-shell-script
2bd1e6acbd
Merge pull request 'Added formatting scripts' (#527) from KSat/fsfw:mueller/clang-shell-script into development
d0c7878da4
simplified test controller and added docs gitignore
bd64a43819
Merge pull request 'simplified test controller and added docs gitignore' (#530) from mueller/controller-update into development
d93f2c5055
Merge branch 'development' into mueller/cfdp-pdus
2a268e14d1
Merge pull request 'Release v3.0.0' (#532) from development into master
78ddce249c
try an optimization
6c63d82f5c
better comment
371ff931bf
Linux CommandExecutor
bc5a6b4a51
bump catch2 version to v3.0.0-preview4
fe95c3337a
changed builddir name in Jenkinsfile
c453af5911
cleanCI
441b3b83c8
Changes to Dockerfile and Jenkinsfile
386843e3e7
update jenkinsfile
8414c9d471
added steps
cf3d4d8de3
cleanDocker
bf7fabd7ba
commented out when block
eba9abfc9a
Jenkinsfile syntax is weird, maybe this works...
b98127cea6
Updated CI Build
5b968f7e5a
Can't use env variables in top leve agent section
1ead156c64
added --pull to the docker build
8a39971a1c
oops, wrong language
b83b2e8f89
Merge pull request 'Catch 2 Update' (#538) from mueller/catch2-update into development
02ac92a6b3
Merge pull request 'CMake optimization' (#533) from mueller/cmake-optimization into development
74ae3f1371
Merge remote-tracking branch 'upstream/development' into mueller/cmd-executor
751de7accc
Merge remote-tracking branch 'upstream/development' into mueller/cfdp-pdus
9cde8c7f45
Merge branch 'mueller/cfdp-pdus' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/cfdp-pdus
990e8672a8
update dockerfile
d2b561ba2f
test
368481f88b
move strcmp outside of macro
acbc2cd749
valgrind why
fed39defd3
update helper script
30687f84c8
Merge branch 'mueller/cmd-executor' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/cmd-executor
e0c50477cb
it actually was an uninitialized array
98dbaf03e0
Merge pull request 'Linux CommandExecutor' (#536) from eive/fsfw:mueller/cmd-executor into development
e5cc7069a6
Merge remote-tracking branch 'upstream/development' into mueller/cfdp-pdus
70b593df65
Merge pull request 'Added CFDP packet stack' (#528) from KSat/fsfw:mueller/cfdp-pdus into development
ddcac2bbac
reapply clang format
bf5a11cbd3
Merge pull request 'applied clang script' (#534) from mueller/apply-clang-script into development
ad5bb4c694
update changelog.md
51add8a8ad
Merge remote-tracking branch 'origin/development' into mueller/update-changelog
79936a3335
uio mapper
2d52042ed6
add uio subdir
40329a33b2
prepared for proper pr
348274c145
merged develop
e9b0951a95
virtual function to print datasets
06ffe27fcc
do send read hook
f08d291e3e
fix to remove compiler warning
1b41153ee6
add uio subdirectory
43b7a314b6
bump version
bd29688307
bump revision
620841a9e5
Merge pull request 'bump version' (#542) from mueller/bump-version into master
f93c173715
Merge pull request 'Update development to master v3.0.1' (#546) from master into development
80a610141a
added v3.0.1 to changelog
baddbf7340
Updated changelog for v4.0.0
7b8019c621
Merge branch 'development' into meier/uioMapper
c7b9df5e40
Merge branch 'development' into mueller/update-changelog
8ab8c57f9c
Merge branch 'development' into meier/doSendReadHook
5f48d77c64
Merge branch 'development' into meier/printDataSet
9b17b282c6
Merge pull request 'do send read hook' (#545) from meier/doSendReadHook into development
9e6948a8d7
Merge pull request 'virtual function to print datasets' (#544) from meier/printDataSet into development
6dc34fc1f0
removed cmake warning as I have a workaround
a4f57a38fa
Merge branch 'mueller/update-changelog' of egit.irs.uni-stuttgart.de:fsfw/fsfw into mueller/update-changelog
2e4cd80556
workaround for build regression catch2-v3.0.0-preview4
793b97f651
Merge branch 'development' into mohr/catch2workaround
136524424f
Merge pull request 'Fix for Catch2 build regression' (#548) from mohr/catch2workaround into development
7a83289b3d
using prebuild, static docker image
54f3d7bd2d
Jenkinsfile typo
7208139630
Jenkinsfile another typo
9df8722c10
Merge pull request 'Switching to a static docker image' (#549) from mohr/static_docker into development
f4f1174849
Merge branch 'development' into mueller/update-changelog
c6d152a01d
updated changelog
bc0100ee08
Merge pull request 'Update CHANGELOG' (#539) from mueller/update-changelog into development
b25555a533
started DHB docs
cdf2a90f90
fixed up cross-ref
2dcf896cca
this sounds better
4f87e24f60
increase test limit
9897f51307
added flose and changed warning message to error message
120750f22a
removed one fclose
805538ec6e
Merge pull request 'meier/uioMapper' (#543) from meier/uioMapper into development
2602d4fed1
Merge branch 'development' into mueller/dhb-docs
3bcd71598d
Merge branch 'development' into mueller/increase-test-limit
9e958e752e
applied clang format
e312cd094a
Merge branch 'development' into mueller/increase-test-limit
d53c7e1190
increase test limit
d81257a91c
Merge branch 'mueller/increase-test-limit' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/increase-test-limit
0d38ac62d8
this should work an ALL systems
22bc300902
increase other limits
d4f059d639
Merge pull request 'increase test limit' (#552) from eive/fsfw:mueller/increase-test-limit into development
074ef29b86
Fixed valgrind python script
7788cada54
Merge branch 'development' into gaisser_build_script
a5adeb333c
Merge pull request 'Fixed valgrind python script' (#553) from gaisser/fsfw:gaisser_build_script into development
a612fb446c
added two links
6744a55b9b
docs update
918783774f
Merge branch 'development' into mueller/dhb-docs
f24de22e9b
Merge pull request 'Some DHB docs' (#551) from eive/fsfw:mueller/dhb-docs into development
c3d78120ea
preparing 4.0.0
a274d6598e
Merge pull request 'Release v4.0.0' (#554) from development into master
b7f3eff742
WIP unit tests
45ea09291a
Still test for InternalError Reporter
2f1b923009
this module should not be needed anymore
6fb64f9ada
removed source from cmakelists.txt
025f79fcb4
apply clang format
90b8ad1e6d
apply clang format
6739890d53
add i2c wiretapping option
d119479c0a
update changelog
68ace0b74a
update changelog
9c2ceb4a9f
one shot flag not static anymore
aebd4817b8
periodic printouts are runtime configurable now
0c4835bfb5
update changelog
eac7e6db07
try readme tweak
a50b52df51
Fixed an issue in host OSAL and added more coverage to IER
4862edfdb5
Clang format
e5e85bcff9
still clang
fdc8a3d4f7
display run commands in helper script
5ff0f8ea10
Merge pull request 'README tweak' (#562) from eive/fsfw:mueller/readme-tweak into development
56d0c8c616
Merge branch 'development' into mueller/test-task-one-shot-flag-not-static
5f7e384442
Merge branch 'development' into mueller/hal-i2c-wiretapping
f99f5ed730
Merge branch 'development' into mueller/dev-printout-runtime-configurable
2cb254a556
Removed unused code
d6508e23b6
Added more coverage and Documentation
d4e48006f2
Merge branch 'development' into mueller/update-helper-script
e75155c329
Merge branch 'development' into mueller/apply-clang-format
457bc6609e
Merge pull request 'apply clang format' (#558) from eive/fsfw:mueller/apply-clang-format into development
d6d13eec95
Merge branch 'development' into gaisser_unit_test_internal_error
a10e5c6ed4
Merge branch 'development' into mueller/update-helper-script
f6357b4531
WIP compiler Flags and new unit tests for fixes
09815f5cce
Clang format
32381a7872
Fixed an issue with wrong buffer size
1ef3dae72e
Fixed an missing include
0e8328fca3
Fixed include based on Feedback
a6c0f3fef5
Merge remote-tracking branch 'upstream/development' into mueller/delete-obsolete-module
bbacdc5cac
Merge pull request 'Linux HAL: Add I2C wiretapping option' (#559) from eive/fsfw:mueller/hal-i2c-wiretapping into development
f4520ea346
Merge remote-tracking branch 'upstream/development' into mueller/test-task-one-shot-flag-not-static
9d9f19781d
Merge remote-tracking branch 'upstream/development' into mueller/test-task-one-shot-flag-not-static
c0fa365f8f
Merge remote-tracking branch 'upstream/development' into mueller/delete-obsolete-module
cf45eca100
Merge remote-tracking branch 'upstream/development' into mueller/dev-printout-runtime-configurable
89327463e3
Merge pull request 'HkSwitchHelper should not be needed anymore' (#557) from eive/fsfw:mueller/delete-obsolete-module into development
2635f39344
Merge branch 'development' into mueller/update-helper-script
a8426750f2
Merge pull request 'display run commands in helper script' (#564) from eive/fsfw:mueller/update-helper-script into development
20928732ec
Merge branch 'development' into gaisser_unit_test_internal_error
af286d3bc6
Merge remote-tracking branch 'upstream/development' into mueller/test-task-one-shot-flag-not-static
19d217e3b9
Merge remote-tracking branch 'upstream/development' into mueller/dev-printout-runtime-configurable
33e9592659
Merge pull request 'Unit test for Internal Error Reporter' (#563) from gaisser/fsfw:gaisser_unit_test_internal_error into development
68ca6fd122
Merge branch 'development' into gaisser_compiler_flags
2d12618c96
Merge branch 'development' into mueller/test-task-one-shot-flag-not-static
8920255565
Merge pull request 'one shot flag not static anymore' (#560) from eive/fsfw:mueller/test-task-one-shot-flag-not-static into development
95078e1103
Merge remote-tracking branch 'upstream/development' into mueller/dev-printout-runtime-configurable
f659f13759
Changing build to -j4 from -j to lessen load on build server
c6540650e2
Merge pull request 'Changing build to -j4 from -j to lessen load on build server' (#569) from mohr/slowbuild into development
117747970d
some forgotten size_t
14b44f8bb2
Merge branch 'development' into gaisser_compiler_flags
dbe31dd339
Merge pull request 'some forgotten size_t' (#570) from eive/fsfw:mohr/sizes into development
10ffa2f44a
Merge branch 'development' into mueller/dev-printout-runtime-configurable
c88b931ef1
Merge pull request 'HAL Devicehandlers: Periodic printouts are runtime configurable now' (#561) from eive/fsfw:mueller/dev-printout-runtime-configurable into development
7db11588b4
Merge branch 'development' into gaisser_compiler_flags
5912ddd2a2
Merge pull request 'Activates new gcc compiler flags' (#568) from gaisser/fsfw:gaisser_compiler_flags into development
d06eecf9b0
small test device handler fixes
5ddac36314
GPIO update
41a82e923c
update changelog
32f420c4f0
SPI HAL improvement
983fa346b3
update CHANGELOG
8b1af232c3
Added Tests for CCSDS Time, fixed LPM Test
a4f97a7ba7
Fixed another issue of time checks
e5a9cab34e
fix changelog
d6856fc54a
another minor changelog update
89c1878622
add link to PR
14620fdd72
minor correction
ca70c8c614
function to get fsfw version
77e5fba7fd
update changelog
d1e3dc4d49
define FSFW_DISABLE_PRINTOUT in any case
7932afc315
small form change
238baa8597
call setTimeout
445d5dd6f0
Added Checks for CDSShort in unittests
345a799031
improved version.h
ca508bfe61
getter not required anymore
7daa9812ff
added tests
949549178a
update changelog
3779b44813
added some more minor tests
6b1a81ee92
minor tweaks
14ac852b7e
this tests even a bit more
aa5d1042f0
undef major and minor
e684680d60
avoid namespace pollution
0bdcb40609
minor event changes
f4922a8686
Merge pull request 'small test device handler fixes' (#571) from eive/fsfw:mueller/small-dh-test-foxes into development
378c6c8006
Merge pull request 'HAL: Update for GPIO code' (#572) from eive/fsfw:mueller/gpio-update into development
5d6de90859
Merge remote-tracking branch 'upstream/development' into mueller/spi-initialize-line-state
5a1585bd00
Merge pull request 'SPI HAL improvement' (#573) from eive/fsfw:mueller/spi-initialize-line-state into development
8704b9ab06
Merge pull request 'Fixed test issue with overflow of times' (#574) from gaisser/fsfw:gaisser_ccsds_time_tests into development
97c93afeff
Merge remote-tracking branch 'upstream/development' into mueller/version-getter-upstream
ce5bcc5897
bugfix
522cbc7f3d
Merge remote-tracking branch 'upstream/development' into mueller/version-getter-upstream
288d453978
Merge pull request 'Version Getter Function' (#575) from eive/fsfw:mueller/version-getter-upstream into development
24ad858b64
Merge branch 'development' into mueller/countdown-improvement-upstream
6998626ad4
Merge branch 'development' into mueller/define-fsfw-disabled-printout-upstream
b694aea100
Merge pull request 'call setTimeout in Countdown ctor' (#577) from eive/fsfw:mueller/countdown-improvement-upstream into development
48c5c3fbd5
Merge branch 'development' into mueller/event-update
fca43b3d34
run auto-formatter
bc95e7c886
Merge branch 'mueller/event-update' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/event-update
b7a617dab3
Merge pull request 'minor event changes' (#578) from eive/fsfw:mueller/event-update into development
d2dd16aef3
Merge branch 'development' into mueller/define-fsfw-disabled-printout-upstream
e08bdd3e35
Merge pull request 'Always define `FSFW_DISABLE_PRINTOUT`' (#576) from eive/fsfw:mueller/define-fsfw-disabled-printout-upstream into development
7c64797f03
Add more baud rates
f441505476
update changelog
3e17011087
small tweaks for local datapool code
a0dfdfab2c
Allow passing a MqArgs struct to the MQ creation
9ce59d3c75
added an additional conversion function
c60aa68d00
changed hal linux uart baudrate and bits per word to enums
d95582b81b
cmake lists update to suppress large warning
d9d9a28ef8
delete code which is not required anymore
7ffb4107d2
added missing docs
7095999bd2
remove CCSDSTime function
59ab54b2fb
call corrections
d0fec93dc3
argument order inversion
10398855a9
Added more unittest coverage
665d8cd479
Applied clang format
6f0362b956
refactor power module
b32d1da421
this should compile
23af170229
small tweaks
916ed3f56a
added function to add component to a periodic task by pointer
d43caa8296
Merge pull request 'Using enums to configure baudrate and bits per word in Linux HAL UART' (#585) from mohr/hal_uart into development
964e311d8b
Merge branch 'development' into mueller/localpool-tweaks
febecd4b30
Merge pull request 'small tweaks for local datapool code' (#582) from eive/fsfw:mueller/localpool-tweaks into development
631a531212
Merge branch 'development' into mueller/clock-addition
d02d5c351d
Merge branch 'development' into mueller/small-mgmlis3-tweak
df3794dfd8
Merge pull request 'delete code which is not required anymore' (#587) from eive/fsfw:mueller/small-mgmlis3-tweak into development
0b3255e463
Fixed tests
cde184f428
Merge branch 'development' into mohr/task
0d7d2203d2
Merge pull request 'Added function to add component to a periodic task by pointer' (#591) from mohr/task into development
a887f852c8
Merge branch 'development' into mueller/clock-addition
4be45adae6
Merge branch 'development' into mueller/catch2-find-package-quiet
e6e71436c2
Added more tests
b4effe7a46
Clang format
2800d6f28c
add ETL dependency
082c86ea18
link ETL lib as well
8ff9eadf30
update changelog, add basic instructions for etl
05495077ec
doc update
8dd0b2608d
cache version variables
c2a89bf709
bugfix
5525466b52
update changelog
d07e0e5576
trying something
8037e8074b
more docs
1a530633ca
small fix
4f9797af3b
Updated CCSDS CuC Functions
a3930dafc5
Moved unused constructors
bfa77cf810
Add TC scheduler service
82fc7f33a8
update afmt scripts to format *.tpp files
b42987059a
make dummy power switcher a system object
6c1db8473b
get alternative reply from device command info
fcb6437388
Merge branch 'development' into mueller/ipc-pass-arbitrary-args-to-mq
c20be13733
change switch type in header as well
c7daf697a8
add new power switcher component
cab508fd64
Merge branch 'development' into mueller/refactor-power-switch-if-etc
738f572043
added unit tests, minor API change
0d549b687d
Merge branch 'mueller/refactor-power-switch-if-etc' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/refactor-power-switch-if-etc
2d0e4ba951
applied afmt
b764194ed0
added more unit tests
7e61ce1ed2
Merge pull request 'cmake lists update to suppress large warning' (#588) from eive/fsfw:mueller/catch2-find-package-quiet into development
b2252bdc0b
Merge remote-tracking branch 'upstream/development' into mueller/add-etl-dependency
4dee913d51
Merge branch 'development' into mueller/add-tc-scheduler-pus-11
c05184e1c4
Merge branch 'development' into meier/alternativeReply
a011e70665
Merge branch 'development' into mueller/ipc-pass-arbitrary-args-to-mq
a02619e5a2
strongly simplified and streamlined IPC MQ Impl
82df132e7d
tests running again
17771c0497
progagate reply returnvalue
ed2c2af4a0
take upstream impl of local data pool manager
8c2105ae0a
correct init value for object ID
95f018a0b0
update IF method
afe006e234
Merge pull request 'Alternative reply ID activation' (#595) from meier/alternativeReply into development
fe739aa81a
Merge branch 'development' into mueller/propagate-pool-manage-retval
acc4c8d975
check serialize result as well
7761b66fe2
delete data from ipc store if reply fails
c0f80680ef
Merge branch 'mueller/propagate-pool-manage-retval' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/propagate-pool-manage-retval
9947a648df
fix compiler warnings
dd1b0a9380
Merge branch 'development' into mueller/power-switcher-component-upstream
72e0938f9a
use size instead of capacity on sanity check
bd0b7aa230
Merge branch 'mueller/power-switcher-component-upstream' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/power-switcher-component-upstream
7af1c86f1c
use default call
4ed9cc933f
Merge branch 'development' into mueller/refactor-power-switch-if-etc
82f46992f6
Merge branch 'development' into mueller/ipc-pass-arbitrary-args-to-mq
d1151ca707
changelog update
f4d05c2c9c
Merge branch 'mueller/ipc-pass-arbitrary-args-to-mq' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/ipc-pass-arbitrary-args-to-mq
a18bc15cbb
update changelog
d0b7c22afc
Merge branch 'mueller/add-tc-scheduler-pus-11' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/add-tc-scheduler-pus-11
f0d996ffd2
Merge branch 'development' into mueller/add-etl-dependency
4f0669c574
doc update
c55925959b
Merge branch 'mueller/add-etl-dependency' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/add-etl-dependency
cb78fefbb3
afmt
a1d7a56dfa
small fix
6aa54fe1d4
added missing empty implementation
c04ca704d2
Merge pull request 'progagate reply returnvalue' (#597) from eive/fsfw:mueller/propagate-pool-manage-retval into development
7c2e50b665
added related PR in changelog
afce942bf8
Merge branch 'development' into mueller/compiler-warning-fixes-upstream-2
b03a6684f9
Merge branch 'development' into mueller/small-stm32-hal-bugifx
5ac88f2b15
Merge pull request 'added missing empty implementation in STM32 SPI HAL' (#599) from mueller/small-stm32-hal-bugifx into development
97e98eae24
Merge branch 'development' into mueller/ipc-pass-arbitrary-args-to-mq
07f5dbb9ac
Merge branch 'development' into mueller/compiler-warning-fixes-upstream-2
35f257800e
Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11
352ab43c1f
Merge remote-tracking branch 'upstream/development' into mueller/add-etl-dependency
8c6c8ad3c0
exntend version class to allow add info
07155e2546
extend version handling with git describe
7e1aed6ad9
apply afmt
b951cb736a
add fsfw specific cmake message prefix
effecd4662
include cmake-modules manually instead
513ae9dc10
prefixed git info variable
9c7eba4431
git version handler more robust now
a569990ca2
fix tests
4079edc80e
update changelog
539e01deee
minor form change
750369b0a6
small addition and possible fix
cccdced74d
unique helper file name
617d41c7d5
maybe this fixed CI/CD issues
85e849ca00
small remaining fix
68231db9a1
changelog typo
18f9958332
add git CST and sha info to version ctor
dd90980520
push test
70d3197212
gpio init bug fix
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
ff98c42514
Merge branch 'development' into mueller/clock-addition
64274acbeb
Merge pull request 'Add ETL dependency' (#592) from KSat/fsfw:mueller/add-etl-dependency into development
29015b340b
update changelog
ac5a54b5da
Merge branch 'development' into mueller/clock-addition
68302e7c5e
Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11
50ce13d596
Merge branch 'development' into mueller/power-switcher-component-upstream
4032228005
Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class
b8516b15cb
Merge pull request 'Added an additional conversion function' (#584) from eive/fsfw:mueller/clock-addition into development
91ef4ff30b
Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11
d62ee6a611
Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class
80be937d9d
Merge remote-tracking branch 'upstream/development' into mueller/compiler-warning-fixes-upstream-2
88051c9302
Merge remote-tracking branch 'upstream/development' into mueller/refactor-power-switch-if-etc
572d602b72
improve changelog, add entry
b94685e045
added missing PR cross-ref
031739ef51
Merge branch 'development' into hoffmann/gpioBugfix
5b7ca8c13c
update CHANGELOG.md, apply afmt
e796f82203
Merge pull request 'gpio bug fix' (#602) from KSat/fsfw:hoffmann/gpioBugfix into development
2c8531ea48
Merge remote-tracking branch 'upstream/development' into mueller/refactor-power-switch-if-etc
496bc665d6
Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11
8e4ad10627
Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class
70eb8325a0
Merge remote-tracking branch 'upstream/development' into mueller/compiler-warning-fixes-upstream-2
c80f06fbcb
hotfix for ETL lib dep
64f0166b64
hotfix for new ETL dependency
17e609c3a5
some more var replacements
b00d83cb1a
bump ETL revision
8c34051d8b
bump Catch2 revision
0e0dbc74aa
Merge branch 'mueller/hotfix-etl' into mueller/bump-catch2
50b1b48678
link Catch2 issue
b5d890eedd
install Catch2 for docker_d2 and update Jenkinsfile
70f0a72f1b
added explicit checkout of v3.0.0-preview5
6aa72892ed
clean usage of FetchContent_MakeAvailable
8642b13fd1
Merge branch 'mueller/hotfix-etl' into mueller/bump-catch2
29b0a352fc
added new functions to add sequences and tables
e98857fab4
update changelog
bf2e0f2d73
added option to change initial submode
9731dc1e61
space packet bug fix
7a2269262b
Merge branch 'development' into meier/spacePacketBugFix
afcbc8be0a
changes for MacOS
7d61e67d20
more macos changes
28015c4735
it compiles and runs
77450eb4b7
removed flag which does not exist
fea301bcc9
Merge remote-tracking branch 'origin/mueller/hotfix-etl' into mueller/mac-os
16714ceb40
Merge branch 'development' into gaisser_cuc_tests
7b979eadff
Merge pull request 'fix compiler warnings and auto-formatting' (#598) from eive/fsfw:mueller/compiler-warning-fixes-upstream-2 into development
861bd15eda
Merge branch 'development' into mueller/hotfix-etl
4c65109ac0
Merge branch 'development' into meier/spacePacketBugFix
cc36baff78
Merge pull request 'Hotfix CMake & ETL' (#604) from mueller/hotfix-etl into development
7cfb1e6076
Merge branch 'development' into mueller/bump-catch2
daffb6b666
Merge branch 'development' into gaisser_cuc_tests
b62c19a364
Merge branch 'development' into mueller/extend-version-class
8cc94a55ab
Merge pull request 'Bump Catch2 dependency & Catch2 pre-installed for CI/CD' (#605) from mueller/bump-catch2 into development
7801c6effe
Merge remote-tracking branch 'upstream/development' into mueller/new-ss-adder-functions
8edf4c3c8d
Merge branch 'development' into meier/spacePacketBugFix
a3617cad11
preproc guards
a3dee05fe3
Merge pull request 'space packet bug fix' (#607) from meier/spacePacketBugFix into development
cddf16f941
Merge branch 'development' into mueller/mac-os
57e6c46e72
Merge branch 'development' into mueller/missing-preproc-defs
c295539c79
Merge pull request 'Fixes to allow compilation on MacOS' (#611) from mueller/mac-os into development
3e9d6bdbb9
Merge branch 'development' into gaisser_cuc_tests
1a07864a5f
Merge pull request 'CCSDS Time CUC Tests' (#593) from gaisser/fsfw:gaisser_cuc_tests into development
54feb77770
Proposed fix for gcc and clang
2fbf847367
Merge branch 'development' into mueller/missing-preproc-defs
3332f68ce7
Tested only std::numeric_limits in MSVC
cb0c80d8dc
add option and cmake module for lto support
a943e4eebb
enable LTO where applicable
a4bd5a2aaa
update changelog
637512ad77
changelog update
4e4820af05
bugfix for prepareHealthSetReply function
e5e163bdbf
mark unused function
79f17843d8
update changelog
16e55a98ce
important bugfix for TCP server
6bfdace512
update changelog
c78b7c432b
Merge branch 'development' into mueller/refactor-power-switch-if-etc
5d5a355110
Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class
80a5ed3c5b
added back fsfw namespace
398d04dc50
fixed tests
6308427d03
run auto-formatter over cmakelists.txt
226f28dc7b
Move some directives up top
b0d71597f0
update changelog
73ff9b97db
bump CMAKE_CXX_STANDARD to C++17
10cc954d27
update changelog
fe1c51ae6d
Merge pull request 'CMake move some directives up top' (#621) from mueller/cmake-fixes into development
83de5b4ec1
Merge branch 'development' into mueller/cpp17-update
220469a2dd
Merge remote-tracking branch 'origin/development' into mueller/amft-cmakelists
8a40878eb5
Merge remote-tracking branch 'origin/development' into mueller/add-lto-support
8b0508d50a
Merge branch 'development' into gaisser_fix_compile_check
118f1da8dd
Merge pull request 'Bump C++ standard to C++17' (#622) from mueller/cpp17-update into development
4015e85506
Merge branch 'development' into mueller/missing-preproc-defs
15352b539d
Merge remote-tracking branch 'upstream/development' into mueller/refactor-power-switch-if-etc
281f91ec5d
Merge remote-tracking branch 'origin/development' into mueller/health-srv-bugfix
f1acf8e18b
Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class
736f8d0238
order fix
eb494707af
Merge remote-tracking branch 'upstream/development' into mueller/power-switcher-component-upstream
75132c1e39
Merge branch 'development' into mueller/add-lto-support
da8a108cb7
Merge remote-tracking branch 'origin/development' into mueller/amft-cmakelists
5989c88c88
indentation
88fa4f1d9d
Merge remote-tracking branch 'origin/development' into mueller/tcp-server-bugfix
96eb8fc21f
Merge branch 'development' into gaisser_fix_compile_check
fd112ed597
enable lto for test target
7b7f5d7e0a
Merge branch 'mueller/add-lto-support' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw into mueller/add-lto-support
46cfe65321
Merge pull request 'Health Service Bugfix' (#617) from mueller/health-srv-bugfix into development
dd9e28fca1
Merge branch 'development' into mueller/add-lto-support
ece32f88f4
Merge remote-tracking branch 'origin/development' into mueller/tcp-server-bugfix
c83cc492c0
Merge pull request 'Compile Time Size Check fixed' (#614) from gaisser/fsfw:gaisser_fix_compile_check into development
d983305ea5
Merge branch 'development' into mueller/amft-cmakelists
3448292e8a
Merge branch 'development' into mueller/tcp-server-bugfix
d45cda93b2
Merge pull request 'important bugfix for TCP server' (#618) from mueller/tcp-server-bugfix into development
18c2847b08
Merge branch 'development' into mueller/missing-preproc-defs
d8bd08dd8c
Merge branch 'development' into mueller/amft-cmakelists
be6a492022
Merge branch 'development' into mueller/extend-version-class
eb0223bc51
Merge branch 'development' into mueller/add-lto-support
4499c9bf04
Merge pull request 'Added new functions to add sequences and tables' (#606) from eive/fsfw:mueller/new-ss-adder-functions into development
458aa5c265
Merge branch 'development' into mueller/missing-preproc-defs
c5b4499d98
Merge remote-tracking branch 'upstream/development' into mueller/refactor-power-switch-if-etc
0fe1b70bae
keep LTO option off by default
b38329aa0e
Merge branch 'development' into mueller/extend-version-class
dd986fefd3
experimenting with PRE_BUILD command
0410ecd9e3
Merge branch 'development' into mueller/add-lto-support
efb3d982f3
added missing prefix
25775614de
only check IPO support if enabled
2ca8523215
Merge branch 'mueller/add-lto-support' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw into mueller/add-lto-support
377c3325d2
update cmake-modules file
e05c72b062
minor formatting fix
34e124f2db
Merge branch 'development' into mueller/amft-cmakelists
d11f898f70
update dummy power switcher docs
9a4c7589cc
Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11
c4c340fde1
lot of refactoring
b99160e850
Merge pull request 'Add LTO support' (#616) from mueller/add-lto-support into development
e5c140e0ae
Merge branch 'development' into mueller/add-tc-scheduler-pus-11
b8cfb36426
added additional explicit returnvalues
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
c561271070
Merge branch 'development' into mueller/refactor-power-switch-if-etc
2d9d83a1c5
Merge branch 'development' into mueller/missing-preproc-defs
e77bde459b
Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class
9b6fa646ed
Merge remote-tracking branch 'origin/development' into mueller/amft-cmakelists
6442dd0c38
Merge branch 'mueller/amft-cmakelists' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw into mueller/amft-cmakelists
3046822e88
run cmake-format
a83b86ccd2
Merge pull request 'refactor power module' (#590) from eive/fsfw:mueller/refactor-power-switch-if-etc into development
171c48495c
Merge remote-tracking branch 'upstream/development' into mueller/power-switcher-component-upstream
ccadbb5942
Merge branch 'development' into mueller/missing-preproc-defs
c215508a12
another missing preproc guard
038e47a46e
better returncode handling
861335212e
Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11
271057ca6b
Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class
57a830cb46
Merge branch 'development' into mueller/amft-cmakelists
994c7299b9
add cmake-format command to shell script
9e3d5b6a0c
small fix
ec03a674bd
Merge branch 'mueller/amft-cmakelists' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw into mueller/amft-cmakelists
ad0b6f1ed1
another small fix
deee4c43c0
finally this works
b6b3221b22
Merge pull request 'run auto-formatter over cmakelists.txt' (#619) from mueller/amft-cmakelists into development
cfa6843c8f
check whether clang-format is installed
57bac4f262
Merge remote-tracking branch 'origin/development' into mueller/amft-cmakelists
d4a6f987bc
small fix
99fe6487c8
another small improvement
01ebf0f4d3
tab size
00952e15b0
Merge branch 'development' into mueller/missing-preproc-defs
4092de911c
use variable for repeated section
c86e99e6dc
rename auto-formatter
23fb06578b
this is better
811287aac8
delete old scripts
13a34cd677
Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11
5a4539def4
Merge branch 'mueller/add-tc-scheduler-pus-11' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/add-tc-scheduler-pus-11
99c72fd00b
Merge pull request 'Auto-Formatter Script Improvements' (#626) from mueller/amft-cmakelists into development
970f039e85
Merge remote-tracking branch 'origin/development' into mueller/extend-version-class
e3d1308205
Merge pull request 'preproc guards' (#612) from eive/fsfw:mueller/missing-preproc-defs into development
52310f7d32
Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11
e98aa005cb
Merge branch 'development' into mueller/power-switcher-component-upstream
5736023ffa
Merge branch 'development' into mueller/extend-version-class
eed6a64597
Merge pull request 'Power Switcher Component' (#596) from eive/fsfw:mueller/power-switcher-component-upstream into development
4821706561
Merge branch 'development' into mueller/extend-version-class
878e32cbe8
Merge branch 'development' into mueller/add-tc-scheduler-pus-11
b8fd2db434
Merge pull request 'Add PUS TC scheduler service' (#594) from KSat/fsfw:mueller/add-tc-scheduler-pus-11 into development
ef9d7aa7d3
Merge branch 'development' into mueller/extend-version-class
f0debecbbc
Merge pull request 'Extend version handling and class' (#601) from eive/fsfw:mueller/extend-version-class into development
muellerr
merged commit ee2f8d6956 into develop 2022-05-17 10:06:59 +02:00
muellerr
deleted branch mueller/update-from-upstream 2022-05-17 10:07:00 +02:00
muellerr
referenced this issue from a commit 2022-05-17 10:07:00 +02:00
Merge pull request 'Update FSFW from Upstream' (#27) from mueller/update-from-upstream into develop
No reviewers
Labels
No Label
bug
duplicate
enhancement
help wanted
invalid
question
wontfix
No Milestone
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies
No dependencies set.
Reference: KSat/fsfw#27
Loading…
Reference in New Issue
No description provided.
Delete Branch "mueller/update-from-upstream"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?