Merge branch 'master' of pwrcvs:/data1/git/pwr

17a3b274 · Claes Sjofors · 603a3e81 · 79d46fce · 17a3b274 · 17a3b274
Commit 17a3b274 authored Aug 13, 2012 by Claes Sjofors
18 changed files
--- a/othermanu/doc/dsh/en_us/janitza_umg96s_1.pdf
+++ b/othermanu/doc/dsh/en_us/janitza_umg96s_1.pdf
--- a/othermanu/doc/dsh/src/os_linux/hw_x86/makefile
+++ b/othermanu/doc/dsh/src/os_linux/hw_x86/makefile
+include $(pwre_dir_symbols)
+ifndef variables_mk
+ -include $(pwre_kroot)/tools/bld/src/$(os_name)/$(hw_name)/variables.mk
+endif
+ifndef variables_mk
+ include $(pwre_kroot)/tools/bld/src/$(os_name)/variables.mk
+endif
+ifndef rules_mk
+ -include $(pwre_kroot)/tools/bld/src/$(os_name)/$(hw_name)/rules.mk
+endif
+ifndef rules_mk
+ include $(pwre_kroot)/tools/bld/src/$(os_name)/rules.mk
+endif
+vpath %.pdf $(hw_source):$(os_source):$(co_source)
+source_dirs := $(hw_source) $(os_source) $(co_source)
+p_en_us_sources := $(sort \
+             $(foreach file, \
+               $(foreach dir, \
+                 $(pwre_sroot)/doc/dsh/en_us, \
+                 $(wildcard $(dir)/*.pdf) \
+               ), $(notdir $(file)) \
+             ) \
+           )
+h_en_us_sources := $(sort \
+             $(foreach file, \
+               $(foreach dir, \
+                 $(pwre_sroot)/doc/dsh/en_us, \
+                 $(wildcard $(dir)/*.html) \
+               ), $(notdir $(file)) \
+             ) \
+           )
+p_sv_se_sources := $(sort \
+             $(foreach file, \
+               $(foreach dir, \
+                 $(pwre_sroot)/doc/dsh/sv_se, \
+                 $(wildcard $(dir)/*.pdf) \
+               ), $(notdir $(file)) \
+             ) \
+           )
+h_sv_se_sources := $(sort \
+             $(foreach file, \
+               $(foreach dir, \
+                 $(pwre_sroot)/doc/dsh/sv_se, \
+                 $(wildcard $(dir)/*.html) \
+               ), $(notdir $(file)) \
+             ) \
+           )
+pdf_en_us_sources := $(filter %.pdf,$(p_en_us_sources)) 
+html_en_us_sources := $(filter %.html,$(h_en_us_sources)) 
+pdf_sv_se_sources := $(filter %.pdf,$(p_sv_se_sources)) 
+html_sv_se_sources := $(filter %.html,$(h_sv_se_sources)) 
+export_pdf_en_us := $(patsubst %.pdf,$(doc_dir)/en_us/dsh/%.pdf,$(pdf_en_us_sources))
+export_html_en_us := $(patsubst %.html,$(doc_dir)/en_us/dsh/%.html,$(html_en_us_sources))
+export_pdf_sv_se := $(patsubst %.pdf,$(doc_dir)/sv_se/dsh/%.pdf,$(pdf_sv_se_sources))
+export_html_sv_se := $(patsubst %.html,$(doc_dir)/sv_se/dsh/%.html,$(html_sv_se_sources))
+clean_pdf := $(patsubst %.pdf,clean_%.pdf,$(pdf_sources))
+clean_html := $(patsubst %.html,clean_%.html,$(html_sources))
+.SUFFIXES:
+$(doc_dir)/en_us/dsh/%.pdf : $(pwre_sroot)/doc/dsh/en_us/%.pdf
+	@ $(log_h_h)
+	@ $(cp) $(cpflags) $(source) $(target)
+$(doc_dir)/en_us/dsh/%.html : $(pwre_sroot)/doc/dsh/en_us/%.html
+	@ $(log_h_h)
+	@ $(cp) $(cpflags) $(source) $(target)
+$(doc_dir)/sv_se/dsh/%.pdf : $(pwre_sroot)/doc/dsh/sv_se/%.pdf
+	@ $(log_h_h)
+	@ $(cp) $(cpflags) $(source) $(target)
+$(doc_dir)/sv_se/dsh/%.html : $(pwre_sroot)/doc/dsh/sv_se/%.html
+	@ $(log_h_h)
+	@ $(cp) $(cpflags) $(source) $(target)
+.PHONY : all init copy lib exe clean realclean \
+         $(clean_pdf)
+all : init copy lib exe
+init :
+copy : $(export_pdf_en_us) $(export_html_en_us) \
+       $(export_pdf_sv_se) $(export_html_sv_se)
+lib :
+exe :
+clean :
+realclean : clean $(clean_pdf) $(clean_html)
+$(clean_pdf) : clean_%.pdf : %.pdf
+	@ $(rm) $(rmflags) $(doc_dir)/$*.pdf
+$(clean_html) : clean_%.html : %.html
+	@ $(rm) $(rmflags) $(doc_dir)/$*.html
--- a/othermanu/doc/dsh/src/os_linux/hw_x86_64/makefile
+++ b/othermanu/doc/dsh/src/os_linux/hw_x86_64/makefile
+include $(pwre_dir_symbols)
+ifndef variables_mk
+ -include $(pwre_kroot)/tools/bld/src/$(os_name)/$(hw_name)/variables.mk
+endif
+ifndef variables_mk
+ include $(pwre_kroot)/tools/bld/src/$(os_name)/variables.mk
+endif
+ifndef rules_mk
+ -include $(pwre_kroot)/tools/bld/src/$(os_name)/$(hw_name)/rules.mk
+endif
+ifndef rules_mk
+ include $(pwre_kroot)/tools/bld/src/$(os_name)/rules.mk
+endif
+vpath %.pdf $(hw_source):$(os_source):$(co_source)
+source_dirs := $(hw_source) $(os_source) $(co_source)
+p_en_us_sources := $(sort \
+             $(foreach file, \
+               $(foreach dir, \
+                 $(pwre_sroot)/doc/dsh/en_us, \
+                 $(wildcard $(dir)/*.pdf) \
+               ), $(notdir $(file)) \
+             ) \
+           )
+h_en_us_sources := $(sort \
+             $(foreach file, \
+               $(foreach dir, \
+                 $(pwre_sroot)/doc/dsh/en_us, \
+                 $(wildcard $(dir)/*.html) \
+               ), $(notdir $(file)) \
+             ) \
+           )
+p_sv_se_sources := $(sort \
+             $(foreach file, \
+               $(foreach dir, \
+                 $(pwre_sroot)/doc/dsh/sv_se, \
+                 $(wildcard $(dir)/*.pdf) \
+               ), $(notdir $(file)) \
+             ) \
+           )
+h_sv_se_sources := $(sort \
+             $(foreach file, \
+               $(foreach dir, \
+                 $(pwre_sroot)/doc/dsh/sv_se, \
+                 $(wildcard $(dir)/*.html) \
+               ), $(notdir $(file)) \
+             ) \
+           )
+pdf_en_us_sources := $(filter %.pdf,$(p_en_us_sources)) 
+html_en_us_sources := $(filter %.html,$(h_en_us_sources)) 
+pdf_sv_se_sources := $(filter %.pdf,$(p_sv_se_sources)) 
+html_sv_se_sources := $(filter %.html,$(h_sv_se_sources)) 
+export_pdf_en_us := $(patsubst %.pdf,$(doc_dir)/en_us/dsh/%.pdf,$(pdf_en_us_sources))
+export_html_en_us := $(patsubst %.html,$(doc_dir)/en_us/dsh/%.html,$(html_en_us_sources))
+export_pdf_sv_se := $(patsubst %.pdf,$(doc_dir)/sv_se/dsh/%.pdf,$(pdf_sv_se_sources))
+export_html_sv_se := $(patsubst %.html,$(doc_dir)/sv_se/dsh/%.html,$(html_sv_se_sources))
+clean_pdf := $(patsubst %.pdf,clean_%.pdf,$(pdf_sources))
+clean_html := $(patsubst %.html,clean_%.html,$(html_sources))
+.SUFFIXES:
+$(doc_dir)/en_us/dsh/%.pdf : $(pwre_sroot)/doc/dsh/en_us/%.pdf
+	@ $(log_h_h)
+	@ $(cp) $(cpflags) $(source) $(target)
+$(doc_dir)/en_us/dsh/%.html : $(pwre_sroot)/doc/dsh/en_us/%.html
+	@ $(log_h_h)
+	@ $(cp) $(cpflags) $(source) $(target)
+$(doc_dir)/sv_se/dsh/%.pdf : $(pwre_sroot)/doc/dsh/sv_se/%.pdf
+	@ $(log_h_h)
+	@ $(cp) $(cpflags) $(source) $(target)
+$(doc_dir)/sv_se/dsh/%.html : $(pwre_sroot)/doc/dsh/sv_se/%.html
+	@ $(log_h_h)
+	@ $(cp) $(cpflags) $(source) $(target)
+.PHONY : all init copy lib exe clean realclean \
+         $(clean_pdf)
+all : init copy lib exe
+init :
+copy : $(export_pdf_en_us) $(export_html_en_us) \
+       $(export_pdf_sv_se) $(export_html_sv_se)
+lib :
+exe :
+clean :
+realclean : clean $(clean_pdf) $(clean_html)
+$(clean_pdf) : clean_%.pdf : %.pdf
+	@ $(rm) $(rmflags) $(doc_dir)/$*.pdf
+$(clean_html) : clean_%.html : %.html
+	@ $(rm) $(rmflags) $(doc_dir)/$*.html
--- a/othermanu/doc/orm/src/orm_janitza_janitza_umg96s_og.gif
+++ b/othermanu/doc/orm/src/orm_janitza_janitza_umg96s_og.gif
--- a/othermanu/doc/orm/src/orm_janitza_umg96s1.gif
+++ b/othermanu/doc/orm/src/orm_janitza_umg96s1.gif
--- a/othermanu/doc/orm/src/orm_janitza_umg96s2.gif
+++ b/othermanu/doc/orm/src/orm_janitza_umg96s2.gif
--- a/othermanu/doc/orm/src/orm_janitza_umg96s_1fo_fo.gif
+++ b/othermanu/doc/orm/src/orm_janitza_umg96s_1fo_fo.gif
--- a/othermanu/doc/orm/src/os_templ/hw_templ/makefile
+++ b/othermanu/doc/orm/src/os_templ/hw_templ/makefile
+include $(pwre_dir_symbols)
+ifndef variables_mk
+ -include $(pwre_kroot)/tools/bld/src/$(os_name)/$(hw_name)/variables.mk
+endif
+ifndef variables_mk
+ include $(pwre_kroot)/tools/bld/src/$(os_name)/variables.mk
+endif
+ifndef rules_mk
+ -include $(pwre_kroot)/tools/bld/src/$(os_name)/$(hw_name)/rules.mk
+endif
+ifndef rules_mk
+ include $(pwre_kroot)/tools/bld/src/$(os_name)/rules.mk
+endif
+vpath %.gif $(hw_source):$(os_source):$(co_source)
+source_dirs := $(hw_source) $(os_source) $(co_source)
+gif_sources := $(sort \
+             $(foreach file, \
+               $(foreach dir, \
+                 $(source_dirs), \
+                 $(wildcard $(dir)/*.gif) \
+               ), $(notdir $(file)) \
+             ) \
+           )
+html_sources := $(sort \
+             $(foreach file, \
+               $(foreach dir, \
+                 $(source_dirs), \
+                 $(wildcard $(dir)/*.html) \
+               ), $(notdir $(file)) \
+             ) \
+           )
+export_gif := $(patsubst %.gif,$(doc_dir)/en_us/orm/%.gif,$(gif_sources))
+export_html := $(patsubst %.html,$(doc_dir)/en_us/orm/%.html,$(html_sources))
+clean_gif := $(patsubst %.gif,clean_%.gif,$(gif_sources))
+clean_html := $(patsubst %.html,clean_%.html,$(html_sources))
+.SUFFIXES:
+$(doc_dir)/en_us/orm/%.gif : %.gif
+	@ $(log_h_h)
+	@ $(cp) $(cpflags) $(source) $(target)
+	@ $(cp) $(cpflags) $(source) $(doc_dir)/sv_se/orm
+	@ $(cp) $(cpflags) $(source) $(doc_dir)/help
+$(doc_dir)/en_us/orm/%.html : ../../%.html
+	@ $(log_h_h)
+	@ $(cp) $(cpflags) $(source) $(target)
+	@ $(cp) $(cpflags) $(source) $(doc_dir)/sv_se/orm
+	@ $(cp) $(cpflags) $(source) $(doc_dir)/help
+.PHONY : all init copy lib exe clean realclean \
+         $(clean_gif)
+all : init copy lib exe
+init :
+copy : $(export_gif) $(export_html)
+lib :
+exe :
+clean :
+realclean : clean $(clean_gif) $(clean_html) $(clean_c)
+$(clean_gif) : clean_%.gif : %.gif
+	@ $(rm) $(rmflags) $(doc_dir)/orm/$*.gif
+$(clean_html) : clean_%.html : %.html
+	@ $(rm) $(rmflags) $(doc_dir)/orm/$*.html
--- a/othermanu/mmi/mcomp/src/mcomp_janitza_umg96s1.pwg
+++ b/othermanu/mmi/mcomp/src/mcomp_janitza_umg96s1.pwg
+0! DefaultWidth 0
+0! DefaultHeight 0
+199
+!/**
+! ACS800PumpAggr
+! Group Components/ABB
+!
+! <image> bcomp_pumpaggr_gs.gif
+!
+! <h1>Description
+! Pump aggregate. Graphic symbol for component ABB_ACS800PumpAggr.
+! Should be connected to an instance of ABB_ACS800PumpAggr, or a 
+! subclass to this class.
+!
+! Subgraph with two pages, pump off (page 1) and pump on (page 2).
+! <image> bcomp_pumpaggr_ags.gif
+!
+! <h1>Default dynamics
+! HostObject <link>GeDynHostObject, ,$pwr_lang/man_geref.dat
+!
+! Dynamics for the symbol
+! - colored red when an error occurs.
+! - colored yellow when a warning occurs.
+! - colored darkgray when the pump is off.
+! - the mode (manual or local) is displayed with a M or L.
+! - pump on and off is displayed with different pages.
+! - popupmenu with the methods of the connected object.
+!
+! DigError <t>$hostobject.IndError <link>GeDynDigError, ,$pwr_lang/man_geref.dat
+! DigWarning <t>$hostobject.IndWarning <link>GeDynDigWarning, ,$pwr_lang/man_geref.dat
+! DigLowColor <t>$hostobject.ACS800.ConvertRun <link>GeDynDigLowColor, ,$pwr_lang/man_geref.dat
+! Value <t>$hostobject.Mode.IndMode <link>GeDynValue, ,$pwr_lang/man_geref.dat
+! DigShift <t>$hostobject.ACS800.ConvertRun <link>GeDynDigShift, ,$pwr_lang/man_geref.dat
+! PopupMenu <t>$hostobject <link>GeDynPopupMenu, ,$pwr_lang/man_geref.dat
+!
+! Default Cycle Slow 
+!
+!*/
+1
+100 121.141
+135 121.141
+101 20
+102 -554
+103 -345
+104 22.6395
+136 22.6395
+105 100
+106 -103
+107 -64
+108 0.99294
+109 -1.00706
+110 1.20756
+111 -0.792445
+116 0
+117 0
+118 126
+119 113
+120 0
+121 Claes context
+122 0
+126 1
+127 1
+128 0
+129 0.3
+130 1.5
+131 0.8
+132 3
+133 2
+137 4510
+138 3
+139 2
+134
+22
+2200 0
+2201 144
+2202 mcomp_janitza_umg96s1
+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 67108864
+2236 0
+2216 0
+2221 0
+2237 0
+2238 0
+2239 3
+2240 0
+2241 0
+2242 0
+2217 0
+2218 0
+2219 1
+2220 
+2230 0
+2231 0
+2222 
+2223 0
+2224 0.5
+2232 0.5
+2225 0.5
+2226 0
+2227 
+2228 0
+2229 0
+2233 1
+2234 1
+2235 0
+2243 0
+2245 0
+2244
+1
+100 113
+101 3
+102 33619964
+103 0
+26
+2600 $hostobject.IndError##Boolean
+2601 37
+2602 9999
+99
+7
+700 $hostobject.IndError##Boolean
+99
+8
+800 $hostobject.IndWarning##Boolean
+99
+50
+5000 $hostobject
+99
+99
+99
+123
+2
+99
+124
+2
+99
+125
+2
+24
+2404 O139
+2400 0.992924
+2401 -1.00706
+2402 1.20756
+2403 -0.792445
+2408 0
+2409 74
+2410 74
+2411 1
+2415 0
+2413 8
+2416 2
+2414 0
+2417 0
+2421 0
+2418 0
+2419 4
+2420 0
+2422 0
+2407 0
+2406
+2405
+8
+802 0
+803 1
+800 0
+801 360
+806 1
+804
+7
+700 0
+701 0
+99
+805
+7
+700 2
+701 2
+99
+99
+2412
+28
+2800 1
+2801 0
+2802 -1.00706
+2803 0
+2804 1
+2805 -0.792445
+2806 0
+99
+99
+21
+2104 O141
+2100 -0.70706
+2101 -1.30706
+2102 0.507555
+2103 -0.0924449
+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 0.958836
+99
+1203 
+1204 0
+1205
+28
+2800 1
+2801 0
+2802 -1.00706
+2803 0
+2804 1
+2805 -0.751345
+2806 0
+99
+99
+99
+21
+2104 O142
+2100 1.29292
+2101 0.692924
+2102 0.507555
+2103 -0.0924449
+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 1
+1202
+7
+700 2
+701 1
+99
+1203 
+1204 0
+1205
+28
+2800 1
+2801 0
+2802 -1.00706
+2803 0
+2804 1
+2805 -0.792445
+2806 0
+99
+99
+99
+30
+3004 O137
+3000 0.756524
+3001 -0.77066
+3002 0.735855
+3003 -0.320745
+3008 0
+3010 0
+3011 2
+3007 0
+3006
+3005
+9
+900 6
+901 304
+904 0
+902 V/A
+903
+7
+700 9.08517
+701 9.36908
+99
+99
+3009
+28
+2800 1
+2801 0
+2802 -9.85586
+2803 0
+2804 1
+2805 -8.86436
+2806 0
+99
+99
+99
+99
--- a/othermanu/mmi/mcomp/src/mcomp_janitza_umg96s1.pwsg
+++ b/othermanu/mmi/mcomp/src/mcomp_janitza_umg96s1.pwsg
+123
+2
+3
+300 mcomp_janitza_umg96s1
+301
+2
+24
+2404 O139
+2400 0.992924
+2401 -1.00706
+2402 1.20756
+2403 -0.792445
+2408 0
+2409 74
+2410 74
+2411 1
+2415 0
+2413 8
+2416 2
+2414 0
+2417 0
+2421 0
+2418 0
+2419 4
+2420 0
+2422 0
+2407 0
+2406
+2405
+8
+802 0
+803 1
+800 0
+801 360
+806 1
+804
+7
+700 0
+701 0
+99
+805
+7
+700 2
+701 2
+99
+99
+2412
+28
+2800 1
+2801 0
+2802 -1.00706
+2803 0
+2804 1
+2805 -0.792445
+2806 0
+99
+99
+12
+1200 0
+1201 2
+1202
+7
+700 0
+701 0.958836
+99
+1203 
+1204 0
+1205
+28
+2800 1
+2801 0
+2802 -1.00706
+2803 0
+2804 1
+2805 -0.751345
+2806 0
+99
+99
+12
+1200 1
+1201 1
+1202
+7
+700 2
+701 1
+99
+1203 
+1204 0
+1205
+28
+2800 1
+2801 0
+2802 -1.00706
+2803 0
+2804 1
+2805 -0.792445
+2806 0
+99
+99
+30
+3004 O137
+3000 0.756524
+3001 -0.77066
+3002 0.735855
+3003 -0.320745
+3008 0
+3010 0
+3011 2
+3007 0
+3006
+3005
+9
+900 6
+901 304
+904 0
+902 V/A
+903
+7
+700 9.08517
+701 9.36908
+99
+99
+3009
+28
+2800 1
+2801 0
+2802 -9.85586
+2803 0
+2804 1
+2805 -8.86436
+2806 0
+99
+99
+99
+302 0
+305 0
+306
+307
+304 0
+303
+308 67108864
+321 0
+309 0
+313 0
+322 0
+323 0
+324 3
+325 0
+326 0
+327 0
+310 0
+311 0
+312 
+314 
+315 0
+316 1
+317 0
+318 0
+319 0
+320 0
+328 0
+329
+1
+100 113
+101 3
+102 33619964
+103 0
+26
+2600 $hostobject.IndError##Boolean
+2601 37
+2602 9999
+99
+7
+700 $hostobject.IndError##Boolean
+99
+8
+800 $hostobject.IndWarning##Boolean
+99
+50
+5000 $hostobject
+99
+99
+99
+99
+99
--- a/othermanu/mmi/mcomp/src/mcomp_janitza_umg96s2.pwg
+++ b/othermanu/mmi/mcomp/src/mcomp_janitza_umg96s2.pwg
--- a/othermanu/mmi/mcomp/src/mcomp_janitza_umg96s2.pwsg
+++ b/othermanu/mmi/mcomp/src/mcomp_janitza_umg96s2.pwsg
+123
+2
+3
+300 mcomp_janitza_umg96s2
+301
+2
+38
+3804 O40
+3800 5.65014
+3801 -3.93525
+3802 3.18599
+3803 -5.94519
+3808 0
+3809 299
+3810 299
+3811 1
+3813 3
+3814 5
+3816 0
+3817 3
+3815 0
+3818 0
+3819 0
+3820 4
+3821 0
+3822 0
+3807 0
+3806
+3805
+5
+500 0
+501 3
+504 1
+505 1
+502
+7
+700 3.26241
+701 8.57788
+99
+503
+7
+700 13.4996
+701 19.4901
+99
+99
+3812
+28
+2800 0.936324
+2801 0
+2802 -6.98992
+2803 0
+2804 0.836793
+2805 -13.1231
+2806 0
+99
+99
+38
+3804 O42
+3800 5.45754
+3801 -3.74268
+3802 2.91479
+3803 -5.72249
+3808 0
+3809 236
+3810 236
+3811 1
+3813 4
+3814 5
+3816 0
+3817 2
+3815 0
+3818 0
+3819 0
+3820 4
+3821 0
+3822 0
+3807 0
+3806
+3805
+5
+500 0
+501 1
+504 1
+505 1
+502
+7
+700 13.0496
+701 10.6591
+99
+503
+7
+700 18.2807
+701 17.8026
+99
+99
+3812
+28
+2800 1.75875
+2801 0
+2802 -26.6938
+2803 0
+2804 1.2091
+2805 -18.6103
+2806 0
+99
+99
+38
+3804 O43
+3800 5.19374
+3801 -3.47889
+3802 0.850415
+3803 -5.43899
+3808 0
+3809 299
+3810 299
+3811 1
+3813 3
+3814 5
+3816 0
+3817 3
+3815 0
+3818 0
+3819 0
+3820 4
+3821 0
+3822 0
+3807 0
+3806
+3805
+5
+500 0
+501 1
+504 1
+505 1
+502
+7
+700 3.26241
+701 8.57788
+99
+503
+7
+700 13.4996
+701 19.4901
+99
+99
+3812
+28
+2800 0.847169
+2801 0
+2802 -6.2427
+2803 0
+2804 0.576362
+2805 -10.3829
+2806 0
+99
+99
+38
+3804 O44
+3800 4.32354
+3801 -2.6087
+3802 0.491115
+3803 -5.15769
+3808 0
+3809 34
+3810 34
+3811 1
+3813 3
+3814 5
+3816 1
+3817 3
+3815 1
+3818 0
+3819 0
+3820 4
+3821 0
+3822 0
+3807 0
+3806
+3805
+5
+500 0
+501 1
+504 1
+505 1
+502
+7
+700 3.26241
+701 8.57788
+99
+503
+7
+700 13.4996
+701 19.4901
+99
+99
+3812
+28
+2800 0.677161
+2801 0
+2802 -4.81787
+2803 0
+2804 0.517659
+2805 -9.59813
+2806 0
+99
+99
+30
+3004 O45
+3000 -2.72591
+3001 -3.37277
+3002 -4.02449
+3003 -4.67129
+3008 3
+3010 0
+3011 2
+3007 0
+3006
+3005
+9
+900 2
+901 304
+904 3
+902 L1
+903
+7
+700 8.99975
+701 27.4773
+99
+99
+3009
+28
+2800 1
+2801 0
+2802 -12.3725
+2803 0
+2804 1
+2805 -31.6424
+2806 0
+99
+99
+30
+3004 O46
+3000 -2.72591
+3001 -3.37277
+3002 -2.05579
+3003 -2.70259
+3008 3
+3010 0
+3011 2
+3007 0
+3006
+3005
+9
+900 2
+901 304
+904 3
+902 L2
+903
+7
+700 8.99975
+701 27.4773
+99
+99
+3009
+28
+2800 1
+2801 0
+2802 -12.3725
+2803 0
+2804 1
+2805 -29.6737
+2806 0
+99
+99
+30
+3004 O47
+3000 -2.72591
+3001 -3.37277
+3002 -0.0870851
+3003 -0.733885
+3008 3
+3010 0
+3011 2
+3007 0
+3006
+3005
+9
+900 2
+901 304
+904 3
+902 L3
+903
+7
+700 8.99975
+701 27.4773
+99
+99
+3009
+28
+2800 1
+2801 0
+2802 -12.3725
+2803 0
+2804 1
+2805 -27.7051
+2806 0
+99
+99
+30
+3004 O59
+3000 3.46144
+3001 3.09584
+3002 -3.23699
+3003 -3.88389
+3008 0
+3010 0
+3011 2
+3007 0
+3006
+3005
+9
+900 2
+901 304
+904 0
+902 V
+903
+7
+700 18.6745
+701 10.3778
+99
+99
+3009
+28
+2800 1
+2801 0
+2802 -15.5787
+2803 0
+2804 1
+2805 -13.7554
+2806 0
+99
+99
+30
+3004 O71
+3000 3.42924
+3001 2.72616
+3002 -0.482785
+3003 -1.12969
+3008 0
+3010 0
+3011 2
+3007 0
+3006
+3005
+9
+900 2
+901 304
+904 0
+902 K1
+903
+7
+700 15.5246
+701 9.19661
+99
+99
+3009
+28
+2800 1
+2801 0
+2802 -12.7984
+2803 0
+2804 1
+2805 -9.82006
+2806 0
+99
+99
+30
+3004 O72
+3000 3.42924
+3001 2.72616
+3002 0.192115
+3003 -0.454685
+3008 0
+3010 0
+3011 2
+3007 0
+3006
+3005
+9
+900 2
+901 304
+904 0
+902 K2
+903
+7
+700 15.5246
+701 9.19661
+99
+99
+3009
+28
+2800 1
+2801 0
+2802 -12.7984
+2803 0
+2804 1
+2805 -9.14508
+2806 0
+99
+99
+24
+2404 O73
+2400 3.91544
+2401 3.51364
+2402 -0.587985
+2403 -0.995485
+2408 0
+2409 34
+2410 34
+2411 1
+2415 0
+2413 5
+2416 2
+2414 0
+2417 0
+2421 0
+2418 0
+2419 4
+2420 0
+2422 0
+2407 0
+2406
+2405
+8
+802 0
+803 1
+800 0
+801 360
+806 0
+804
+7
+700 19.3495
+701 8.97162
+99
+805
+7
+700 20.1932
+701 9.7591
+99
+99
+2412
+28
+2800 0.47619
+2801 0
+2802 -5.70039
+2803 0
+2804 0.517391
+2805 -5.63729
+2806 0
+99
+99
+24
+2404 O74
+2400 3.91544
+2401 3.51364
+2402 0.0588149
+2403 -0.348585
+2408 0
+2409 34
+2410 34
+2411 1
+2415 0
+2413 5
+2416 2
+2414 0
+2417 0
+2421 0
+2418 0
+2419 4
+2420 0
+2422 0
+2407 0
+2406
+2405
+8
+802 0
+803 1
+800 0
+801 360
+806 0
+804
+7
+700 19.3495
+701 8.97162
+99
+805
+7
+700 20.1932
+701 9.7591
+99
+99
+2412
+28
+2800 0.47619
+2801 0
+2802 -5.70039
+2803 0
+2804 0.517391
+2805 -4.99039
+2806 0
+99
+99
+30
+3004 O75
+3000 -0.917145
+3001 -3.44833
+3002 1.60659
+3003 0.931615
+3008 3
+3010 0
+3011 2
+3007 0
+3006
+3005
+9
+900 1
+901 304
+904 3
+902 UMG 96 S
+903
+7
+700 48.1818
+701 17.1115
+99
+99
+3009
+28
+2800 1.11268
+2801 0
+2802 -57.0592
+2803 0
+2804 1.21053
+2805 -19.2479
+2806 0
+99
+99
+30
+3004 O76
+3000 -1.02965
+3001 -3.30771
+3002 2.54059
+3003 1.75309
+3008 3
+3010 0
+3011 2
+3007 0
+3006
+3005
+9
+900 2
+901 304
+904 3
+902 Janitza
+903
+7
+700 48.1818
+701 17.1115
+99
+99
+3009
+28
+2800 1.12903
+2801 0
+2802 -57.7066
+2803 0
+2804 1.22222
+2805 -18.5421
+2806 0
+99
+99
+20
+2004 O77
+2000 -0.684765
+2001 -3.47021
+2002 2.58309
+2003 2.58309
+2009 30
+2010 0
+2005
+6
+600 30
+601 2
+602
+7
+700 58.322
+701 21.2715
+99
+603
+7
+700 49.4169
+701 21.2715
+99
+99
+2008
+28
+2800 0.312791
+2801 0
+2802 -18.9274
+2803 0
+2804 16
+2805 -337.761
+2806 0
+99
+99
+38
+3804 O78
+3800 5.18074
+3801 3.71454
+3802 2.37159
+3803 1.00981
+3808 0
+3809 30
+3810 30
+3811 1
+3813 5
+3814 5
+3816 1
+3817 2
+3815 0
+3818 0
+3819 0
+3820 4
+3821 0
+3822 0
+3807 0
+3806
+3805
+5
+500 0
+501 1
+504 1
+505 1
+502
+7
+700 15.3558
+701 9.47786
+99
+503
+7
+700 16.6495
+701 10.6028
+99
+99
+3812
+28
+2800 1.13333
+2801 0
+2802 -13.6887
+2803 0
+2804 1.21053
+2805 -10.4634
+2806 0
+99
+99
+27
+2703 0
+2704 30
+2722 10000
+2705 30
+2723 10000
+2706 0
+2708 0
+2709 0
+2710 0
+2711 0
+2712 0
+2713 0
+2714 0
+2715 0
+2720 0
+2725 0
+2726 0
+2702 0
+2701
+2700
+10
+1000 pwr_switch
+1002 O85
+1005
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+1006 4.94764
+1007 3.94764
+1008 2.19069
+1009 1.19071
+1013 4.94764
+1014 3.94764
+1015 2.19069
+1016 1.19071
+1003
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+1004
+1001
+7
+700 13.0624
+701 23.0452
+99
+1010 
+1011 
+1018 
+1019 
+1020 
+1021 
+1022 
+1023 
+1024 
+1025 
+1012 0
+1017 9999
+1027 9999
+1026 33619964
+1028 0
+1029 
+99
+2707
+28
+2800 -1
+2801 0
+2802 4.44764
+2803 -0
+2804 -1
+2805 1.19071
+2806 -180
+99
+2716 0
+2718
+2717
+2719 0
+2724 0
+2727 0
+2728 303
+2729 9999
+2721
+1
+100 1
+101 1
+102 33619964
+103 0
+99
+99
+30
+3004 O86
+3000 5.07934
+3001 4.83134
+3002 1.59169
+3003 1.05441
+3008 0
+3010 0
+3011 2
+3007 0
+3006
+3005
+9
+900 1
+901 304
+904 0
+902 2
+903
+7
+700 -2.9349
+701 18.8702
+99
+99
+3009
+28
+2800 1
+2801 0
+2802 7.76624
+2803 0
+2804 1
+2805 -17.3818
+2806 0
+99
+99
+38
+3804 O87
+3800 3.25854
+3801 1.79238
+3802 2.37159
+3803 1.00981
+3808 0
+3809 30
+3810 30
+3811 1
+3813 5
+3814 5
+3816 1
+3817 2
+3815 0
+3818 0
+3819 0
+3820 4
+3821 0
+3822 0
+3807 0
+3806
+3805
+5
+500 0
+501 1
+504 1
+505 1
+502
+7
+700 15.3558
+701 9.47786
+99
+503
+7
+700 16.6495
+701 10.6028
+99
+99
+3812
+28
+2800 1.13333
+2801 0
+2802 -15.6109
+2803 0
+2804 1.21053
+2805 -10.4634
+2806 0
+99
+99
+27
+2703 0
+2704 30
+2722 10000
+2705 30
+2723 10000
+2706 0
+2708 0
+2709 0
+2710 0
+2711 0
+2712 0
+2713 0
+2714 0
+2715 0
+2720 0
+2725 0
+2726 0
+2702 0
+2701
+2700
+10
+1000 pwr_switch
+1002 O88
+1005
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+1006 3.02544
+1007 2.02548
+1008 2.19069
+1009 1.19071
+1013 3.02544
+1014 2.02548
+1015 2.19069
+1016 1.19071
+1003
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+1004
+1001
+7
+700 13.0624
+701 23.0452
+99
+1010 
+1011 
+1018 
+1019 
+1020 
+1021 
+1022 
+1023 
+1024 
+1025 
+1012 0
+1017 9999
+1027 9999
+1026 33619964
+1028 0
+1029 
+99
+2707
+28
+2800 0
+2801 1
+2802 3.02544
+2803 -1
+2804 0
+2805 1.69069
+2806 -450
+99
+2716 0
+2718
+2717
+2719 0
+2724 0
+2727 0
+2728 303
+2729 9999
+2721
+1
+100 1
+101 1
+102 33619964
+103 0
+99
+99
+30
+3004 O89
+3000 3.15714
+3001 2.90914
+3002 1.59169
+3003 1.05441
+3008 0
+3010 0
+3011 2
+3007 0
+3006
+3005
+9
+900 1
+901 304
+904 0
+902 1
+903
+7
+700 -2.9349
+701 18.8702
+99
+99
+3009
+28
+2800 1
+2801 0
+2802 5.84404
+2803 0
+2804 1
+2805 -17.3818
+2806 0
+99
+99
+30
+3004 O90
+3000 5.17284
+3001 0.959335
+3002 2.83669
+3003 2.47039
+3008 30
+3010 0
+3011 2
+3007 0
+3006
+3005
+9
+900 0
+901 304
+904 30
+902 Universal Measuring Device
+903
+7
+700 2.27352
+701 23.4585
+99
+99
+3009
+28
+2800 0.984615
+2801 0
+2802 -1.27921
+2803 0
+2804 0.869565
+2805 -17.6353
+2806 0
+99
+99
+29
+2907
+13
+1300 1
+1301 304
+1306 0
+1302 11
+1305 1
+1303
+7
+700 6.66314
+701 15.4159
+99
+1304 0
+1307 0
+99
+2908
+28
+2800 1
+2801 0
+2802 -4.87147
+2803 0
+2804 1
+2805 -19.0733
+2806 0
+99
+2901 1
+99
+29
+2907
+13
+1300 2
+1301 304
+1306 0
+1302 11
+1305 1
+1303
+7
+700 6.66314
+701 15.4159
+99
+1304 0
+1307 0
+99
+2908
+28
+2800 1
+2801 0
+2802 -4.87147
+2803 0
+2804 1
+2805 -17.3681
+2806 0
+99
+2901 1
+99
+29
+2907
+13
+1300 3
+1301 304
+1306 0
+1302 11
+1305 1
+1303
+7
+700 6.66314
+701 15.4159
+99
+1304 0
+1307 0
+99
+2908
+28
+2800 1
+2801 0
+2802 -4.87147
+2803 0
+2804 1
+2805 -15.6629
+2806 0
+99
+2901 1
+99
+99
+302 0
+305 0
+306
+307
+304 0
+303
+308 67108864
+321 0
+309 0
+313 0
+322 0
+323 0
+324 3
+325 0
+326 0
+327 0
+310 0
+311 0
+312 
+314 
+315 0
+316 1
+317 0
+318 0
+319 0
+320 0
+328 0
+329
+1
+100 1025
+101 3
+102 33619964
+103 0
+12
+1200 $hostobject.U_L3.ActualValue##Float32
+1201 %3.0f
+1202 4
+1203 1
+1204 0
+99
+12
+1200 $hostobject.U_L2.ActualValue##Float32
+1201 %3.0f
+1202 2
+1203 1
+1204 0
+99
+12
+1200 $hostobject.U_L1.ActualValue##Float32
+1201 %3.0f
+1202 1
+1203 7
+1204 0
+99
+50
+5000 $hostobject
+99
+99
+99
+99
+99
--- a/othermanu/mmi/mcomp/src/pwr_c_janitza_umg96s_1.pwg
+++ b/othermanu/mmi/mcomp/src/pwr_c_janitza_umg96s_1.pwg
--- a/othermanu/wbl/mcomp/src/othermanufacturer.wb_load
+++ b/othermanu/wbl/mcomp/src/othermanufacturer.wb_load
--- a/othermanu/wbl/mcomp/src/pwr_janitza_umg96s_1fo.flw
+++ b/othermanu/wbl/mcomp/src/pwr_janitza_umg96s_1fo.flw
--- a/profibus/exp/gsd/src/janitza_umg96s.gsd
+++ b/profibus/exp/gsd/src/janitza_umg96s.gsd
+;==========================================================
+; GSD-File  for UMG96S           Janitza electronics GmbH
+; Auto_Baud_supp, 1.5MBaud
+;
+; Stand : 21.05.2003
+; File    : U96S0781.GSD
+;===========================================================
+#Profibus_DP
+; Unit-Definition-List:
+GSD_Revision=2
+Vendor_Name="Janitza electronics GmbH"
+Model_Name="UMG96S"
+Revision="Rev. 1"
+Ident_Number=0x0781
+Protocol_Ident=0
+Station_Type=0
+Hardware_Release="1.00"
+Software_Release="1.00"
+9.6_supp = 1
+19.2_supp = 1
+45.45_supp = 1
+93.75_supp = 1
+187.5_supp = 1
+500_supp = 1
+1.5M_supp = 1
+MaxTsdr_9.6 = 15
+MaxTsdr_19.2 = 15
+MaxTsdr_45.45 = 15
+MaxTsdr_93.75 = 15
+MaxTsdr_187.5 = 15
+MaxTsdr_500 = 15
+MaxTsdr_1.5M = 25
+Repeater_Ctrl_Sig = 0
+Implementation_Type="SPC3"
+Bitmap_Device="DP_NORM"
+;
+; Slave-Specification:
+;
+Freeze_Mode_supp=0
+Sync_Mode_supp = 0
+Auto_Baud_supp = 1
+Set_Slave_Add_supp = 0
+Min_Slave_Intervall=1
+Max_Diag_Data_Len=6
+Slave_Family=0
+User_Prm_Data_Len=0
+;
+Modular_Station = 1
+Max_Module=1
+Max_Input_Len=124
+Max_Output_Len=2
+Max_Data_Len=126
+;
+;
+; Module-Definitions:
+;
+Module = "STD: 62 Word In, 2 Byte Out" 0xc0,0x01,0x7d
+1
+EndModule
--- a/wb/exp/wb/src/pwr_wb_palette.cnf
+++ b/wb/exp/wb/src/pwr_wb_palette.cnf
@@ -1149,6 +1149,7 @@ palette PlcEditorPalette
      class Eurotherm_TC3001AggrFo
      class SEW_Movidrive_1Fo
      class SEW_Movidrive_EPBFo
+      class Janitza_UMG96S_1Fo	
    }
    menu Simulate
    {

--- a/xtt/lib/ge/src/pwr_ge_setup.dat
+++ b/xtt/lib/ge/src/pwr_ge_setup.dat
@@ -594,6 +594,8 @@ menu Components
  {
    subgraph	Eurotherm_TC3001  pwr_exe:mcomp_eurotherm_tc3001.pwsg 180
    subgraph	Eurotherm_TC3001Aggr  pwr_exe:mcomp_eurotherm_tc3001aggr.pwsg 180
+    subgraph	Janitza_UMG96S		pwr_exe:mcomp_janitza_umg96s1.pwsg 47	
+    subgraph	Janitza_UMG96S_Large	pwr_exe:mcomp_janitza_umg96s2.pwsg 6		
  }
  menu Profibus
  {