Commit Graph

210 Commits

Author SHA1 Message Date
234fd8e300 Merge branch 'mueller_framework' into mueller_fw_loc_globpool_distinction 2020-05-17 18:00:51 +02:00
0467b6a1bf slight DHB improvements 2020-05-17 17:53:18 +02:00
9597a0121b DHB update 2020-05-17 15:49:46 +02:00
da972e1b58 DHB improvements 2020-05-17 15:41:42 +02:00
e9a4056deb added DHB cookie init
(why was that never a problem beofre????) ¯\_(ツ)_/¯
2020-05-17 15:19:24 +02:00
5b8a6e35dc renaming complete, pool in namespace 2020-05-17 13:37:50 +02:00
cbfa21d45a merging renaming into main branch 2020-05-17 01:17:11 +02:00
50a1b5170a formatting 2020-05-13 18:03:09 +02:00
e5c46c5ec1 Merge branch 'mueller_FixedSequenceImprovements' into mueller_framework 2020-05-11 19:25:45 +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
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
9489b7abc1 modifyData override deleted
is not really thread-safe anyway
2020-05-07 19:23:56 +02:00
e950051b4a some object managerIF security measures
objectmanager get function checks whether global object manager was
initialized now.
New returnvalues, which are also used for local pool init
2020-05-06 14:35:30 +02:00
6b205e166b Merge branch 'master' into mueller_framework 2020-05-06 13:54:18 +02:00
cc0469fef6 return failed insteead of exiting 2020-05-05 20:09:42 +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
f09836a9eb removed exit for empty psremoved exit for empty pstt 2020-05-05 19:30:03 +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
160a09790e removed c omment for now 2020-05-05 18:53:25 +02:00
0ea692a5ea some more sif changes 2020-04-23 20:04:48 +02:00
01195093e3 Merge branch 'mueller_sifRenaming_soooMany' into mueller_framework 2020-04-23 19:21:12 +02:00
2c6b446500 it is done :-)
However, commented outputs are not changed yet.
2020-04-23 19:13:18 +02:00
Uli
6553450b4b Actually, not that horrible, thanks to sed 2020-04-21 22:28:43 +02:00
Uli
a42832ca01 working on updating SerializeIF, to quote Basti: This is going to be horrible 2020-04-21 21:34:03 +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
7e3af7cf83 replaced slotLengthMs with lengthMs 2020-04-19 21:36:10 +02:00
a7d3b4c4a0 added std:: before uint32_t typedef 2020-04-18 15:22:34 +02:00
9580f51c30 removed self-inclusion 2020-04-18 14:17:34 +02:00
a405357578 Merge remote-tracking branch 'upstream/master'
into mueller_framework
2020-04-18 13:30:22 +02:00
5595b0f3ce Merge branch 'mueller_framework' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller_framework 2020-04-16 17:02:10 +02:00
eb362dcad2 some comment line break 2020-04-16 17:02:04 +02:00
f45a8cc171 fixed slot sequence safety check added 2020-04-16 13:17:26 +02:00
33b834ad91 null replaced by nullptr 2020-04-16 10:43:50 +02:00
fc08754b98 some doc unclarities comment added 2020-04-15 23:28:45 +02:00
906f941f32 ssize_t in deSerialize replaced by size_t 2020-04-15 15:53:46 +02:00
8a8761ea88 stopwatch bugfix 2020-04-09 17:56:48 +02:00
aaabbe8aef DHB fix 2020-04-06 13:59:57 +02:00
f28886e970 Moved crc calculation into its own class, renamed function to show which
crc is calculated.
2020-04-06 13:22:42 +02:00
58008c8db5 all fixed slot sequence improvenements, freeRTOS
fix
2020-04-06 11:19:05 +02:00
42838272a5 replaced int32_t size by ssize_t (type trait trick) 2020-04-05 22:42:48 +02:00
87852e5f2a replaced getSerializedSize returnvalue with size_t 2020-04-05 21:54:11 +02:00
7079c9c56d replaced serializeIF serialize sizes with size_t 2020-04-05 17:58:39 +02:00
80b1d28bc8 new dvice com IF return value 2020-04-05 00:23:29 +02:00
8f39820ace doc formatting 2020-04-01 17:05:55 +02:00
996dbc9e4b DHB/Cookie refactoring 2020-04-01 12:41:54 +02:00
5218a0d84f doc fix 2020-03-28 19:42:24 +01:00
93678adc5a replace std::set by std::multiset
so there can be multiple entries with same pollignTime
2020-03-28 00:09:15 +01:00
5d071a1cf1 new device comIF return value in DHB
request receive message
2020-03-26 19:53:05 +01:00
093fef5d6f moved address_t typedef to cookieImoved address_t typedef to cookieIFF 2020-03-26 15:20:17 +01:00
163779622f DHB: replyLen in replyMap now 2020-03-25 02:08:35 +01:00
b2b6b8ee23 added initializeInterface for comIF/cookie 2020-03-24 15:33:18 +01:00
ea49d88c4b moved all return values to DH IF 2020-03-24 14:21:57 +01:00
7e8d92f956 replaced std::list by std::set for fixedSlotSequen 2020-03-24 00:22:17 +01:00
f7b7e10d05 date format changed 2020-03-23 19:14:36 +01:00
b6bf9d7147 to avoid dynamic casting, introuced CookieIF 2020-03-23 19:09:42 +01:00
f7bd661e69 small fixes 2020-03-23 18:08:24 +01:00
fa058ee602 renamed rmap to com (more generic) 2020-03-23 18:05:39 +01:00
d3e2652078 replaced DHB sizes by size_t, rework
Cookie now passed to DHB, rework in progress
2020-03-23 17:58:23 +01:00
c50d9d90d6 replaced std::variant by two uint32 parameters 2020-03-23 13:14:23 +01:00
af6d18d60b added additional parameter form open/reopen call 2020-03-20 22:47:07 +01:00
a3903f80fb typedef address_t moved to deviceComIF 2020-03-19 00:49:47 +01:00
b5fe1fa530 dhb virtual function moved to top 2020-03-09 22:15:52 +01:00
6579200f55 removed counter, will be implemented in childclass 2020-03-06 19:01:31 +01:00
68cda479d6 DHB: performOperation Hook + polling counter
polling counter to specify how often communication opertions are
performed, however this still needs to be changed..
2020-03-06 18:48:48 +01:00
43ac0ec04b Communication Message continued 2020-03-04 23:07:54 +01:00
fb6172fdc5 communication message continued.
Some fixed timeslot task improvements
2020-03-04 00:37:58 +01:00
dd4a5a45e3 communication message extended 2020-03-03 21:20:08 +01:00
d0e8eb386c renamed system context to call context
to avoid conflicts with ISIS library, I don't want to fiddle with
it if we don't have source code
2020-03-02 01:00:17 +01:00
c93ee5c6cd message queue IF return values 2020-02-27 19:00:51 +01:00
3d2bdae14d CSB abstract functions moved to top
So documentation of functions to implement is closer to the top
2020-01-20 23:29:36 +01:00
dba26baee6 Restructured header file
Abstract functions are closer to the top
because they must be implemented and documentation
should be near the top.
Important virtual functions moved up too.
Additional documentation added
2020-01-20 23:00:23 +01:00
1d1bb88a6f Merge request check 2020-01-16 19:07:53 +01:00
a7450144de doxygen group definitions moved to framework 2020-01-03 15:39:32 +01:00
89f490ac36 assembly constructor formatting 2019-12-20 23:09:35 +01:00
950a48078c some documentation, question about HasParametersIF,
variable in ParameterHelper intialized (compiler warning)
2019-12-05 12:21:06 +01:00
9c3a9323b7 some doc change proposals while
writing hk service.
Added Type.h in PoolRawAccess.h, compiler error
when not doing that
2019-12-03 19:30:37 +01:00
10c24e39a3 new returnvalue for scanForReply to ignore full packet 2019-11-29 19:56:05 +01:00
b8af3b5e3d debugInterface extended 2019-11-09 18:15:45 +01:00
537e2ceb18 Getter method for logicalAddress 2019-11-09 13:29:12 +01:00
ee765eafc7 ioBoardAddress renamed to logicalAddress 2019-11-09 13:17:54 +01:00
801bd4d7eb debug interface for dhb created.
This is useful to track states or values
in child handler. some documentation added.
New doxygen group for interfaced added.
2019-11-09 13:07:26 +01:00
bf7bc342ff Revert "documentation for DHB init function, ioBoard addres has default value 0 now, order in ctor changed (not used in source)"
This reverts commit c6e34cada6.
2019-11-05 19:30:02 +01:00
b594bc2a97 removed obsolete comment 2019-11-05 19:25:00 +01:00
cb919ada2a assuming that a default value of 0 for expectedReplies is needed, I introduced a new variable into DeviceCommandInfo, which stores another number of replies expected. this value is assigned in enableReplyInReplyMap. That way, the initial value of 0 remains the same (if it was needed), and is only set to another desired value if a write was sent 2019-11-04 01:55:40 +01:00
12f51575eb removed a flag by accident, fixed now 2019-11-04 00:53:05 +01:00
8eb1a5b13e proposal 1: expectedReplies parameter is set in insertInCommandAndReplyMap, default value stays one. overriding enableReplyInReplyMap is not necessary anymore.second proposal: the commander id is supplied in the interpretDeviceReply function, so we don't have to look for it in the DeviceCommandMap. was it removed at some point because it is listed in the documentation? 2019-11-04 00:47:46 +01:00
d47496db40 Merge branch 'mueller_framework' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller_framework 2019-10-29 19:31:20 +01:00
16af33a7bb doc for fifo, device com if.. 2019-10-29 19:31:18 +01:00
3887cb8ca1 removed wrong include in dhb 2019-10-29 18:22:34 +01:00
d79f072851 Additional documentation for DHB and CSB 2019-10-27 13:38:08 +01:00
64f84d9d9f doc for dhb, serializeIF and SerializeAdapter 2019-10-27 03:21:38 +01:00
8f1517d276 additional comments on endianness (I hope this is correct) 2019-10-25 21:12:11 +02:00
c6e34cada6 documentation for DHB init function, ioBoard addres has default value 0 now, order in ctor changed (not used in source) 2019-10-22 17:15:29 +02:00
cbc8012198 ioBoardAddress protected instead of private to allow custom initialize 2019-10-22 00:06:11 +02:00
907664cea9 added do performOperation where the comIF functions are called, some comments added in DeviceHandlerIF 2019-10-21 11:38:13 +02:00
5e3b7c3625 explanation of cookie purpose added, device handler base indentation 2019-10-18 13:37:09 +02:00
cd7e47ccbb Updated FreeRTOS Osal
CommandingServiceBase is no longer a template
2019-08-28 14:50:24 +02:00
fd782b20c0 Adding Code for Linux 2018-12-19 19:42:00 +01:00
db1f93a155 Adding Code for freeRTOS 2018-07-20 15:10:41 +02:00
575f70ba03 updating code from Flying Laptop
This is the framework of Flying Laptop OBSW version A.13.0.
2018-07-12 16:29:32 +02:00
Bastian Baetz
1d22a6c97e Today's the day. Renamed platform to framework. 2016-06-15 23:48:49 +02:00