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

fix merge conflict

Browse Source
This commit is contained in:
Robin Müller 2022-02-28 15:50:27 +01:00
parent ac036b2a70
commit e05e203c83
No known key found for this signature in database
GPG Key ID: 11D4952C8CCEF814
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/fsfw/rmap/RMAPChannelIF.h
View File

@ -75,21 +75,11 @@ class RMAPChannelIF {
* - @c RETURN_OK * - @c RETURN_OK
* - @c COMMAND_NO_DESCRIPTORS_AVAILABLE no descriptors available for sending * - @c COMMAND_NO_DESCRIPTORS_AVAILABLE no descriptors available for sending
* command; command was not sent * command; command was not sent
<<<<<<< HEAD
* - @c COMMAND_BUFFER_FULL no receiver buffer available for
expected
* len; command was not sent
* - @c COMMAND_TOO_BIG the data that was to be sent was too long for
the
* hw to handle (write command) or the expected len was bigger than maximal expected len (read
* command) command was not sent
=======
* - @c COMMAND_BUFFER_FULL no receiver buffer available for * - @c COMMAND_BUFFER_FULL no receiver buffer available for
* expected len; command was not sent * expected len; command was not sent
* - @c COMMAND_TOO_BIG the data that was to be sent was too * - @c COMMAND_TOO_BIG the data that was to be sent was too
* long for the hw to handle (write command) or the expected len was bigger than maximal expected * long for the hw to handle (write command) or the expected len was bigger than maximal expected
* len (read command) command was not sent * len (read command) command was not sent
>>>>>>> origin/eive/develop
* - @c COMMAND_CHANNEL_DEACTIVATED the channel has no port set * - @c COMMAND_CHANNEL_DEACTIVATED the channel has no port set
* - @c NOT_SUPPORTED if you dont feel like * - @c NOT_SUPPORTED if you dont feel like
* implementing something... * implementing something...
@ -107,14 +97,8 @@ the
* - @c REPLY_NO_REPLY no reply was received * - @c REPLY_NO_REPLY no reply was received
* - @c REPLY_NOT_SENT command was not sent, implies no reply * - @c REPLY_NOT_SENT command was not sent, implies no reply
* - @c REPLY_NOT_YET_SENT command is still waiting to be sent * - @c REPLY_NOT_YET_SENT command is still waiting to be sent
<<<<<<< HEAD
* - @c WRITE_REPLY_INTERFACE_BUSY Interface is busy (transmission
buffer
* still being processed)
=======
* - @c WRITE_REPLY_INTERFACE_BUSY Interface is busy (transmission * - @c WRITE_REPLY_INTERFACE_BUSY Interface is busy (transmission
* buffer still being processed) * buffer still being processed)
>>>>>>> origin/eive/develop
* - @c WRITE_REPLY_TRANSMISSION_ERROR Interface encountered errors during last * - @c WRITE_REPLY_TRANSMISSION_ERROR Interface encountered errors during last
* operation, data could not be processed. (transmission error) * operation, data could not be processed. (transmission error)
* - @c WRITE_REPLY_INVALID_DATA Invalid data (amount / value) * - @c WRITE_REPLY_INVALID_DATA Invalid data (amount / value)