DSupComp and ASupComp added, all DSup replaced in basecomponents and ABB

inor/wbl/mcomp/src/inor.wb_load

@@ -38,13 +38,45 @@ Volume Inor $ClassVolume 0.0.250.8
           Attr Super.Super.Super.Specification = "Inor Tempsensor VRS"
           Attr Super.Super.Super.DataSheet = "$pwr_lang/dsh/inor_tempsensor_vrs.pdf"
           Attr Super.Super.Value.PresMaxLimit = 1.000000e+02
-          Attr Super.Super.LimitHH.AlarmText = "HighHigh limit exceeded, levelsensor "
+          Attr Super.Super.LimitHH.Alarm.DetectOn = 1
+          Attr Super.Super.LimitHH.Alarm.DetectText = "Temperature HighHigh limit exceeded"
+          Attr Super.Super.LimitHH.Alarm.EventType = 64
+          Attr Super.Super.LimitHH.Alarm.EventPriority = 67
+          Attr Super.Super.LimitHH.Alarm.EventFlags = 7
+          Attr Super.Super.LimitHH.Alarm.MoreText = ""
+          Attr Super.Super.LimitHH.Alarm.Attribute = "BaseComponent:Class-BaseTempSensor-Template"
+          Attr Super.Super.LimitHH.Alarm.CtrlPosition = 1
+          Attr Super.Super.LimitHH.Alarm.LockAttribute = 1
           Attr Super.Super.LimitHH.Limit = 9.500000e+01
-          Attr Super.Super.LimitH.AlarmText = "High limit exceeded, levelsensor "
+          Attr Super.Super.LimitH.Alarm.DetectOn = 1
+          Attr Super.Super.LimitH.Alarm.DetectText = "Temperature High limit exceeded"
+          Attr Super.Super.LimitH.Alarm.EventType = 64
+          Attr Super.Super.LimitH.Alarm.EventPriority = 66
+          Attr Super.Super.LimitH.Alarm.EventFlags = 7
+          Attr Super.Super.LimitH.Alarm.MoreText = ""
+          Attr Super.Super.LimitH.Alarm.Attribute = "BaseComponent:Class-BaseTempSensor-Template"
+          Attr Super.Super.LimitH.Alarm.CtrlPosition = 1
+          Attr Super.Super.LimitH.Alarm.LockAttribute = 1
           Attr Super.Super.LimitH.Limit = 9.000000e+01
-          Attr Super.Super.LimitL.AlarmText = "Beyond Low limit, levelsensor "
+          Attr Super.Super.LimitL.Alarm.DetectOn = 1
+          Attr Super.Super.LimitL.Alarm.DetectText = "Temperature below Low limit"
+          Attr Super.Super.LimitL.Alarm.EventType = 64
+          Attr Super.Super.LimitL.Alarm.EventPriority = 66
+          Attr Super.Super.LimitL.Alarm.EventFlags = 7
+          Attr Super.Super.LimitL.Alarm.MoreText = ""
+          Attr Super.Super.LimitL.Alarm.Attribute = "BaseComponent:Class-BaseTempSensor-Template"
+          Attr Super.Super.LimitL.Alarm.CtrlPosition = 1
+          Attr Super.Super.LimitL.Alarm.LockAttribute = 1
           Attr Super.Super.LimitL.Limit = 1.000000e+01
-          Attr Super.Super.LimitLL.AlarmText = "Beyond LowLow limit, levelsensor "
+          Attr Super.Super.LimitLL.Alarm.DetectOn = 1
+          Attr Super.Super.LimitLL.Alarm.DetectText = "Temperature below LowLow limit"
+          Attr Super.Super.LimitLL.Alarm.EventType = 64
+          Attr Super.Super.LimitLL.Alarm.EventPriority = 67
+          Attr Super.Super.LimitLL.Alarm.EventFlags = 7
+          Attr Super.Super.LimitLL.Alarm.MoreText = ""
+          Attr Super.Super.LimitLL.Alarm.Attribute = "BaseComponent:Class-BaseTempSensor-Template"
+          Attr Super.Super.LimitLL.Alarm.CtrlPosition = 1
+          Attr Super.Super.LimitLL.Alarm.LockAttribute = 1
           Attr Super.Super.LimitLL.Limit = 5.000000e+00
           Attr Super.Super.Trend.Multiple = 1
           Attr Super.Super.Trend.DataName = "Inor:Class-Inor_TempSensor_VRS-Template.Super.Super.Value.ActualValue"

klocknermoeller/wbl/mcomp/src/klocknermoeller.wb_load

