|
@@ -1312,28 +1312,28 @@ void RecipeContext::executeNextStep()
|
|
|
char* cork = CovertIntToChar(currentOtherRecipeKey);
|
|
|
steptimes = (abortStepListMap.get(cork))->get(currentOtherStepNo)->time;
|
|
|
}
|
|
|
- for (int i = 0; i < 200; i++)
|
|
|
- {
|
|
|
- if (retcommand == NULL) break; // 先判断数组指针有效性
|
|
|
- if (retcommand[i].Command[0] == '\0') continue; // 跳过空元素
|
|
|
- if (retcommand[i].Param[0] == '\0') continue; // 跳过空元素
|
|
|
- CommandMapST* rc = retcommand + i;
|
|
|
- //LOG->Log(tlInfo, FLEAVEA"Command = %s,Param = %s", retcommand[i].Command, retcommand[i].Param);
|
|
|
- static char opName[MAX_NAME_LEN];
|
|
|
- opName[0] = '\0';
|
|
|
- if (strcmp(rc->Command, "SetBoatMotion") == 0) {
|
|
|
- //TODO:boat运动,第一个参数拼到命令中
|
|
|
- sprintf(opName, "SetBoatMotion.%s", SC->getBaseName(rc->Param, ';'));
|
|
|
- }
|
|
|
- else {
|
|
|
- strcpy(opName, rc->Command);
|
|
|
- }
|
|
|
- auto retnode = OP->select(opName);
|
|
|
- retnode->setParams(rc->Param);
|
|
|
- retnode->setTimes(TIME_USE_LAST, TIME_USE_LAST, TIME_USE_LAST, steptimes);
|
|
|
- retnode->Do();
|
|
|
+ //for (int i = 0; i < 200; i++)
|
|
|
+ //{
|
|
|
+ // if (retcommand == NULL) break; // 先判断数组指针有效性
|
|
|
+ // if (retcommand[i].Command[0] == '\0') continue; // 跳过空元素
|
|
|
+ // if (retcommand[i].Param[0] == '\0') continue; // 跳过空元素
|
|
|
+ // CommandMapST* rc = retcommand + i;
|
|
|
+ // //LOG->Log(tlInfo, FLEAVEA"Command = %s,Param = %s", retcommand[i].Command, retcommand[i].Param);
|
|
|
+ // static char opName[MAX_NAME_LEN];
|
|
|
+ // opName[0] = '\0';
|
|
|
+ // if (strcmp(rc->Command, "SetBoatMotion") == 0) {
|
|
|
+ // //TODO:boat运动,第一个参数拼到命令中
|
|
|
+ // sprintf(opName, "SetBoatMotion.%s", SC->getBaseName(rc->Param, ';'));
|
|
|
+ // }
|
|
|
+ // else {
|
|
|
+ // strcpy(opName, rc->Command);
|
|
|
+ // }
|
|
|
+ // auto retnode = OP->select(opName);
|
|
|
+ // retnode->setParams(rc->Param);
|
|
|
+ // retnode->setTimes(TIME_USE_LAST, TIME_USE_LAST, TIME_USE_LAST, steptimes);
|
|
|
+ // retnode->Do();
|
|
|
|
|
|
- }
|
|
|
+ //}
|
|
|
|
|
|
// 6.如果step.time == 0,设置recipeExecuteStatus == StepCompleted,返回到1步骤进行循环
|
|
|
|