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

Merge remote-tracking branch 'upstream/development' into mueller/update-from-upstream

Browse Source
This commit is contained in:
Robin Müller
2022-08-12 12:21:50 +02:00
parent 904ae2cc0e 43048c852a
commit 8970a7379a
291 changed files with 892 additions and 408 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/fsfw/devicehandlers/DeviceHandlerBase.h
View File

@ -469,12 +469,21 @@ class DeviceHandlerBase : public DeviceHandlerIF,
* @param maxDelayCycles The maximum number of delay cycles the reply waits
* until it times out.
* @param periodic Indicates if the command is periodic (i.e. it is sent
<<<<<<< HEAD
* by the device repeatedly without request) or not. Default is aperiodic (0).
* Please note that periodic replies are disabled by default. You can enable them with
* #updatePeriodicReply
* @param countdown Instead of using maxDelayCycles to timeout a device reply it is also possible
* to provide a pointer to a Countdown object which will signal the timeout
* when expired
=======
* by the device repeatedly without request) or not. Default is aperiodic (0).
* Please note that periodic replies are disabled by default. You can enable them with
* #updatePeriodicReply
* @param countdown Instead of using maxDelayCycles to timeout a device reply it is also possible
* to provide a pointer to a Countdown object which will signal the timeout
* when expired
>>>>>>> upstream/development
* @return - @c RETURN_OK when the command was successfully inserted,
* - @c RETURN_FAILED else.
*/
@ -1274,15 +1283,15 @@ class DeviceHandlerBase : public DeviceHandlerIF,
void doGetRead(void);
/**
* @brief Handles disabling of replies which use a timeout to detect missed replies.
* @brief Resets replies which use a timeout to detect missed replies.
*/
void disableTimeoutControlledReply(DeviceReplyInfo *info);
void resetTimeoutControlledReply(DeviceReplyInfo *info);
/**
* @brief Handles disabling of replies which use a number of maximum delay cycles to detect
* @brief Resets replies which use a number of maximum delay cycles to detect
* missed replies.
*/
void disableDelayCyclesControlledReply(DeviceReplyInfo *info);
void resetDelayCyclesControlledReply(DeviceReplyInfo *info);
/**
* Retrive data from the #IPCStore.