eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 121 Wiki Activity

fixed merge conflicts

Browse Source
This commit is contained in:
Jakob Meier
2021-02-17 10:33:19 +01:00
parent b48798c5c5 a17b6ffcce
commit 9963d42a3e
9 changed files with 285 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
linux/csp/CspComIF.cpp
View File

@ -192,8 +192,6 @@ ReturnValue_t CspComIF::cspTransfer(uint8_t cspAddress, uint8_t cspPort,
memcpy(replyBuffer, reply->data, reply->length);
expectedSize = expectedSize - reply->length;
bytesRead += reply->length;
sif::debug << "CspComIF::cspTransfer: Received csp packet has data field with length "
<< reply->length << std::endl;
csp_buffer_free(reply);
while (expectedSize > 0) {
reply = csp_read(conn, timeout_ms);
@ -211,13 +209,12 @@ ReturnValue_t CspComIF::cspTransfer(uint8_t cspAddress, uint8_t cspPort,
memcpy(replyBuffer + bytesRead, reply->data, reply->length);
expectedSize = expectedSize - reply->length;
bytesRead += reply->length;
sif::debug << "CspComIF::cspTransfer: Received csp packet has data field with length "
<< reply->length << std::endl;
csp_buffer_free(reply);
}
if(expectedSize != 0){
sif::error << "CspComIF::cspTransfer: Received more bytes than requested" << std::endl;
sif::debug << "CspComIF::cspTransfer: Received bytes: " << bytesRead << std::endl;
csp_close(conn);
return RETURN_FAILED;
}

2
linux/gpio/GpioIF.h
View File

@ -40,7 +40,7 @@ public:
virtual ReturnValue_t pullLow(gpioId_t gpioId) = 0;
/**
* @brief This function requires a child to implement the functionaliy to read the state of
* @brief This function requires a child to implement the functionality to read the state of
* an ouput or input gpio.
*
* @param gpioId A unique number which specifies the GPIO to read.