Added small things

profibus/changelog.txt

@@ -21,4 +21,6 @@
 080115 cs -           Reading of Di, Ai and Ii can be disabled by setting ConversionOn in channel object to 0.
 080229 rk -           I/O-handling routines generalized and some routines moved to rt_io_bus.c
 100708 rk -           Added functionality for PROFINET IO using Softing Profinet Stack
+101202 rk -           Finalized PROFINET IO functionality. Added several classes
+                      for handling different types of Profinet IO.
 

profibus/exe/profinet_viewer/src/profinet_deviceid.dat

@@ -93,11 +93,14 @@ Finely-graduated modular distributed I/O device, protection type IP20
 # Processing file: /home/claes/gsdml/test.xml
 328 8192
 GRT1-PNT
-
 # Processing file: /home/claes/gsdml/GSDML-V2.0-ABBdrives-RETA02-20070621.xml
 26 1
 ABB RETA-02
 PROFINET IO module RETA-02
+# Processing file: /home/claes/gsdml/gsdml-v2.0-siemens-sinamicsg120prof-20080514.xml
+42 1288
+SINAMICS
+SINAMICS drives
 # Processing file: /home/claes/gsdml/GSDML-V1.0-PhoenixContact-FL-SWITCH-MC-16TX-V1.0-20051207.xml
 176 19
 Factory Line

profibus/exp/gsd/src/os_templ/hw_templ/makefile

@@ -15,6 +15,7 @@ ifndef rules_mk
 endif
 
 vpath %.gsd $(hw_source):$(os_source):$(co_source)
+vpath %.xml $(hw_source):$(os_source):$(co_source)
 
 source_dirs = $(hw_source) $(os_source) $(co_source)
 
@@ -27,18 +28,29 @@ gsd_sources := $(sort \
              ) \
            )
 
+xml_sources := $(sort \
+             $(foreach file, \
+               $(foreach dir, \
+                 $(source_dirs), \
+                 $(wildcard $(dir)/*.xml) \
+               ), $(notdir $(file)) \
+             ) \
+           )
+
 export_gsd := $(patsubst %.gsd, $(exe_dir)/%.gsd, $(gsd_sources))
 clean_gsd := $(patsubst %.gsd, clean_%.gsd, $(gsd_sources))
+export_xml := $(patsubst %.xml, $(exe_dir)/%.xml, $(xml_sources))
+clean_xml := $(patsubst %.xml, clean_%.xml, $(xml_sources))
 
 
 .PHONY : all init copy lib exe clean realclean\
-         $(clean_gsd)
+         $(clean_gsd) $(clean_xml)
 
 all : init copy
 
 init :
 
-copy : $(export_gsd)
+copy : $(export_gsd) $(export_xml)
 
 lib :
 
@@ -46,7 +58,7 @@ exe :
 
 clean :
 
-realclean : clean $(clean_gsd)
+realclean : clean $(clean_gsd) $(clean_xml)
 
 $(export_gsd) : $(exe_dir)/%.gsd : %.gsd
 	@ echo "Exporting $< ..."
@@ -55,4 +67,11 @@ $(export_gsd) : $(exe_dir)/%.gsd : %.gsd
 $(clean_gsd) : clean_%.gsd : %.gsd
 	@ rm $(exe_dir)/$*.gsd
 
+$(export_xml) : $(exe_dir)/%.xml : %.xml
+	@ echo "Exporting $< ..."
+	@ $(cp) $(cpflags) $(source) $(target)
+
+$(clean_xml) : clean_%.xml : %.xml
+	@ rm $(exe_dir)/$*.xml
+
 

siemens/changelog.txt

@@ -6,3 +6,6 @@
 070426 rk  rt         Added IO-method's for Siemens_DiagRepeater.
 070502 rk  mmi        Added object graphs for classes Siemens_DiagRepeater and
                       Siemens_DR_SegmStatus.
+101202 rk  wbl        Added classes for Sinamics G120 drive with Profinet/Profibus.
+101202 rk  wbl        Added classes for Siemens ET200M/S using Profinet.
+

siemens/wbl/mcomp/src/siemens.wb_load

@@ -6100,7 +6100,7 @@ Volume Siemens $ClassVolume 0.0.250.3
       EndObject
       Object Template Sinamics_G120_PbSlave 2164490240 01-JAN-1970 01:00:00.00
         Body RtBody 24-NOV-2010 14:41:25.30
-          Attr Super.GSDfile = "$pwr_exe/SI028158.gse"
+          Attr Super.GSDfile = "$pwr_exe/SI028158.gsd"
           Attr Super.Process = 1
           Attr Super.ByteOrdering = 1
           Attr Super.StallAction = 1

src/changelog.txt

@@ -138,3 +138,4 @@
 100304 cs  script    Script type int change from int to long int.
 100610 cs  emon      Support for EmergBreakAction Reboot added.
 100617 cs  cdh       Bugfix in cdh_SuppressSuperAll.
+101202 rk  rt        Added support for handling i/o-channels hidden inside attribute..