Update v1.1.0 - MGT - RTD - PUSC #28

Merged
meierj merged 88 commits from mueller/mgt-rtd-pusc into develop 2021-04-25 12:40:38 +02:00
5 changed files with 37 additions and 4 deletions
Showing only changes of commit 4c09e973be - Show all commits

2
etl

@ -1 +1 @@
Subproject commit 1ac3b77ef40aa783024d15185ee8ff41ae04a73e
Subproject commit ae06e6417702b770c49289c9e7162cb3f4a5a217

2
fsfw

@ -1 +1 @@
Subproject commit e994d81e1862fade52b090311b3978fb59061966
Subproject commit 7d0916a44e18c87b00998448333023186b3d85b1

View File

@ -184,6 +184,19 @@ std::string SyrlinksHkHandler::convertIntToHexString(uint16_t intValue) {
return stream.str();
}
uint8_t SyrlinksHkHandler::convertHexStringToUint8(char* twoChars) {
uint8_t value;
std::string hexString(twoChars, 2);
std::stringstream stream;
stream << std::hex << hexString;
stream >> value;
return value;
}
uint16_t convertHexStringToUint16(char* fourChars) {
}
ReturnValue_t SyrlinksHkHandler::parseReplyStatus(const char* status) {
switch (*status) {
case '0':

View File

@ -80,12 +80,32 @@ private:
/**
* @brief This function converts an uint16_t into its hexadecimal string representation.
*
* @param The value to convert.
* @param intValue The value to convert.
*
* @return An std::string object containing the hex representation of intValue.
*/
std::string convertIntToHexString(uint16_t intValue);
/**
* @brief This function converts a hex number represented by to chars to an 8-bit integer.
*
* @param twoChars Pointer to the two characters representing the hex value.
*
* @details E.g. when twoChars points to an array with the two characters "A5" then the function
* will return 0xA5.
* @return The converted integer.
*/
uint8_t convertHexStringToUint8(char* twoChars);
/**
* @brief This function converts a hex number represented by 4 chars to an uint16_t.
*
* @param Pointer to the fourCharacters representing the 16-bit integer.
*
* @return The uint16_t result.
*/
uint16_t convertHexStringToUint16(char* fourChars);
/**
* @brief This function parses the status reply
* @param status Pointer to the status information.

2
tmtc

@ -1 +1 @@
Subproject commit 50c6752b324c080c9adc3f14e2072d575549c90d
Subproject commit 1d5fe4ebc7165c2a4979c5f9be9cfa0324e366fb