KSat/fsfw
17
6
Fork 2
forked from fsfw/fsfw
Code Issues Pull Requests Releases Wiki Activity

ksat_master #5

Manually merged
muellerr merged 169 commits from ksat_master into master 2020-04-08 19:35:26 +02:00
Conversation 0 Commits 169 Files Changed 150
+4097 -1751

169 Commits

Author SHA1 Message Date
muellerr c88c6c2a45 binary semaphore info printout added 2020-04-06 19:51:45 +02:00
muellerr aaabbe8aef DHB fix 2020-04-06 13:59:57 +02:00
muellerr 78aad91aab PSB subservice passed to handleRequest 2020-04-06 12:38:39 +02:00
muellerr 3654c7bf81 some form stuff 2020-04-06 11:15:44 +02:00
muellerr e791f44c41 copy ctor and assgnment op forbidden 
for serial linked lists
 2020-04-05 23:03:32 +02:00
muellerr 42838272a5 replaced int32_t size by ssize_t (type trait trick) 2020-04-05 22:42:48 +02:00
muellerr 87852e5f2a replaced getSerializedSize returnvalue with size_t 2020-04-05 21:54:11 +02:00
muellerr 7079c9c56d replaced serializeIF serialize sizes with size_t 2020-04-05 17:58:39 +02:00
muellerr 06ae64d59c CSB: replaced some uint32 with size_t 2020-04-05 15:46:10 +02:00
muellerr a65a19f583 deletd serial buffer adapter2 2020-04-05 15:33:24 +02:00
muellerr 4a35035b28 serial buffer adapted improvements 2020-04-05 15:30:31 +02:00
muellerr 80b1d28bc8 new dvice com IF return value 2020-04-05 00:23:29 +02:00
muellerr bd468a1b74 timeslot time 0 definitely leads to error 2020-04-01 17:19:03 +02:00
muellerr 335df7787a testing timeslot task 0 2020-04-01 17:15:27 +02:00
muellerr 8f39820ace doc formatting 2020-04-01 17:05:55 +02:00
muellerr 996dbc9e4b DHB/Cookie refactoring 2020-04-01 12:41:54 +02:00
muellerr 5218a0d84f doc fix 2020-03-28 19:42:24 +01:00
muellerr 93678adc5a replace std::set by std::multiset 
so there can be multiple entries with same pollignTime
 2020-03-28 00:09:15 +01:00
muellerr 5d071a1cf1 new device comIF return value in DHB 
request receive message
 2020-03-26 19:53:05 +01:00
muellerr 093fef5d6f moved address_t typedef to cookieImoved address_t typedef to cookieIFF 2020-03-26 15:20:17 +01:00
muellerr 163779622f DHB: replyLen in replyMap now 2020-03-25 02:08:35 +01:00
muellerr b2b6b8ee23 added initializeInterface for comIF/cookie 2020-03-24 15:33:18 +01:00
muellerr ea49d88c4b moved all return values to DH IF 2020-03-24 14:21:57 +01:00
muellerr 7e8d92f956 replaced std::list by std::set for fixedSlotSequen 2020-03-24 00:22:17 +01:00
muellerr f7b7e10d05 date format changed 2020-03-23 19:14:36 +01:00
muellerr b6bf9d7147 to avoid dynamic casting, introuced CookieIF 2020-03-23 19:09:42 +01:00
muellerr f7bd661e69 small fixes 2020-03-23 18:08:24 +01:00
muellerr fa058ee602 renamed rmap to com (more generic) 2020-03-23 18:05:39 +01:00
muellerr d3e2652078 replaced DHB sizes by size_t, rework 
Cookie now passed to DHB, rework in progress
 2020-03-23 17:58:23 +01:00
