*** empty log message ***

src/wbl/mcomp/src/os_linux/hw_x86/makefile

@@ -38,13 +38,16 @@ copy : $(inc_dir)/pwr_othermanufacturerclasses.h \
        $(inc_dir)/pwr_siemensclasses.h \
        $(inc_dir)/pwr_siemensclasses.hpp \
        $(inc_dir)/pwr_telemecaniqueclasses.h \
-       $(inc_dir)/pwr_telemecaniqueclasses.hpp
+       $(inc_dir)/pwr_telemecaniqueclasses.hpp \
+       $(inc_dir)/pwr_ssaboxclasses.h \
+       $(inc_dir)/pwr_ssaboxclasses.hpp
 
 
 lib  : $(load_dir)/othermanufacturer.dbs \
        $(load_dir)/abb.dbs \
        $(load_dir)/siemens.dbs \
-       $(load_dir)/telemecanique.dbs
+       $(load_dir)/telemecanique.dbs \
+       $(load_dir)/ssabox.dbs
 
 exe : $(doc_dir)/en_us/orm/othermanufacturer_allclasses.html \
       $(doc_dir)/sv_se/orm/othermanufacturer_allclasses.html \
@@ -61,7 +64,9 @@ exe : $(doc_dir)/en_us/orm/othermanufacturer_allclasses.html \
       $(doc_dir)/en_us/orm/telemecanique_allclasses.html \
       $(doc_dir)/sv_se/orm/telemecanique_allclasses.html \
       $(exe_dir)/en_us/telemecanique_xtthelp.dat \
-      $(exe_dir)/sv_se/telemecanique_xtthelp.dat
+      $(exe_dir)/sv_se/telemecanique_xtthelp.dat \
+      $(exe_dir)/en_us/ssabox_xtthelp.dat \
+      $(exe_dir)/sv_se/ssabox_xtthelp.dat
 
 clean : 
 
@@ -214,6 +219,43 @@ $(exe_dir)/sv_se/telemecanique_xtthelp.dat : ../../telemecanique.wb_load
 	@ echo "Generating xtt help files for telemecanique classes sv_se"
 	@ co_convert -x -l sv_se -d $(exe_dir)/sv_se "$(source)"
 
+#
+# SsabOx
+#
+$(load_dir)/ssabox.dbs : ../../ssabox.wb_load
+	@ echo "Generating snapshot for ssabox"
+	@ wb_cmd create snapshot /file=\"$(source)\"/out=\"$(target)\"
+	@ chmod a+w $(target)
+
+$(inc_dir)/pwr_ssaboxclasses.h : ../../ssabox.wb_load
+	@ echo "Generating struct files for ssabox classes..."
+	@ co_convert -sv -d $(inc_dir) "$(source)"
+
+$(inc_dir)/pwr_ssaboxclasses.hpp : ../../ssabox.wb_load
+	@ echo "Generating hpp files for ssabox classes..."
+	@ co_convert -po -d $(inc_dir) "$(source)"
+
+$(doc_dir)/en_us/orm/ssabox_allclasses.html : ../../ssabox.wb_load
+	@ echo "Generating html files for ssabox classes en_us..."
+	@ co_convert -w -d $(doc_dir)/en_us/orm -g $(pwre_sroot)/wbl/mcomp/src/cnv_setup.dat "$(source)"
+	@ co_convert -c -d $(doc_dir)/en_us/orm $(inc_dir)/pwr_ssaboxclasses.h
+	@ co_convert -c -d $(doc_dir)/en_us/orm $(inc_dir)/pwr_ssaboxclasses.hpp
+	@ echo "Generating html files for ssabox classes sv_se..."
+	@ co_convert -w -l sv_se -d $(doc_dir)/sv_se/orm -g $(pwre_sroot)/wbl/mcomp/src/cnv_setup.dat "$(source)"
+	@ co_convert -c -d $(doc_dir)/sv_se/orm $(inc_dir)/pwr_ssaboxclasses.h
+	@ co_convert -c -d $(doc_dir)/sv_se/orm $(inc_dir)/pwr_ssaboxclasses.hpp
+	@ echo "Generating postscript file for ssabox classes..."
+	@ co_convert -q -d $(doc_dir)/en_us "$(source)"
+	@ co_convert -q -l sv_se -d $(doc_dir)/sv_se "$(source)"
+
+$(exe_dir)/en_us/ssabox_xtthelp.dat : ../../ssabox.wb_load
+	@ echo "Generating xtt help files for ssabox classes en_us"
+	@ co_convert -x -d $(exe_dir)/en_us "$(source)"
+
+$(exe_dir)/sv_se/ssabox_xtthelp.dat : ../../ssabox.wb_load
+	@ echo "Generating xtt help files for ssabox classes sv_se"
+	@ co_convert -x -l sv_se -d $(exe_dir)/sv_se "$(source)"
+
 #
 # Clean
 #