@@ -37,7 +37,15 @@ Volume KlocknerMoeller $ClassVolume 0.0.250.6
         Body RtBody
           Attr Super.Super.Specification = "Klockner Moeller type PKZ"
           Attr Super.NotTripped.Description = "CircuitBreaker is tripped"
-          Attr Super.AlarmText = "Circuit breaker tripped"
+          Attr Super.Alarm.DetectOn = 1
+          Attr Super.Alarm.DetectText = "Circuit breaker tripped"
+          Attr Super.Alarm.EventType = 64
+          Attr Super.Alarm.EventPriority = 67
+          Attr Super.Alarm.EventFlags = 7
+          Attr Super.Alarm.MoreText = ""
+          Attr Super.Alarm.Attribute = "KlocknerMoeller:Class-KM_CircuitBreaker_PKZ-Template"
+          Attr Super.Alarm.CtrlPosition = 1
+          Attr Super.Alarm.LockAttribute = 1
           Attr Super.Super.DataSheet = "$pwr_lang/dsh/km_motor_protective_pkz.pdf"
         EndBody
       EndObject
@@ -77,7 +85,15 @@ Volume KlocknerMoeller $ClassVolume 0.0.250.6
           Attr Super.Feedback.Description = "Contactor is energized"
           Attr Super.Order.Description = "Energize contactor"
           Attr Super.FbTimeLimit = 1.000000e+00
-          Attr Super.AlarmText = "Contactor feedback lost "
+          Attr Super.Alarm.DetectOn = 1
+          Attr Super.Alarm.DetectText = "Contactor feedback lost"
+          Attr Super.Alarm.EventType = 64
+          Attr Super.Alarm.EventPriority = 67
+          Attr Super.Alarm.EventFlags = 7
+          Attr Super.Alarm.MoreText = ""
+          Attr Super.Alarm.Attribute = "KlocknerMoeller:Class-KM_Contactor_PKZ-Template"
+          Attr Super.Alarm.CtrlPosition = 1
+          Attr Super.Alarm.LockAttribute = 1
           Attr Super.Super.DataSheet = "$pwr_lang/dsh/km_motor_protective_pkz.pdf"
         EndBody
       EndObject

siemens/wbl/mcomp/src/siemens.wb_load

@@ -6428,11 +6428,51 @@ Volume Siemens $ClassVolume 0.0.250.3
           Attr Super.RefSpeed.PresMaxLimit = 1.000000e+02
           Attr Super.RefSpeed.DefTrend = "Siemens:Class-Sinamics_G120_Tgm1-Template.Super.TrendRefSpeed"
           Attr Super.PowerUpTime = 1.500000e+01
-          Attr Super.AlarmLocalMod = "Frequency converter is in local mode,  "
-          Attr Super.AlarmTripped = "Frequency converter tripped, reset is required"
-          Attr Super.AlarmWarning = "Frequency converter warning"
-          Attr Super.AlarmError = "Frequency converter error"
-          Attr Super.AlarmConnection = "No connection"
+          Attr Super.AlarmLocalMod.DetectOn = 1
+          Attr Super.AlarmLocalMod.DetectText = "Frequency converter is in local mode"
+          Attr Super.AlarmLocalMod.EventType = 64
+          Attr Super.AlarmLocalMod.EventPriority = 66
+          Attr Super.AlarmLocalMod.EventFlags = 7
+          Attr Super.AlarmLocalMod.MoreText = ""
+          Attr Super.AlarmLocalMod.Attribute = "Siemens:Class-Sinamics_G120_Tgm1-Template"
+          Attr Super.AlarmLocalMod.CtrlPosition = 1
+          Attr Super.AlarmLocalMod.LockAttribute = 1
+          Attr Super.AlarmTripped.DetectOn = 1
+          Attr Super.AlarmTripped.DetectText = "Frequency converter tripped, reset is required"
+          Attr Super.AlarmTripped.EventType = 64
+          Attr Super.AlarmTripped.EventPriority = 67
+          Attr Super.AlarmTripped.EventFlags = 7
+          Attr Super.AlarmTripped.MoreText = ""
+          Attr Super.AlarmTripped.Attribute = "Siemens:Class-Sinamics_G120_Tgm1-Template"
+          Attr Super.AlarmTripped.CtrlPosition = 1
+          Attr Super.AlarmTripped.LockAttribute = 1
+          Attr Super.AlarmWarning.DetectOn = 1
+          Attr Super.AlarmWarning.DetectText = "Frequency converter warning"
+          Attr Super.AlarmWarning.EventType = 64
+          Attr Super.AlarmWarning.EventPriority = 66
+          Attr Super.AlarmWarning.EventFlags = 7
+          Attr Super.AlarmWarning.MoreText = ""
+          Attr Super.AlarmWarning.Attribute = "Siemens:Class-Sinamics_G120_Tgm1-Template"
+          Attr Super.AlarmWarning.CtrlPosition = 1
+          Attr Super.AlarmWarning.LockAttribute = 1
+          Attr Super.AlarmError.DetectOn = 1
+          Attr Super.AlarmError.DetectText = "Frequency converter error"
+          Attr Super.AlarmError.EventType = 64
+          Attr Super.AlarmError.EventPriority = 67
+          Attr Super.AlarmError.EventFlags = 7
+          Attr Super.AlarmError.MoreText = ""
+          Attr Super.AlarmError.Attribute = "Siemens:Class-Sinamics_G120_Tgm1-Template"
+          Attr Super.AlarmError.CtrlPosition = 1
+          Attr Super.AlarmError.LockAttribute = 1
+          Attr Super.AlarmConnection.DetectOn = 1
+          Attr Super.AlarmConnection.DetectText = "No connection"
+          Attr Super.AlarmConnection.EventType = 64
+          Attr Super.AlarmConnection.EventPriority = 67
+          Attr Super.AlarmConnection.EventFlags = 7
+          Attr Super.AlarmConnection.MoreText = ""
+          Attr Super.AlarmConnection.Attribute = "Siemens:Class-Sinamics_G120_Tgm1-Template"
+          Attr Super.AlarmConnection.CtrlPosition = 1
+          Attr Super.AlarmConnection.LockAttribute = 1
           Attr Super.DefTrend = "Siemens:Class-Sinamics_G120_Tgm1-Template.Super.PlotGroup"
           Attr Super.TrendActSpeed.Multiple = 1
           Attr Super.TrendActSpeed.DataName = "Siemens:Class-Sinamics_G120_Tgm1-Template.Super.ActSpeed.ActualValue"

