KSat/fsfw
15
4
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests 1 Releases Wiki Activity

new returnvalue for scanForReply to ignore full packet

Browse Source
This commit is contained in:
Robin Müller 2019-11-29 19:56:05 +01:00
parent 2039aa5665
commit 10c24e39a3
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devicehandlers/DeviceCommunicationIF.h
View File

@ -62,7 +62,8 @@ public:
* @param cookie * @param cookie
* @param data * @param data
* @param len * @param len
* @return * @return @c RETURN_OK for successfull send
* Everything else triggers sending failed event with returnvalue as parameter 1
*/ */
virtual ReturnValue_t sendMessage(Cookie *cookie,const uint8_t *data, virtual ReturnValue_t sendMessage(Cookie *cookie,const uint8_t *data,
uint32_t len) = 0; uint32_t len) = 0;
@ -78,7 +79,8 @@ public:
* @param cookie * @param cookie
* @param data * @param data
* @param len * @param len
* @return * @return @c RETURN_OK for successfull receive
* Everything else triggers receiving failed with returnvalue as parameter 1
*/ */
virtual ReturnValue_t readReceivedMessage(Cookie *cookie, uint8_t **buffer, virtual ReturnValue_t readReceivedMessage(Cookie *cookie, uint8_t **buffer,
uint32_t *size) = 0; uint32_t *size) = 0;

2
devicehandlers/DeviceHandlerBase.cpp
View File

@ -537,6 +537,8 @@ void DeviceHandlerBase::doGetRead() {
break; break;
case IGNORE_REPLY_DATA: case IGNORE_REPLY_DATA:
break; break;
case IGNORE_FULL_PACKET:
return;
default: default:
//We need to wait for timeout.. don't know what command failed and who sent it. //We need to wait for timeout.. don't know what command failed and who sent it.
replyRawReplyIfnotWiretapped(receivedData, foundLen); replyRawReplyIfnotWiretapped(receivedData, foundLen);

14
devicehandlers/DeviceHandlerBase.h
View File

@ -153,7 +153,8 @@ protected:
static const ReturnValue_t INVALID_CHANNEL = MAKE_RETURN_CODE(4); static const ReturnValue_t INVALID_CHANNEL = MAKE_RETURN_CODE(4);
static const ReturnValue_t APERIODIC_REPLY = MAKE_RETURN_CODE(5); //!< This is used to specify for replies from a device which are not replies to requests static const ReturnValue_t APERIODIC_REPLY = MAKE_RETURN_CODE(5); //!< This is used to specify for replies from a device which are not replies to requests
static const ReturnValue_t IGNORE_REPLY_DATA = MAKE_RETURN_CODE(6); static const ReturnValue_t IGNORE_REPLY_DATA = MAKE_RETURN_CODE(6); //!< Ignore parts of the received packet
static const ReturnValue_t IGNORE_FULL_PACKET = MAKE_RETURN_CODE(7); //!< Ignore full received packet
// static const ReturnValue_t ONE_SWITCH = MAKE_RETURN_CODE(8); // static const ReturnValue_t ONE_SWITCH = MAKE_RETURN_CODE(8);
// static const ReturnValue_t TWO_SWITCHES = MAKE_RETURN_CODE(9); // static const ReturnValue_t TWO_SWITCHES = MAKE_RETURN_CODE(9);
static const ReturnValue_t NO_SWITCH = MAKE_RETURN_CODE(10); static const ReturnValue_t NO_SWITCH = MAKE_RETURN_CODE(10);
@ -607,6 +608,7 @@ protected:
* @return The current delay count. If the command does not exist (should never happen) it returns 0. * @return The current delay count. If the command does not exist (should never happen) it returns 0.
*/ */
uint8_t getReplyDelayCycles(DeviceCommandId_t deviceCommand); uint8_t getReplyDelayCycles(DeviceCommandId_t deviceCommand);
/** /**
* Scans a buffer for a valid reply. * Scans a buffer for a valid reply.
* *
@ -618,15 +620,17 @@ protected:
* Errors should be reported directly, the base class does NOT report any errors based on the return * Errors should be reported directly, the base class does NOT report any errors based on the return
* value of this function. * value of this function.
* *
* @param start start of data * @param start start of remaining buffer to be scanned
* @param len length of data * @param len length of remaining buffer to be scanned
* @param[out] foundId the id of the packet starting at @c start * @param[out] foundId the id of the data found in the buffer.
* @param[out] foundLen length of the packet found * @param[out] foundLen length of the data found. Is to be set in function, buffer is scanned at previous position + foundLen.
* @return * @return
* - @c RETURN_OK a valid packet was found at @c start, @c foundLen is valid * - @c RETURN_OK a valid packet was found at @c start, @c foundLen is valid
* - @c RETURN_FAILED no reply could be found starting at @c start, implies @c foundLen is not valid, base class will call scanForReply() again with ++start * - @c RETURN_FAILED no reply could be found starting at @c start, implies @c foundLen is not valid, base class will call scanForReply() again with ++start
* - @c DeviceHandlerIF::INVALID_DATA a packet was found but it is invalid, eg checksum error, implies @c foundLen is valid, can be used to skip some bytes * - @c DeviceHandlerIF::INVALID_DATA a packet was found but it is invalid, eg checksum error, implies @c foundLen is valid, can be used to skip some bytes
* - @c DeviceHandlerIF::LENGTH_MISSMATCH @c len is invalid * - @c DeviceHandlerIF::LENGTH_MISSMATCH @c len is invalid
* - @c DeviceHandlerIF::IGNORE_REPLY_DATA Ignore this specific part of the packet
* - @c DeviceHandlerIF::IGNORE_FULL_PACKET Ignore the packet
* - @c APERIODIC_REPLY if a valid reply is received that has not been requested by a command, but should be handled anyway (@see also fillCommandAndCookieMap() ) * - @c APERIODIC_REPLY if a valid reply is received that has not been requested by a command, but should be handled anyway (@see also fillCommandAndCookieMap() )
*/ */
virtual ReturnValue_t scanForReply(const uint8_t *start, uint32_t len, virtual ReturnValue_t scanForReply(const uint8_t *start, uint32_t len,