*** empty log message ***

* empty log message *
65b2eed3 · claes · 1c17dce2 · 65b2eed3 · 65b2eed3 · 65b2eed3
Commit 65b2eed3 authored Feb 13, 2006 by claes
7 changed files
--- a/bcomp/mmi/bcomp/src/pwr_c_basesafetyswitchsim.pwg
+++ b/bcomp/mmi/bcomp/src/pwr_c_basesafetyswitchsim.pwg
@@ -1287,9 +1287,9 @@ pwr_exe:
 99
 27
 2703 10000
-2704 114
+2704 294
 2722 10000
-2705 114
+2705 294
 2723 10000
 2706 10000
 2708 0
@@ -1404,7 +1404,7 @@ pwr_exe:
 102 65532
 103 0
 2
-200 !$object.On.ActualValue##Boolean
+200 $object.On.ActualValue##Boolean
 201 9999
 99
 99

--- a/bcomp/mmi/bcomp/src/pwr_c_basesensorsim.pwg
+++ b/bcomp/mmi/bcomp/src/pwr_c_basesensorsim.pwg
 1
-100 19.5929
-135 19.5929
+100 20
+135 20
 101 20
-102 -45
-103 -45
-104 6.96018
-136 6.96018
+102 -64
+103 86
+104 7.1048
+136 7.1048
 105 100
-106 -15
-107 -15
+106 -22
+107 -14
 108 21.3898
 109 0.50325
 110 17.5696
 111 -2.01545
 116 0
-117 0
+117 44
 118 199
-119 154
-120 0
+119 200
+120 1
 121 Claes context
 122 0
 126 1
@@ -3957,13 +3957,13 @@ pwr_exe:
 99
 2707
 28
-2800 0
-2801 1
-2802 1.3
-2803 -1
-2804 0
-2805 17.0529
-2806 -90
+2800 -0
+2801 -1
+2802 20.3
+2803 1
+2804 -0
+2805 15.0529
+2806 -270
 99
 2716 0
 2718
@@ -4040,14 +4040,14 @@ pwr_exe:
 0
 0
 0
-1006 4.95
-1007 3.95
-1008 15.9529
-1009 15.3529
-1013 4.95
-1014 3.95
-1015 15.9529
-1016 15.3529
+1006 17.65
+1007 16.65
+1008 16.7529
+1009 16.1529
+1013 17.65
+1014 16.65
+1015 16.7529
+1016 16.1529
 1003
 0
 0
@@ -4084,13 +4084,13 @@ pwr_exe:
 99
 2707
 28
-2800 0
-2801 1
-2802 3.95
-2803 -1
-2804 0
-2805 15.9529
-2806 -90
+2800 -0
+2801 -1
+2802 17.65
+2803 1
+2804 -0
+2805 16.1529
+2806 -270
 99
 2716 0
 2718
@@ -4118,10 +4118,10 @@ pwr_exe:
 3702
 19
 1904 
-1900 19.3294
-1901 2.31906
-1902 16.806
-1903 15.9956
+1900 19.2809
+1901 2.27064
+1902 16.1706
+1903 15.1918
 1908 0
 1909 0
 1910 0
@@ -4155,12 +4155,12 @@ pwr_exe:
 1912
 28
 2800 0
-2801 3.40206
-2802 -46.1603
-2803 -0.675325
-2804 0
-2805 19.1021
-2806 -90
+2801 -3.40206
+2802 67.7603
+2803 0.815714
+2804 -0
+2805 12.4183
+2806 -270
 99
 99
 3703 51

--- a/bcomp/wbl/bcomp/src/basecomponent.wb_load
+++ b/bcomp/wbl/bcomp/src/basecomponent.wb_load
@@ -26294,17 +26294,17 @@ Start/Stop, Manual/Auto, Local/Remote"
            Attr GraphName = "fbd"
          EndBody
        EndObject