muellerr c50d9d90d6 replaced std::variant by two uint32 parameters 2020-03-23 13:14:23 +01:00
muellerr af6d18d60b added additional parameter form open/reopen call 2020-03-20 22:47:07 +01:00
muellerr 52c05e2f3d minor formatting for pull request 2020-03-19 12:44:24 +01:00
muellerr b7e3449b04 some more doc for containers 2020-03-19 12:38:11 +01:00
muellerr a3903f80fb typedef address_t moved to deviceComIF 2020-03-19 00:49:47 +01:00
muellerr b5fe1fa530 dhb virtual function moved to top 2020-03-09 22:15:52 +01:00
muellerr 6579200f55 removed counter, will be implemented in childclass 2020-03-06 19:01:31 +01:00
muellerr 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
muellerr 22e4dabd1b BinSemaphore reset function added 2020-03-06 15:39:42 +01:00
muellerr 43ac0ec04b Communication Message continued 2020-03-04 23:07:54 +01:00
muellerr fb6172fdc5 communication message continued. 
Some fixed timeslot task improvements
 2020-03-04 00:37:58 +01:00
muellerr dd4a5a45e3 communication message extended 2020-03-03 21:20:08 +01:00
muellerr 72963f5855 Merge branch 'mueller_framework' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller_framework 2020-03-03 00:07:48 +01:00
muellerr 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
muellerr 238892bd66 Merge branch 'mueller_framework' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller_framework 2020-02-29 01:22:41 +01:00
muellerr 6d6c78b255 task management doc 2020-02-29 01:21:36 +01:00
muellerr fa38a37604 all context switches calls to TaskManagement.h now 2020-02-28 22:55:25 +01:00
muellerr c93ee5c6cd message queue IF return values 2020-02-27 19:00:51 +01:00
muellerr abccd81fdf new file for freeRTOS task management functions 2020-02-26 16:55:35 +01:00
muellerr 083cc7c50a sempahore wrapper extended 2020-02-25 17:04:21 +01:00
muellerr 685c18dc4e Merge branch 'ksat_master' into mueller_framework 2020-02-25 12:55:20 +01:00
muellerr bfc7a768ce message queue adaptions for calls from ISR 
functions moved to top
binary sempahore file init
mutex return values
 2020-02-25 12:54:28 +01:00
muellerr 7a426acece therm sensor doc correction 2020-02-21 16:08:43 +01:00
muellerr 54eeb71f02 bugfix: added implementation 2020-02-17 21:20:51 +01:00
muellerr 6ab07aeb19 valid mask bugfixes 2020-02-16 21:04:17 +01:00
muellerr 1001c1d48b added new IF for thermal messages 2020-02-16 17:21:06 +01:00
muellerr 99b90e625d refactored: limit type specified separately 2020-02-16 16:14:29 +01:00
muellerr ddae9ee80f adapted temp sensor to use °C limits, doc added 2020-02-16 14:59:45 +01:00
muellerr d8ed5bb1c1 some comments for missing doc 2020-02-15 18:55:22 +01:00
muellerr e15839b3a6 Thermal: Some formatting stuff, doc to do 
Need to find out how to use the thermal components
 2020-02-15 18:26:25 +01:00
muellerr a7964c7200 Merge branch 'luz_FixedTimeslotTask_ExistenceCheck' into mueller_framework 2020-02-15 15:34:53 +01:00
muellerr 413d659381 slight change 2020-02-15 15:27:06 +01:00
muellerr b3faf1e4ad old timestring used 2020-01-31 23:42:11 +01:00
muellerr 5190e4c16e Serial Buffer dapter changes reverted 
CCSDS time bugfixes in separate section (for C98)
Serial buffer adapter 2 bugfixes
 2020-01-31 00:54:34 +01:00
muellerr 09144b18c4 ccsds time changes changed 2020-01-29 01:03:20 +01:00
muellerr 7dd4694d9d CCSDS time extra defined for avr lib 2020-01-28 23:19:19 +01:00
muellerr 8f17d5147e SerialFixedArrayList constructor bugfix 2020-01-27 00:43:01 +01:00
muellerr 85048cc9ee Pool Raw Access change bugfix 2020-01-26 22:13:56 +01:00
muellerr d9fa13b6eb ADDED old pool entry constructor 2020-01-26 18:31:17 +01:00
muellerr 6eedb3f097 New Pool List Initializer. 
Needs testing !!!
 2020-01-23 15:45:21 +01:00
