 meierj
|
fc742e4270
|
Merge branch 'development' into meier/debug-info
|
2022-06-16 07:22:43 +02:00 |
|
|
meierj
|
b5183a19fc
|
minor change in debug text
|
2022-06-16 07:03:58 +02:00 |
|
 muellerr
|
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 |
|
|
muellerr
|
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 |
|
|
muellerr
|
69859fdbc9
|
rerun afmt
|
2022-06-13 16:21:20 +02:00 |
|
|
muellerr
|
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 |
|
|
muellerr
|
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 |
|
|
muellerr
|
e67fc2ab0d
|
some fixes for TC Map printout function
|
2022-06-13 10:56:37 +02:00 |
|
|
muellerr
|
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 |
|
|
muellerr
|
6b0f4a159f
|
Merge remote-tracking branch 'upstream/development' into mueller/spi-com-if-shadowing
|
2022-06-13 10:54:20 +02:00 |
|
|
muellerr
|
4a06b558c1
|
Fix SPI ComIF shadowing warning
|
2022-06-13 10:53:04 +02:00 |
|
|
muellerr
|
6d921f03fd
|
Fix SPI ComIF shadowing warning
|
2022-06-13 10:50:49 +02:00 |
|
|
muellerr
|
a07a368272
|
Merge branch 'development' into mueller/apply-afmt
|
2022-06-08 17:34:04 +02:00 |
|
|
muellerr
|
17f54006b8
|
Merge pull request 'rtems fixes' (#635) from mueller/rtems-fixes into development
Reviewed-on: fsfw/fsfw#635
|
2022-06-08 16:12:53 +02:00 |
|
|
muellerr
|
395cf9cfa7
|
added clion base files
|
2022-06-08 12:12:33 +02:00 |
|
|
muellerr
|
a3c0b441ec
|
update changelog
|
2022-06-08 12:12:33 +02:00 |
|
|
muellerr
|
b4132800ae
|
apply afmt, update .gitignore
|
2022-06-08 12:12:33 +02:00 |
|
|
muellerr
|
e03f55604a
|
rtems fixes
|
2022-06-08 12:11:26 +02:00 |
|
|
muellerr
|
12046a2db6
|
Merge pull request 'bump etl to 20.28.0' (#634) from mueller/bump-etl into development
Reviewed-on: fsfw/fsfw#634
|
2022-06-08 11:09:42 +02:00 |
|
|
muellerr
|
c697d0f8ab
|
bump etl to 20.28.0
|
2022-05-30 10:34:03 +02:00 |
|
 gaisser
|
c7cf8e710d
|
Merge pull request 'return end iterator instead of crashing' (#633) from mueller/possible-fix-ccsds-distrib into development
Reviewed-on: fsfw/fsfw#633
|
2022-05-25 13:59:35 +02:00 |
|
|
muellerr
|
7dddcdfd55
|
Merge branch 'development' into mueller/possible-fix-ccsds-distrib
|
2022-05-25 09:52:33 +02:00 |
|
|
gaisser
|
261eea381e
|
Merge pull request 'PUS11 TC sched update and bugfixes' (#632) from mueller/tc-11-tweaks into development
Reviewed-on: fsfw/fsfw#632
|
2022-05-24 17:48:06 +02:00 |
|
|
muellerr
|
e59f1f26bf
|
return end iterator instead of crashing
|
2022-05-24 14:33:18 +02:00 |
|
|
muellerr
|
f7cde80088
|
added missing delete
|
2022-05-24 14:32:35 +02:00 |
|
|
muellerr
|
e60a665de4
|
added 3 new subservices
|
2022-05-24 11:52:29 +02:00 |
|
|
muellerr
|
34658ef7db
|
afmt
|
2022-05-24 10:40:25 +02:00 |
|
|
muellerr
|
f288d5120d
|
Merge branch 'development' into mueller/tc-11-tweaks
|
2022-05-23 15:34:00 +02:00 |
|
|
gaisser
|
5a425a1c58
|
Merge pull request 'cache the TCP client address now' (#630) from eive/fsfw:mueller/tcp-server-cache-client-addr into development
Reviewed-on: fsfw/fsfw#630
|
2022-05-23 14:42:12 +02:00 |
|
|
gaisser
|
5e62258aa6
|
Merge branch 'development' into mueller/tcp-server-cache-client-addr
|
2022-05-23 14:38:05 +02:00 |
|
|
muellerr
|
0b53b4873f
|
bugfix for srv11
|
2022-05-20 11:20:31 +02:00 |
|
|
muellerr
|
8e2597f609
|
clang-format
|
2022-05-20 11:09:03 +02:00 |
|
|
muellerr
|
dac700b80a
|
static STORE renamed
|
2022-05-20 08:59:06 +02:00 |
|
|
muellerr
|
d0fc360697
|
apply afmt
|
2022-05-20 08:34:14 +02:00 |
|
|
muellerr
|
576414438c
|
Merge pull request 'Apply cmake-format and auto-format script on all CMakeLists.txt file' (#628) from eive/fsfw:mueller/apply-clang-format-on-all-files into development
Reviewed-on: fsfw/fsfw#628
|
2022-05-18 13:14:18 +02:00 |
|
|
muellerr
|
13cda86d23
|
remove commented code
|
2022-05-18 13:13:24 +02:00 |
|
|
muellerr
|
e1dd27b9dd
|
cache the TCP client address now
|
2022-05-17 13:16:36 +02:00 |
|
|
muellerr
|
7fee852dbd
|
re-apply updated auto-formatter
|
2022-05-16 14:55:15 +02:00 |
|
|
muellerr
|
1e7032f89c
|
minor improvements for auto-formatter
|
2022-05-16 14:54:43 +02:00 |
|
|
muellerr
|
f0debecbbc
|
Merge pull request 'Extend version handling and class' (#601) from eive/fsfw:mueller/extend-version-class into development
Reviewed-on: fsfw/fsfw#601
|
2022-05-16 14:52:15 +02:00 |
|
|
muellerr
|
ef9d7aa7d3
|
Merge branch 'development' into mueller/extend-version-class
|
2022-05-16 14:42:23 +02:00 |
|
|
muellerr
|
b8fd2db434
|
Merge pull request 'Add PUS TC scheduler service' (#594) from KSat/fsfw:mueller/add-tc-scheduler-pus-11 into development
Reviewed-on: fsfw/fsfw#594
|
2022-05-16 14:32:19 +02:00 |
|
|
muellerr
|
878e32cbe8
|
Merge branch 'development' into mueller/add-tc-scheduler-pus-11
|
2022-05-16 14:29:02 +02:00 |
|
|
muellerr
|
4821706561
|
Merge branch 'development' into mueller/extend-version-class
|
2022-05-16 14:16:53 +02:00 |
|
|
muellerr
|
eed6a64597
|
Merge pull request 'Power Switcher Component' (#596) from eive/fsfw:mueller/power-switcher-component-upstream into development
Reviewed-on: fsfw/fsfw#596
|
2022-05-13 22:42:23 +02:00 |
|
|
muellerr
|
5736023ffa
|
Merge branch 'development' into mueller/extend-version-class
|
2022-05-13 17:22:57 +02:00 |
|
|
muellerr
|
e98aa005cb
|
Merge branch 'development' into mueller/power-switcher-component-upstream
|
2022-05-13 13:25:13 +02:00 |
|
|
muellerr
|
52310f7d32
|
Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11
|
2022-05-13 13:24:26 +02:00 |
|
|
muellerr
|
e3d1308205
|
Merge pull request 'preproc guards' (#612) from eive/fsfw:mueller/missing-preproc-defs into development
Reviewed-on: fsfw/fsfw#612
|
2022-05-13 13:22:38 +02:00 |
|
|
muellerr
|
970f039e85
|
Merge remote-tracking branch 'origin/development' into mueller/extend-version-class
|
2022-05-13 13:21:01 +02:00 |
|