- examples: changed SCL file extensions to reflect the correct file type

7 years ago · 6e9a794047
parent d376370aaa
commit 6e9a794047
27 changed files with 13 additions and 35 deletions
--- a/examples/server_example_61400_25/Makefile
+++ b/examples/server_example_61400_25/Makefile
@ -4,7 +4,7 @@ PROJECT_BINARY_NAME = server_example_61400_25
 PROJECT_SOURCES = server_example_61400_25.c
 PROJECT_SOURCES += static_model.c

-PROJECT_ICD_FILE = wtur.icd
+PROJECT_ICD_FILE = wtur.cid

 include $(LIBIEC_HOME)/make/target_system.mk
 include $(LIBIEC_HOME)/make/stack_includes.mk
--- a/examples/server_example_61400_25/wtur.cid
+++ b/examples/server_example_61400_25/wtur.cid
@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<!--2014.05.12-21:21:53 Academic and Evaluation License (AEL) Powered by Masson Technologies (www.massontech.com)-->
-<!--2014.05.12-21:21:53 This file is generated using RedWind IED Modeler (www.iedmodeler.com)-->
-<!--2014.05.12-21:21:53 ????? RedWind IED Modeler ???? (www.iedmodeler.com)-->
 <SCL xmlns="http://www.iec.ch/61850/2003/SCL" revision="" version="">
  <Header id="" nameStructure="IEDName" toolID="RedWind IED Modeler">
    <History>
--- a/examples/server_example_basic_io/simpleIO_direct_control.cid
+++ b/examples/server_example_basic_io/simpleIO_direct_control.cid
@ -4,7 +4,6 @@
  </Header>
  <Communication>
    <SubNetwork name="subnetwork1" type="8-MMS">
-      <Text>Station bus</Text>
      <ConnectedAP iedName="simpleIO" apName="accessPoint1">
        <Address>
          <P type="IP">0.0.0.0</P>
--- a/examples/server_example_complex_array/Makefile
+++ b/examples/server_example_complex_array/Makefile
@ -4,7 +4,7 @@ PROJECT_BINARY_NAME = server_example_ca
 PROJECT_SOURCES = server_example_ca.c
 PROJECT_SOURCES += static_model.c

-PROJECT_ICD_FILE = mhai_array.icd
+PROJECT_ICD_FILE = mhai_array.cid

 include $(LIBIEC_HOME)/make/target_system.mk
 include $(LIBIEC_HOME)/make/stack_includes.mk
--- a/examples/server_example_complex_array/mhai_array.cid
+++ b/examples/server_example_complex_array/mhai_array.cid
@ -6,8 +6,6 @@
  
  <Communication>
    <SubNetwork name="subnetwork1" type="8-MMS">
-      <Text>Station bus</Text>
-      <BitRate unit="b/s">10</BitRate>
      <ConnectedAP iedName="test" apName="accessPoint1">
        <Address>
          <P type="IP">0.0.0.0</P>
--- a/examples/server_example_config_file/simpleIO_direct_control_goose.cid
+++ b/examples/server_example_config_file/simpleIO_direct_control_goose.cid
@ -4,7 +4,6 @@
  </Header>
  <Communication>
    <SubNetwork name="subnetwork1" type="8-MMS">
-      <Text>Station bus</Text>
      <ConnectedAP iedName="simpleIO" apName="accessPoint1">
        <GSE ldInst="GenericIO" cbName="gcbEvents">
           <Address>
--- a/examples/server_example_control/Makefile
+++ b/examples/server_example_control/Makefile
@ -4,7 +4,7 @@ PROJECT_BINARY_NAME = server_example_control
 PROJECT_SOURCES = server_example_control.c
 PROJECT_SOURCES += static_model.c

-PROJECT_ICD_FILE = simpleIO_control_tests.icd
+PROJECT_ICD_FILE = simpleIO_control_tests.cid


 include $(LIBIEC_HOME)/make/target_system.mk
--- a/examples/server_example_control/simpleIO_control_tests.cid
+++ b/examples/server_example_control/simpleIO_control_tests.cid
@ -4,7 +4,6 @@
  </Header>
  <Communication>
    <SubNetwork name="subnetwork1" type="8-MMS">
-      <Text>Station bus</Text>
      <ConnectedAP iedName="simpleIO" apName="accessPoint1">
        <Address>
          <P type="IP">0.0.0.0</P>
--- a/examples/server_example_files/Makefile
+++ b/examples/server_example_files/Makefile
@ -4,7 +4,7 @@ PROJECT_BINARY_NAME = server_example_files
 PROJECT_SOURCES = server_example_files.c
 PROJECT_SOURCES += static_model.c

