Commit 5cbcdcd7 authored by Claes Sjofors's avatar Claes Sjofors

Spelling fix for suppresssup

parent d28b2480
...@@ -197,27 +197,27 @@ ...@@ -197,27 +197,27 @@
} }
/*_* /*_*
SUPRESSSUP SUPPRESSSUP
@aref supresssup SupressSup @aref suppresssup SuppressSup
*/ */
#define SupressSup_exec(obj,sup,cid,in)\ #define SuppressSup_exec(obj,sup,cid,in)\
switch ( cid) { \ switch ( cid) { \
case pwr_cClass_DSup: \ case pwr_cClass_DSup: \
((pwr_sClass_DSup *)sup)->Supressed = in; \ ((pwr_sClass_DSup *)sup)->Suppressed = in; \
obj->Out = in || ((pwr_sClass_DSup *)sup)->Action; \ obj->Out = in || ((pwr_sClass_DSup *)sup)->Action; \
break; \ break; \
case pwr_cClass_DSupComp: \ case pwr_cClass_DSupComp: \
((pwr_sClass_DSupComp *)sup)->Supressed = in; \ ((pwr_sClass_DSupComp *)sup)->Suppressed = in; \
obj->Out = in || ((pwr_sClass_DSupComp *)sup)->Action; \ obj->Out = in || ((pwr_sClass_DSupComp *)sup)->Action; \
break; \ break; \
case pwr_cClass_ASup: \ case pwr_cClass_ASup: \
((pwr_sClass_ASup *)sup)->Supressed = in; \ ((pwr_sClass_ASup *)sup)->Suppressed = in; \
obj->Out = in || ((pwr_sClass_ASup *)sup)->Action; \ obj->Out = in || ((pwr_sClass_ASup *)sup)->Action; \
break; \ break; \
case pwr_cClass_ASupComp: \ case pwr_cClass_ASupComp: \
((pwr_sClass_ASupComp *)sup)->Supressed = in; \ ((pwr_sClass_ASupComp *)sup)->Suppressed = in; \
obj->Out = in || ((pwr_sClass_ASupComp *)sup)->Action; \ obj->Out = in || ((pwr_sClass_ASupComp *)sup)->Action; \
break; \ break; \
default: ; \ default: ; \
} \ } \
obj->Supressed = in; obj->Suppressed = in;
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
((o->High && In > o->CtrlLimit) || \ ((o->High && In > o->CtrlLimit) || \
(!o->High && In < o->CtrlLimit))) { \ (!o->High && In < o->CtrlLimit))) { \
if (!o->Action) o->Action = TRUE; \ if (!o->Action) o->Action = TRUE; \
if (o->Supressed) { \ if (o->Suppressed) { \
if (o->ReturnCheck) { \ if (o->ReturnCheck) { \
time_GetTime( &o->ReturnTime); \ time_GetTime( &o->ReturnTime); \
o->ReturnCheck = FALSE; \ o->ReturnCheck = FALSE; \
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
else if (o->DetectSend) \ else if (o->DetectSend) \
o->DetectSend = FALSE; \ o->DetectSend = FALSE; \
} \ } \
if (o->AlarmCheck && o->DetectOn && !o->Blocked && !o->Supressed) { \ if (o->AlarmCheck && o->DetectOn && !o->Blocked && !o->Suppressed) { \
if (o->DetectCheck) { \ if (o->DetectCheck) { \
o->ActualValue = In; \ o->ActualValue = In; \
timer2_in(tp, o); \ timer2_in(tp, o); \
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
} \ } \
} \ } \
} \ } \
if (o->Blocked || o->Supressed) { \ if (o->Blocked || o->Suppressed) { \
o->TimerCount = 0; \ o->TimerCount = 0; \
o->DetectCheck = TRUE; \ o->DetectCheck = TRUE; \
} }
...@@ -173,7 +173,7 @@ ...@@ -173,7 +173,7 @@
} \ } \
} else if (con) { \ } else if (con) { \
if (!o->Action) o->Action = TRUE; \ if (!o->Action) o->Action = TRUE; \
if (o->Supressed) { \ if (o->Suppressed) { \
if (o->ReturnCheck) { \ if (o->ReturnCheck) { \
time_GetTime( &o->ReturnTime); \ time_GetTime( &o->ReturnTime); \
o->ReturnCheck = FALSE; \ o->ReturnCheck = FALSE; \
...@@ -182,7 +182,7 @@ ...@@ -182,7 +182,7 @@
else if (o->DetectSend) \ else if (o->DetectSend) \
o->DetectSend = FALSE; \ o->DetectSend = FALSE; \
} \ } \
if (o->AlarmCheck && o->DetectOn && !o->Blocked && !o->Supressed) { \ if (o->AlarmCheck && o->DetectOn && !o->Blocked && !o->Suppressed) { \
if (o->DetectCheck) { \ if (o->DetectCheck) { \
o->ActualValue = In; \ o->ActualValue = In; \
timer2_in(tp, o); \ timer2_in(tp, o); \
...@@ -197,7 +197,7 @@ ...@@ -197,7 +197,7 @@
} \ } \
} \ } \
} \ } \
if (o->Blocked || o->Supressed) { \ if (o->Blocked || o->Suppressed) { \
o->TimerCount = 0; \ o->TimerCount = 0; \
o->DetectCheck = TRUE; \ o->DetectCheck = TRUE; \
} }
...@@ -242,7 +242,7 @@ ...@@ -242,7 +242,7 @@
}\ }\
} else if (con) {\ } else if (con) {\
if (!co->Action) co->Action = TRUE;\ if (!co->Action) co->Action = TRUE;\
if (co->Supressed) {\ if (co->Suppressed) {\
if (co->ReturnCheck) {\ if (co->ReturnCheck) {\
time_GetTime( &co->ReturnTime);\ time_GetTime( &co->ReturnTime);\
co->ReturnCheck = FALSE;\ co->ReturnCheck = FALSE;\
...@@ -251,7 +251,7 @@ ...@@ -251,7 +251,7 @@
else if (co->DetectSend)\ else if (co->DetectSend)\
co->DetectSend = FALSE;\ co->DetectSend = FALSE;\
}\ }\
if (co->AlarmCheck && co->DetectOn && !co->Blocked && !co->Supressed) {\ if (co->AlarmCheck && co->DetectOn && !co->Blocked && !co->Suppressed) {\
if (co->DetectCheck) {\ if (co->DetectCheck) {\
co->ActualValue = In;\ co->ActualValue = In;\
timer2_in(tp, co);\ timer2_in(tp, co);\
...@@ -266,7 +266,7 @@ ...@@ -266,7 +266,7 @@
}\ }\
}\ }\
}\ }\
if (co->Blocked || co->Supressed) {\ if (co->Blocked || co->Suppressed) {\
co->TimerCount = 0;\ co->TimerCount = 0;\
co->DetectCheck = TRUE;\ co->DetectCheck = TRUE;\
}\ }\
...@@ -319,7 +319,7 @@ ...@@ -319,7 +319,7 @@
((co->High && In > co->CtrlLimit) ||\ ((co->High && In > co->CtrlLimit) ||\
(!co->High && In < co->CtrlLimit))) {\ (!co->High && In < co->CtrlLimit))) {\
if (!co->Action) co->Action = TRUE;\ if (!co->Action) co->Action = TRUE;\
if (co->Supressed) {\ if (co->Suppressed) {\
if (co->ReturnCheck) {\ if (co->ReturnCheck) {\
time_GetTime( &co->ReturnTime);\ time_GetTime( &co->ReturnTime);\
co->ReturnCheck = FALSE;\ co->ReturnCheck = FALSE;\
...@@ -328,7 +328,7 @@ ...@@ -328,7 +328,7 @@
else if (co->DetectSend)\ else if (co->DetectSend)\
co->DetectSend = FALSE;\ co->DetectSend = FALSE;\
}\ }\
if (co->AlarmCheck && co->DetectOn && !co->Blocked && !co->Supressed) {\ if (co->AlarmCheck && co->DetectOn && !co->Blocked && !co->Suppressed) {\
if (co->DetectCheck) {\ if (co->DetectCheck) {\
co->ActualValue = In;\ co->ActualValue = In;\
timer2_in(tp, co);\ timer2_in(tp, co);\
...@@ -343,7 +343,7 @@ ...@@ -343,7 +343,7 @@
}\ }\
}\ }\
}\ }\
if (co->Blocked || co->Supressed) {\ if (co->Blocked || co->Suppressed) {\
co->TimerCount = 0;\ co->TimerCount = 0;\
co->DetectCheck = TRUE;\ co->DetectCheck = TRUE;\
}\ }\
......
...@@ -590,9 +590,9 @@ SObject pwrb:Class ...@@ -590,9 +590,9 @@ SObject pwrb:Class
EndBody EndBody
EndObject EndObject
!/** !/**
! Used by the SupressSup object to supress the alarm. ! Used by the SuppressSup object to suppress the alarm.
!*/ !*/
Object Supressed $Attribute 42 Object Suppressed $Attribute 42
Body SysBody Body SysBody
Attr Flags |= PWR_MASK_STATE Attr Flags |= PWR_MASK_STATE
Attr Flags |= PWR_MASK_NOEDIT Attr Flags |= PWR_MASK_NOEDIT
......
...@@ -572,9 +572,9 @@ SObject pwrb:Class ...@@ -572,9 +572,9 @@ SObject pwrb:Class
EndBody EndBody
EndObject EndObject
!/** !/**
! Used by the SupressSup object to supress the alarm. ! Used by the SuppressSup object to suppress the alarm.
!*/ !*/
Object Supressed $Attribute 44 Object Suppressed $Attribute 44
Body SysBody Body SysBody
Attr Flags |= PWR_MASK_STATE Attr Flags |= PWR_MASK_STATE
Attr Flags |= PWR_MASK_NOEDIT Attr Flags |= PWR_MASK_NOEDIT
......
...@@ -554,9 +554,9 @@ SObject pwrb:Class ...@@ -554,9 +554,9 @@ SObject pwrb:Class
EndBody EndBody
EndObject EndObject
!/** !/**
! Used by the SupressSup object to supress the alarm. ! Used by the SuppressSup object to suppress the alarm.
!*/ !*/
Object Supressed $Attribute 39 Object Suppressed $Attribute 39
Body SysBody Body SysBody
Attr Flags |= PWR_MASK_STATE Attr Flags |= PWR_MASK_STATE
Attr Flags |= PWR_MASK_NOEDIT Attr Flags |= PWR_MASK_NOEDIT
......
...@@ -537,9 +537,9 @@ SObject pwrb:Class ...@@ -537,9 +537,9 @@ SObject pwrb:Class
EndBody EndBody
EndObject EndObject
!/** !/**
! Used by the SupressSup object to supress the alarm. ! Used by the SuppressSup object to suppress the alarm.
!*/ !*/
Object Supressed $Attribute 41 Object Suppressed $Attribute 41
Body SysBody Body SysBody
Attr Flags |= PWR_MASK_STATE Attr Flags |= PWR_MASK_STATE
Attr Flags |= PWR_MASK_NOEDIT Attr Flags |= PWR_MASK_NOEDIT
......
...@@ -33,29 +33,29 @@ ...@@ -33,29 +33,29 @@
! combined work), being distributed under the terms of the GNU ! combined work), being distributed under the terms of the GNU
! General Public License plus this exception. ! General Public License plus this exception.
! !
! pwrb_c_supresssup.wb_load -- Defines the class SupressSup. ! pwrb_c_suppresssup.wb_load -- Defines the class SuppressSup.
! !
SObject pwrb:Class SObject pwrb:Class
!/** !/**
! @Version 1.0 ! @Version 1.0
! @Code rt_plc_macro_io.h ! @Code rt_plc_macro_io.h
! @Summary Object to suppress alarms. ! @Summary Object to suppress alarms.
! Object to supress alarm. ! Object to suppress alarm.
! @image orm_supresssup_fo.gif ! @image orm_suppresssup_fo.gif
! !
!*/ !*/
Object SupressSup $ClassDef 690 Object SuppressSup $ClassDef 690
Body SysBody Body SysBody
Attr Editor = pwr_eEditor_AttrEd Attr Editor = pwr_eEditor_AttrEd
Attr Method = pwr_eMethod_RtConnectionsAndDevBodies Attr Method = pwr_eMethod_RtConnectionsAndDevBodies
EndBody EndBody
Object RtBody $ObjBodyDef 1 Object RtBody $ObjBodyDef 1
Body SysBody Body SysBody
Attr StructName = "SupressSup" Attr StructName = "SuppressSup"
EndBody EndBody
!/** !/**
! Digital input to supress the alarm. ! Digital input to suppress the alarm.
! When In is high, the alarm is supressed. ! When In is high, the alarm is suppressed.
!*/ !*/
Object In $Input 1 Object In $Input 1
Body SysBody Body SysBody
...@@ -69,16 +69,16 @@ SObject pwrb:Class ...@@ -69,16 +69,16 @@ SObject pwrb:Class
EndBody EndBody
EndObject EndObject
!/** !/**
! Indicating that alarm is supressed. ! Indicating that alarm is suppressed.
!*/ !*/
Object Supressed $Intern 2 Object Suppressed $Intern 2
Body SysBody Body SysBody
Attr PgmName = "Supressed" Attr PgmName = "Suppressed"
Attr TypeRef = "pwrs:Type-$Boolean" Attr TypeRef = "pwrs:Type-$Boolean"
EndBody EndBody
EndObject EndObject
!/** !/**
! Output indicating that alarm is supressed or the associated ! Output indicating that alarm is suppressed or the associated
! alarm is active. ! alarm is active.
!*/ !*/
Object Out $Output 3 Object Out $Output 3
...@@ -140,12 +140,12 @@ SObject pwrb:Class ...@@ -140,12 +140,12 @@ SObject pwrb:Class
Attr traceindex = 1 Attr traceindex = 1
Attr connectmethod = 36 Attr connectmethod = 36
Attr executeordermethod = 6 Attr executeordermethod = 6
Attr objname = "SupressSup" Attr objname = "SuppressSup"
Attr graphname = "SupressSup" Attr graphname = "SuppressSup"
Attr debugpar = "Supressed" Attr debugpar = "Suppressed"
EndBody EndBody
EndObject EndObject
Object Template SupressSup Object Template SuppressSup
Body RtBody Body RtBody
EndBody EndBody
Body DevBody Body DevBody
......
...@@ -879,7 +879,7 @@ palette PlcEditorPalette ...@@ -879,7 +879,7 @@ palette PlcEditorPalette
class PulseTrain class PulseTrain
class SR_R class SR_R
class SR_S class SR_S
class SupressSup class SuppressSup
class Timer class Timer
class True class True
class Wait class Wait
......
...@@ -3166,8 +3166,8 @@ int gobj_get_object_m35( WFoe *foe, vldh_t_node node, unsigned long index) ...@@ -3166,8 +3166,8 @@ int gobj_get_object_m35( WFoe *foe, vldh_t_node node, unsigned long index)
} }
// //
// Method for SupressSup. Inserts the selected Sup-object in the // Method for SuppressSup. Inserts the selected Sup-object in the
// navigator in the parameter SupObject in a SupressSup object. // navigator in the parameter SupObject in a SuppressSup object.
// //
int gobj_get_object_m36( WFoe *foe, vldh_t_node node, unsigned long index) int gobj_get_object_m36( WFoe *foe, vldh_t_node node, unsigned long index)
{ {
...@@ -3332,7 +3332,7 @@ int gobj_expand( WFoe *foe, ...@@ -3332,7 +3332,7 @@ int gobj_expand( WFoe *foe,
case pwr_cClass_GetBoInt32: case pwr_cClass_GetBoInt32:
case pwr_cClass_GetBoFloat32: case pwr_cClass_GetBoFloat32:
case pwr_cClass_GetBoString80: case pwr_cClass_GetBoString80:
case pwr_cClass_SupressSup: case pwr_cClass_SuppressSup:
sts = gobj_expand_m1( foe, node, compress); sts = gobj_expand_m1( foe, node, compress);
break; break;
case pwr_cClass_and: case pwr_cClass_and:
......
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