From 6e9a7940476ec6316643e0d93d8e8d8e82d1e1cc Mon Sep 17 00:00:00 2001 From: Michael Zillgith Date: Sat, 30 Mar 2019 16:29:32 +0100 Subject: [PATCH] - examples: changed SCL file extensions to reflect the correct file type --- examples/server_example_61400_25/Makefile | 2 +- examples/server_example_61400_25/{wtur.icd => wtur.cid} | 3 --- examples/server_example_basic_io/simpleIO_direct_control.cid | 1 - examples/server_example_complex_array/Makefile | 2 +- .../{mhai_array.icd => mhai_array.cid} | 2 -- ...ect_control_goose.icd => simpleIO_direct_control_goose.cid} | 1 - examples/server_example_control/Makefile | 2 +- .../{simpleIO_control_tests.icd => simpleIO_control_tests.cid} | 1 - examples/server_example_files/Makefile | 2 +- ...simpleIO_direct_control.icd => simpleIO_direct_control.cid} | 2 -- examples/server_example_goose/Makefile | 2 +- ...ect_control_goose.icd => simpleIO_direct_control_goose.cid} | 2 -- examples/server_example_logging/Makefile | 2 +- ...simpleIO_direct_control.icd => simpleIO_direct_control.cid} | 2 -- examples/server_example_password_auth/Makefile | 2 +- ...simpleIO_direct_control.icd => simpleIO_direct_control.cid} | 3 --- examples/server_example_setting_groups/Makefile | 2 +- .../server_example_setting_groups/{sg_demo.icd => sg_demo.cid} | 0 examples/server_example_simple/Makefile | 2 +- ...mpleModel_with_dataset.icd => sampleModel_with_dataset.cid} | 3 --- examples/server_example_simple/server_example_simple.c | 2 +- examples/server_example_substitution/Makefile | 2 +- .../{substitution_example.icd => substitution_example.cid} | 0 examples/server_example_threadless/Makefile | 2 +- ...simpleIO_direct_control.icd => simpleIO_direct_control.cid} | 2 -- examples/server_example_write_handler/Makefile | 2 +- .../{complexModel.icd => complexModel.cid} | 0 27 files changed, 13 insertions(+), 35 deletions(-) rename examples/server_example_61400_25/{wtur.icd => wtur.cid} (97%) rename examples/server_example_complex_array/{mhai_array.icd => mhai_array.cid} (96%) rename examples/server_example_config_file/{simpleIO_direct_control_goose.icd => simpleIO_direct_control_goose.cid} (97%) rename examples/server_example_control/{simpleIO_control_tests.icd => simpleIO_control_tests.cid} (97%) rename examples/server_example_files/{simpleIO_direct_control.icd => simpleIO_direct_control.cid} (97%) rename examples/server_example_goose/{simpleIO_direct_control_goose.icd => simpleIO_direct_control_goose.cid} (97%) rename examples/server_example_logging/{simpleIO_direct_control.icd => simpleIO_direct_control.cid} (96%) rename examples/server_example_password_auth/{simpleIO_direct_control.icd => simpleIO_direct_control.cid} (96%) rename examples/server_example_setting_groups/{sg_demo.icd => sg_demo.cid} (100%) rename examples/server_example_simple/{sampleModel_with_dataset.icd => sampleModel_with_dataset.cid} (96%) rename examples/server_example_substitution/{substitution_example.icd => substitution_example.cid} (100%) rename examples/server_example_threadless/{simpleIO_direct_control.icd => simpleIO_direct_control.cid} (96%) rename examples/server_example_write_handler/{complexModel.icd => complexModel.cid} (100%) diff --git a/examples/server_example_61400_25/Makefile b/examples/server_example_61400_25/Makefile index 28ab2081..85053a63 100644 --- 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 diff --git a/examples/server_example_61400_25/wtur.icd b/examples/server_example_61400_25/wtur.cid similarity index 97% rename from examples/server_example_61400_25/wtur.icd rename to examples/server_example_61400_25/wtur.cid index b7322a21..d70644ff 100644 --- a/examples/server_example_61400_25/wtur.icd +++ b/examples/server_example_61400_25/wtur.cid @@ -1,7 +1,4 @@ - - -
diff --git a/examples/server_example_basic_io/simpleIO_direct_control.cid b/examples/server_example_basic_io/simpleIO_direct_control.cid index 1bc0fabc..fcf046b9 100644 --- a/examples/server_example_basic_io/simpleIO_direct_control.cid +++ b/examples/server_example_basic_io/simpleIO_direct_control.cid @@ -4,7 +4,6 @@
- Station bus

