Commit Graph

6111 Commits

Author SHA1 Message Date
734767045a
Merge remote-tracking branch 'upstream/development' into develop 2023-08-15 18:44:23 +02:00
12f8cc5fc2
remove more obsolete code 2023-08-15 18:06:50 +02:00
1e78d6ce66 Merge remote-tracking branch 'eive/develop' into remove-diagnostic-hk 2023-08-15 18:00:51 +02:00
845f040f13
remove diagnostic HK 2023-08-15 18:00:37 +02:00
d246ce34d0 Merge pull request 'Change TLE validity duration' (#159) from spg4-tle-too-old into develop
Reviewed-on: eive/fsfw#159
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2023-08-14 10:09:00 +02:00
796c7a9e37 tle is too old after 30 days now 2023-08-09 11:42:11 +02:00
d575da8540 Merge pull request 'Small tweak to allow immediate HK generation' (#158) from small-hk-tweak into develop
Reviewed-on: eive/fsfw#158
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2023-07-17 10:37:39 +02:00
62ace649a7
fix unittest 2023-07-17 10:35:35 +02:00
aac74fae38
shared cmake file 2023-07-17 10:34:19 +02:00
a26b0c38ac
small tweak to allow immediate HK generation 2023-07-17 10:31:02 +02:00
42e74d22cc Merge pull request 'countdown based HK generation' (#156) from hk-generation-countdown-based into develop
Reviewed-on: eive/fsfw#156
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2023-07-11 17:35:10 +02:00
36caa58043 Merge branch 'develop' into hk-generation-countdown-based 2023-07-11 17:34:24 +02:00
988e07f0be
countdown 2023-07-11 15:40:43 +02:00
4ecd9eb62e Merge pull request 'important bugfix for PUS TM creator' (#751) from bugfix-tm-creator into development
Reviewed-on: fsfw/fsfw#751
2023-07-10 21:36:49 +02:00
fb89d7a3b6 important bugfix for PUS TM creator 2023-07-10 17:47:05 +02:00
88e8665280
important bugfix for PUS TM creator 2023-07-10 17:45:02 +02:00
9c8b1c697b
added back missing function 2023-07-10 14:20:02 +02:00
110cb903a6
countdown based HK generation 2023-07-10 14:14:31 +02:00
7e1fb04f8a
possible Apple CLang fixes 2023-07-04 16:51:29 +02:00
7f2411358d
fix shadowing warning 2023-06-30 15:52:30 +02:00
f0ee7772e8 Merge pull request 'EIVE upstream' (#29) from use-eive-upstream into develop
Reviewed-on: #29
2023-06-30 15:44:39 +02:00
4fc06a1eaf
fixes for SOURCE 2023-06-30 15:20:25 +02:00
a196c3387e
Merge remote-tracking branch 'eive/develop' into use-eive-upstream 2023-06-30 15:02:53 +02:00
f8fae1ac62
fix variable shadowing 2023-06-30 14:59:24 +02:00
8da89eba80 Merge pull request 'add API to set msg counter' (#155) from pus-msg-counter-mutable into develop
Reviewed-on: eive/fsfw#155
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2023-06-28 13:19:28 +02:00
7e8845f2c2 Merge remote-tracking branch 'origin/develop' into pus-msg-counter-mutable 2023-06-26 18:12:36 +02:00
6aff3250c2 Merge pull request 'Internal Error Reporter Configurability' (#154) from internal-error-reporter-set into develop
Reviewed-on: eive/fsfw#154
2023-06-26 18:10:06 +02:00
c3572e31a8
add API to set msg counter 2023-06-25 12:35:50 +02:00
2293e7f2bb
typo 2023-06-22 16:12:41 +02:00
a85a38c882
some thnings are configurable now 2023-06-22 16:08:29 +02:00
0f76cdb3ba
typo 2023-06-20 20:36:03 +02:00
268c2e87c9 Merge pull request 'max value calc fix' (#153) from max-value-fix-v2 into develop
Reviewed-on: eive/fsfw#153
2023-06-20 18:20:00 +02:00
87f94a252f Merge branch 'develop' into max-value-fix-v2 2023-06-20 18:19:19 +02:00
c7037d417a nullptr check for optional argument 2023-06-20 11:54:15 +02:00
f80c5980ea max value calc fix 2023-06-19 17:04:45 +02:00
ad01642fee Merge pull request 'specify truncate flag explicitely' (#151) from specify-truncate-flag-explicitely into develop
Reviewed-on: eive/fsfw#151
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2023-06-19 09:32:19 +02:00
f2947bc78e
specify truncate flag explicitely 2023-06-18 19:04:36 +02:00
0a977ea688 Merge pull request 'make number of parallel cmds configurable' (#149) from make-srv3-num-parallel-cmds-configurable into develop
Reviewed-on: eive/fsfw#149
2023-06-14 03:37:02 +02:00
74b164b1da make number of parallel cmds configurable 2023-06-13 08:09:04 +02:00
5322de0599 Merge pull request 'Pull CFPD bugfix in dev branch' (#147) from pull-cfdp-fix-into-dev-branch into obsw-v3.0.0-dev
Reviewed-on: eive/fsfw#147
2023-06-09 13:41:29 +02:00
9a4bf51006 Merge branch 'develop' into obsw-v3.0.0-dev 2023-06-09 13:11:30 +02:00
3a70229510 Merge pull request 'configurable queue depth' (#146) from service-8-configurable-queue-depth into obsw-v3.0.0-dev
Reviewed-on: eive/fsfw#146
2023-06-09 13:03:17 +02:00
b3beedad9f Merge branch 'obsw-v3.0.0-dev' into service-8-configurable-queue-depth 2023-06-09 13:03:08 +02:00
efe217a197 Merge pull request 'Rework L3GD20H Config' (#143) from gyr-config-rework into obsw-v3.0.0-dev
Reviewed-on: eive/fsfw#143
2023-06-09 13:01:23 +02:00
b442ca09b9 configurable queue depth 2023-06-07 13:46:46 +02:00
146c3471d0 Merge pull request 'fixes for GCC13' (#750) from mohr/GCC13 into development
Reviewed-on: fsfw/fsfw#750
2023-06-02 13:40:35 +02:00
1816c3f623 Merge pull request 'CFDP bugfix' (#749) from eive/fsfw:cfdp-bugfix-unittest-fixes into development
Reviewed-on: fsfw/fsfw#749
2023-06-02 13:30:54 +02:00
d03d5aa74c fixing host osal for GCC13 2023-06-02 12:02:37 +02:00
26e97ddf89 overload vs override clarification for GCC13; Also, cmake-format 2023-06-02 11:33:20 +02:00
be3a57a795 bump ETL and Catch2 version 2023-06-01 17:54:38 +02:00