diff --git a/config/stack_config.h b/config/stack_config.h index abe9515..2159992 100644 --- a/config/stack_config.h +++ b/config/stack_config.h @@ -36,7 +36,7 @@ * 0 ==> server runs in multi-threaded mode (one thread for each connection and * one server background thread ) */ -#define CONFIG_MMS_SINGLE_THREADED 1 +#define CONFIG_MMS_SINGLE_THREADED 0 /* * Optimize stack for threadless operation - don't use semaphores diff --git a/demos/beaglebone/beagle_demo.iid b/demos/beaglebone/beagle_demo.iid index 32b1946..449274c 100644 --- a/demos/beaglebone/beagle_demo.iid +++ b/demos/beaglebone/beagle_demo.iid @@ -2,22 +2,7 @@
- - - Station bus - 10 - -
-

10.0.0.2

-

255.255.255.0

-

10.0.0.1

-

0001

-

00000001

-

0001

-
- - - + @@ -87,7 +72,12 @@ - + + + + + + @@ -140,6 +130,159 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -289,6 +432,17 @@ + + + + + + + + + + + on @@ -327,5 +481,66 @@ maintenance process + + + not-ready + validated + ready + running + + + + Time + WeekDay + WeekOfYear + DayOfMonth + DayOfYear + + + + Hour + Day + Week + Month + Year + + + + reserved + Monday + Tuesday + Wednesday + Thursday + Friday + Saturday + Sunday + + + + reserved + January + February + March + April + May + June + July + August + September + October + November + December + + + + MS + PER_CYCLE + CYCLE + DAY + WEEK + MONTH + YEAR + EXTERNAL + diff --git a/demos/beaglebone/static_model.c b/demos/beaglebone/static_model.c index 0081d63..4001823 100644 --- a/demos/beaglebone/static_model.c +++ b/demos/beaglebone/static_model.c @@ -1,7 +1,7 @@ /* * static_model.c * - * automatically generated from beagle_demo.icd + * automatically generated from beagle_demo.iid */ #include "static_model.h" @@ -7583,7 +7583,7 @@ ReportControlBlock iedModel_GenericIO_LLN0_report4 = {&iedModel_GenericIO_LLN0, IedModel iedModel = { - "Template", + "beagle", &iedModel_GenericIO, &iedModelds_GenericIO_LLN0_Events, &iedModel_GenericIO_LLN0_report0, diff --git a/demos/beaglebone/static_model.h b/demos/beaglebone/static_model.h index ff5ef52..c51257e 100644 --- a/demos/beaglebone/static_model.h +++ b/demos/beaglebone/static_model.h @@ -1,7 +1,7 @@ /* * static_model.h * - * automatically generated from beagle_demo.icd + * automatically generated from beagle_demo.iid */ #ifndef STATIC_MODEL_H_ diff --git a/examples/server_example_config_file/Makefile b/examples/server_example_config_file/Makefile index 687747f..f27d8b7 100644 --- a/examples/server_example_config_file/Makefile +++ b/examples/server_example_config_file/Makefile @@ -13,7 +13,7 @@ all: $(PROJECT_BINARY_NAME) include $(LIBIEC_HOME)/make/common_targets.mk model: $(PROJECT_ICD_FILE) - java -jar $(LIBIEC_HOME)/tools/model_generator/genconfig.jar $(PROJECT_ICD_FILE) > vmd-filestore/model.cfg + java -jar $(LIBIEC_HOME)/tools/model_generator/genconfig.jar $(PROJECT_ICD_FILE) model.cfg $(PROJECT_BINARY_NAME): $(PROJECT_SOURCES) $(LIB_NAME) $(CC) $(CFLAGS) $(LDFLAGS) -o $(PROJECT_BINARY_NAME) $(PROJECT_SOURCES) $(INCLUDES) $(LIB_NAME) $(LDLIBS) diff --git a/examples/server_example_config_file/model.cfg b/examples/server_example_config_file/model.cfg index 7070762..8f79d45 100644 --- a/examples/server_example_config_file/model.cfg +++ b/examples/server_example_config_file/model.cfg @@ -2,7 +2,6 @@ MODEL(simpleIO){ LD(GenericIO){ LN(LLN0){ DO(Mod 0){ -DA(stVal 0 3 0 1 0); DA(q 0 23 0 2 0); DA(t 0 22 0 0 0); DA(ctlModel 0 12 4 0 0)=0; @@ -18,45 +17,36 @@ DA(q 0 23 0 2 0); DA(t 0 22 0 0 0); } DO(NamPlt 0){ -DA(vendor 0 20 5 0 0)="MZ Automation"; -DA(swRev 0 20 5 0 0)="0.7.3"; -DA(d 0 20 5 0 0)="libiec61850 server example"; +DA(vendor 0 20 5 0 0); +DA(swRev 0 20 5 0 0); +DA(d 0 20 5 0 0); DA(configRev 0 20 5 0 0); DA(ldNs 0 20 11 0 0); } DS(Events){ -DE(simpleIOGenericIO/GGIO1$ST$SPCSO1$stVal); +DE(GGIO1$ST$SPCSO1$stVal); DE(GGIO1$ST$SPCSO2$stVal); DE(GGIO1$ST$SPCSO3$stVal); DE(GGIO1$ST$SPCSO4$stVal); } -DS(Events2){ -DE(GGIO1$ST$SPCSO1); -DE(GGIO1$ST$SPCSO2); -DE(GGIO1$ST$SPCSO3); -DE(GGIO1$ST$SPCSO4); +DS(AnalogValues){ +DE(GGIO1$MX$AnIn1); +DE(GGIO1$MX$AnIn2); +DE(GGIO1$MX$AnIn3); +DE(GGIO1$MX$AnIn4); } -DS(Measurements){ -DE(GGIO1$MX$AnIn1$mag$f); -DE(GGIO1$MX$AnIn1$q); -DE(GGIO1$MX$AnIn2$mag$f); -DE(GGIO1$MX$AnIn2$q); -DE(GGIO1$MX$AnIn3$mag$f); -DE(GGIO1$MX$AnIn3$q); -DE(GGIO1$MX$AnIn4$mag$f); -DE(GGIO1$MX$AnIn4$q); -} -RC(EventsRCB01 Events1 0 Events 4294967295 24 111 50 1000); -RC(EventsIndexed01 Events2 0 Events 1 24 111 50 1000); -RC(EventsIndexed02 Events2 0 Events 1 24 111 50 1000); -RC(EventsIndexed03 Events2 0 Events 1 24 111 50 1000); -RC(Measurements01 Measurements 1 Measurements 1 16 111 50 1000); -RC(Measurements02 Measurements 1 Measurements 1 16 111 50 1000); -RC(Measurements03 Measurements 1 Measurements 1 16 111 50 1000); -LC(EventLog Events GenericIO/LLN0$EventLog 19 0 1 1); -LC(GeneralLog - - 19 0 1 1); +RC(EventsRCB01 Events 0 Events 1 24 111 50 1000); +RC(AnalogValuesRCB01 AnalogValues 0 AnalogValues 1 24 111 50 1000); +LC(EventLog Events GenericIO/LLN0$EventLog 19 0 0 1); +LC(GeneralLog - - 19 0 0 1); LOG(GeneralLog); LOG(EventLog); +GC(gcbEvents events Events 2 0 -1 -1 ){ +PA(4 273 4096 010ccd010001); +} +GC(gcbAnalogValues analog AnalogValues 2 0 -1 -1 ){ +PA(4 273 4096 010ccd010001); +} } LN(LPHD1){ DO(PhyNam 0){ @@ -102,11 +92,11 @@ DA(q 0 23 1 2 0); DA(t 0 22 1 0 0); } DO(AnIn2 0){ -DA(mag 0 27 1 1 0){ +DA(mag 0 27 1 1 101){ DA(f 0 10 1 1 0); } DA(q 0 23 1 2 0); -DA(t 0 22 1 0 0); +DA(t 0 22 1 0 102); } DO(AnIn3 0){ DA(mag 0 27 1 1 0){