0.0.0.0

diff --git a/examples/server_example_complex_array/Makefile b/examples/server_example_complex_array/Makefile index 124da8d6..ae0a41b8 100644 --- 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 diff --git a/examples/server_example_complex_array/mhai_array.icd b/examples/server_example_complex_array/mhai_array.cid similarity index 96% rename from examples/server_example_complex_array/mhai_array.icd rename to examples/server_example_complex_array/mhai_array.cid index 4a622f06..be81a20d 100644 --- a/examples/server_example_complex_array/mhai_array.icd +++ b/examples/server_example_complex_array/mhai_array.cid @@ -6,8 +6,6 @@ - Station bus - 10

0.0.0.0

diff --git a/examples/server_example_config_file/simpleIO_direct_control_goose.icd b/examples/server_example_config_file/simpleIO_direct_control_goose.cid similarity index 97% rename from examples/server_example_config_file/simpleIO_direct_control_goose.icd rename to examples/server_example_config_file/simpleIO_direct_control_goose.cid index 72552c45..a40c8ddb 100644 --- a/examples/server_example_config_file/simpleIO_direct_control_goose.icd +++ b/examples/server_example_config_file/simpleIO_direct_control_goose.cid @@ -4,7 +4,6 @@ - Station bus
diff --git a/examples/server_example_control/Makefile b/examples/server_example_control/Makefile index f537715b..c975e6d5 100644 --- 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 diff --git a/examples/server_example_control/simpleIO_control_tests.icd b/examples/server_example_control/simpleIO_control_tests.cid similarity index 97% rename from examples/server_example_control/simpleIO_control_tests.icd rename to examples/server_example_control/simpleIO_control_tests.cid index 78b1a68f..d1044052 100644 --- a/examples/server_example_control/simpleIO_control_tests.icd +++ b/examples/server_example_control/simpleIO_control_tests.cid @@ -4,7 +4,6 @@ - Station bus

0.0.0.0

diff --git a/examples/server_example_files/Makefile b/examples/server_example_files/Makefile index bcc7b4c5..0742e846 100644 --- 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 diff --git a/examples/server_example_files/simpleIO_direct_control.icd b/examples/server_example_files/simpleIO_direct_control.cid similarity index 97% rename from examples/server_example_files/simpleIO_direct_control.icd rename to examples/server_example_files/simpleIO_direct_control.cid index 0a0c6355..68e96123 100644 --- a/examples/server_example_files/simpleIO_direct_control.icd +++ b/examples/server_example_files/simpleIO_direct_control.cid @@ -4,8 +4,6 @@ - Station bus - 10

10.0.0.2

diff --git a/examples/server_example_goose/Makefile b/examples/server_example_goose/Makefile index 25b326c7..17ac7a55 100644 --- 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 diff --git a/examples/server_example_goose/simpleIO_direct_control_goose.icd b/examples/server_example_goose/simpleIO_direct_control_goose.cid similarity index 97% rename from examples/server_example_goose/simpleIO_direct_control_goose.icd rename to examples/server_example_goose/simpleIO_direct_control_goose.cid index 4adbf3f1..253c4011 100644 --- a/examples/server_example_goose/simpleIO_direct_control_goose.icd +++ b/examples/server_example_goose/simpleIO_direct_control_goose.cid @@ -4,8 +4,6 @@ - Station bus - 10

10.0.0.2

diff --git a/examples/server_example_logging/Makefile b/examples/server_example_logging/Makefile index 7c1e389f..75e73935 100644 --- 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 diff --git a/examples/server_example_logging/simpleIO_direct_control.icd b/examples/server_example_logging/simpleIO_direct_control.cid similarity index 96% rename from examples/server_example_logging/simpleIO_direct_control.icd rename to examples/server_example_logging/simpleIO_direct_control.cid index a2c745a4..ba4db76e 100644 --- a/examples/server_example_logging/simpleIO_direct_control.icd +++ b/examples/server_example_logging/simpleIO_direct_control.cid @@ -4,8 +4,6 @@ - Station bus - 10