src/exp/com/src/os_linux/upgrade.sh

@@ -576,7 +576,7 @@ usage()
 {
   cat << EOF
 
-  upgrade.sh  Upgrade from V4.7.0 to V4.7.1
+  upgrade.sh  Upgrade from V5.0.0 to V5.1.0
 
 
   Pass

src/lib/rt/src/rt_plc_macro_sup.h

@@ -207,6 +207,7 @@
   pwr_sClass_DSupComp *co = (pwr_sClass_DSupComp *)o->PlcConnectP;\
   if ( !co)\
     return;\
+  co->Control = con;\
   if (In != co->CtrlPosition) {\
     if (co->Action) co->Action = FALSE;\
     if (co->ReturnCheck) {\
@@ -269,6 +270,7 @@
   pwr_sClass_ASupComp *co = (pwr_sClass_ASupComp *)o->PlcConnectP;\
   if ( !co)\
     return;\
+  co->Control = con;\
   if ((co->High && In <= co->CtrlLimit - co->Hysteres) ||\
       (!co->High && In >= co->CtrlLimit + co->Hysteres)\
   ) {\

src/wbl/pwrb/src/pwrb_c_asupcompfo.wb_load

@@ -198,6 +198,7 @@ SObject pwrb:Class
     EndObject
     Object Template ASupCompFo
       Body RtBody
+        Attr Control = 1
       EndBody
       Body DevBody
         Attr ShowDetectText = 1

src/wbl/pwrb/src/pwrb_c_dsupcompfo.wb_load

@@ -198,6 +198,7 @@ SObject pwrb:Class
     EndObject
     Object Template DSupCompFo
       Body RtBody
+        Attr Control = 1
       EndBody
       Body DevBody
         Attr ShowDetectText = 1

ssabox/wbl/mcomp/src/ssabox.wb_load

@@ -192,7 +192,15 @@ Volume SsabOx $ClassVolume 0.0.250.5
         Body RtBody 25-JAN-2006 14:55:38.69
           Attr Super.Super.Specification = "SSAB SafetySwitch"
           Attr Super.Super.DataSheet = "$pwr_lang/dsh/ssab_safetyswitch.pdf"
-          Attr Super.AlarmText = "Safety switch is not on"
+          Attr Super.Alarm.DetectOn = 1
+          Attr Super.Alarm.DetectText = "Safety switch is not on"
+          Attr Super.Alarm.EventType = 64
+          Attr Super.Alarm.EventPriority = 67
+          Attr Super.Alarm.EventFlags = 7
+          Attr Super.Alarm.MoreText = ""
+          Attr Super.Alarm.Attribute = "SsabOx:Class-Ssab_SafetySwitch-Template"
+          Attr Super.Alarm.CtrlPosition = 1
+          Attr Super.Alarm.LockAttribute = 1
         EndBody
       EndObject
     EndObject