Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions src/ExtractFromXML.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,10 @@ bool extractInterfaceData(const fileDataStr fileData, eventDataStr& eventData)
// open the input file and check if it exists

tinyxml2::XMLElement* element;
findInterfaceType(fileData, eventData, element);
if (!findInterfaceType(fileData, eventData, element)) {
std::cerr << "Failed to find interface type for component '" << eventData.componentName << "' and function '" << eventData.functionName << "' in file '" << fileData.inputFileName << "'."<< std::endl;
return false;
}

// Only populate interfaceData if we have interface fields that need type information
if (!eventData.interfaceRequestFields.empty() || !eventData.interfaceResponseFields.empty() || !eventData.interfaceTopicFields.empty()) {
Expand Down Expand Up @@ -170,11 +173,11 @@ bool findInterfaceType(const fileDataStr fileData, eventDataStr& eventData, tiny
if (!findElementByTagAndAttValue(root, std::string("ros_service_send_request"), std::string("name"), std::string("/" + eventData.componentName + "/" + eventData.functionName), fieldParent))
{
std::cerr << "No ros_service_send_request element found for component '" << eventData.componentName << "' and function '" << eventData.functionName << "' in file '" << fileData.inputFileName << "'."<< std::endl;
// return false;
}
if (fieldParent) {
add_to_log("fieldParent: " + std::string(fieldParent->Name()) + " at line " + std::to_string(__LINE__));
return false;
}
// if (fieldParent) {
// add_to_log("fieldParent: " + std::string(fieldParent->Name()) + " at line " + std::to_string(__LINE__));
// }
if (!getInterfaceFieldsFromFieldTag(fieldParent, eventData.interfaceRequestFields))
{
std::cerr << "Failed to get interface ros_service_send_request fields for component '" << eventData.componentName << "' and function '" << eventData.functionName << "' in file '" << fileData.inputFileName << "'."<< std::endl;
Expand All @@ -187,7 +190,7 @@ bool findInterfaceType(const fileDataStr fileData, eventDataStr& eventData, tiny
if (!findElementByTagAndAttValue(root, std::string("ros_service_handle_response"), std::string("name"), std::string("/" + eventData.componentName + "/" + eventData.functionName), responseParent))
{
std::cerr << "No ros_service_handle_response element found for component '" << eventData.componentName << "' and function '" << eventData.functionName << "' in file '" << fileData.inputFileName << "'."<< std::endl;
// return false;
return false;
}
if(responseParent)
{
Expand Down
1 change: 1 addition & 0 deletions src/Replacer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,7 @@ void handleGenericEvent(const eventDataStr eventData, const savedCodeStr savedCo
//H
replaceAll(interfaceCodeH, "$eventData.interfaceName$", eventData.interfaceName);
replaceAll(interfaceCodeH, "$eventData.functionNameSnakeCase$", eventData.functionNameSnakeCase);
replaceAll(interfaceCodeH, "$eventData.serviceTypeNameSnakeCase$", eventData.serviceTypeNameSnakeCase);
writeAfterCommand(str, "/*INTERFACES_LIST*/", interfaceCodeH);

//CMakeLists.txt
Expand Down
2 changes: 1 addition & 1 deletion template_skill/include/TemplateSkill.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "$className$SM.h"
#include <bt_interfaces_dummy/msg/$skillTypeLC$_response.hpp>/*INTERFACES_LIST*/
/*INTERFACE*/
#include <$eventData.interfaceName$/srv/$eventData.functionNameSnakeCase$.hpp> /*END_INTERFACE*/
#include <$eventData.interfaceName$/srv/$eventData.serviceTypeNameSnakeCase$.hpp> /*END_INTERFACE*/
/*ACTION_INTERFACE*/
#include <$eventData.interfaceName$/action/$eventData.functionNameSnakeCase$.hpp> /*END_ACTION_INTERFACE*/
/*TOPIC_INTERFACE*/
Expand Down