Skip to content

Commit

Permalink
Fix string initialization when printing base info
Browse files Browse the repository at this point in the history
  • Loading branch information
@MSECode
MSECode committed Jul 4, 2023
1 parent e9f35d1 commit 96100fb
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 38 deletions.
74 changes: 36 additions & 38 deletions src/libraries/icubmod/embObjLib/diagnosticInfoParsers.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,12 @@ void DefaultParser::parseInfo()

}

void DefaultParser::printBaseInfo()
{
char str[512] = {0};
snprintf(str, sizeof(str), "%s", m_dnginfo.baseMessage.c_str());
m_dnginfo.baseInfo.finalMessage.append(str);
}


/**************************************************************************************************************************/
Expand Down Expand Up @@ -206,7 +212,7 @@ void ConfigParser::parseInfo()
);
m_dnginfo.baseInfo.finalMessage.append(str);

for(i=1; i<15; i++)
for(int i=1; i<15; i++)
{
uint64_t val = (invalidmask >> (4*i)) & 0x0f;
if(0 != val)
Expand Down Expand Up @@ -420,10 +426,8 @@ void ConfigParser::parseInfo()
case eoerror_value_CFG_bat_not_verified_yet:
case eoerror_value_CFG_bat_using_onboard_config:
case eoerror_value_CFG_bat_failed_notsupported:
//case eoerror_value_CFG_encoders_ok:
{
snprintf(str, sizeof(str), "%s", m_dnginfo.baseMessage.c_str());
m_dnginfo.baseInfo.finalMessage.append(str);
printBaseInfo();
} break;

// p16&0xf000: number of joint; primary encs: failure mask in p16&0x000f and errorcodes in p64&0x0000ffff; secondary encs: failure mask in p16&0x00f0 and errorcodes in p64&0xffff0000"},
Expand Down Expand Up @@ -659,11 +663,10 @@ void SkinParser::parseInfo()

switch (value)
{
case eoerror_value_SYS_unspecified:
case eoerror_value_SK_unspecified:
case eoerror_value_SK_obsoletecommand:
{
snprintf(str, sizeof(str), "%s", m_dnginfo.baseMessage.c_str());
m_dnginfo.baseInfo.finalMessage.append(str);
printBaseInfo();
} break;

case eoerror_value_SK_arrayofcandataoverflow:
Expand Down Expand Up @@ -752,8 +755,7 @@ void HwErrorParser::parseInfo()
case eoerror_value_HW_encoder_crc:
case eoerror_value_HW_encoder_not_connected:
{
snprintf(str, sizeof(str), " %s", m_dnginfo.baseMessage.c_str());
m_dnginfo.baseInfo.finalMessage.append(str);
printBaseInfo();
} break;


Expand Down Expand Up @@ -1098,23 +1100,23 @@ void SysParser::parseInfo()
case eoerror_value_SYS_canservices_boards_lostcontact: //TODO: DONE (see eomn_servicecategory2string) make a specific message.need some translation from enum to string
case eoerror_value_SYS_canservices_boards_retrievedcontact://TODO: DONE (see eomn_servicecategory2string) make a specific message.need some translation from enum to string
{
eOmn_serv_category_t serv_category = m_dnginfo.param16;
eOmn_serv_category_t serv_category = (eOmn_serv_category_t)m_dnginfo.param16;
uint16_t lostMaskcan2 = (m_dnginfo.param64 & 0x00000000ffff0000) >> 16;
uint16_t lostMaskcan1 = (m_dnginfo.param64 & 0x000000000000ffff);
char lostCanBoards1[64] = {0};
char lostCanBoards2[64] = {0};

for(i=1; i<15; i++)
for(int i=1; i<15; i++)
{
if ( (lostMaskcan1 & (1<<i)) == (1<<i))
{
strcat(lostCanBoards1, std::to_string(i));
strcat(lostCanBoards1, std::to_string(i).c_str());
strcat(lostCanBoards1, " ");
}

if ( (lostMaskcan2 & (1<<i)) == (1<<i))
{
strcat(lostCanBoards2, std::to_string(i));
strcat(lostCanBoards2, std::to_string(i).c_str());
strcat(lostCanBoards2, " ");
}
}
Expand All @@ -1139,7 +1141,7 @@ void SysParser::parseInfo()
*/
case eoerror_value_SYS_canservices_monitor_retrievedcontact: //TODO: make a specific message.need some translation from enum to string
{
eOmn_serv_category_t serv_category = m_dnginfo.baseInfo.sourceCANBoardAddr;
eOmn_serv_category_t serv_category = (eOmn_serv_category_t)m_dnginfo.baseInfo.sourceCANBoardAddr;
snprintf(str, sizeof(str), "%s Type of service category is %s.",
m_dnginfo.baseMessage.c_str(),
eomn_servicecategory2string(serv_category)
Expand All @@ -1149,61 +1151,61 @@ void SysParser::parseInfo()

case eoerror_value_SYS_canservices_monitor_regularcontact: //TODO: make a specific message.need some translation from enum to string
{
eOmn_serv_category_t serv_category = m_dnginfo.baseInfo.sourceCANBoardAddr;
eOmn_serv_category_t serv_category = (eOmn_serv_category_t)m_dnginfo.baseInfo.sourceCANBoardAddr;
uint16_t foundMaskcan2 = (m_dnginfo.param64 & 0x00000000ffff0000) >> 16;
uint16_t foundMaskcan1 = (m_dnginfo.param64 & 0x000000000000ffff);
char foundCanBoards1[64] = {0};
char foundCanBoards2[64] = {0};

for(i=1; i<15; i++)
for(int i=1; i<15; i++)
{
if ( (foundMaskcan1 & (1<<i)) == (1<<i))
{
strcat(foundCanBoards1, std::to_string(i));
strcat(foundCanBoards1, std::to_string(i).c_str());
strcat(foundCanBoards1, " ");
}

if ( (foundMaskcan2 & (1<<i)) == (1<<i))
{
strcat(foundCanBoards2, std::to_string(i));
strcat(foundCanBoards1, std::to_string(i).c_str());
strcat(foundCanBoards2, " ");
}
}

snprintf(str, sizeof(str), "%s Type of service category is %s. CAN boards are on (can1map, can2map) = ([ %s ], [ %s ])",
m_dnginfo.baseMessage.c_str(),
eomn_servicecategory2string(serv_category),
foundMaskcan1,
foundMaskcan2
foundCanBoards1,
foundCanBoards2
);
m_dnginfo.baseInfo.finalMessage.append(str);
} break;

case eoerror_value_SYS_canservices_monitor_lostcontact: //TODO: make a specific message.need some translation from enum to string
{
eOmn_serv_category_t serv_category = m_dnginfo.baseInfo.sourceCANBoardAddr;
eOmn_serv_category_t serv_category = (eOmn_serv_category_t)m_dnginfo.baseInfo.sourceCANBoardAddr;
uint16_t lostMaskcan2 = (m_dnginfo.param64 & 0x00000000ffff0000) >> 16;
uint16_t lostMaskcan1 = (m_dnginfo.param64 & 0x000000000000ffff);
uint64_t timeLastContact = (m_dnginfo.param64 & 0xffff000000000000) >> 48;
char lostCanBoards1[64] = {0};
char lostCanBoards2[64] = {0};

for(i=1; i<15; i++)
for(int i=1; i<15; i++)
{
if ( (lostMaskcan1 & (1<<i)) == (1<<i))
{
strcat(lostCanBoards1, std::to_string(i));
strcat(lostCanBoards1, std::to_string(i).c_str());
strcat(lostCanBoards1, " ");
}

if ( (lostMaskcan2 & (1<<i)) == (1<<i))
{
strcat(lostCanBoards2, std::to_string(i));
strcat(lostCanBoards2, std::to_string(i).c_str());
strcat(lostCanBoards2, " ");
}
}

snprintf(str, sizeof(str), "%s Type of service category is %s. Lost CAN boards are on (can1map, can2map) = ([ %s ], [ %s ]). Time since last contact: %d [ms]",
snprintf(str, sizeof(str), "%s Type of service category is %s. Lost CAN boards are on (can1map, can2map) = ([ %s ], [ %s ]). Time since last contact: %ld [ms]",
m_dnginfo.baseMessage.c_str(),
eomn_servicecategory2string(serv_category),
lostCanBoards1,
Expand All @@ -1215,30 +1217,30 @@ void SysParser::parseInfo()

case eoerror_value_SYS_canservices_monitor_stillnocontact://TODO: make a specific message.need some translation from enum to string
{
eOmn_serv_category_t serv_category = m_dnginfo.baseInfo.sourceCANBoardAddr;
eOmn_serv_category_t serv_category = (eOmn_serv_category_t)m_dnginfo.baseInfo.sourceCANBoardAddr;
uint16_t lostMaskcan2 = (m_dnginfo.param64 & 0x00000000ffff0000) >> 16;
uint16_t lostMaskcan1 = (m_dnginfo.param64 & 0x000000000000ffff);
uint64_t totDisappTime = (m_dnginfo.param64 & 0xffff000000000000) >> 48;

char lostCanBoards1[64] = {0};
char lostCanBoards2[64] = {0};

for(i=1; i<15; i++)
for(int i=1; i<15; i++)
{
if ( (lostMaskcan1 & (1<<i)) == (1<<i))
{
strcat(lostCanBoards1, std::to_string(i));
strcat(lostCanBoards1, std::to_string(i).c_str());
strcat(lostCanBoards1, " ");
}

if ( (lostMaskcan2 & (1<<i)) == (1<<i))
{
strcat(lostCanBoards2, std::to_string(i));
strcat(lostCanBoards2, std::to_string(i).c_str());
strcat(lostCanBoards2, " ");
}
}

snprintf(str, sizeof(str), "%s Type of service category is %s. Lost CAN boards are on (can1map, can2map) = ([ %s ] , [ %s ]). Total disappearance time: %d [ms]",
snprintf(str, sizeof(str), "%s Type of service category is %s. Lost CAN boards are on (can1map, can2map) = ([ %s ] , [ %s ]). Total disappearance time: %ld [ms]",
m_dnginfo.baseMessage.c_str(),
eomn_servicecategory2string(serv_category),
lostCanBoards1,
Expand Down Expand Up @@ -1273,8 +1275,7 @@ void SysParser::parseInfo()
case eoerror_value_SYS_canservices_boards_found:
case eoerror_value_SYS_transceiver_rxinvalidframe_error:
{
snprintf(str, sizeof(str), " %s", m_dnginfo.baseMessage.c_str());
m_dnginfo.baseInfo.finalMessage.append(str);
printBaseInfo();
} break;


Expand Down Expand Up @@ -1357,8 +1358,7 @@ void EthMonitorParser::parseInfo()
case eoerror_value_ETHMON_juststarted:
case eoerror_value_ETHMON_justverified:
{
snprintf(str, sizeof(str), " %s", m_dnginfo.baseMessage.c_str());
m_dnginfo.baseInfo.finalMessage.append(str);
printBaseInfo();
} break;


Expand Down Expand Up @@ -1409,8 +1409,7 @@ void InertialSensorParser::parseInfo()

case eoerror_value_IS_unknownsensor:
{
snprintf(str, sizeof(str), " %s", m_dnginfo.baseMessage.c_str());
m_dnginfo.baseInfo.finalMessage.append(str);
printBaseInfo();
} break;


Expand Down Expand Up @@ -1459,8 +1458,7 @@ void AnalogSensorParser::parseInfo()

case eoerror_value_AS_unknownsensor:
{
snprintf(str, sizeof(str), " %s", m_dnginfo.baseMessage.c_str());
m_dnginfo.baseInfo.finalMessage.append(str);
printBaseInfo();
} break;


Expand Down
2 changes: 2 additions & 0 deletions src/libraries/icubmod/embObjLib/diagnosticLowLevelFormatter_hid.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@ class Diagnostic::LowLevel::DefaultParser
protected:
Diagnostic::LowLevel::AuxEmbeddedInfo &m_dnginfo;
Diagnostic::LowLevel::EntityNameProvider &m_entityNameProvider;

void printBaseInfo();
};

class Diagnostic::LowLevel::ConfigParser : public Diagnostic::LowLevel::DefaultParser
Expand Down

0 comments on commit 96100fb

Please sign in to comment.