Skip to content

P
proview
Commit 5cbcdcd7 authored by Claes Sjofors's avatar Claes Sjofors
Browse files
Options

Spelling fix for suppresssup

parent d28b2480
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 47 deletions
src/lib/rt/src/rt_plc_macro_logic.h
View file @ 5cbcdcd7
......@@ -197,27 +197,27 @@
}
/*_*
SUPRESSSUP
@aref supresssup SupressSup
SUPPRESSSUP
@aref suppresssup SuppressSup
*/
#define SupressSup_exec(obj,sup,cid,in)\
#define SuppressSup_exec(obj,sup,cid,in)\
switch ( cid) { \
case pwr_cClass_DSup: \
((pwr_sClass_DSup *)sup)->Supressed = in; \
((pwr_sClass_DSup *)sup)->Suppressed = in; \
obj->Out = in || ((pwr_sClass_DSup *)sup)->Action; \
break; \
case pwr_cClass_DSupComp: \
((pwr_sClass_DSupComp *)sup)->Supressed = in; \
((pwr_sClass_DSupComp *)sup)->Suppressed = in; \
obj->Out = in || ((pwr_sClass_DSupComp *)sup)->Action; \
break; \
case pwr_cClass_ASup: \
((pwr_sClass_ASup *)sup)->Supressed = in; \
((pwr_sClass_ASup *)sup)->Suppressed = in; \
obj->Out = in || ((pwr_sClass_ASup *)sup)->Action; \
break; \
case pwr_cClass_ASupComp: \
((pwr_sClass_ASupComp *)sup)->Supressed = in; \
((pwr_sClass_ASupComp *)sup)->Suppressed = in; \
obj->Out = in || ((pwr_sClass_ASupComp *)sup)->Action; \
break; \
default: ; \
} \
obj->Supressed = in;
obj->Suppressed = in;
src/lib/rt/src/rt_plc_macro_sup.h
View file @ 5cbcdcd7
......@@ -104,7 +104,7 @@
((o->High && In > o->CtrlLimit) || \
(!o->High && In < o->CtrlLimit))) { \
if (!o->Action) o->Action = TRUE; \
if (o->Supressed) { \
if (o->Suppressed) { \
if (o->ReturnCheck) { \
time_GetTime( &o->ReturnTime); \
o->ReturnCheck = FALSE; \
......@@ -113,7 +113,7 @@
else if (o->DetectSend) \
o->DetectSend = FALSE; \
} \
if (o->AlarmCheck && o->DetectOn && !o->Blocked && !o->Supressed) { \
if (o->AlarmCheck && o->DetectOn && !o->Blocked && !o->Suppressed) { \
if (o->DetectCheck) { \
o->ActualValue = In; \
timer2_in(tp, o); \
......@@ -128,7 +128,7 @@
} \
} \
} \
if (o->Blocked || o->Supressed) { \
if (o->Blocked || o->Suppressed) { \
o->TimerCount = 0; \
o->DetectCheck = TRUE; \
}
......@@ -173,7 +173,7 @@
} \
} else if (con) { \
if (!o->Action) o->Action = TRUE; \
if (o->Supressed) { \
if (o->Suppressed) { \
if (o->ReturnCheck) { \
time_GetTime( &o->ReturnTime); \
o->ReturnCheck = FALSE; \
......@@ -182,7 +182,7 @@
else if (o->DetectSend) \
o->DetectSend = FALSE; \
} \
if (o->AlarmCheck && o->DetectOn && !o->Blocked && !o->Supressed) { \
if (o->AlarmCheck && o->DetectOn && !o->Blocked && !o->Suppressed) { \
if (o->DetectCheck) { \
o->ActualValue = In; \
timer2_in(tp, o); \
......@@ -197,7 +197,7 @@
} \
} \
} \
if (o->Blocked || o->Supressed) { \
if (o->Blocked || o->Suppressed) { \
o->TimerCount = 0; \
o->DetectCheck = TRUE; \
}
......@@ -242,7 +242,7 @@
}\
} else if (con) {\
if (!co->Action) co->Action = TRUE;\
if (co->Supressed) {\
if (co->Suppressed) {\
if (co->ReturnCheck) {\
time_GetTime( &co->ReturnTime);\
co->ReturnCheck = FALSE;\
......@@ -251,7 +251,7 @@
else if (co->DetectSend)\
co->DetectSend = FALSE;\
}\
if (co->AlarmCheck && co->DetectOn && !co->Blocked && !co->Supressed) {\
if (co->AlarmCheck && co->DetectOn && !co->Blocked && !co->Suppressed) {\
if (co->DetectCheck) {\
co->ActualValue = In;\
timer2_in(tp, co);\
......@@ -266,7 +266,7 @@
}\
}\
}\
if (co->Blocked || co->Supressed) {\
if (co->Blocked || co->Suppressed) {\
co->TimerCount = 0;\
co->DetectCheck = TRUE;\
}\
......@@ -319,7 +319,7 @@
((co->High && In > co->CtrlLimit) ||\
(!co->High && In < co->CtrlLimit))) {\
if (!co->Action) co->Action = TRUE;\
if (co->Supressed) {\
if (co->Suppressed) {\
if (co->ReturnCheck) {\
time_GetTime( &co->ReturnTime);\
co->ReturnCheck = FALSE;\
......@@ -328,7 +328,7 @@
else if (co->DetectSend)\
co->DetectSend = FALSE;\
}\
if (co->AlarmCheck && co->DetectOn && !co->Blocked && !co->Supressed) {\
if (co->AlarmCheck && co->DetectOn && !co->Blocked && !co->Suppressed) {\
if (co->DetectCheck) {\
co->ActualValue = In;\
timer2_in(tp, co);\
......@@ -343,7 +343,7 @@
}\
}\
}\
if (co->Blocked || co->Supressed) {\
if (co->Blocked || co->Suppressed) {\
co->TimerCount = 0;\
co->DetectCheck = TRUE;\
}\
......
src/wbl/pwrb/src/pwrb_c_asup.wb_load
View file @ 5cbcdcd7
......@@ -590,9 +590,9 @@ SObject pwrb:Class
EndBody
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
Attr Flags |= PWR_MASK_STATE
Attr Flags |= PWR_MASK_NOEDIT
......
src/wbl/pwrb/src/pwrb_c_asupcomp.wb_load
View file @ 5cbcdcd7
......@@ -572,9 +572,9 @@ SObject pwrb:Class
EndBody
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
Attr Flags |= PWR_MASK_STATE
Attr Flags |= PWR_MASK_NOEDIT
......
src/wbl/pwrb/src/pwrb_c_dsup.wb_load
View file @ 5cbcdcd7
......@@ -554,9 +554,9 @@ SObject pwrb:Class
EndBody
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
Attr Flags |= PWR_MASK_STATE
Attr Flags |= PWR_MASK_NOEDIT
......
src/wbl/pwrb/src/pwrb_c_dsupcomp.wb_load
View file @ 5cbcdcd7
......@@ -537,9 +537,9 @@ SObject pwrb:Class
EndBody
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
Attr Flags |= PWR_MASK_STATE
Attr Flags |= PWR_MASK_NOEDIT
......
src/wbl/pwrb/src/pwrb_c_supresssup.wb_load → src/wbl/pwrb/src/pwrb_c_suppresssup.wb_load
View file @ 5cbcdcd7
......@@ -33,29 +33,29 @@
! combined work), being distributed under the terms of the GNU
! 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
!/**
! @Version 1.0
! @Code rt_plc_macro_io.h
! @Summary Object to suppress alarms.
! Object to supress alarm.
! @image orm_supresssup_fo.gif
! Object to suppress alarm.
! @image orm_suppresssup_fo.gif
!
!*/
Object SupressSup $ClassDef 690
Object SuppressSup $ClassDef 690
Body SysBody
Attr Editor = pwr_eEditor_AttrEd
Attr Method = pwr_eMethod_RtConnectionsAndDevBodies
EndBody
Object RtBody $ObjBodyDef 1
Body SysBody
Attr StructName = "SupressSup"
Attr StructName = "SuppressSup"
EndBody
!/**
! Digital input to supress the alarm.
! When In is high, the alarm is supressed.
! Digital input to suppress the alarm.
! When In is high, the alarm is suppressed.
!*/
Object In $Input 1
Body SysBody
......@@ -69,16 +69,16 @@ SObject pwrb:Class
EndBody
EndObject
!/**
! Indicating that alarm is supressed.
! Indicating that alarm is suppressed.
!*/
Object Supressed $Intern 2
Object Suppressed $Intern 2
Body SysBody
Attr PgmName = "Supressed"
Attr PgmName = "Suppressed"
Attr TypeRef = "pwrs:Type-$Boolean"
EndBody
EndObject
!/**
! Output indicating that alarm is supressed or the associated
! Output indicating that alarm is suppressed or the associated
! alarm is active.
!*/
Object Out $Output 3
......@@ -140,12 +140,12 @@ SObject pwrb:Class
Attr traceindex = 1
Attr connectmethod = 36
Attr executeordermethod = 6
Attr objname = "SupressSup"
Attr graphname = "SupressSup"
Attr debugpar = "Supressed"
Attr objname = "SuppressSup"
Attr graphname = "SuppressSup"
Attr debugpar = "Suppressed"
EndBody
EndObject
Object Template SupressSup
Object Template SuppressSup
Body RtBody
EndBody
Body DevBody
......
wb/exp/wb/src/pwr_wb_palette.cnf
View file @ 5cbcdcd7
......@@ -879,7 +879,7 @@ palette PlcEditorPalette
class PulseTrain
class SR_R
class SR_S
class SupressSup
class SuppressSup
class Timer
class True
class Wait
......
wb/lib/wb/src/wb_gobj.cpp
View file @ 5cbcdcd7
......@@ -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
// navigator in the parameter SupObject in a SupressSup object.
// Method for SuppressSup. Inserts the selected Sup-object in the
// navigator in the parameter SupObject in a SuppressSup object.
//
int gobj_get_object_m36( WFoe *foe, vldh_t_node node, unsigned long index)
{
......@@ -3332,7 +3332,7 @@ int gobj_expand( WFoe *foe,
case pwr_cClass_GetBoInt32:
case pwr_cClass_GetBoFloat32:
case pwr_cClass_GetBoString80:
case pwr_cClass_SupressSup:
case pwr_cClass_SuppressSup:
sts = gobj_expand_m1( foe, node, compress);
break;
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7