muellerr d330958abb Array List endian swapper protected now 2020-01-22 14:27:11 +01:00
muellerr 1977942c4b Array List Entry swapper function 
And respective SerialAdapter functions to use it
 2020-01-22 14:24:48 +01:00
muellerr 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
muellerr 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
muellerr 782ba143a6 FixedTimeslotTask object check 
Before adding to PST. Prevents NULL exception.
 2020-01-20 22:03:13 +01:00
muellerr 424c82ce16 Extracted one logic block 
To increase readability
 2020-01-18 23:07:43 +01:00
muellerr 5cb591a063 Array List swapper for SerialFixedArrayList 2020-01-18 18:01:37 +01:00
muellerr 6fe0f45c27 SerialBufferAdapter new setBuffer function 
Serial Fixed Array List Adapter documentation adapted
SinglyLinkedList setEnd() function added
 2020-01-18 16:48:33 +01:00
muellerr c9e4c73bd2 Local pool public members/functions moved to top 2020-01-18 15:03:22 +01:00
muellerr 1f4391f56e Endian Swapper buffer swapper changes reverted 2020-01-17 21:11:39 +01:00
muellerr 1d1bb88a6f Merge request check 2020-01-16 19:07:53 +01:00
muellerr 9bdbc2c380 Endian swapper changes, Serial buffer adapter 
New Serial Buffer Adapter with complete template class for buffer type.
Endian Swapper input now standard uint8_t * pointers instead of template
type. Fixed Array List new ctor, but commented out for now
 2020-01-16 18:46:29 +01:00
muellerr 1437f33027 Serial Fixed Array List template type clarifications 2020-01-15 17:30:23 +01:00
muellerr 9aa57f29b8 basic documentation thermal 2020-01-15 13:52:18 +01:00
muellerr 9ec0b80497 Merge branch 'mueller_framework' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller_framework 2020-01-15 13:32:41 +01:00
muellerr f16cce8be1 Basic doc for thermal modules started 2020-01-15 13:32:21 +01:00
muellerr b0d88129db Pool Raw Access Helper bugfix 
debug output commented
 2020-01-14 01:39:47 +01:00
muellerr c747952336 fixed map full() function added. 
Pool raw access debugging
 2020-01-14 00:49:09 +01:00
muellerr 01551b8fa5 Getter function in SerialBufferAdapter 
For const uint8_t *
 2020-01-13 01:21:53 +01:00
muellerr 1369e792b4 CommandingServiceBase documentation 2020-01-13 00:14:14 +01:00
muellerr d2325e60b6 Import bugfix in MessageQueue.cpp 
lastPartner is only assigned if receiveMessage is successful
 2020-01-12 15:51:59 +01:00
muellerr a8247eb2f0 Some more debugging output switched on 2020-01-12 14:18:12 +01:00
muellerr 0ce67de8c8 Changes to pool access classes 
1. PoolRawAccessHelper is more robust now and has better error handling
2. PoolRawAccess: Removed an unneeded constructor value, moved serialize
further to the top. Added new returnvalues and more precise error
handling for read() call
3. DataSet: Made MAX Number of data pool entries public so it can be
used by pool raw access error handling
 2020-01-10 00:57:09 +01:00
muellerr 59b25bee86 pool raw helper input buffer type changed to uint32_t 2020-01-09 19:04:33 +01:00
muellerr 0ddc44062d Merge branch 'mueller_framework' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller_framework 2020-01-09 12:50:00 +01:00
muellerr 2ec486a880 max number of stored packets lowered 2020-01-05 18:20:57 +01:00
muellerr 827f185e20 Some bugfixes(?) for PusServiceBase. 
Getter Function for Serial Buffer Adapter.
 2020-01-04 16:37:08 +01:00
