Commit Graph

178 Commits

Author SHA1 Message Date
a5134769ed Merge branch 'development' into mueller/newLocalDataPools 2020-12-01 15:27:41 +01:00
30f4348bff Merge branch 'master' into mueller/DHB-update 2020-12-01 14:11:35 +01:00
1cc0847bb5 small bugfix 2020-11-21 00:15:31 +01:00
1f632b9331 Merge remote-tracking branch 'upstream/master' into mueller/newLocalDataPools 2020-11-02 14:41:47 +01:00
b441f5242f Merge remote-tracking branch 'upstream/master' into development 2020-11-02 14:23:51 +01:00
508f31a359 adaptions so it compiles 2020-11-02 14:19:56 +01:00
410094ed28 Fixes #161 2020-10-27 15:16:14 +01:00
dbcd06527e separate step for performOp now 2020-10-12 18:28:07 +02:00
140aa3ab42 form improvements DHB 2020-10-12 18:18:41 +02:00
196cde4075 DHB update 2020-10-01 12:30:53 +02:00
f979d603b4 Merge branch 'mueller/oldPoolRenaming' into mueller/newLocalDataPools 2020-10-01 12:04:33 +02:00
7c3f99ed2d Revert "DH IF and DH message form improved"
This reverts commit adf528fce9.
2020-10-01 11:06:46 +02:00
adf528fce9 DH IF and DH message form improved 2020-10-01 11:01:52 +02:00
9f7dad31eb Merge branch 'master' into mueller/FixedTimeslotUpdate 2020-09-29 14:21:02 +02:00
f61056eeb7 adapted DHB to renaming 2020-09-06 15:30:56 +02:00
7ad5274803 Merge remote-tracking branch 'upstream/master' into mueller/FixedTimeslotUpdate 2020-09-04 13:51:09 +02:00
4da21d2c38 Merge branch 'master' into mueller/ipc-updates 2020-09-01 13:12:39 +02:00
a9e5b54238 Merge branch 'master' into mueller/feature/DHBupdate 2020-09-01 12:22:14 +02:00
b07b19327c renormalize CHB 2020-09-01 11:52:18 +02:00
4abdc436fb Revert "renormalize CHB"
This reverts commit a4d9c761a7.
2020-09-01 11:51:43 +02:00
a4d9c761a7 renormalize CHB 2020-09-01 11:49:43 +02:00
54112acf62 chb update 2020-08-27 20:11:36 +02:00
c4c607776c important fix, 0 init removed 2020-08-27 20:07:03 +02:00
8f2d5a5528 DH fdir improvements 2020-08-27 19:58:35 +02:00
2a74c8d150 Merge remote-tracking branch 'upstream/master' into mueller/devices/FDIR 2020-08-27 19:55:22 +02:00
dfe3658a85 removed hk stuff 2020-08-27 19:52:25 +02:00
386b153ede Merge remote-tracking branch 'upstream/master' into mueller/feature/DHBupdate 2020-08-27 19:50:02 +02:00
66cf2d3559 timeslot update for FreeRTOS 2020-08-27 16:05:31 +02:00
3f9d9b8770 ipc update 2020-08-25 18:24:46 +02:00
9fbf0d1d94 Merge remote-tracking branch 'upstream/master' into mueller_MessageNamespaceRenamed 2020-08-25 14:02:48 +02:00
5b4e49e966 Merge remote-tracking branch 'upstream/master' into mueller/devices/FDIR 2020-08-19 17:26:50 +02:00
d5dedce294 Relative Paths 2020-08-13 20:53:35 +02:00
6b4fa0cc04 fdir update 2020-08-08 13:28:59 +02:00
2e08037e75 revertiing pool changes 2020-08-02 15:48:09 +02:00
a0ff1e0019 reverted datapool changes 2020-08-02 15:46:25 +02:00
dc4db6e031 Fixed spelling mistake in HealthHelper 2020-07-16 13:32:08 +02:00
6b03a1c03d commented out some more components 2020-07-16 13:00:22 +02:00
c9bc022941 commented out all new hk manager components 2020-07-16 12:57:29 +02:00
36f7cf2caf updated DHB changes 2020-07-16 12:54:30 +02:00
307c954007 fixed CommandMessageTypo
and integrated HasActionsIF interface changes
2020-07-16 12:49:53 +02:00
646e86ea85 dhb update init 2020-07-16 11:56:48 +02:00
ced61da357 Merge pull request 'Fixed spelling mistake in HealthHelper' (#121) from gaisser_fix_spelling_mistake_health into master 2020-07-14 11:24:14 +02:00
8c68895c06 Merge remote-tracking branch 'origin/master' into mohr_serialize 2020-07-03 11:59:15 +02:00
3cd946fef8 Merge pull request 'DeviceHandlerBase: All Refactoring' (#44) from KSat/fsfw:mueller_DeviceHandlerBase_AllRefactoring into master 2020-07-03 11:48:55 +02:00
053b472157 Fixed spelling mistake in HealthHelper 2020-06-25 18:09:32 +02:00
df418ae1b4 typedef in class declaration now 2020-06-24 12:02:01 +02:00
cda3130b34 periodic reply map param is bool now 2020-06-19 01:05:51 +02:00
b412ef587a Merge remote-tracking branch 'upstream/master' into mueller_DeviceHandlerBase_AllRefactoring 2020-06-19 00:45:02 +02:00
952fc7303a renamed MESSAGE_TYPE to messagetypes 2020-06-17 21:15:19 +02:00
92074c7fa2 Merge remote-tracking branch 'upstream/master' into mueller_FixedSequenceImprovements 2020-06-10 16:45:22 +02:00
9c766c123d device command iter was uninitialized 2020-06-06 20:56:09 +02:00
ca74e0c0f2 removed comments 2020-05-26 16:07:32 +02:00
9951b59627 DHB retval fixes 2020-05-25 23:45:32 +02:00
dd5b301980 improved returnvalues 2020-05-25 23:38:11 +02:00
5de68fcc6e some returnvalue comments 2020-05-25 23:36:47 +02:00
112779d91f cleaned up returnvlaues 2020-05-25 23:31:13 +02:00
98449ddc7f comment removed 2020-05-25 23:17:15 +02:00
19b4332801 some little tweaks 2020-05-25 23:16:46 +02:00
e576ddaa86 Merge remote-tracking branch 'upstram/master' into mueller_localPoolNeat 2020-05-20 14:38:41 +02:00
df7be467eb nullptr replacements 2020-05-17 17:54:21 +02:00
0bf8e97830 better error output for invalid passed cookie 2020-05-17 17:49:32 +02:00
80c6eff8a6 added error output for passed nullptr cookie 2020-05-17 17:46:27 +02:00
deb8ce3744 merged upstream master 2020-05-17 15:53:29 +02:00
e8a1912fda Merge remote-tracking branch 'upstram/master' into mueller_DeviceHandlerBase_AllRefactoring 2020-05-17 15:50:40 +02:00
f4ad38f07f replyMap insertion improvements 2020-05-17 15:47:17 +02:00
7ceb6f3c96 override for executeAction() 2020-05-17 15:43:45 +02:00
fb0834ffe1 added cookie caching and deletion 2020-05-17 15:28:00 +02:00
b8e7b12a63 commented whole SWITCH IO BOARD block 2020-05-17 13:10:09 +02:00
77565c7412 additional comment for oprator overload 2020-05-11 19:20:21 +02:00
26103aa8cc fixed sequence slot comments 2020-05-11 17:21:24 +02:00
eb376318c3 comment format 2020-05-11 17:20:10 +02:00
fc4f9156b9 Merge remote-tracking branch 'upstram/master' into mueller_FixedSequenceImprovements 2020-05-11 17:16:25 +02:00
614deea323 last size_t replacements 2020-05-07 23:38:28 +02:00
33eae034c7 replace device comIF uint32_t with size_t 2020-05-07 23:14:29 +02:00
24441809a9 Merge remote-tracking branch 'upstream/master' into mueller_FixedSequenceImprovements 2020-05-07 20:06:17 +02:00
3b63dd72e3 added missing sif prefixes 2020-05-07 19:41:42 +02:00
10628ddbb6 Merge remote-tracking branch 'upstream/master' into mueller_sifRenaming_soooMany 2020-05-07 19:28:06 +02:00
119455f3fd replaced exit by returning failed 2020-05-05 19:33:06 +02:00
c4486e79ec removed exit for empty pst 2020-05-05 19:30:26 +02:00
432dbbd26e removed sif 2020-05-05 18:57:30 +02:00
a6b3cee898 class comment formatting 2020-05-05 18:56:45 +02:00
75da7a4c50 comment moved to header 2020-05-05 18:55:05 +02:00
c7856da81c size_t replacements 2020-05-04 17:07:00 +02:00
2c6b446500 it is done :-)
However, commented outputs are not changed yet.
2020-04-23 19:13:18 +02:00
cf3190a904 Actually, not that horrible, thanks to sed 2020-04-21 22:28:43 +02:00
2093329481 working on updating SerializeIF, to quote Basti: This is going to be horrible 2020-04-21 21:34:03 +02:00
b78b3ac68a added performOperationHook() 2020-04-19 22:17:14 +02:00
225e1b98a0 some bugfixes in cpp file to enable compilation 2020-04-19 22:10:02 +02:00
cee8b4dc37 name slotLengthMs reverted to lengthMs 2020-04-19 21:37:55 +02:00
4d64a76b8e Merge remote-tracking branch 'upstream/master' into mueller_FixedSequenceImprovements 2020-04-19 21:36:50 +02:00
fd100cb994 header function order change
fillCOmmandANdREplyMAp is now closer to its helper functions
2020-04-19 16:10:44 +02:00
f4c925e671 Merge branch 'mueller_DeviceHandlerBase_API_change_CookieIF' into mueller_DeviceHandlerBase_AllRefactoring 2020-04-19 15:57:39 +02:00
7f08bb3506 removed ioboardAddress, max reply Len 2020-04-19 15:54:28 +02:00
36dbf6e1ce Merge branch 'mueller_DeviceHandlerBase_ctor_reduction' into mueller_DeviceHandlerBase_AllRefactoring 2020-04-19 15:51:58 +02:00
1820ad14b7 API change introduced, using new device comIF
also changed child handler base.
2020-04-19 15:48:17 +02:00
c8983650f7 Merge branch 'mueller_DeviceHandlerBase_Changes' into mueller_newDeviceCommunicationIF 2020-04-19 15:36:42 +02:00
bb650ac784 Merge remote-tracking branch 'origin/mueller_CookieToCookieIF' into mueller_newDeviceCommunicationIF 2020-04-19 15:30:14 +02:00
ff47fa191a Communication interface rework
As discussed, open/reOpen not used anymore, replaced by
initializeInterface call.
Using CookieIF.
2020-04-19 15:25:17 +02:00
520ed881bb wrong function call fixed 2020-04-19 15:16:44 +02:00
ce554c615c reduced massive ctor size
this was done by moving zero or nullptr initialization
into the header file
2020-04-19 15:15:33 +02:00