-        Object LimitSwitchDecr $Input 32 05-DEC-2005 13:15:13.24
-          Body SysBody 08-DEC-2005 14:12:42.83
-            Attr PgmName = "LimitSwitchDecr"
+        Object LimitSwitchIncr $Input 33 05-DEC-2005 13:15:23.42
+          Body SysBody 13-FEB-2006 09:50:48.45
+            Attr PgmName = "LimitSwitchIncr"
            Attr Flags = 8192
            Attr TypeRef = "pwrs:Type-$Boolean"
            Attr GraphName = "sin"
          EndBody
        EndObject
-        Object LimitSwitchIncr $Input 33 05-DEC-2005 13:15:23.42
-          Body SysBody 08-DEC-2005 14:12:55.02
-            Attr PgmName = "LimitSwitchIncr"
+        Object LimitSwitchDecr $Input 32 13-FEB-2006 09:51:22.21
+          Body SysBody 13-FEB-2006 09:50:43.65
+            Attr PgmName = "LimitSwitchDecr"
            Attr Flags = 8192
            Attr TypeRef = "pwrs:Type-$Boolean"
            Attr GraphName = "sde"
@@ -26394,7 +26394,7 @@ Start/Stop, Manual/Auto, Local/Remote"
      Object Code PlcTemplate 6556 05-DEC-2005 11:35:20.16
        Body RtBody 05-DEC-2005 11:35:20.16
        EndBody
-        Body DevBody 20-DEC-2005 09:19:15.04
+        Body DevBody 13-FEB-2006 09:33:53.00
          Buffer PlcProgram
            Attr oid = "BaseComponent:Class-CompModeD2Fo-Code"
            Attr cid = "pwrb:Class-PlcTemplate"
@@ -26426,8 +26426,8 @@ Start/Stop, Manual/Auto, Local/Remote"
        Object W WindowPlc 6557 05-DEC-2005 11:35:20.16
          Body RtBody 05-DEC-2005 11:35:20.16
          EndBody
-          Body DevBody 20-DEC-2005 09:19:15.04
-            Attr Modified = "20-DEC-2005 09:19:15.04"
+          Body DevBody 13-FEB-2006 09:33:53.00
+            Attr Modified = "13-FEB-2006 09:33:53.00"
            Buffer PlcWindow
              Attr oid = "BaseComponent:Class-CompModeD2Fo-Code-W"
              Attr cid = "pwrb:Class-WindowPlc"
@@ -96464,14 +96464,6 @@ Motor aggregat"
            Attr GraphName = "ilk"
          EndBody
        EndObject
-        Object LimitSwitchDecr $Input 42 05-DEC-2005 13:56:11.48
-          Body SysBody 05-DEC-2005 13:59:10.89
-            Attr PgmName = "LimitSwitchDecr"
-            Attr Flags = 8192
-            Attr TypeRef = "pwrs:Type-$Boolean"
-            Attr GraphName = "lsd"
-          EndBody
-        EndObject
        Object LimitSwitchIncr $Input 43 05-DEC-2005 13:56:14.84
          Body SysBody 05-DEC-2005 13:59:20.63
            Attr PgmName = "LimitSwitchIncr"
@@ -96480,6 +96472,14 @@ Motor aggregat"
            Attr GraphName = "lsi"
          EndBody
        EndObject
+        Object LimitSwitchDecr $Input 42 13-FEB-2006 09:56:56.47
+          Body SysBody 05-DEC-2005 13:59:10.89
+            Attr PgmName = "LimitSwitchDecr"
+            Attr Flags = 8192
+            Attr TypeRef = "pwrs:Type-$Boolean"
+            Attr GraphName = "lsd"
+          EndBody
+        EndObject
        Object LocMode $Input 28 05-DEC-2005 10:07:25.63
          Body SysBody 05-DEC-2005 10:07:25.63
            Attr PgmName = "LocMode"