muellerr a7450144de doxygen group definitions moved to framework 2020-01-03 15:39:32 +01:00
muellerr 0a57103339 Merge branch 'mueller_framework' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller_framework 2020-01-02 21:12:42 +01:00
muellerr f6e88e83db debug output change 2020-01-02 21:12:21 +01:00
muellerr e2f07cbcd1 connect and disconnect functions public 2020-01-02 14:01:21 +01:00
muellerr 831a01e79e recvBuffer and recvSize initialized 2020-01-01 17:31:17 +01:00
muellerr c73cb90c36 receiveTc function adapted 2020-01-01 16:54:05 +01:00
muellerr a762c159fe pool raw access helper info output commented out 2019-12-30 01:13:33 +01:00
muellerr 2425685e44 Pool Raw Access Helper serialization of vectors implemented 2019-12-29 01:59:02 +01:00
muellerr 666341d03d new bool datatype for possible pool entries 2019-12-27 22:43:09 +01:00
muellerr 79e7fee807 comment deleted 2019-12-26 22:15:19 +01:00
muellerr a38a2f4b3a tmtc bridge bugfix: tm data deleted when overwriting old data 2019-12-26 22:07:17 +01:00
muellerr 33a7c033a2 doc extended, instructions for sendTm and receiveTc 2019-12-26 20:38:15 +01:00
muellerr 19e257a90a tmtc bridge debug output corrected 2019-12-26 20:35:11 +01:00
muellerr 8397f5b2b1 tmtc bridge bugfix 2019-12-26 20:17:21 +01:00
muellerr 0066a6b788 Generic TMTC Bridge added 2019-12-26 19:47:46 +01:00
muellerr 29b4480fc4 include adapted 2019-12-26 18:55:31 +01:00
muellerr e24f9b89e4 Pool Raw Access Helper tested, appesrs to work. SerializeAdapter doc 
changes, tm packet stored debug output if not enough
storage available
 2019-12-26 16:44:50 +01:00
muellerr 1f1831c4a1 pool raw access init 2019-12-24 22:15:39 +01:00
muellerr f6b9b23287 pool raw access init 2019-12-24 01:41:04 +01:00
muellerr 89f490ac36 assembly constructor formatting 2019-12-20 23:09:35 +01:00
Maximilian Luz d17146d847 Check object existence before adding it to the PST 
Currently, adding new objects/components to the FixedSlotSequence PST is
not being checked, meaning that it is possible to add NULL objects here
without any warning. This causes NULL-pointer errors when non-existent
components are added, which can be hard to debug.

To solve this, add a check for the object existence before adding it to
PST and emit an error message.

Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
 2019-12-20 18:10:39 +01:00
muellerr fa6cbe7e0c pool raw access changed reverted 2019-12-11 23:18:28 +01:00
muellerr 625f3dc79c local pool modify data doc modifided 2019-12-11 23:15:34 +01:00
muellerr 9382eb03e6 function to serialize pool ID buffers into dataset created 2019-12-11 22:50:08 +01:00
muellerr 29a15e8154 commented out functions which will propably not 
be needed and removed
 2019-12-11 13:03:51 +01:00
muellerr 138cac98d1 experimenting with recursive constructor and dataset call 2019-12-11 01:57:36 +01:00
muellerr f7d8f0c161 Reverted changed pool raw access commit 2019-12-10 23:26:48 +01:00
muellerr 6abb3cc525 Merge remote-tracking branch 'origin/feature_EndianSwapper_UINT32_BUFFER_PoolRawAccess_Modification_For_Vectors' into mueller_framework 2019-12-10 14:54:32 +01:00
muellerr f33949ba4b doc adapted, merging 2019-12-10 14:54:17 +01:00
muellerr 356d1d35dc experimenting with recursive constructor to enable 
automatic vector registering
 2019-12-10 13:29:16 +01:00
muellerr e765f8c99b pool raw access modified so vectors are properly serialized now 
Endian swapper can swap the entries of a uint16,uint32 buffers now.
Some documentation for functions added. setter function for serial buffer
adapter written but does not appear to compile, commented out
 2019-12-09 12:27:14 +01:00
muellerr 8168885dd9 Serialization documentation update 2019-12-08 22:57:03 +01:00
muellerr 3159ccbc40 fixed map and local pool doc 2019-12-08 22:26:42 +01:00
muellerr d99ed47150 fixed map bugfix (fist instead of first), new access functions for fixed maP 
(first(), second()), some documentation, raw pool access read() call public
because call is necessary before using public serialize function.
maybe integrate read() call into serialize function?
 2019-12-08 19:04:53 +01:00