10.0.0.2

diff --git a/examples/server_example_password_auth/Makefile b/examples/server_example_password_auth/Makefile index 62a92580..2fbe18f9 100644 --- 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 diff --git a/examples/server_example_password_auth/simpleIO_direct_control.icd b/examples/server_example_password_auth/simpleIO_direct_control.cid similarity index 96% rename from examples/server_example_password_auth/simpleIO_direct_control.icd rename to examples/server_example_password_auth/simpleIO_direct_control.cid index 7cb91a23..fe371482 100644 --- a/examples/server_example_password_auth/simpleIO_direct_control.icd +++ b/examples/server_example_password_auth/simpleIO_direct_control.cid @@ -4,8 +4,6 @@ - Station bus - 10

10.0.0.2

@@ -31,7 +29,6 @@ - diff --git a/examples/server_example_setting_groups/Makefile b/examples/server_example_setting_groups/Makefile index 236aff4e..2a5e4868 100644 --- 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 diff --git a/examples/server_example_setting_groups/sg_demo.icd b/examples/server_example_setting_groups/sg_demo.cid similarity index 100% rename from examples/server_example_setting_groups/sg_demo.icd rename to examples/server_example_setting_groups/sg_demo.cid diff --git a/examples/server_example_simple/Makefile b/examples/server_example_simple/Makefile index 4d9c741f..f9dcaa36 100644 --- 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 diff --git a/examples/server_example_simple/sampleModel_with_dataset.icd b/examples/server_example_simple/sampleModel_with_dataset.cid similarity index 96% rename from examples/server_example_simple/sampleModel_with_dataset.icd rename to examples/server_example_simple/sampleModel_with_dataset.cid index 9b2c0fc1..65030e24 100644 --- a/examples/server_example_simple/sampleModel_with_dataset.icd +++ b/examples/server_example_simple/sampleModel_with_dataset.cid @@ -11,10 +11,7 @@ - - - diff --git a/examples/server_example_simple/server_example_simple.c b/examples/server_example_simple/server_example_simple.c index f531e577..6d148e95 100644 --- a/examples/server_example_simple/server_example_simple.c +++ b/examples/server_example_simple/server_example_simple.c @@ -27,7 +27,7 @@ #include #include -#include "../server_example_simple/static_model.h" +#include "static_model.h" /* import IEC 61850 device model created from SCL-File */ extern IedModel iedModel; diff --git a/examples/server_example_substitution/Makefile b/examples/server_example_substitution/Makefile index f3b779f4..3c34e3e0 100644 --- 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 diff --git a/examples/server_example_substitution/substitution_example.icd b/examples/server_example_substitution/substitution_example.cid similarity index 100% rename from examples/server_example_substitution/substitution_example.icd rename to examples/server_example_substitution/substitution_example.cid diff --git a/examples/server_example_threadless/Makefile b/examples/server_example_threadless/Makefile index c0490fd5..9c5bef2a 100644 --- 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 diff --git a/examples/server_example_threadless/simpleIO_direct_control.icd b/examples/server_example_threadless/simpleIO_direct_control.cid similarity index 96% rename from examples/server_example_threadless/simpleIO_direct_control.icd rename to examples/server_example_threadless/simpleIO_direct_control.cid index d17242cf..c89a5f10 100644 --- a/examples/server_example_threadless/simpleIO_direct_control.icd +++ b/examples/server_example_threadless/simpleIO_direct_control.cid @@ -4,8 +4,6 @@ - Station bus - 10

10.0.0.2

diff --git a/examples/server_example_write_handler/Makefile b/examples/server_example_write_handler/Makefile index 639e88ef..d4f97f3f 100644 --- 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 diff --git a/examples/server_example_write_handler/complexModel.icd b/examples/server_example_write_handler/complexModel.cid similarity index 100% rename from examples/server_example_write_handler/complexModel.icd rename to examples/server_example_write_handler/complexModel.cid