src/wbl/mcomp/src/othermanufacturer.wb_load

@@ -31,7 +31,7 @@ Volume OtherManufacturer $ClassVolume 0.0.250.1
           Body SysBody
             Attr PgmName = "Super"
             Attr Flags = 393216
-            Attr TypeRef = "BaseComponent:Class-ManualValve2Sw"
+            Attr TypeRef = "BaseComponent:Class-ManValve2Sw"
           EndBody
         EndObject
       EndObject
@@ -210,31 +210,5 @@ Volume OtherManufacturer $ClassVolume 0.0.250.1
         EndBody
       EndObject
     EndObject
-    Object Ssab_SafetySwitch $ClassDef 7
-      Body SysBody
-        Attr Editor = 0
-        Attr Method = 0
-        Attr Flags = 16
-      EndBody
-      Object RtBody $ObjBodyDef 1
-        Body SysBody
-          Attr StructName = "Ssab_SafetySwitch"
-          Attr NextAix = "_X2"
-        EndBody
-        Object Super $Attribute 1
-          Body SysBody
-            Attr PgmName = "Super"
-            Attr Flags = 393216
-            Attr TypeRef = "BaseComponent:Class-SafetySwitch"
-          EndBody
-        EndObject
-      EndObject
-      Object Template Ssab_SafetySwitch 2149548032
-        Body RtBody
-          Attr Super.Specification = "SSAB SafetySwitch"
-          Attr Super.DataSheet = "$pwr_lang/datasheet/ssab_safetyswitch.pdf"
-        EndBody
-      EndObject
-    EndObject
   EndObject
 EndVolume

src/wbl/mcomp/src/siemens.wb_load

@@ -163,7 +163,7 @@ Volume Siemens $ClassVolume 0.0.250.3
           Body SysBody
             Attr PgmName = "Ch"
             Attr Flags = 131074
-            Attr Elements = 2
+            Attr Elements = 4
             Attr TypeRef = "pwrb:Class-ChanDi"
           EndBody
         EndObject
@@ -197,7 +197,7 @@ Volume Siemens $ClassVolume 0.0.250.3
           Body SysBody
             Attr PgmName = "Ch"
             Attr Flags = 131074
-            Attr Elements = 2
+            Attr Elements = 4
             Attr TypeRef = "pwrb:Class-ChanDo"
           EndBody
         EndObject

src/wbl/pwrb/src/pwrb_td_datarepenum.wb_load

@@ -77,23 +77,73 @@ SObject pwrb:Type
      EndBody
     EndObject
     !/**
-    !  A single bit.
+    !  64-bit signed integer.
     !*/
-    Object Bit $Value
+    Object Int8 $Value
      Body SysBody
-       Attr PgmName = "Bit"
-       Attr Text = "Bit"
+       Attr PgmName = "Int64"
+       Attr Text = "Int64"
        Attr Value = 6
      EndBody
     EndObject
     !/**
+    !  64-bit unsigned integer.
+    !*/
+    Object UInt64 $Value
+     Body SysBody
+       Attr PgmName = "UInt64"
+       Attr Text = "UInt64"
+       Attr Value = 7
+     EndBody
+    EndObject
+    !/**
+    !  A single bit in a 8-bit word.
+    !*/
+    Object Bit8 $Value
+     Body SysBody
+       Attr PgmName = "Bit8"
+       Attr Text = "Bit8"
+       Attr Value = 8
+     EndBody
+    EndObject
+    !/**
+    !  A single bit in a 16-bit word.
+    !*/
+    Object Bit8 $Value
+     Body SysBody
+       Attr PgmName = "Bit16"
+       Attr Text = "Bit16"
+       Attr Value = 9
+     EndBody
+    EndObject
+    !/**
+    !  A single bit in a 32-bit word.
+    !*/
+    Object Bit32 $Value
+     Body SysBody
+       Attr PgmName = "Bit32"
+       Attr Text = "Bit32"
+       Attr Value = 10
+     EndBody
+    EndObject
+    !/**
+    !  A single bit in a 64-bit word.
+    !*/
+    Object Bit64 $Value
+     Body SysBody
+       Attr PgmName = "Bit64"
+       Attr Text = "Bit64"
+       Attr Value = 11
+     EndBody
+    EndObject
+    !/**
     !  32-bit float.
     !*/
     Object Float32 $Value
      Body SysBody
        Attr PgmName = "Float32"
        Attr Text = "Float32"
