merged develop

This commit is contained in:
Jakob Meier
2021-12-19 12:15:18 +01:00
parent 8694a20c63
commit e3841d180e
15 changed files with 142 additions and 73 deletions

View File

@ -73,10 +73,21 @@ ReturnValue_t StarTrackerHandler::executeAction(ActionId_t actionId, MessageQueu
ReturnValue_t result = RETURN_OK;
if (actionId == StarTracker::STOP_IMAGE_LOADER) {
switch(actionId) {
case(StarTracker::STOP_IMAGE_LOADER): {
strImageLoader->stopProcess();
return EXECUTION_FINISHED;
}
case(StarTracker::SET_JSON_FILE_NAME): {
if (size > MAX_PATH_SIZE) {
return FILE_PATH_TOO_LONG;
}
paramJsonFile = std::string(reinterpret_cast<const char*>(data), size);
return EXECUTION_FINISHED;
}
default:
break;
}
if (imageLoaderExecuting == true) {
return IMAGE_LOADER_EXECUTING;