@@ -96588,7 +96588,7 @@ Motor aggregat"
      Object Code PlcTemplate 6368 05-DEC-2005 10:07:25.63
        Body RtBody 05-DEC-2005 10:07:25.63
        EndBody
-        Body DevBody 12-DEC-2005 16:39:19.49
+        Body DevBody 13-FEB-2006 09:53:03.59
          Buffer PlcProgram
            Attr oid = "BaseComponent:Class-BaseMotorIncrDecrAggrFo-Code"
            Attr cid = "pwrb:Class-PlcTemplate"
@@ -96625,8 +96625,8 @@ Motor aggregat"
        Object W WindowPlc 6369 05-DEC-2005 10:07:25.63
          Body RtBody 05-DEC-2005 10:07:25.63
          EndBody
-          Body DevBody 12-DEC-2005 16:39:19.49
-            Attr Modified = "12-DEC-2005 16:39:19.49"
+          Body DevBody 13-FEB-2006 09:53:03.59
+            Attr Modified = "13-FEB-2006 09:53:03.59"
            Buffer PlcWindow
              Attr oid = "BaseComponent:Class-BaseMotorIncrDecrAggrFo-Code-W"
              Attr cid = "pwrb:Class-WindowPlc"
@@ -96966,7 +96966,7 @@ Motor aggregat"
            EndBody
          EndObject
          Object cn325 ConDigital 7482 12-DEC-2005 16:33:25.98
-            Body DevBody 12-DEC-2005 16:38:29.07
+            Body DevBody 13-FEB-2006 09:53:03.59
              Buffer PlcConnection
                Attr oid = "BaseComponent:Class-BaseMotorIncrDecrAggrFo-Code-W-cn325"
                Attr object_type = 23
@@ -97009,7 +97009,7 @@ Motor aggregat"
            EndBody
          EndObject
          Object cn324 ConDigital 7481 12-DEC-2005 16:33:23.61
-            Body DevBody 12-DEC-2005 16:38:29.07
+            Body DevBody 13-FEB-2006 09:53:03.59
              Buffer PlcConnection
                Attr oid = "BaseComponent:Class-BaseMotorIncrDecrAggrFo-Code-W-cn324"
                Attr object_type = 23
@@ -100664,7 +100664,7 @@ Motor Incr/Decr aggregat"
          Object GetDp56 GetDp 7163 08-DEC-2005 18:16:24.63
            Body RtBody 08-DEC-2005 18:16:24.63
            EndBody
-            Body DevBody 12-DEC-2005 16:33:49.13
+            Body DevBody 13-FEB-2006 09:53:03.59
              Attr DpObject = "$PlcFo:BaseComponent-Class-BaseMotorIncrDecrAggrFo.LimitSwitchIncr"
              Buffer PlcNode
                Attr object_type = 256
@@ -100682,7 +100682,7 @@ Motor Incr/Decr aggregat"
          Object GetDp57 GetDp 7165 08-DEC-2005 18:16:29.70
            Body RtBody 08-DEC-2005 18:16:29.70
            EndBody
-            Body DevBody 12-DEC-2005 16:33:49.13
+            Body DevBody 13-FEB-2006 09:53:03.59
              Attr DpObject = "$PlcFo:BaseComponent-Class-BaseMotorIncrDecrAggrFo.LimitSwitchDecr"
              Buffer PlcNode
                Attr object_type = 256
--- a/bcomp/wbl/bcomp/src/pwr_basemotorincrdecraggrfo.flw
+++ b/bcomp/wbl/bcomp/src/pwr_basemotorincrdecraggrfo.flw
--- a/xtt/lib/ge/src/pwr_ge_setup.dat
+++ b/xtt/lib/ge/src/pwr_ge_setup.dat
@@ -37,6 +37,7 @@ menu Process
  subgraph	MValve		pwr_exe:pwr_mvalve.pwsg			55
  subgraph 	Padlock		pwr_exe:pwr_padlock.pwsg 		39
  subgraph 	PadlockAnim 	pwr_exe:pwr_padlockanim.pwsg		39