-       Attr Value = 7
+       Attr Value = 12
      EndBody
     EndObject
     !/**
@@ -103,7 +153,7 @@ SObject pwrb:Type
      Body SysBody
        Attr PgmName = "Float64"
        Attr Text = "Float64"
-       Attr Value = 8
+       Attr Value = 13
      EndBody
     EndObject
   EndObject

wb/exp/wb/src/pwr_volumelist.dat

@@ -8,4 +8,5 @@ othermanufacturer 0.2.250.1
 abb 0.0.250.2
 siemens 0.0.250.3
 telemecanique 0.0.250.4
+ssabox 0.0.250.5
 wb 254.254.254.254
\ No newline at end of file

wb/exp/wb/src/pwr_wb_palette.cnf

@@ -192,6 +192,7 @@ palette NavigatorPalette
     classvolume ABB ABB
     classvolume Siemens Siemens
     classvolume Telemecanique Telemecanique
+    classvolume SsabOx SsabOx
   }
 }
 
@@ -255,6 +256,7 @@ palette ClassNavigatorPalette
     classvolume ABB ABB
     classvolume Siemens Siemens
     classvolume Telemecanique Telemecanique
+    classvolume SsabOx SsabOx
   }
 }
 
@@ -632,8 +634,18 @@ palette PlcEditorPalette
       class RunTimeCounterFo
       class FanCbCoSsFo  
       class ActuatorPoOr2SwFo
-      class ControlValvePoOr2SwFo
-      class ManualValve2SwFo
+      class ActuatorPoOrFo
+      class ActuatorOrFo
+      class ActuatorOr2SwFo
+      class ActuatorOrSwOpFo
+      class ActuatorOrSwClFo
+      class CValvePoOr2SwFo
+      class CValvePoOrFo
+      class CValveOrFo
+      class CValveOr2SwFo
+      class CValveOrSwOpFo
+      class CValveOrSwClFo
+      class ManValve2SwFo
     }
     menu ABB
     {
@@ -642,7 +654,11 @@ palette PlcEditorPalette
     }
     menu Simulate
     {
-      class ControlValvePoOr2SwSim
+      class CValvePoOr2SwSim
+      class CValvePoOrSim
+      class CValveOr2SwSim
+      class CValveOrSwOpSim
+      class CValveOrSwClSim
       class FanCbCoSsSim
       class BaseSensorSim
       class ABB_ACS800Pump1Sim

xtt/lib/ge/src/pwr_ge_setup.dat

@@ -182,10 +182,11 @@ menu Other
 {
   menu BaseComponent
   {
-    subgraph    ManualValve2Sw pwr_exe:bcomp_manualvalve2sw.pwsg 	4
-    subgraph    ManualValveSwOp pwr_exe:bcomp_manualvalveswop.pwsg 	4
-    subgraph    ManualValveSwCl pwr_exe:bcomp_manualvalveswcl.pwsg 	4
-    subgraph    ManualValveNoSw pwr_exe:bcomp_manualvalvenosw.pwsg 	4
+    subgraph    ManValve2Sw 	pwr_exe:bcomp_manvalve2sw.pwsg 	4
+    subgraph    ManValveSwOp	pwr_exe:bcomp_manvalveswop.pwsg 	4
+    subgraph    ManValveSwCl 	pwr_exe:bcomp_manvalveswcl.pwsg 	4
+    subgraph    ManValveNoSw 	pwr_exe:bcomp_manvalvenosw.pwsg 	4
+    subgraph    CValvePoOr2Sw 	pwr_exe:bcomp_cvalvepoor2sw.pwsg 4
     subgraph    FanCoCbSs 	pwr_exe:bcomp_fancocbss.pwsg 		6
     subgraph    LevelSensor 	pwr_exe:bcomp_levelsensor.pwsg 		16
     subgraph    PressureSensor 	pwr_exe:bcomp_pressuresensor.pwsg 	16