KSat/fsfw
15
4
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests 1 Releases Wiki Activity
6,339 Commits 9 Branches 1 Tag 26 MiB
a46a66c35a
Commit Graph

6339 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jakob Meier
161dbde0d7 fixed merge conflicts 2022-06-06 10:30:17 +02:00
Jakob Meier
2fa4fd61d0 device fdir mock 2022-06-05 12:54:13 +02:00
Jakob Meier
bf673c56c6 unit test for dhb 2022-06-05 12:52:55 +02:00
Cleanroom Laptop L15
cda81fc841 enable hk 2022-06-03 18:05:38 +02:00
Robin Mueller
c697d0f8ab
bump etl to 20.28.0 2022-05-30 10:34:03 +02:00
Robin Müller
b9fbb4fd4c Merge branch 'development' into mueller/tc-packet-pus-improvement 2022-05-27 15:15:39 +02:00
Robin Müller
5a69c1f8b9 Merge pull request 'DHB Mode Off disable pending commands' (#95) from meier/dhb-disable-pending-commands into develop 
Reviewed-on: eive/fsfw#95
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
 2022-05-27 14:40:36 +02:00
Robin Müller
1d1d91f591 Merge branch 'develop' into meier/dhb-disable-pending-commands 2022-05-27 14:40:18 +02:00
Robin Müller
043b8b5b3f Merge pull request 'FixedTimeSlotTaskBase Bugfix' (#96) from meier/FixedTimeSlotTaskBase-BugFix into develop 
Reviewed-on: eive/fsfw#96
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
 2022-05-27 14:38:04 +02:00
Jakob Meier
95a64e1da3 wrong initialization order 2022-05-27 13:04:21 +02:00
Jakob Meier
ab68817e9a removed debugging printout 2022-05-26 02:06:05 +02:00
Jakob Meier
36652e6fce Merge branch 'develop' into meier/dhb-disable-pending-commands 2022-05-26 02:04:33 +02:00
Jakob Meier
3749f31ab4 disable pending commands and replies in MODE_OFF transition 2022-05-26 02:03:39 +02:00
Jakob.Meier
ebbe08639c Merge pull request 'TaskIF refactoring continued' (#91) from mueller/task-if-refactoring-eive into develop 
Reviewed-on: eive/fsfw#91
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
 2022-05-25 16:11:22 +02:00
Jakob.Meier
d286fc1855 Merge pull request 'service 3 and local HK man improvements' (#92) from mueller/hk-improvements into develop 
Reviewed-on: eive/fsfw#92
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
 2022-05-25 16:10:32 +02:00
Robin Mueller
cf35cca923
Merge remote-tracking branch 'origin/develop' into mueller/task-if-refactoring-eive 2022-05-25 15:41:07 +02:00
Robin Mueller
2058817ba5 Merge branch 'mueller/task-if-refactoring-eive' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/task-if-refactoring-eive 2022-05-25 15:38:20 +02:00
Robin Mueller
c328891030 Merge remote-tracking branch 'origin/develop' into mueller/task-if-refactoring-eive 2022-05-25 15:38:14 +02:00
Jakob.Meier
76a459a02c Merge pull request 'use better type for stored limit' (#93) from mueller/tmtc-bridge-tweaks into develop 
Reviewed-on: eive/fsfw#93
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
 2022-05-25 15:24:57 +02:00
Jakob.Meier
fbec1b3dc9 Merge pull request 'Update from upstream' (#94) from mueller/update-from-upstream into develop 
Reviewed-on: eive/fsfw#94
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
 2022-05-25 15:24:18 +02:00
Robin Mueller
c4fa7281ae
Merge remote-tracking branch 'upstream/development' into mueller/update-from-upstream 2022-05-25 14:44:21 +02:00
Robin Mueller
ac62443f31
use better type for stored limit 2022-05-25 14:30:58 +02:00
Robin Mueller
8cfe848dfe
service 3 and local HK man improvements 2022-05-25 14:30:00 +02:00
Steffen 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
Robin Müller
af7c6c57a3 Merge branch 'develop' into mueller/task-if-refactoring-eive 2022-05-25 10:30:23 +02:00
Robin Mueller
c835525196
added cast for PUS11 2022-05-25 09:56:32 +02:00
Robin Müller
7dddcdfd55 Merge branch 'development' into mueller/possible-fix-ccsds-distrib 2022-05-25 09:52:33 +02:00
Steffen 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
Robin Mueller
24069dfd78
removed [[maybe_unused]] 2022-05-24 16:22:27 +02:00
Robin Mueller
40cc557978
Merge remote-tracking branch 'upstream/mueller/task-if-refactoring' into mueller/task-if-refactoring-eive 2022-05-24 15:42:08 +02:00
Robin Mueller
e59f1f26bf
return end iterator instead of crashing 2022-05-24 14:33:18 +02:00
Robin Mueller
f7cde80088
added missing delete 2022-05-24 14:32:35 +02:00
Robin Mueller
e60a665de4
added 3 new subservices 2022-05-24 11:52:29 +02:00
Robin Mueller
34658ef7db
afmt 2022-05-24 10:40:25 +02:00
Jakob.Meier
4b128d2435 Merge pull request 'TaskIF refactor SPI refactor' (#89) from mueller/task-if-refactor-spi-refactor into develop 
Reviewed-on: eive/fsfw#89
 2022-05-23 16:22:40 +02:00
Robin Mueller
f35b0ffbbd
Merge remote-tracking branch 'origin/develop' into mueller/task-if-refactor-spi-refactor 2022-05-23 16:10:49 +02:00
Robin Müller
940fd6f465 Merge branch 'development' into mueller/new-cicd-cmake-opts 2022-05-23 15:59:13 +02:00
Robin Müller
9368ae81e5 Merge branch 'development' into mueller/tc-packet-pus-improvement 2022-05-23 15:56:26 +02:00
Robin Müller
f288d5120d Merge branch 'development' into mueller/tc-11-tweaks 2022-05-23 15:34:00 +02:00
Steffen 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
Steffen Gaisser
5e62258aa6 Merge branch 'development' into mueller/tcp-server-cache-client-addr 2022-05-23 14:38:05 +02:00
Robin Mueller
b8b7756a3e
fix host OSAL 2022-05-22 14:32:48 +02:00
Robin Mueller
4cc108f3a1
Merge branch 'develop' of https://egit.irs.uni-stuttgart.de/eive/fsfw into develop 2022-05-20 20:53:48 +02:00
Robin Mueller
c0292f072e
warning printout correction 2022-05-20 20:52:36 +02:00
Jakob.Meier
336ad9b7be Merge pull request 'PUS TC11 bugfix and upstream updates' (#88) from mueller/tc-11-tweaks-eive into develop 
Reviewed-on: eive/fsfw#88
 2022-05-20 17:35:07 +02:00
Robin Mueller
942bfafaa3
Merge remote-tracking branch 'upstream/mueller/tc-11-tweaks' into mueller/tc-11-tweaks-eive 2022-05-20 15:39:40 +02:00
Robin Mueller
0b53b4873f
bugfix for srv11 2022-05-20 11:20:31 +02:00
Robin Mueller
8e2597f609
clang-format 2022-05-20 11:09:03 +02:00
Robin Mueller
dac700b80a
static STORE renamed 2022-05-20 08:59:06 +02:00
Robin Mueller
d0fc360697
apply afmt 2022-05-20 08:34:14 +02:00