Commit c5be1e67 authored by Claes's avatar Claes

Merge branch 'master' of 62.20.65.89:/data1/git/pwr

parents 52201f6c f11ac6fe
......@@ -26,7 +26,7 @@
void pnak_init (void) {}
void pnak_term (void) {}
T_PNAK_RESULT pnak_start_profistack (unsigned short a1, const T_PNAK_MODE_ID a2) {return PNAK_OK;}
T_PNAK_RESULT pnak_start_profistack (unsigned short a1, const T_PNAK_MODE_ID a2) {return -9999;}
T_PNAK_RESULT pnak_stop_profistack (unsigned short a1) {return PNAK_OK;}
/*--- General interface functions -------------------------------------------*/
......
......@@ -16,7 +16,11 @@ BEGIN {
else if ( $3 == "BaseFcPPO5FanAggr" || $3 == "BaseFcPPO3FanAggr" ||
$3 == "BaseFcPPO5PumpAggr" || $3 == "BaseFcPPO3PumpAggr" ||
$3 == "BaseFcPPO5MotorAggr" || $3 == "BaseFcPPO3MotorAggr" ||
$3 == "BaseFcPPO5" || $3 == "BaseFcPPO3") {
$3 == "BaseFcPPO5" || $3 == "BaseFcPPO3" ||
$3 == "ABB_ACS800_1" || $3 == "ABB_ACC800" ||
$3 == "ABB_ACS800MotorAggr" || $3 == "ABB_ACS800PumpAggr" ||
$3 == "ABB_ACS800FanAggr" || $3 == "ABB_Converter_ACS800_PPO3" ||
$3 == "ABB_Converter_ACS800_PPO5") {
innumaggr = 1;
inbodyaggr = 0;
}
......@@ -86,8 +90,16 @@ BEGIN {
printf( " %s\n", $0);
}
else {
printf( "%s\n", $0);
}
pos = index($2, "IoConnect");
if ( pos != 0) {
a2 = substr( $4, 0, length($4) - 1);
$4 = a2 ".Io\"";
printf( " %s\n", $0);
}
else {
printf( "%s\n", $0);
}
}
}
else {
printf( "%s\n", $0);
......
......@@ -1551,10 +1551,15 @@ int GeDyn::action( grow_tObject object, glow_tEvent event)
int GeDyn::confirmed_action( grow_tObject object, glow_tEvent event)
{
int sts;
total_action_type = (ge_mActionType) (total_action_type & ~ge_mActionType_Confirm);
for ( GeDynElem *elem = elements; elem; elem = elem->next)
elem->action( object, event);
for ( GeDynElem *elem = elements; elem; elem = elem->next) {
sts = elem->action( object, event);
if ( sts == GE__NO_PROPAGATE || sts == GLOW__TERMINATED)
return sts;
}
total_action_type = (ge_mActionType) (total_action_type | ge_mActionType_Confirm);
return 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment