 muellerr
|
9c59079e94
|
Merge remote-tracking branch 'upstream/development' into mueller/LocalPoolRefactoring
|
2020-12-10 17:12: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
|
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
|
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
|
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 |
|
|
muellerr
|
bb11bc5685
|
task if is set now
|
2020-12-05 17:11:34 +01:00 |
|
|
muellerr
|
8b74fcff38
|
Merge branch 'development' into mueller/unittest-fixes
|
2020-12-05 11:51:54 +01:00 |
|
|
muellerr
|
334815463b
|
Merge branch 'development' into mueller/power-update
|
2020-12-05 11:51:14 +01:00 |
|
|
muellerr
|
e6143eb0d8
|
Merge branch 'development' into mueller/monitoring-update
|
2020-12-05 11:51:04 +01:00 |
|
|
muellerr
|
90f851f9b3
|
Merge branch 'development' into mueller/parameter-convergence
|
2020-12-05 11:49:47 +01:00 |
|
|
muellerr
|
b6f0049535
|
Merge branch 'development' into feature/has-file-system-if-init
|
2020-12-05 11:47:01 +01:00 |
|
|
muellerr
|
cb73e507b5
|
Merge branch 'development' into mueller/make-event-update
|
2020-12-05 11:46:39 +01:00 |
|
|
muellerr
|
50a1ee5691
|
Merge branch 'development' into mueller/thermal-update
|
2020-12-05 11:46:06 +01:00 |
|
|
muellerr
|
32eec9dfda
|
Merge pull request 'OSAL MessageQueue Hotfix' (#297) from mueller/osal-mq-hotfix into development
Reviewed-on: fsfw/fsfw#297
|
2020-12-05 11:43:13 +01:00 |
|
|
muellerr
|
c8f4bdd09a
|
Merge branch 'development' into mueller/host-osal-atomic
|
2020-12-05 10:48:59 +01:00 |
|
|
muellerr
|
6766abc0fa
|
changelog update
|
2020-12-05 10:41:37 +01:00 |
|
|
muellerr
|
c0e9c22f34
|
hotfix for message queue
|
2020-12-05 10:40:53 +01:00 |
|
|
muellerr
|
983556b3b3
|
evil bug fixed
|
2020-12-05 01:21:04 +01:00 |
|
|
muellerr
|
bd972ae356
|
Merge branch 'development' into mueller/thermal-update
|
2020-12-03 18:33:50 +01:00 |
|
|
muellerr
|
64cf0d0a70
|
thermal update
|
2020-12-03 18:32:32 +01:00 |
|
|
muellerr
|
c70ed5004e
|
Merge branch 'development' into mueller/power-update
|
2020-12-03 18:30:27 +01:00 |
|
|
muellerr
|
9ba8ef1ae2
|
power update
|
2020-12-03 18:29:28 +01:00 |
|
|
muellerr
|
778f524714
|
Merge branch 'development' into mueller/monitoring-update
|
2020-12-03 18:26:23 +01:00 |
|
|
muellerr
|
ec3c83bcc1
|
monitoring update
|
2020-12-03 18:24:51 +01:00 |
|
|
muellerr
|
9781105ad0
|
moved catch factory again
|
2020-12-03 14:50:28 +01:00 |
|
|
muellerr
|
03aacea4dd
|
fixed unittest
|
2020-12-03 14:44:11 +01:00 |
|
|
muellerr
|
ddcaee4aae
|
Merge branch 'mueller/internal-error-rprtr-update' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/internal-error-rprtr-update
|
2020-12-03 13:27:00 +01:00 |
|
|
muellerr
|
c6db9944fd
|
changelog update
|
2020-12-03 13:26:50 +01:00 |
|
|
muellerr
|
c94f8a8ddb
|
Merge branch 'development' into mueller/internal-error-rprtr-update
|
2020-12-03 13:24:01 +01:00 |
|
|
muellerr
|
f7f062570e
|
new internal error reporter using local pools
|
2020-12-03 13:21:44 +01:00 |
|
|
muellerr
|
98f9896911
|
Merge branch 'development' into mueller/datalinklayer-convergence
|
2020-12-03 13:19:43 +01:00 |
|
|
muellerr
|
5e092778ed
|
some minor changes
|
2020-12-03 13:17:28 +01:00 |
|
|
muellerr
|
ffcbc11351
|
Merge branch 'development' into mueller/controller-update
|
2020-12-03 13:16:25 +01:00 |
|
|
muellerr
|
795ff585f8
|
controller base update
|
2020-12-03 13:14:30 +01:00 |
|
|
muellerr
|
3f9f062435
|
changelog update
|
2020-12-03 13:11:52 +01:00 |
|
|
muellerr
|
74ba8b7664
|
changel og updated
|
2020-12-03 13:10:33 +01:00 |
|
|
muellerr
|
0a80bf29b1
|
Merge branch 'development' into mueller/parameter-convergence
|
2020-12-03 13:05:12 +01:00 |
|
|
muellerr
|
464988ca61
|
update
|
2020-12-03 13:00:04 +01:00 |
|
|
muellerr
|
0cf65af506
|
Merge branch 'development' into mueller/newLocalDataPools
|
2020-12-03 12:58:30 +01:00 |
|
|
muellerr
|
2deb7037b0
|
todo added
|
2020-12-02 01:07:40 +01:00 |
|
|
muellerr
|
558220643e
|
small form improvements
|
2020-12-02 01:01:31 +01:00 |
|
|
muellerr
|
7b742a2e67
|
warning removed from osal
|
2020-12-02 01:00:07 +01:00 |
|
|
muellerr
|
8ad30d489a
|
important bugfix for host osal
|
2020-12-02 00:58:13 +01:00 |
|
|
muellerr
|
73d3defe9f
|
error output improved
|
2020-12-02 00:32:07 +01:00 |
|
|
muellerr
|
f5c384de14
|
some bugfixes
|
2020-12-02 00:27:53 +01:00 |
|
|
muellerr
|
206d4b58b2
|
removed boolean var
|
2020-12-02 00:17:12 +01:00 |
|
|
muellerr
|
a92f6c5d8e
|
mutex bugfix for host
|
2020-12-02 00:05:54 +01:00 |
|
|
muellerr
|
37196c8e3b
|
atomic fix
|
2020-12-01 23:47:11 +01:00 |
|
|
muellerr
|
d3711e2dc2
|
Merge branch 'development' into mueller/make-event-update
|
2020-12-01 17:46:30 +01:00 |
|
|
muellerr
|
94b108e03d
|
changelog update
|
2020-12-01 17:45:23 +01:00 |
|
|
muellerr
|
606aac687b
|
make event api change
|
2020-12-01 17:44:36 +01:00 |
|
|
muellerr
|
114c1d9061
|
Merge branch 'feature/has-file-system-if-init' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into feature/has-file-system-if-init
|
2020-12-01 17:18:01 +01:00 |
|
|
muellerr
|
f1c5f19213
|
changelog update
|
2020-12-01 17:17:53 +01:00 |
|
|
muellerr
|
c41d5b44d4
|
Merge branch 'development' into feature/has-file-system-if-init
|
2020-12-01 17:16:54 +01:00 |
|
|
muellerr
|
09caeffbc7
|
added new interface for file systems
|
2020-12-01 17:15:25 +01:00 |
|
|
muellerr
|
ede099bdc9
|
Merge branch 'development' into mueller/op-divider-update
|
2020-12-01 17:10:02 +01:00 |
|
|
muellerr
|
29e701d14d
|
op divider additional features
|
2020-12-01 17:08:46 +01:00 |
|
|
muellerr
|
5eb2cbde0e
|
some additional ionclude fixes
|
2020-12-01 17:08:03 +01:00 |
|
|
muellerr
|
51b9e0074b
|
Revert "testcfg update"
This reverts commit 36b76fa07c.
|
2020-12-01 17:06:05 +01:00 |
|
|
muellerr
|
36b76fa07c
|
testcfg update
|
2020-12-01 17:04:33 +01:00 |
|
|
muellerr
|
a0689320d1
|
more include fixes
|
2020-12-01 16:55:24 +01:00 |
|
|
muellerr
|
c741ef3945
|
using relative includes now
|
2020-12-01 16:50:02 +01:00 |
|
|
muellerr
|
8cddf8f509
|
more relative includes
|
2020-12-01 16:24:38 +01:00 |
|