-PROJECT_ICD_FILE = simpleIO_direct_control.icd
+PROJECT_ICD_FILE = simpleIO_direct_control.cid

 include $(LIBIEC_HOME)/make/target_system.mk
 include $(LIBIEC_HOME)/make/stack_includes.mk
--- a/examples/server_example_files/simpleIO_direct_control.cid
+++ b/examples/server_example_files/simpleIO_direct_control.cid
@ -4,8 +4,6 @@
  </Header>
  <Communication>
    <SubNetwork name="subnetwork1" type="8-MMS">
-      <Text>Station bus</Text>
-      <BitRate unit="b/s">10</BitRate>
      <ConnectedAP iedName="simpleIO" apName="accessPoint1">
        <Address>
          <P type="IP">10.0.0.2</P>
--- a/examples/server_example_goose/Makefile
+++ b/examples/server_example_goose/Makefile
@ -4,7 +4,7 @@ PROJECT_BINARY_NAME = server_example_goose
 PROJECT_SOURCES = server_example_goose.c
 PROJECT_SOURCES += static_model.c

-PROJECT_ICD_FILE = simpleIO_direct_control_goose.icd
+PROJECT_ICD_FILE = simpleIO_direct_control_goose.cid

 include $(LIBIEC_HOME)/make/target_system.mk
 include $(LIBIEC_HOME)/make/stack_includes.mk
--- a/examples/server_example_goose/simpleIO_direct_control_goose.cid
+++ b/examples/server_example_goose/simpleIO_direct_control_goose.cid
@ -4,8 +4,6 @@
  </Header>
  <Communication>
    <SubNetwork name="subnetwork1" type="8-MMS">
-      <Text>Station bus</Text>
-      <BitRate unit="b/s">10</BitRate>
      <ConnectedAP iedName="simpleIO" apName="accessPoint1">
        <Address>
          <P type="IP">10.0.0.2</P>
--- a/examples/server_example_logging/Makefile
+++ b/examples/server_example_logging/Makefile
@ -5,7 +5,7 @@ PROJECT_SOURCES = server_example_logging.c
 PROJECT_SOURCES += static_model.c
 PROJECT_SOURCES += $(LIBIEC_HOME)/src/logging/drivers/sqlite/log_storage_sqlite.c

-PROJECT_ICD_FILE = simpleIO_direct_control.icd
+PROJECT_ICD_FILE = simpleIO_direct_control.cid

 include $(LIBIEC_HOME)/make/target_system.mk
 include $(LIBIEC_HOME)/make/stack_includes.mk
--- a/examples/server_example_logging/simpleIO_direct_control.cid
+++ b/examples/server_example_logging/simpleIO_direct_control.cid
@ -4,8 +4,6 @@
 	</Header>
 	<Communication>
 		<SubNetwork name="subnetwork1" type="8-MMS">
-			<Text>Station bus</Text>
-			<BitRate unit="b/s">10</BitRate>
 			<ConnectedAP iedName="simpleIO" apName="accessPoint1">
 				<Address>
 					<P type="IP">10.0.0.2</P>
--- a/examples/server_example_password_auth/Makefile
+++ b/examples/server_example_password_auth/Makefile
@ -4,7 +4,7 @@ PROJECT_BINARY_NAME = server_example_password_auth
 PROJECT_SOURCES = server_example_password_auth.c
 PROJECT_SOURCES += static_model.c

-PROJECT_ICD_FILE = simpleIO_direct_control.icd
+PROJECT_ICD_FILE = simpleIO_direct_control.cid

 include $(LIBIEC_HOME)/make/target_system.mk
 include $(LIBIEC_HOME)/make/stack_includes.mk
--- a/examples/server_example_password_auth/simpleIO_direct_control.cid
+++ b/examples/server_example_password_auth/simpleIO_direct_control.cid
@ -4,8 +4,6 @@
  </Header>
  <Communication>
    <SubNetwork name="subnetwork1" type="8-MMS">
-      <Text>Station bus</Text>
-      <BitRate unit="b/s">10</BitRate>
      <ConnectedAP iedName="simpleIO" apName="accessPoint1">
        <Address>
          <P type="IP">10.0.0.2</P>
@ -31,7 +29,6 @@
      <GOOSE max="5" />
      <GSSE max="5" />
      <FileHandling />
-      <GSEDir />
      <TimerActivatedControl />
    </Services>
    <AccessPoint name="accessPoint1">
