muellerr
|
d607332f8d
|
removed comment
|
2020-12-22 14:19:13 +01:00 |
|
muellerr
|
3b391d3380
|
deleted service types header
|
2020-12-22 14:15:21 +01:00 |
|
muellerr
|
331d940852
|
Merge remote-tracking branch 'upstream/development' into mueller/tmtcservices-update
|
2020-12-22 14:07:33 +01:00 |
|
muellerr
|
dda7b5ff6c
|
Merge remote-tracking branch 'upstream/development' into mueller/tmtcservices-update
|
2020-12-22 14:06:13 +01:00 |
|
muellerr
|
0a7aaffe6a
|
Merge remote-tracking branch 'upstream/development' into mueller/defaultcfg-update
|
2020-12-22 12:47:33 +01:00 |
|
muellerr
|
ca2d242adb
|
defaultcfg update
|
2020-12-22 12:45:51 +01:00 |
|
muellerr
|
07814abf3a
|
Merge branch 'development' into mueller/datapoollocal-long-name
|
2020-12-16 14:03:23 +01:00 |
|
muellerr
|
a411df18db
|
deleted tpp files, replaced by source files
|
2020-12-15 22:52:29 +01:00 |
|
muellerr
|
cd1fb88313
|
Merge remote-tracking branch 'upstream/development' into mueller/linux-update
|
2020-12-15 22:49:18 +01:00 |
|
muellerr
|
4f33a1908a
|
Merge branch 'development' into mueller/hk-service3
|
2020-12-15 22:44:24 +01:00 |
|
muellerr
|
e39c4fe2a8
|
added hk service 3
|
2020-12-15 22:42:50 +01:00 |
|
muellerr
|
82a83a50ee
|
change log update
|
2020-12-15 15:39:33 +01:00 |
|
muellerr
|
72c54d59fa
|
fsfw config
|
2020-12-15 15:32:56 +01:00 |
|
muellerr
|
703d2590ff
|
update csb
|
2020-12-15 15:20:08 +01:00 |
|
muellerr
|
eb5ac573a9
|
Merge branch 'mueller/tmtcservices-update' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/tmtcservices-update
|
2020-12-15 15:16:51 +01:00 |
|
muellerr
|
fcce61aee0
|
Merge remote-tracking branch 'upstream/development' into mueller/tmtcservices-update
|
2020-12-15 15:16:45 +01:00 |
|
muellerr
|
4e4ffeb608
|
Merge branch 'development' into mueller/tmtcservices-update
|
2020-12-15 15:16:29 +01:00 |
|
muellerr
|
103d8b8c6a
|
fixed timeslot task IF
|
2020-12-15 15:12:31 +01:00 |
|
muellerr
|
4c152e9fd8
|
subsystem doc upodate
|
2020-12-15 15:07:41 +01:00 |
|
muellerr
|
a57af5852d
|
made check sequence
|
2020-12-15 15:04:07 +01:00 |
|
muellerr
|
f733a85a9c
|
type update
|
2020-12-15 14:41:33 +01:00 |
|
muellerr
|
9986203eff
|
Merge branch 'mueller/FreeRTOS' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/FreeRTOS
|
2020-12-14 23:56:57 +01:00 |
|
muellerr
|
3cc053a581
|
changes from mueller/master taken over
|
2020-12-14 23:56:44 +01:00 |
|
muellerr
|
93842bb913
|
using long name now
|
2020-12-14 22:56:30 +01:00 |
|
muellerr
|
7f93c4a6aa
|
Merge branch 'development' into mueller/FreeRTOS
|
2020-12-14 21:51:19 +01:00 |
|
muellerr
|
efb4f0efbb
|
Merge branch 'development' into mueller/type
|
2020-12-14 21:51:05 +01:00 |
|
muellerr
|
4f2470b93f
|
task factory
|
2020-12-14 21:48:12 +01:00 |
|
muellerr
|
336b43572f
|
linux update
|
2020-12-14 21:46:33 +01:00 |
|
muellerr
|
25db9bc9ed
|
tmtcservices update
|
2020-12-14 21:30:39 +01:00 |
|
muellerr
|
a3ebad46e7
|
small fix
|
2020-12-14 21:00:15 +01:00 |
|
muellerr
|
d96d3d6c46
|
one define now
|
2020-12-14 20:58:47 +01:00 |
|
muellerr
|
0f6d878d86
|
update
|
2020-12-14 20:48:41 +01:00 |
|
muellerr
|
57853ba566
|
event update
|
2020-12-14 20:22:59 +01:00 |
|
muellerr
|
d62e092be6
|
task convergence
|
2020-12-14 11:49:30 +01:00 |
|
muellerr
|
9d5ac16398
|
some more improvements
|
2020-12-14 11:43:08 +01:00 |
|
muellerr
|
5eafd4f353
|
tiny format stuff
|
2020-12-14 11:42:02 +01:00 |
|
muellerr
|
e97787cceb
|
some more tweaks
|
2020-12-14 11:39:19 +01:00 |
|
muellerr
|
252bfa5c39
|
subsystem convergence
|
2020-12-14 11:35:45 +01:00 |
|
muellerr
|
7eeba71619
|
subsystem update
|
2020-12-14 11:34:54 +01:00 |
|
muellerr
|
313d898aef
|
small update
|
2020-12-14 11:22:44 +01:00 |
|
muellerr
|
94fa917202
|
some tweaks
|
2020-12-14 11:17:22 +01:00 |
|
muellerr
|
dc72fa938d
|
type update
|
2020-12-14 11:10:22 +01:00 |
|
muellerr
|
720e3baa90
|
fixed includes
|
2020-12-14 10:48:39 +01:00 |
|
muellerr
|
715386e366
|
clened up a bit
|
2020-12-13 22:12:57 +01:00 |
|
muellerr
|
bc6936dddd
|
indentation corrected (again)
|
2020-12-12 18:35:58 +01:00 |
|
muellerr
|
d0d6247753
|
and now it compiles
|
2020-12-12 00:01:36 +01:00 |
|
muellerr
|
101babd863
|
indentation consistent now
|
2020-12-11 23:53:29 +01:00 |
|
muellerr
|
f9d5403204
|
added device handler thermalset
|
2020-12-11 23:50:00 +01:00 |
|
muellerr
|
bb7ebf4b27
|
removed glob pool
|
2020-12-10 17:29:23 +01:00 |
|
muellerr
|
0489c7a42d
|
Merge remote-tracking branch 'upstream/development' into mueller/enhanced-controller
|
2020-12-10 17:23:07 +01:00 |
|
muellerr
|
0cf9f334cc
|
Merge branch 'mueller/DeviceHandler-LocalPools' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/DeviceHandler-LocalPools
|
2020-12-10 17:18:58 +01:00 |
|
muellerr
|
7986584d17
|
updated comment
|
2020-12-10 17:18:46 +01:00 |
|
muellerr
|
5cf4f4e839
|
Merge remote-tracking branch 'upstream/development' into mueller/enhanced-controller
|
2020-12-10 17:14:15 +01:00 |
|
muellerr
|
9c59079e94
|
Merge remote-tracking branch 'upstream/development' into mueller/LocalPoolRefactoring
|
2020-12-10 17:12:01 +01:00 |
|
muellerr
|
8ae13a189d
|
Merge remote-tracking branch 'upstream/development' into mueller/enhanced-controller
|
2020-12-10 17:11:01 +01:00 |
|
muellerr
|
804155e951
|
Merge remote-tracking branch 'upstream/development' into mueller/LocalPoolRefactoring
|
2020-12-10 17:09:41 +01:00 |
|
muellerr
|
a2823835dd
|
explicit cast added
|
2020-12-10 17:05:41 +01:00 |
|
muellerr
|
4964ba0246
|
Merge remote-tracking branch 'upstream/development' into mueller/parameter-convergence
|
2020-12-10 17:02:07 +01:00 |
|
muellerr
|
2569080425
|
Merge remote-tracking branch 'upstream/development' into mueller/parameter-convergence
|
2020-12-10 17:01:07 +01:00 |
|
muellerr
|
413e008d35
|
Merge remote-tracking branch 'upstream/development' into feature/has-file-system-if-init
|
2020-12-10 16:59:44 +01:00 |
|
muellerr
|
50ad2c0380
|
resolved merge conflicts
|
2020-12-10 16:57:43 +01:00 |
|
muellerr
|
67a8b031d0
|
Merge remote-tracking branch 'upstream/development' into mueller/LocalPoolRefactoring
|
2020-12-10 16:54:22 +01:00 |
|
muellerr
|
cbdf56e62b
|
Merge remote-tracking branch 'upstream/development' into mueller/enhanced-controller
|
2020-12-10 16:52:44 +01:00 |
|
muellerr
|
5628d16197
|
Merge remote-tracking branch 'upstream/development' into feature/has-file-system-if-init
|
2020-12-10 16:51:42 +01:00 |
|
muellerr
|
d7ca1df85b
|
Merge remote-tracking branch 'upstream/development' into mueller/internal-error-rprtr-update
|
2020-12-10 16:50:14 +01:00 |
|
muellerr
|
b1012b7cef
|
Merge remote-tracking branch 'upstream/development' into mueller/power-update
|
2020-12-10 16:46:39 +01:00 |
|
muellerr
|
be9913f262
|
themral module update
|
2020-12-10 16:40:22 +01:00 |
|
muellerr
|
f81c9d7ecc
|
resolved merge conflicts
|
2020-12-10 16:36:09 +01:00 |
|
muellerr
|
0a5099e293
|
deleted file which was renamed
|
2020-12-10 16:34:25 +01:00 |
|
muellerr
|
ff62ab8427
|
removed core component
|
2020-12-10 16:32:52 +01:00 |
|
muellerr
|
14e254141c
|
Merge remote-tracking branch 'upstream/development' into mueller/thermal-update
|
2020-12-10 16:30:21 +01:00 |
|
muellerr
|
46596f9397
|
tab changed
|
2020-12-08 16:01:48 +01:00 |
|
muellerr
|
5e2e18ac07
|
device handler uses local pools now
|
2020-12-08 15:59:30 +01:00 |
|
muellerr
|
1d6402a0c0
|
Merge remote-tracking branch 'upstream/development' into mueller/parameter-convergence
|
2020-12-08 15:55:49 +01:00 |
|
muellerr
|
c126833dcf
|
Merge remote-tracking branch 'upstream/development' into mueller/parameter-convergence
|
2020-12-08 15:51:31 +01:00 |
|
muellerr
|
7f40566031
|
include removed
|
2020-12-08 15:50:21 +01:00 |
|
muellerr
|
a612e19e94
|
ndentation
|
2020-12-08 15:49:46 +01:00 |
|
muellerr
|
81988e77d9
|
Merge remote-tracking branch 'upstream/development' into mueller/internal-error-rprtr-update
|
2020-12-08 15:48:41 +01:00 |
|
muellerr
|
9891086e65
|
Merge branch 'development' into mueller/datalinklayer-convergence
|
2020-12-08 15:46:49 +01:00 |
|
muellerr
|
2514082af7
|
Merge remote-tracking branch 'upstream/development' into mueller/monitoring-update
|
2020-12-08 15:46:25 +01:00 |
|
muellerr
|
012fb6f314
|
Merge remote-tracking branch 'upstream/development' into feature/has-file-system-if-init
|
2020-12-08 15:45:09 +01:00 |
|
muellerr
|
ac5446b2b1
|
removed hk switcher helper member
|
2020-12-08 15:43:58 +01:00 |
|
muellerr
|
b0053c3b77
|
Merge remote-tracking branch 'upstream/development' into mueller/controller-update
|
2020-12-08 15:42:51 +01:00 |
|
muellerr
|
38819d796c
|
Merge remote-tracking branch 'upstream/development' into mueller/enhanced-controller
|
2020-12-08 15:40:43 +01:00 |
|
muellerr
|
eb781ecc7a
|
Merge remote-tracking branch 'upstream/development' into mueller/DHB-update
|
2020-12-08 15:36:16 +01:00 |
|
muellerr
|
42dd641924
|
Merge remote-tracking branch 'upstream/development' into mueller/DHB-update
|
2020-12-08 15:34:51 +01:00 |
|
muellerr
|
bd1137d089
|
replaced hardcoded value with NO_COMMAND
|
2020-12-08 15:33:32 +01:00 |
|
muellerr
|
ba52d54244
|
Merge remote-tracking branch 'upstream/development' into mueller/internal-error-rprtr-update
|
2020-12-08 15:17:25 +01:00 |
|
muellerr
|
6064984671
|
Merge remote-tracking branch 'upstream/development' into mueller/internal-error-rprtr-update
|
2020-12-08 15:16:29 +01:00 |
|
muellerr
|
3b0e5daeed
|
Merge branch 'mueller/datalinklayer-convergence' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/datalinklayer-convergence
|
2020-12-08 15:15:50 +01:00 |
|
muellerr
|
8504bf3f42
|
Merge remote-tracking branch 'upstream/development' into mueller/datalinklayer-convergence
|
2020-12-08 15:15:42 +01:00 |
|
muellerr
|
4a46349286
|
minor imrpovements
|
2020-12-08 15:14:39 +01:00 |
|
muellerr
|
34dac6f312
|
Merge branch 'development' into mueller/datalinklayer-convergence
|
2020-12-08 15:11:32 +01:00 |
|
muellerr
|
913914ce93
|
Merge branch 'mueller/make-event-update' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/make-event-update
|
2020-12-08 14:58:34 +01:00 |
|
muellerr
|
6ee4ceeb65
|
deleted event.cpp source file
|
2020-12-08 14:58:24 +01:00 |
|
muellerr
|
f0b13427e6
|
changelog update
|
2020-12-08 14:51:36 +01:00 |
|
muellerr
|
7d70cce4de
|
namepsace fix
|
2020-12-08 14:45:43 +01:00 |
|
muellerr
|
fdbe5408b7
|
renamed namespaces
|
2020-12-08 14:43:44 +01:00 |
|
muellerr
|
7e9702c140
|
Merge branch 'mueller/make-event-update' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/make-event-update
|
2020-12-08 14:20:08 +01:00 |
|
muellerr
|
2a025de321
|
changelog update
|
2020-12-08 14:19:53 +01:00 |
|