+  subgraph 	PIDController 	pwr_exe:pwr_pidcontroller.pwsg		5
  subgraph	Pump2		pwr_exe:pwr_pump2.pwsg			72
  subgraph	Pump3		pwr_exe:pwr_pump3.pwsg			73
  subgraph 	PumpAnim 	pwr_exe:pwr_pumpanim.pwsg		97

--- a/xtt/lib/ge/src/pwr_pidcontroller.pwg
+++ b/xtt/lib/ge/src/pwr_pidcontroller.pwg
+1
+100 70.3162
+135 70.3162
+101 20
+102 -94
+103 -111
+104 24.9791
+136 24.9791
+105 100
+106 -33
+107 -39
+108 2
+109 0
+110 2
+111 0
+116 0
+117 0
+118 199
+119 131
+120 1
+121 Claes context
+122 0
+126 0.2
+127 0.2
+128 0
+129 0.3
+130 1.5
+131 0.8
+132 3
+133 2
+137 4001
+134
+22
+2200 7
+2201 0
+2202 pwr_pidcontroller
+2203 300
+2205 0
+2204
+2206 0
+2207
+2208
+2209 0
+2210 0
+2211 0
+2212 0
+2213 4
+2214
+pwrp_pop:
+pwrp_exe:
+ssab_exe:
+pwr_exe:
+2215 0
+2236 0
+2216 0
+2221 0
+2237 0
+2238 0
+2239 0
+2240 0
+2241 0
+2242 0
+2217 0
+2218 0
+2219 1
+2220 
+2230 0
+2231 0
+2222 
+2223 1
+2224 0.5
+2232 0.5
+2225 0.5
+2226 0
+2227 
+2228 0
+2229 0
+2233 1
+2234 1
+2235 0
+2243 0
+2244
+1
+100 1
+101 1
+102 65532
+103 0
+99
+99
+123
+2
+99
+124
+2
+99
+125
+2
+19
+1904 
+1900 2
+1901 0
+1902 2
+1903 0
+1908 0
+1909 52
+1910 52
+1911 1
+1915 0
+1913 5
+1916 2
+1914 0
+1918 0
+1919 0
+1917 0
+1907 0
+1906
+1905
+5
+500 0
+501 1
+504 1
+505 1
+502
+7
+700 0
+701 0
+99
+503
+7
+700 2
+701 2
+99
+99
+1912
+28
+2800 1
+2801 0
+2802 0
+2803 0
+2804 1
+2805 0
+2806 0
+99
+99
+21
+2104 
+2100 0.3
+2101 -0.3
+2102 1.3
+2103 0.7
+2105
+8
+802 0
+803 2
+800 0
+801 360
+806 0
+804
+7
+700 -0.3
+701 -0.3
+99
+805
+7
+700 0.3
+701 0.3
+99
+99
+2106
+12
+1200 0
+1201 2
+1202
+7
+700 0
+701 1
+99
+1203 
+1204 0
+1205
+28
+2800 1
+2801 0
+2802 2.77556e-17
+2803 0
+2804 1
+2805 -5.55112e-17
+2806 0
+99
+99
+99
+21
+2104 
+2100 1.3
+2101 0.7
+2102 0.3
+2103 -0.3
+2105
+8
+802 0
+803 2
+800 0
+801 360
+806 0
+804
+7
+700 -0.3
+701 -0.3
+99
+805
+7
+700 0.3
+701 0.3
+99
+99
+2106
+12
+1200 1
+1201 4
+1202
+7
+700 1
+701 0
+99
+1203 
+1204 0
+1205
+28
+2800 1
+2801 0
+2802 0
+2803 0
+2804 1
+2805 0
+2806 0
+99
+99
+99
+21
+2104 
+2100 2.3
+2101 1.7
+2102 1.3
+2103 0.7
+2105
+8
+802 0
+803 2
+800 0
+801 360
+806 0
+804
+7
+700 -0.3
+701 -0.3
+99
+805
+7
+700 0.3
+701 0.3
+99
+99
+2106
+12
+1200 2
+1201 1
+1202
+7
+700 2
+701 1
+99
+1203 
+1204 0
+1205
+28
+2800 1
+2801 0
+2802 0
+2803 0
+2804 1
+2805 0
+2806 0
+99
+99
+99
+21
+2104 
+2100 1.3
+2101 0.7
+2102 2.3
+2103 1.7
+2105
+8
+802 0
+803 2
+800 0
+801 360
+806 0
+804
+7
+700 -0.3
+701 -0.3
+99
+805
+7
+700 0.3
+701 0.3
+99
+99
+2106
+12
+1200 3
+1201 3
+1202
+7
+700 1
+701 2
+99
+1203 
+1204 0
+1205
+28
+2800 1
+2801 0
+2802 0
+2803 0
+2804 1
+2805 0
+2806 0
+99
+99
+99
+21
+2104 
+2100 0.3
+2101 -0.3
+2102 0.8
+2103 0.2
+2105
+8
+802 0
+803 2
+800 0
+801 360
+806 0
+804
+7
+700 -0.3
+701 -0.3
+99
+805
+7
+700 0.3
+701 0.3
+99
+99
+2106
+12
+1200 5
+1201 2
+1202
+7
+700 0
+701 0.5
+99
+1203 
+1204 0
+1205
+28
+2800 1
+2801 0
+2802 0
+2803 0
+2804 1
+2805 0
+2806 0
+99
+99
+99
+21
+2104 
+2100 0.3
+2101 -0.3
+2102 1.8
+2103 1.2
+2105
+8
+802 0
+803 2
+800 0
+801 360
+806 0
+804
+7
+700 -0.3
+701 -0.3
+99
+805
+7
+700 0.3
+701 0.3
+99
+99
+2106
+12
+1200 6
+1201 2
+1202
+7
+700 0
+701 1.5
+99
+1203 
+1204 0
+1205
+28
+2800 1
+2801 0
+2802 0
+2803 0
+2804 1
+2805 0
+2806 0
+99
+99
+99
+23
+2304 
+2300 0.714671
+2301 0.414671
+2302 1.17066
+2303 0.870658
+2305
+9
+900 2
+901 304
+904 0
+902 A1
+903
+7
+700 0.40045
+701 1.34266
+99
+99
+2306
+5
+500 2
+501 1
+504 1
+505 0
+502
+7
+700 0.40045
+701 1.04266
+99
+503
+7
+700 0.70045
+701 1.34266
+99
+99
+2307
+13
+1300 1
+1301 304
+1306 0
+1302 2
+1305 1
+1303
+7
+700 0.5
+701 1
+99
+1304 0
+99
+2308
+28
+2800 1
+2801 0
+2802 -0.0995503
+2803 0
+2804 1
+2805 0.342664
+2806 0
+99
+99
+20
+2004 
+2000 2
+2001 1.2
+2002 1
+2003 0
+2009 0
+2010 0
+2005
+6
+600 0
+601 1
+602
+7
+700 2
+701 1
+99
+603
+7
+700 1.2
+701 0
+99
+99
+2008
+28
+2800 1
+2801 0
+2802 0
+2803 0
+2804 1
+2805 0
+2806 0
+99
+99
+20
+2004 
+2000 2
+2001 1.2
+2002 2
+2003 1
+2009 0
+2010 0
+2005
+6
+600 0
+601 1
+602
+7
+700 2
+701 1
+99
+603
+7
+700 1.2
+701 2
+99
+99
+2008
+28
+2800 1
+2801 0
+2802 0
+2803 0
+2804 1
+2805 0
+2806 0
+99
+99
+99
+99
--- a/xtt/lib/ge/src/pwr_pidcontroller.pwsg
+++ b/xtt/lib/ge/src/pwr_pidcontroller.pwsg
+123
+2
+3
+300 pwr_pidcontroller
+301
+2
+19
+1904 
+1900 2
+1901 0
+1902 2
+1903 0
+1908 0
+1909 52
+1910 52
+1911 1
+1915 0
+1913 5
+1916 2
+1914 0
+1918 0
+1919 0
+1917 0
+1907 0
+1906
+1905
+5
+500 0
+501 1
+504 1
+505 1
+502
+7
+700 0
+701 0
+99
+503
+7
+700 2
+701 2
+99
+99
+1912
+28
+2800 1
+2801 0
+2802 0
+2803 0
+2804 1
+2805 0
+2806 0
+99
+99
+12
+1200 0
+1201 2
+1202
+7
+700 0
+701 1
+99
+1203 
+1204 0
+1205
+28
+2800 1
+2801 0
+2802 2.77556e-17
+2803 0
+2804 1
+2805 -5.55112e-17
+2806 0
+99
+99
+12
+1200 1
+1201 4
+1202
+7
+700 1
+701 0
+99
+1203 
+1204 0
+1205
+28
+2800 1
+2801 0
+2802 0
+2803 0
+2804 1
+2805 0
+2806 0
+99
+99
+12
+1200 2
+1201 1
+1202
+7
+700 2
+701 1
+99
+1203 
+1204 0
+1205
+28
+2800 1
+2801 0
+2802 0
+2803 0
+2804 1
+2805 0
+2806 0
+99
+99
+12
+1200 3
+1201 3
+1202
+7
+700 1
+701 2
+99
+1203 
+1204 0
+1205
+28
+2800 1
+2801 0
+2802 0
+2803 0
+2804 1
+2805 0
+2806 0
+99
+99
+12
+1200 5
+1201 2
+1202
+7
+700 0
+701 0.5
+99
+1203 
+1204 0
+1205
+28
+2800 1
+2801 0
+2802 0
+2803 0
+2804 1
+2805 0
+2806 0
+99
+99
+12
+1200 6
+1201 2
+1202
+7
+700 0
+701 1.5
+99
+1203 
+1204 0
+1205
+28
+2800 1
+2801 0
+2802 0
+2803 0
+2804 1
+2805 0
+2806 0
+99
+99
+29
+2907
+13
+1300 1
+1301 304
+1306 0
+1302 2
+1305 1
+1303
+7
+700 0.5
+701 1
+99
+1304 0
+99
+2908
+28
+2800 1
+2801 0
+2802 -0.0995503
+2803 0
+2804 1
+2805 0.342664
+2806 0
+99
+99
+20
+2004 
+2000 2
+2001 1.2
+2002 1
+2003 0
+2009 0
+2010 0
+2005
+6
+600 0
+601 1
+602
+7
+700 2
+701 1
+99
+603
+7
+700 1.2
+701 0
+99
+99
+2008
+28
+2800 1
+2801 0
+2802 0
+2803 0
+2804 1
+2805 0
+2806 0
+99
+99
+20
+2004 
+2000 2
+2001 1.2
+2002 2
+2003 1
+2009 0
+2010 0
+2005
+6
+600 0
+601 1
+602
+7
+700 2
+701 1
+99
+603
+7
+700 1.2
+701 2
+99
+99
+2008
+28
+2800 1
+2801 0
+2802 0
+2803 0
+2804 1
+2805 0
+2806 0
+99
+99
+99
+302 0
+305 0
+306
+307
+304 0
+303
+308 0
+321 0
+309 0
+313 0
+322 0
+323 0
+324 0
+325 0
+326 0
+327 0
+310 0
+311 0
+312 
+314 
+315 1
+316 1
+317 0
+318 0
+319 0
+320 0
+328 0
+329
+1
+100 1
+101 1
+102 65532
+103 0
+99
+99
+99
+99