|
@@ -77,24 +77,7 @@ int RecipeContext::Moniter()
|
|
|
}
|
|
|
if (recipeExecuteStatus == recipeExecuteStatusValue::ExecStep)
|
|
|
{
|
|
|
- char jumpRecipeCmd[32];
|
|
|
- sprintf(jumpRecipeCmd, "%s.Recipe.Command", MODULE_NAME);
|
|
|
- SC->setStringValue(jumpRecipeCmd, "");
|
|
|
- OperatorStatus& status = OP->monitor();
|
|
|
- if (status == OperatorStatusEnum::SUCCESS) {
|
|
|
- if (status.trigger()) {
|
|
|
- status.clearTrigger();
|
|
|
- //TODO:这里是第一次所有命令都检查通过(或alarm condition设置了跳转),但仍需根据step time和jumpRecipeCmd 继续判断处理
|
|
|
- }
|
|
|
- //TODO:这里是第n次所有命令都检查通过(或alarm condition设置了跳转),但仍需根据step time和jumpRecipeCmd继续判断处理
|
|
|
- }
|
|
|
- else if (status == OperatorStatusEnum::ALARM) {
|
|
|
- //TODO:这里发生了ALARM,且alarm condition处理未能挽回
|
|
|
|
|
|
- }
|
|
|
- else {
|
|
|
- //TODO:命令执行过程中
|
|
|
- }
|
|
|
}
|
|
|
|
|
|
|
|
@@ -1277,7 +1260,24 @@ void RecipeContext::executeNextStep()
|
|
|
recipeExecuteStatus = recipeExecuteStatusValue::ExecStep;
|
|
|
//数据上报,本步开始
|
|
|
|
|
|
-
|
|
|
+ char jumpRecipeCmd[32];
|
|
|
+ sprintf(jumpRecipeCmd, "%s.Recipe.Command", MODULE_NAME);
|
|
|
+ SC->setStringValue(jumpRecipeCmd, "");
|
|
|
+ OperatorStatus& status = OP->monitor();
|
|
|
+ if (status == OperatorStatusEnum::SUCCESS) {
|
|
|
+ if (status.trigger()) {
|
|
|
+ status.clearTrigger();
|
|
|
+ //TODO:这里是第一次所有命令都检查通过(或alarm condition设置了跳转),但仍需根据step time和jumpRecipeCmd 继续判断处理
|
|
|
+ }
|
|
|
+ //TODO:这里是第n次所有命令都检查通过(或alarm condition设置了跳转),但仍需根据step time和jumpRecipeCmd继续判断处理
|
|
|
+ }
|
|
|
+ else if (status == OperatorStatusEnum::ALARM) {
|
|
|
+ //TODO:这里发生了ALARM,且alarm condition处理未能挽回
|
|
|
+ ReportAlarm();
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ //TODO:命令执行过程中
|
|
|
+ }
|
|
|
|
|
|
|
|
|
// 4.刷新计时upateTime(TRUE)
|