|
39881e7671
|
Merge pull request 'some form updates' (#100) from mueller/afmt-gen-tweaks into develop
Reviewed-on: #100
|
2022-06-21 10:37:03 +02:00 |
|
|
5abbf42e9f
|
some form updates
|
2022-06-21 00:49:58 +02:00 |
|
|
438efe074e
|
Merge pull request 'LocalDataPoolManager Warning Text' (#99) from meier/eive-debug-info into develop
Reviewed-on: #99
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
|
2022-06-20 09:35:31 +02:00 |
|
|
1759700b6a
|
Merge branch 'develop' into meier/eive-debug-info
|
2022-06-20 09:35:14 +02:00 |
|
|
c7618294ac
|
Merge pull request 'HK Generation for L3GD20, LIS3MDL, RM3100' (#97) from meier/device-hk into develop
Reviewed-on: #97
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
|
2022-06-20 09:34:16 +02:00 |
|
|
af890c6218
|
corrected warning text
|
2022-06-16 07:55:57 +02:00 |
|
|
7f3e5e42bb
|
Merge branch 'develop' into meier/device-hk
|
2022-06-16 07:44:58 +02:00 |
|
|
cda81fc841
|
enable hk
|
2022-06-03 18:05:38 +02:00 |
|
|
5a69c1f8b9
|
Merge pull request 'DHB Mode Off disable pending commands' (#95) from meier/dhb-disable-pending-commands into develop
Reviewed-on: #95
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
|
2022-05-27 14:40:36 +02:00 |
|
|
1d1d91f591
|
Merge branch 'develop' into meier/dhb-disable-pending-commands
|
2022-05-27 14:40:18 +02:00 |
|
|
043b8b5b3f
|
Merge pull request 'FixedTimeSlotTaskBase Bugfix' (#96) from meier/FixedTimeSlotTaskBase-BugFix into develop
Reviewed-on: #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 |
|
|
ebbe08639c
|
Merge pull request 'TaskIF refactoring continued' (#91) from mueller/task-if-refactoring-eive into develop
Reviewed-on: #91
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
|
2022-05-25 16:11:22 +02:00 |
|
|
d286fc1855
|
Merge pull request 'service 3 and local HK man improvements' (#92) from mueller/hk-improvements into develop
Reviewed-on: #92
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
|
2022-05-25 16:10:32 +02:00 |
|
|
cf35cca923
|
Merge remote-tracking branch 'origin/develop' into mueller/task-if-refactoring-eive
|
2022-05-25 15:41:07 +02:00 |
|
|
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 |
|
|
c328891030
|
Merge remote-tracking branch 'origin/develop' into mueller/task-if-refactoring-eive
|
2022-05-25 15:38:14 +02:00 |
|
|
76a459a02c
|
Merge pull request 'use better type for stored limit' (#93) from mueller/tmtc-bridge-tweaks into develop
Reviewed-on: #93
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
|
2022-05-25 15:24:57 +02:00 |
|
|
fbec1b3dc9
|
Merge pull request 'Update from upstream' (#94) from mueller/update-from-upstream into develop
Reviewed-on: #94
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
|
2022-05-25 15:24:18 +02:00 |
|
|
c4fa7281ae
|
Merge remote-tracking branch 'upstream/development' into mueller/update-from-upstream
|
2022-05-25 14:44:21 +02:00 |
|
|
ac62443f31
|
use better type for stored limit
|
2022-05-25 14:30:58 +02:00 |
|
|
8cfe848dfe
|
service 3 and local HK man improvements
|
2022-05-25 14:30:00 +02:00 |
|
|
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 |
|
|
af7c6c57a3
|
Merge branch 'develop' into mueller/task-if-refactoring-eive
|
2022-05-25 10:30:23 +02:00 |
|
|
c835525196
|
added cast for PUS11
|
2022-05-25 09:56:32 +02:00 |
|
|
7dddcdfd55
|
Merge branch 'development' into mueller/possible-fix-ccsds-distrib
|
2022-05-25 09:52:33 +02:00 |
|
|
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 |
|
|
24069dfd78
|
removed [[maybe_unused]]
|
2022-05-24 16:22:27 +02:00 |
|
|
40cc557978
|
Merge remote-tracking branch 'upstream/mueller/task-if-refactoring' into mueller/task-if-refactoring-eive
|
2022-05-24 15:42:08 +02:00 |
|
|
e59f1f26bf
|
return end iterator instead of crashing
|
2022-05-24 14:33:18 +02:00 |
|
|
f7cde80088
|
added missing delete
|
2022-05-24 14:32:35 +02:00 |
|
|
e60a665de4
|
added 3 new subservices
|
2022-05-24 11:52:29 +02:00 |
|
|
34658ef7db
|
afmt
|
2022-05-24 10:40:25 +02:00 |
|
|
4b128d2435
|
Merge pull request 'TaskIF refactor SPI refactor' (#89) from mueller/task-if-refactor-spi-refactor into develop
Reviewed-on: #89
|
2022-05-23 16:22:40 +02:00 |
|
|
f35b0ffbbd
|
Merge remote-tracking branch 'origin/develop' into mueller/task-if-refactor-spi-refactor
|
2022-05-23 16:10:49 +02:00 |
|
|
f288d5120d
|
Merge branch 'development' into mueller/tc-11-tweaks
|
2022-05-23 15:34:00 +02:00 |
|
|
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 |
|
|
5e62258aa6
|
Merge branch 'development' into mueller/tcp-server-cache-client-addr
|
2022-05-23 14:38:05 +02:00 |
|
|
b8b7756a3e
|
fix host OSAL
|
2022-05-22 14:32:48 +02:00 |
|
|
4cc108f3a1
|
Merge branch 'develop' of https://egit.irs.uni-stuttgart.de/eive/fsfw into develop
|
2022-05-20 20:53:48 +02:00 |
|
|
c0292f072e
|
warning printout correction
|
2022-05-20 20:52:36 +02:00 |
|
|
336ad9b7be
|
Merge pull request 'PUS TC11 bugfix and upstream updates' (#88) from mueller/tc-11-tweaks-eive into develop
Reviewed-on: #88
|
2022-05-20 17:35:07 +02:00 |
|
|
942bfafaa3
|
Merge remote-tracking branch 'upstream/mueller/tc-11-tweaks' into mueller/tc-11-tweaks-eive
|
2022-05-20 15:39:40 +02:00 |
|
|
0b53b4873f
|
bugfix for srv11
|
2022-05-20 11:20:31 +02:00 |
|
|
8e2597f609
|
clang-format
|
2022-05-20 11:09:03 +02:00 |
|
|
dac700b80a
|
static STORE renamed
|
2022-05-20 08:59:06 +02:00 |
|
|
d0fc360697
|
apply afmt
|
2022-05-20 08:34:14 +02:00 |
|