muellerr 950a48078c some documentation, question about HasParametersIF, 
variable in ParameterHelper intialized (compiler warning)
 2019-12-05 12:21:06 +01:00
muellerr 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
muellerr 37a70df244 SerialBufferAdapter can process uint32_t * buffers now 2019-12-01 17:48:05 +01:00
muellerr 10c24e39a3 new returnvalue for scanForReply to ignore full packet 2019-11-29 19:56:05 +01:00
muellerr 2039aa5665 Service Interface Stream buffer size higher to print long buffers (like nav data) 2019-11-25 00:14:39 +01:00
muellerr 2f14fd5d4d Cant reach mode reason getter function added 2019-11-11 22:45:53 +01:00
muellerr 2b44e1c9c4 CCSDS sscanf function adapted for atmel stdio.c (see comments) 2019-11-10 13:08:02 +01:00
muellerr b8af3b5e3d debugInterface extended 2019-11-09 18:15:45 +01:00
muellerr 537e2ceb18 Getter method for logicalAddress 2019-11-09 13:29:12 +01:00
muellerr ee765eafc7 ioBoardAddress renamed to logicalAddress 2019-11-09 13:17:54 +01:00
muellerr 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
muellerr 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
muellerr af4e9db9e3 Merge branch 'mueller_framework' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller_framework 2019-11-05 19:25:27 +01:00
muellerr b594bc2a97 removed obsolete comment 2019-11-05 19:25:00 +01:00
muellerr 8a93a873a8 Merge branch 'mueller_framework' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller_framework 2019-11-04 11:07:02 +01:00
muellerr e7f7625adf removed wrong include 2019-11-04 11:06:59 +01:00
muellerr 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
muellerr 12f51575eb removed a flag by accident, fixed now 2019-11-04 00:53:05 +01:00
muellerr 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
muellerr 46986f69e4 serialize tools more documentation 2019-11-02 23:30:12 +01:00
muellerr 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
muellerr 16af33a7bb doc for fifo, device com if.. 2019-10-29 19:31:18 +01:00
muellerr 3887cb8ca1 removed wrong include in dhb 2019-10-29 18:22:34 +01:00
muellerr 3f1d68542e Merge branch 'mueller_framework' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller_framework 2019-10-29 18:21:03 +01:00
muellerr e8a16ac59c dummy com if sendMessage data const 2019-10-29 18:21:01 +01:00
muellerr 1ee445ce24 fifo typo 2019-10-29 11:17:07 +01:00
muellerr b51536c772 CSB doc correction 2019-10-28 12:48:41 +01:00
muellerr d79f072851 Additional documentation for DHB and CSB 2019-10-27 13:38:08 +01:00
muellerr 64f84d9d9f doc for dhb, serializeIF and SerializeAdapter 2019-10-27 03:21:38 +01:00
muellerr 8f1517d276 additional comments on endianness (I hope this is correct) 2019-10-25 21:12:11 +02:00
muellerr 1631e739b8 at91sam9g20 uses custom stdio.c, unsigned long cast in sprintf does not seem to work, casting (unsigned int) does, timestamp now visible in debug output 2019-10-23 12:03:32 +02:00
muellerr 07950b0c2b documentation for object manager IF get function 2019-10-23 00:31:45 +02:00
muellerr cd1b26b04c Merge branch 'mueller_framework' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller_framework 2019-10-22 17:15:54 +02:00
muellerr 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
muellerr 4db655e489 task priority order comment 2019-10-22 14:01:17 +02:00
muellerr cbc8012198 ioBoardAddress protected instead of private to allow custom initialize 2019-10-22 00:06:11 +02:00
muellerr 907664cea9 added do performOperation where the comIF functions are called, some comments added in DeviceHandlerIF 2019-10-21 11:38:13 +02:00
muellerr 5e3b7c3625 explanation of cookie purpose added, device handler base indentation 2019-10-18 13:37:09 +02:00
muellerr 743d8abeaf first attempt to document and explain serialization tools for application developers 2019-10-17 00:23:46 +02:00