Commit Graph

1476 Commits

Author SHA1 Message Date
dac2d210b5
updates for thermal module in DHB 2023-02-13 00:36:54 +01:00
8b4f73a97b
better error msg 2023-02-12 21:07:11 +01:00
7fae6cbd6d
added missing CS unlock 2023-02-12 20:06:32 +01:00
d302ba7185
afmt 2023-02-10 13:51:16 +01:00
94e5f62331
add allowed subservice 2023-02-09 18:30:08 +01:00
14a92b3d89
typo 2023-02-09 18:28:16 +01:00
e4fd424d66
Merge branch 'possible_tc_sched_fixes' into develop 2023-02-09 18:25:44 +01:00
b9b076aa4c logic error 2023-02-09 18:18:25 +01:00
d93486a340 that time margin check is possible broken 2023-02-09 18:18:05 +01:00
820a7f059c
logic error 2023-02-09 18:13:58 +01:00
f4d188c36f
that time margin check is possible broken 2023-02-09 18:12:43 +01:00
1841f92944
important bugfix for thermal set 2023-02-09 17:17:42 +01:00
b279985859
refactor DHB: Bugfix for thermal module 2023-02-09 16:42:38 +01:00
0a9c563bbc format 2023-02-09 15:58:48 +01:00
fa7675897d Merge pull request 'Mode Service Bugfixes' (#736) from eive/fsfw:mode_service_fixes into development
Reviewed-on: fsfw/fsfw#736
2023-02-09 15:56:26 +01:00
3a2393885f more style 2023-02-09 15:44:39 +01:00
c752b6d143 Merge pull request 'Generic TMTC Bridge Update' (#734) from eive/fsfw:tmtcbridge_tweaks into development
Reviewed-on: fsfw/fsfw#734
2023-02-09 15:37:35 +01:00
b676040c7c Merge pull request 'CMakeLists file updates' (#731) from eive/fsfw:cmakelists_update into development
Reviewed-on: fsfw/fsfw#731
2023-02-09 15:29:46 +01:00
dfb1633f00 Merge branch 'development' into mode_service_fixes 2023-02-09 13:46:19 +01:00
5f7172e130 Merge pull request 'TCP/IP TMTC bridge memory leak fixes' (#737) from eive/fsfw:possible_tcpip_bridge_fixes into development
Reviewed-on: fsfw/fsfw#737
2023-02-09 12:15:45 +01:00
0c6465cd95 Merge pull request 'time stamper empty ctor' (#730) from eive/fsfw:empty_cds_short_ctor into development
Reviewed-on: fsfw/fsfw#730
2023-02-09 11:45:49 +01:00
f94987c46d Merge pull request 'RM3100 important bugfix' (#733) from eive/fsfw:rm3100_fixes into development
Reviewed-on: fsfw/fsfw#733
2023-02-09 11:41:53 +01:00
1fffcc2229 possiible leak fixes 2023-02-08 21:23:21 +01:00
6f05d6b7b0
possiible leak fixes 2023-02-08 20:38:32 +01:00
7f907fb9d3 Merge remote-tracking branch 'origin/develop' into mueller/pus-15-tm-storage 2023-02-08 17:17:33 +01:00
a419806a05
Merge remote-tracking branch 'upstream/development' into mode_service_fixes 2023-02-08 09:33:13 +01:00
84bbef0167
make it consistent 2023-02-08 09:27:14 +01:00
88b2b0e005
Merge branch 'mode_service_fixes' into develop 2023-02-08 09:26:38 +01:00
8014e4adf9
mode service fixes 2023-02-08 09:23:48 +01:00
ec12ab5daa
mode service fixes 2023-02-08 01:20:28 +01:00
134d908f26
that stuff is not in upstream yet.. 2023-02-07 12:52:18 +01:00
40a9e12416
1000 is a bit much 2023-02-07 12:47:40 +01:00
f39054edd4
introduce warning switch 2023-02-07 12:45:29 +01:00
c2e6a22dec
important bugfix for RM3100 2023-02-07 12:39:43 +01:00
c8e065a713
comment tweak to event parser can read everything 2023-02-07 12:36:42 +01:00
3ed49dbae3
Merge remote-tracking branch 'upstream/development' into empty_cds_short_ctor 2023-02-07 12:24:02 +01:00
a1567de9e8 Merge branch 'develop' into mueller/pus-15-tm-storage 2023-02-07 12:21:35 +01:00
0a23f2c85a
correction for printout, add prefix 2023-02-07 12:15:44 +01:00
06e30684fe
Merge remote-tracking branch 'upstream/development' into develop 2023-02-07 12:14:31 +01:00
46230e6c6d
Merge remote-tracking branch 'upstream/development' into updates_fixes_pus_time_service 2023-02-07 12:11:29 +01:00
7e7b3bbbc9
time stamper empty ctor 2023-02-07 12:07:41 +01:00
06dca7608a
time stamper empty ctor 2023-02-07 12:06:34 +01:00
6af5274b68 Merge remote-tracking branch 'origin/develop' into mueller/pus-15-tm-storage 2023-02-07 10:51:17 +01:00
5b92247fbd Merge branch 'development' into add_health_service_announce_all 2023-02-06 16:31:05 +01:00
e2b66df72e Merge pull request 'various fixes related to linux Unittests and memory leaks' (#715) from eive/fsfw:unittest_fix_semaphore into development
Reviewed-on: fsfw/fsfw#715
2023-02-06 16:30:37 +01:00
d9da55fdab Merge branch 'development' into add_health_service_announce_all 2023-02-06 15:03:52 +01:00
7b828f233a Merge pull request 'I2C Linux: remove duplicate printout' (#718) from eive/fsfw:i2c_remove_duplicate_printout into development
Reviewed-on: fsfw/fsfw#718
2023-02-06 14:54:58 +01:00
c3d1000cd5 Merge branch 'development' into unittest_fix_semaphore 2023-02-06 14:46:45 +01:00
8e0e57714d Merge pull request 'allow using SO_REUSEADDR and SO_REUSEPORT on TCP server' (#722) from eive/fsfw:tcp_server_reuseaddr_reusesocket into development
Reviewed-on: fsfw/fsfw#722
2023-02-06 14:45:40 +01:00
066f7a6f9b
remove unreachable code 2023-02-06 14:41:14 +01:00
cc9e54ea6b Merge pull request 'improve srv20 error messages' (#723) from eive/fsfw:srv20_error_msgs into development
Reviewed-on: fsfw/fsfw#723
2023-02-06 14:37:26 +01:00
c0e5d1eb99 Merge branch 'development' into tcp_server_reuseaddr_reusesocket 2023-02-06 14:34:52 +01:00
3bc5d4a2e0
Merge remote-tracking branch 'upstream/development' into mgm_handler_small_fix 2023-02-06 14:25:33 +01:00
b1e9dd9e4a
Merge remote-tracking branch 'upstream/development' into updates_fixes_pus_time_service 2023-02-06 14:24:38 +01:00
034eb34c2e
small tweak 2023-02-03 16:05:50 +01:00
38789e053b
Merge branch 'bugfix_dhb_set_datapool_entries_invalid' into develop 2023-02-03 16:05:29 +01:00
5343844be5 bugfix in setNormalDataPoolEntriesInvalid
Do not forget to call read and write to actually update the
validity state
2023-02-03 16:00:55 +01:00
e11eabdbcf
bugfix in setNormalDataPoolEntriesInvalid
Do not forget to call read and write to actually update the
validity state
2023-02-03 15:58:26 +01:00
d17ec02cf0 fixed Z value calculation 2023-02-02 18:26:08 +01:00
f2461cd7e9
helper method for commanding mode 2023-02-02 16:22:29 +01:00
e93137939e set sequence flags for PUS TMTC to unsegmented 2023-02-01 20:48:26 +01:00
2339712373
set sequence flags for PUS TMTC to unsegmented 2023-02-01 20:46:48 +01:00
c1f42618db small but important bugfix for health service 2023-02-01 19:59:32 +01:00
d9d253d3bb
small but important bugfix for health service 2023-02-01 19:58:27 +01:00
5f481739d8
Merge branch 'updates_fixes_pus_time_service' into develop 2023-02-01 18:39:51 +01:00
7e94baceef
service 9 update
- fix time info event
- add time dump subservice
2023-02-01 18:39:23 +01:00
7ee83e4e5d
service 9 update
- fix time info event
- add time dump subservice
2023-02-01 18:10:07 +01:00
29ea89044e beatufil 2023-02-01 17:35:49 +01:00
e487f5be87
proper announce all impl 2023-02-01 17:35:32 +01:00
1cacceddad
beatufil 2023-02-01 17:33:24 +01:00
5c35b8e3cd
proper announce all impl 2023-02-01 17:07:38 +01:00
9b05e8f274 re-order fields in TcpConfig 2023-01-30 14:24:48 +01:00
7766b24a1d
re-order fields in TcpConfig 2023-01-30 14:24:28 +01:00
3656662d88 small tweak, gain factory was always them same 2023-01-30 14:18:03 +01:00
fe71978467 improve srv20 error messages 2023-01-30 14:15:37 +01:00
99d8c845f2 allow using SO_REUSEADDR and SO_REUSEPORT on TCP server 2023-01-30 14:07:41 +01:00
9a4ae550ab Merge branch 'develop' of https://egit.irs.uni-stuttgart.de/eive/fsfw into develop 2023-01-30 14:07:10 +01:00
c64b9b3e71
allow using SO_REUSEADDR and SO_REUSEPORT on TCP server 2023-01-30 14:05:39 +01:00
226818886f
improve srv20 error messages 2023-01-28 14:31:32 +01:00
da12495335
connect mode tree parent: make health helper optional 2023-01-27 15:08:24 +01:00
0cc3231ceb Merge remote-tracking branch 'origin/develop' into mueller/pus-15-tm-storage 2023-01-23 14:20:38 +01:00
049e3b431d
small tweak for printout 2023-01-23 11:31:00 +01:00
bd189518b6
small tweak, gain factory was always them same 2023-01-20 11:10:05 +01:00
accaf855ee Merge remote-tracking branch 'upstream/service_11_bugfixes' into develop 2023-01-13 11:19:17 +01:00
75fa7caf25
Merge remote-tracking branch 'upstream/development' into develop 2023-01-13 11:19:09 +01:00
d16c5024dc
small include improvement 2023-01-13 11:15:36 +01:00
a4531e4ced
typo 2023-01-13 10:59:39 +01:00
bf12f284fa
add size and crc check for contained TC 2023-01-13 10:53:04 +01:00
ba62c28b64 adding linux ci and fixing problems 2023-01-12 15:40:52 +01:00
041d1b8795 Merge remote-tracking branch 'origin/develop' into mueller/pus-15-tm-storage 2023-01-11 09:17:57 +01:00
7adb47aecb remove duplicate printout 2023-01-11 08:45:37 +01:00
5bb66c9723 remove duplicate printout 2023-01-10 11:55:54 +01:00
8589f4d63a Merge pull request 'updates for source sequence counter' (#714) from eive/fsfw:source_seq_counter_update into development
Reviewed-on: fsfw/fsfw#714
2022-12-19 15:00:28 +01:00
ca80589233
make get const 2022-12-19 14:58:08 +01:00
f2ebaed092 Merge pull request 'vec getter, reset for content' (#716) from eive/fsfw:get_cmd_exec_read_buf into development
Reviewed-on: fsfw/fsfw#716
2022-12-19 14:56:11 +01:00
2aa4af6974
make function public 2022-12-14 13:50:57 +01:00
75fc7a056d Merge remote-tracking branch 'origin/develop' into mueller/pus-15-tm-storage 2022-12-12 09:02:04 +01:00
05cad893a2 introduce error counter to avoid spam 2022-12-06 10:05:23 +01:00
5557d95994 Merge branch 'development' into i2c_printout_improvements 2022-12-05 14:20:58 +01:00
fc24c9b5d8 Merge branch 'development' into get_cmd_exec_read_buf 2022-12-05 14:20:52 +01:00
1b005d706a Merge remote-tracking branch 'origin/develop' into mueller/pus-15-tm-storage 2022-12-01 16:40:39 +01:00
5b0ea91222
statically assert MAX_SIZE > 0 2022-11-29 23:24:29 +01:00
7ef69c839c Merge pull request 'small fix to allow teardown handling' (#713) from eive/fsfw:mueller/shutdown_for_failed_to_on_transition into development
Reviewed-on: fsfw/fsfw#713
2022-11-28 14:30:15 +01:00
e68f54b9bd Merge remote-tracking branch 'origin/develop' into mueller/pus-15-tm-storage 2022-11-28 11:37:15 +01:00
b13453f46b
vec getter, reset for content 2022-11-28 08:43:54 +01:00
d0e322d7e2
printout handling improvements 2022-11-28 08:42:08 +01:00
2643ff194c
Merge remote-tracking branch 'upstream/development' into develop 2022-11-28 08:34:04 +01:00
ecde164f68
updates for source sequence counter 2022-11-28 08:30:45 +01:00
50930b41ba
Merge remote-tracking branch 'upstream/development' into mueller/dle_parser 2022-11-28 08:27:24 +01:00
296bc56e2a Merge remote-tracking branch 'origin/develop' into mueller/pus-15-tm-storage 2022-11-24 15:16:34 +01:00
d6ee2ed400 Merge pull request 'AcceptsTelemetryIF tweaks' (#712) from eive/fsfw:mueller/accepts_tm_if_adaptions into development
Reviewed-on: fsfw/fsfw#712
2022-11-21 16:30:43 +01:00
f2150ff9c2 Merge pull request 'only delete table entry if not nullptr' (#710) from eive/fsfw:mueller/health_helper_bugfix into development
Reviewed-on: fsfw/fsfw#710
2022-11-21 16:24:13 +01:00
742152b28e Merge branch 'development' into mueller/accepts_tm_if_adaptions 2022-11-21 15:29:35 +01:00
bf4ca56658 Merge branch 'development' into mueller/shutdown_for_failed_to_on_transition 2022-11-21 15:29:11 +01:00
16ffa00155 Merge branch 'development' into mueller/dle_parser 2022-11-21 15:28:34 +01:00
14c681c93a Merge branch 'development' into mueller/uio_mapper_handle_symlinks 2022-11-21 15:27:06 +01:00
0958c3a00e Merge branch 'development' into mueller/health_helper_bugfix 2022-11-21 15:24:51 +01:00
3b0fed733f Merge branch 'development' into mueller/uio_mapper_handle_symlinks 2022-11-21 15:23:15 +01:00
23d3812fe3
this is actually important 2022-11-21 15:22:25 +01:00
dec7db3ae2
Merge remote-tracking branch 'upstream/development' into mueller/accepts_tm_if_adaptions 2022-11-21 15:00:06 +01:00
65a5abab49
move free call 2022-11-21 14:56:08 +01:00
0129783e34 Merge branch 'development' into mueller/sp_reader_const_get_data 2022-11-21 14:50:44 +01:00
f05295bada small fix to allow teardown handling 2022-11-17 15:16:29 +01:00
160ff799ac
small fix to allow teardown handling 2022-11-17 15:09:08 +01:00
a236a5ec50
adaptions for AcceptsTelemetryIF 2022-11-15 11:40:26 +01:00
03620970e2
function to get queue is const now 2022-11-15 11:38:32 +01:00
8fe8d810e9
only delete table if not nullptr 2022-11-15 11:27:31 +01:00
9483c2809d
DLE parser 2022-11-15 11:26:53 +01:00
fe3d6bd432
uio able to resolve symlinks now 2022-11-15 10:56:46 +01:00
c5f91926c9
remove includes 2022-11-15 10:54:47 +01:00
be4a87535d
remove data wrapper 2022-11-15 10:54:11 +01:00
99927b8e95
afmt 2022-11-15 10:53:38 +01:00
5e5eb82830
make warning switch protected 2022-11-15 10:53:14 +01:00
686dc97234
this is better / more correct 2022-11-15 10:52:47 +01:00
2a842666d5
SP reader getPacketData is const now 2022-11-15 10:46:46 +01:00
c013fcc1f5
move container retvals to namespace 2022-11-15 10:01:37 +01:00
002845108d Merge remote-tracking branch 'upstream/development' into develop_update 2022-11-14 15:05:47 +01:00
ab9b6c8c89
Merge remote-tracking branch 'origin/development' into mueller/cfdp-update-without-handlers 2022-11-14 14:51:33 +01:00
68223869d5 Merge branch 'development' into mueller/local-pool-update-remove-ignore-fault-arg 2022-11-14 14:47:07 +01:00
7b0db08962 Merge branch 'development' into mueller/refactor_serial_linux 2022-11-14 14:36:31 +01:00
b48e0fdc0d
Merge remote-tracking branch 'origin/development' into mueller/cfdp-update-without-handlers 2022-11-14 14:25:36 +01:00
1d084ee22f Merge branch 'development' into mueller/fixed_array_list_copy_ctor 2022-11-14 14:21:04 +01:00
1bea2344f6
remove using declaraction 2022-11-14 14:21:00 +01:00
6021d897b8 Merge branch 'development' into windows-tweaks-upstream 2022-11-14 14:13:57 +01:00
a9c6c088f2
remove leftover debugging code 2022-11-14 14:08:38 +01:00
2b6a33e718
afmt 2022-11-11 14:13:46 +01:00
61fd5d1b62
impl function to generate ASCII timestamp sec accuracy 2022-11-11 14:12:42 +01:00
046dbe1deb
Merge branch 'develop' into mueller/pus-15-tm-storage 2022-11-11 11:38:32 +01:00
e03e7f5260
Merge branch 'mueller/refactor_serial_linux' into develop 2022-11-11 11:37:55 +01:00
b6a3c206cc
smaller include tweaks 2022-11-11 11:34:58 +01:00
5b352978c5
rename cookie class 2022-11-11 11:33:35 +01:00
0303c1a885
remove file 2022-11-11 11:31:22 +01:00
4d2802a470
Merge remote-tracking branch 'origin/develop' into mueller/pus-15-tm-storage 2022-11-11 11:29:29 +01:00
819a298b19
refactoring of serial drivers for linux 2022-11-10 17:50:21 +01:00
39946bff58
some renaming and tweaks for linux serial driver 2022-11-10 17:31:11 +01:00
16246d6ece
replace other memcpy 2022-11-10 16:18:36 +01:00
5c84f12440 this not crash 2022-11-10 16:15:52 +01:00
2a203ae13d
this not crash 2022-11-10 16:15:28 +01:00
6ca1a5c796
fix unittests 2022-11-10 16:11:05 +01:00
83c2c4825c fix compiler error for fixed array list copy ctor 2022-11-10 15:54:03 +01:00
194b3e100a
fix compiler error for fixed array list copy ctor 2022-11-10 15:53:18 +01:00
177c39dd53
helper interface implementations 2022-11-10 15:38:34 +01:00
530a261e14
dedicated header file for container retvals 2022-11-10 15:12:18 +01:00
c913fe40bf tweaks 2022-11-09 17:54:08 +01:00
bee33526a1
missing include 2022-11-09 13:49:40 +01:00
0e8f5ddd26
added missing const specifier 2022-11-08 11:07:56 +01:00
672fca5169
extend uart helper a bit 2022-11-04 11:08:23 +01:00
e5b5c7d253
higher default MQ depth for events, printout tweak 2022-11-03 10:33:52 +01:00
9a0cc64be3 Merge branch 'develop' into eive/dhb2normal 2022-11-03 10:12:19 +01:00
00f1c5bbe9
missing replacements 2022-11-03 10:12:05 +01:00
8a61af779d Merge remote-tracking branch 'origin/develop' into eive/dhb2normal 2022-11-03 10:10:47 +01:00
6efa482eb0
use uniform uart api 2022-11-03 10:10:36 +01:00
f0fa1bf477 Merge remote-tracking branch 'origin/develop' into eive/dhb2normal 2022-11-03 10:08:35 +01:00
91ebf98c28
add new ping with data TC 2022-11-02 19:35:22 +01:00
e1d4209fbe missing fifo pop command 2022-11-02 16:07:00 +01:00
e302c89f74 health helper dtor bugfix 2022-11-02 15:48:13 +01:00
a38279f813 Merge branch 'develop' into eive/dhb2normal 2022-11-02 10:47:25 +01:00
033676ad3b
smaller fixes for DHB 2022-10-28 10:30:48 +02:00
af06969905
Merge remote-tracking branch 'upstream/mohr/dhb2normal' into mohr/dhb2normal 2022-10-28 10:15:40 +02:00
f715b65d6e
Merge remote-tracking branch 'upstream/development' into mueller/local-pool-update-remove-ignore-fault-arg 2022-10-28 10:06:04 +02:00
c11af63015
Merge remote-tracking branch 'origin/development' into mueller/cfdp-update-without-handlers 2022-10-28 10:04:21 +02:00
852f27cec2 Merge remote-tracking branch 'origin/develop' into mueller/improve-ss-dhb-logic 2022-10-27 16:58:30 +02:00
226dc4d8b7
UIO mapper can handle symlinks now 2022-10-27 14:01:35 +02:00
fa01798ebb Merge remote-tracking branch 'origin/develop' into mueller/improve-ss-dhb-logic 2022-10-27 08:30:30 +02:00
1b7e94d718 this api works as well 2022-10-26 18:26:48 +02:00
60ff411721 improvements for HAL com IFs 2022-10-26 17:06:24 +02:00
bddc7a7ca6 minimal first version 2022-10-26 13:22:16 +02:00
819a2bfac4
add prototype for new ToAscii CCSDSTime function 2022-10-25 18:20:48 +02:00
1f05e6b297
fs retval 2022-10-25 11:30:44 +02:00
dc1583c932 Merge branch 'development' into windows-tweaks-upstream 2022-10-24 17:10:44 +02:00
81a7de2814
make dtor virtual 2022-10-24 16:39:32 +02:00
d26f230bee
builds 2022-10-24 15:43:20 +02:00
4db124c680
ignore fault 2022-10-24 15:41:29 +02:00
955579c856 Merge branch 'development' into mueller/refactor-accepts-tc-tm-if 2022-10-24 14:57:38 +02:00
2df66c9304 Merge branch 'mueller/local-pool-update' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw into mueller/local-pool-update 2022-10-24 14:39:11 +02:00
54ad6b3016
add some docs 2022-10-24 14:39:05 +02:00
73e313c35b Merge branch 'development' into mueller/local-pool-update 2022-10-24 14:35:24 +02:00
dd2f42d22b Merge branch 'development' into mueller/local-pool-update 2022-10-24 14:34:56 +02:00
b0c5a49b50
iter not a member anymore, more bugfixes 2022-10-24 14:24:57 +02:00
1164c21ddd
iter not a member anymore, more bugfixes 2022-10-24 14:23:43 +02:00
096af44e39
needs some fixing 2022-10-24 10:56:01 +02:00
56e8e5a8b3
dont know if I am going to need this 2022-10-24 10:39:43 +02:00
11422a658c Merge remote-tracking branch 'origin/develop' into mueller/improve-ss-dhb-logic 2022-10-21 15:35:27 +02:00
2de9e25ceb Merge remote-tracking branch 'upstream/mueller/new-cfdp-update-with-handlers' into mueller/update-cfdp-components 2022-10-21 11:21:26 +02:00
ec7566fb8c Merge remote-tracking branch 'origin/develop' into mueller/improve-ss-dhb-logic 2022-10-20 16:59:53 +02:00
73454c629c
oh god 2022-10-20 16:05:45 +02:00
77b1a85b47 important bugfix for i2c device com IF 2022-10-20 14:24:40 +02:00
0c5c2f6c4f
important bugfix for i2c device com IF 2022-10-20 14:24:03 +02:00
009700ce80
remove info printout 2022-10-17 17:29:10 +02:00
652c31a683 missing validity check 2022-10-17 17:25:27 +02:00
1e43296f2b
missing validity check 2022-10-17 17:24:46 +02:00
1aa062df7f
const specifier for AcceptsTelemetryIF 2022-10-17 16:27:41 +02:00
bfe120636c
this should have the same effect 2022-10-17 15:08:46 +02:00
a8041f220f Merge branch 'development' into mueller/cfdp-update-without-handlers 2022-10-17 14:44:28 +02:00
dd636b186b size check bugfix 2022-10-17 14:30:27 +02:00
3349fc36f8 Merge branch 'development' into windows-tweaks-upstream 2022-10-17 14:20:48 +02:00
14a8924a83
size check bugfix 2022-10-17 14:01:21 +02:00
9f81926aec
some more basic error handling 2022-10-17 12:22:01 +02:00
79c38b45df
events for FSFW specific errors 2022-10-17 12:20:26 +02:00
e893e73f86
add first CFDP events 2022-10-17 12:19:31 +02:00
f3e9277e59 Merge branch 'development' into mueller/refactor-accepts-tc-tm-if 2022-10-10 15:45:05 +02:00
518dcdef4b Merge branch 'development' into mueller/smaller-tweaks 2022-10-10 15:03:04 +02:00
d9730032fd Merge pull request 'DHB Countdown Bug' (#693) from eive/fsfw:mueller/dhb-countdown-bug into development
Reviewed-on: fsfw/fsfw#693
2022-10-10 14:55:43 +02:00
cd0cb43412 Merge branch 'development' into mueller/missing-retval-conversion 2022-10-10 14:46:10 +02:00
1d6ccfe5ab
Service 200: Add mode announcement support 2022-10-10 11:06:58 +02:00
221df7ece6
allow recursive mode announcements 2022-10-10 10:46:29 +02:00
7f180ac1fa
Merge remote-tracking branch 'origin/develop' into mueller/improve-ss-dhb-logic 2022-10-10 10:29:08 +02:00
337cb0d6c9
hotfix 2022-10-10 10:21:17 +02:00
692be9df8d DHB bugfix and addition 2022-10-06 16:57:47 +02:00
8195587604 Merge branch 'mueller/uart-helper-module' into mueller/simplify-dle-parser 2022-10-06 11:14:54 +02:00
40e7b2dc31
new uart helper module 2022-10-06 11:14:00 +02:00
1c53b60442
small additional tweak 2022-10-04 23:04:28 +02:00
d1630cdc4c
something is wrong 2022-10-04 21:17:35 +02:00
49747fc8a4
some bugfixes 2022-10-04 20:51:58 +02:00
cfc00d0260
try to do this in a simpler way 2022-10-04 18:38:20 +02:00
6f562e5f3e
missing retval conv 2022-10-04 10:25:58 +02:00
1eceef4645
move retvals 2022-09-30 15:05:32 +02:00
acab5f6bce
added missing health and mode helper init 2022-09-30 14:14:45 +02:00
10dd855244
expose child itself in interface 2022-09-30 13:30:07 +02:00
f824004897
need to fix all of these TODOs 2022-09-29 19:39:37 +02:00
7c5308429c
this seems to work 2022-09-29 19:21:24 +02:00
f78344b8fb Merge remote-tracking branch 'origin/develop' into mueller/improve-ss-dhb-logic 2022-09-29 17:46:54 +02:00
3de0ae5a48 DHB bug 2022-09-29 17:22:44 +02:00
b9d0ff8fb7
DHB bug 2022-09-29 17:20:18 +02:00
77f7fa2ef1
typo 2022-09-29 16:48:23 +02:00
78314ad966
this makes a bit more sense 2022-09-29 16:47:23 +02:00
227535c461
formatting and smaller stuff 2022-09-29 16:46:55 +02:00
c47bed0760 small important bugfix for DLE parser 2022-09-28 17:04:11 +02:00
9927dbb2e4 Merge branch 'windows-tweaks' into develop 2022-09-28 10:06:08 +02:00
e0c780f21c better comment 2022-09-28 09:59:31 +02:00
876815b1c9 another small windows tweak 2022-09-28 09:59:22 +02:00
b0ecf87580 last windows tweak 2022-09-28 09:59:12 +02:00
68ce8b5b08 tweaks to make windows build again 2022-09-28 09:59:02 +02:00
14a48fe41d
better comment 2022-09-28 09:56:20 +02:00
c932e51818 Merge branch 'windows-tweaks' into develop 2022-09-28 00:03:51 +02:00
2ca8d72e83
another small windows tweak 2022-09-28 00:03:12 +02:00
03e1a93250
last windows tweak 2022-09-27 23:57:58 +02:00
6d2f44a432
tweaks to make windows build again 2022-09-27 21:46:11 +02:00
fe03da6def
Merge remote-tracking branch 'origin/development' into mueller/cfdp-update-without-handlers 2022-09-26 15:38:45 +02:00
bd64591f30 Merge branch 'development' into mueller/smaller-tweaks 2022-09-26 14:34:38 +02:00
9ec397c8b7 Merge branch 'development' into mueller/local-pool-obj-base-better-warning 2022-09-26 14:17:19 +02:00
808e3e0462
remove unused variable 2022-09-16 18:54:48 +02:00
b4b11ebd3b fixes and tweaks 2022-09-16 18:20:42 +02:00
c5b24f2516
fixes and tweaks 2022-09-16 18:08:20 +02:00
bdbe0cc9da pass message queue externally 2022-09-16 16:28:41 +02:00
e2c1158337
pass message queue externally 2022-09-16 16:27:57 +02:00
3d2fc28468
Merge remote-tracking branch 'upstream/mueller/new-cfdp-update-with-handlers' into cfdp-integration 2022-09-16 11:10:35 +02:00
c38088c64b
adaptions for enum renaming 2022-09-15 18:44:00 +02:00
7eb63d6d79 Merge branch 'mueller/cfdp-update-without-handlers' into mueller/new-cfdp-update-with-handlers 2022-09-15 18:41:29 +02:00
6f8ccf83e7
use singular enum names 2022-09-15 18:41:15 +02:00
ef9ed95fd1 Merge branch 'develop' into mohr/merge-upstream 2022-09-15 18:34:37 +02:00
ed68268c0c
generic cfdp handler wrapper 2022-09-15 16:53:04 +02:00
c549914efb
include helpers 2022-09-15 16:50:06 +02:00
753d5ff39e
adaptions for enum renaming 2022-09-15 16:47:09 +02:00
36ca35da77 Merge branch 'mueller/cfdp-update-without-handlers' into mueller/new-cfdp-update-with-handlers 2022-09-15 16:46:25 +02:00
54762232a4
refactoring and condition code to strin converter 2022-09-15 16:46:09 +02:00
4fb7375492 Merge branch 'mueller/cfdp-update-without-handlers' into mueller/new-cfdp-update-with-handlers 2022-09-15 16:21:32 +02:00
2fee2fdff5
unittest which would have caught this 2022-09-15 16:20:52 +02:00
47df9e8b5b Merge branch 'mueller/cfdp-update-without-handlers' into mueller/new-cfdp-update-with-handlers 2022-09-15 16:03:06 +02:00
954c749de0
additional docs 2022-09-15 16:02:46 +02:00
7e0a5d5a9e printout tweak 2022-09-15 13:40:37 +02:00
ce7146e468
printout tweak 2022-09-15 13:40:12 +02:00
a681a4a797 better error printout 2022-09-15 13:38:38 +02:00
ee1c6a3f04
better error printout 2022-09-15 13:37:10 +02:00
ab7c3480f5
storage manager update 2022-09-15 10:30:22 +02:00
237e29cc59
all necessary modifications 2022-09-14 20:21:03 +02:00
0849c8a08d
adding files manually 2022-09-14 20:10:41 +02:00
9d626e0a5d
include correction 2022-09-14 19:59:02 +02:00
dbaeed83af Merge branch 'mueller/cfdp-update-without-handlers' into mueller/new-cfdp-update-with-handlers 2022-09-14 19:48:25 +02:00
2e27a85c95
finished renaming operation 2022-09-14 19:48:11 +02:00
385a0ffd73
add CFDP handlers manually 2022-09-14 19:29:43 +02:00
3a52454949
removed handlers 2022-09-14 19:15:52 +02:00
44615c150b
add printout capabilities 2022-09-14 14:00:20 +02:00
bd594123a2 Merge remote-tracking branch 'upstream/development' into mohr/merge-upstream 2022-09-14 12:54:15 +02:00
4dadef34fd Merge remote-tracking branch 'origin/development' into mueller/cfdp-routers 2022-09-13 15:35:59 +02:00
382543fc59
important bugfix 2022-09-13 15:26:14 +02:00
a1ea671e2f
header include update 2022-09-13 14:46:41 +02:00
9ee1896553 Merge pull request 'Refactor Local Pool API' (#667) from mueller/refactor-local-pool-api into development
Reviewed-on: fsfw/fsfw#667
2022-09-12 14:32:08 +02:00
a5b5523111 Merge pull request 'Refactor TMTC Stack, improve test framework' (#655) from mueller/refactor-tmtc-stack into development
Reviewed-on: fsfw/fsfw#655
2022-09-12 14:31:22 +02:00
62cd39e573 Merge pull request 'SerialBufferAdapter refactoring' (#677) from mueller/refactor-serial-buffer-adapter into development
Reviewed-on: fsfw/fsfw#677
2022-09-12 14:30:51 +02:00