--- a/examples/server_example_setting_groups/Makefile
+++ b/examples/server_example_setting_groups/Makefile
@ -4,7 +4,7 @@ PROJECT_BINARY_NAME = server_example_sg
 PROJECT_SOURCES = server_example_sg.c
 PROJECT_SOURCES += static_model.c

-PROJECT_ICD_FILE = sg_demo.icd
+PROJECT_ICD_FILE = sg_demo.cid

 include $(LIBIEC_HOME)/make/target_system.mk
 include $(LIBIEC_HOME)/make/stack_includes.mk
--- a/examples/server_example_setting_groups/sg_demo.cid
+++ b/examples/server_example_setting_groups/sg_demo.cid
--- a/examples/server_example_simple/Makefile
+++ b/examples/server_example_simple/Makefile
@ -4,7 +4,7 @@ PROJECT_BINARY_NAME = server_example_simple
 PROJECT_SOURCES = server_example_simple.c
 PROJECT_SOURCES += static_model.c

-PROJECT_ICD_FILE = sampleModel_with_dataset.icd
+PROJECT_ICD_FILE = sampleModel_with_dataset.cid

 include $(LIBIEC_HOME)/make/target_system.mk
 include $(LIBIEC_HOME)/make/stack_includes.mk
--- a/examples/server_example_simple/sampleModel_with_dataset.cid
+++ b/examples/server_example_simple/sampleModel_with_dataset.cid
@ -11,10 +11,7 @@
      <ReadWrite />
      <GetCBValues />
      <ConfLNs fixPrefix="true" fixLnInst="true" />
-      <GOOSE max="5" />
-      <GSSE max="5" />
      <FileHandling />
-      <GSEDir />
      <TimerActivatedControl />
    </Services>
    <AccessPoint name="accessPoint1">
--- a/examples/server_example_simple/server_example_simple.c
+++ b/examples/server_example_simple/server_example_simple.c
@ -27,7 +27,7 @@
 #include <stdlib.h>
 #include <stdio.h>

-#include "../server_example_simple/static_model.h"
+#include "static_model.h"

 /* import IEC 61850 device model created from SCL-File */
 extern IedModel iedModel;
--- a/examples/server_example_substitution/Makefile
+++ b/examples/server_example_substitution/Makefile
@ -4,7 +4,7 @@ PROJECT_BINARY_NAME = server_example_substitution
 PROJECT_SOURCES = server_example_substitution.c
 PROJECT_SOURCES += static_model.c

-PROJECT_ICD_FILE = substitution_example.icd
+PROJECT_ICD_FILE = substitution_example.cid

 include $(LIBIEC_HOME)/make/target_system.mk
 include $(LIBIEC_HOME)/make/stack_includes.mk
--- a/examples/server_example_substitution/substitution_example.cid
+++ b/examples/server_example_substitution/substitution_example.cid
--- a/examples/server_example_threadless/Makefile
+++ b/examples/server_example_threadless/Makefile
@ -4,7 +4,7 @@ PROJECT_BINARY_NAME = server_example_threadless
 PROJECT_SOURCES = server_example_threadless.c
 PROJECT_SOURCES += static_model.c

-PROJECT_ICD_FILE = simpleIO_direct_control.icd
+PROJECT_ICD_FILE = simpleIO_direct_control.cid

 include $(LIBIEC_HOME)/make/target_system.mk
 include $(LIBIEC_HOME)/make/stack_includes.mk
--- a/examples/server_example_threadless/simpleIO_direct_control.cid
+++ b/examples/server_example_threadless/simpleIO_direct_control.cid
@ -4,8 +4,6 @@
  </Header>
  <Communication>
    <SubNetwork name="subnetwork1" type="8-MMS">
-      <Text>Station bus</Text>
-      <BitRate unit="b/s">10</BitRate>
      <ConnectedAP iedName="simpleIO" apName="accessPoint1">
        <Address>
          <P type="IP">10.0.0.2</P>
--- a/examples/server_example_write_handler/Makefile
+++ b/examples/server_example_write_handler/Makefile
@ -4,7 +4,7 @@ PROJECT_BINARY_NAME = server_example_write_handler
 PROJECT_SOURCES = server_example_write_handler.c
 PROJECT_SOURCES += static_model.c

-PROJECT_ICD_FILE = complexModel.icd
+PROJECT_ICD_FILE = complexModel.cid

 include $(LIBIEC_HOME)/make/target_system.mk
 include $(LIBIEC_HOME)/make/stack_includes.mk
--- a/examples/server_example_write_handler/complexModel.cid
+++ b/examples/server_example_write_handler/complexModel.cid