diff --git a/docs/changelog.md b/docs/changelog.md index 73ca054..4ce01f4 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -1,5 +1,10 @@ # Changelog +## v0.4.0-alpha + +- updated to support mobject-datatypes v0.7.0 +- updated to support mobject-deserialization v0.2.0 + ## v0.3.0-alpha - updated to support mobject-datatypes v0.6.0 diff --git a/mobject-basic-datatypes.library b/mobject-basic-datatypes.library index ff0e67a..22a6650 100644 Binary files a/mobject-basic-datatypes.library and b/mobject-basic-datatypes.library differ diff --git a/src/mobject-basic-datatypes/mobject-basic-datatypes-test-project/Main/Main.plcproj b/src/mobject-basic-datatypes/mobject-basic-datatypes-test-project/Main/Main.plcproj index 3882044..99847c4 100644 --- a/src/mobject-basic-datatypes/mobject-basic-datatypes-test-project/Main/Main.plcproj +++ b/src/mobject-basic-datatypes/mobject-basic-datatypes-test-project/Main/Main.plcproj @@ -67,19 +67,19 @@ - + mobject_basic_datatypes - + mobject_datatypes - + mobject_deserialization mobject_enumerable - + mobject_json diff --git a/src/mobject-basic-datatypes/mobject-basic-datatypes-test-project/Main/Tests/Enums/_E_TcEventClass_TestSuite.TcPOU b/src/mobject-basic-datatypes/mobject-basic-datatypes-test-project/Main/Tests/Enums/_E_TcEventClass_TestSuite.TcPOU index 786417c..af0100d 100644 --- a/src/mobject-basic-datatypes/mobject-basic-datatypes-test-project/Main/Tests/Enums/_E_TcEventClass_TestSuite.TcPOU +++ b/src/mobject-basic-datatypes/mobject-basic-datatypes-test-project/Main/Tests/Enums/_E_TcEventClass_TestSuite.TcPOU @@ -192,7 +192,7 @@ TEST_FINISHED(); VAR _type : _E_TcEventClass(E_TcEventClass.TCEVENTCLASS_NONE); serializer : JsonSerializer; - expected : STRING(500) := '{"typeName":"ENUM","identifier":"E_TcEventClass","enumerations":["TCEVENTCLASS_ALARM","TCEVENTCLASS_HINT","TCEVENTCLASS_INSTRUCTION","TCEVENTCLASS_MAINTENANCE","TCEVENTCLASS_MESSAGE","TCEVENTCLASS_NONE","TCEVENTCLASS_PARAMERROR","TCEVENTCLASS_STATEINFO","TCEVENTCLASS_WARNING"],"baseType":{"typeName":"UINT","minValue":0,"maxValue":65535,"isSigned":false,"isFloat":false}}'; + expected : STRING(500) := '{"typeName":"ENUM","identifier":"E_TcEventClass","enumerations":["TCEVENTCLASS_NONE","TCEVENTCLASS_MAINTENANCE","TCEVENTCLASS_MESSAGE","TCEVENTCLASS_HINT","TCEVENTCLASS_STATEINFO","TCEVENTCLASS_INSTRUCTION","TCEVENTCLASS_WARNING","TCEVENTCLASS_ALARM","TCEVENTCLASS_PARAMERROR"],"baseType":{"typeName":"UINT","minValue":0,"maxValue":65535,"isSigned":false,"isFloat":false}}'; actual : STRING(500); END_VAR ]]> diff --git a/src/mobject-basic-datatypes/mobject-basic-datatypes-test-project/Main/Tests/Structs/_TIMESTRUCT_TestSuite.TcPOU b/src/mobject-basic-datatypes/mobject-basic-datatypes-test-project/Main/Tests/Structs/_TIMESTRUCT_TestSuite.TcPOU index e80e53f..052a17d 100644 --- a/src/mobject-basic-datatypes/mobject-basic-datatypes-test-project/Main/Tests/Structs/_TIMESTRUCT_TestSuite.TcPOU +++ b/src/mobject-basic-datatypes/mobject-basic-datatypes-test-project/Main/Tests/Structs/_TIMESTRUCT_TestSuite.TcPOU @@ -191,7 +191,7 @@ TEST_FINISHED(); VAR _type : _TIMESTRUCT; serializer : JsonSerializer; - expected : STRING(1000) := '{"typeName":"STRUCT","identifier":"TIMESTRUCT","members":{"wDay":{"typeName":"WORD","minValue":0,"maxValue":65535,"isSigned":false,"isFloat":false},"wDayOfWeek":{"typeName":"WORD","minValue":0,"maxValue":65535,"isSigned":false,"isFloat":false},"wHour":{"typeName":"WORD","minValue":0,"maxValue":65535,"isSigned":false,"isFloat":false},"wMilliseconds":{"typeName":"WORD","minValue":0,"maxValue":65535,"isSigned":false,"isFloat":false},"wMinute":{"typeName":"WORD","minValue":0,"maxValue":65535,"isSigned":false,"isFloat":false},"wMonth":{"typeName":"WORD","minValue":0,"maxValue":65535,"isSigned":false,"isFloat":false},"wSecond":{"typeName":"WORD","minValue":0,"maxValue":65535,"isSigned":false,"isFloat":false},"wYear":{"typeName":"WORD","minValue":0,"maxValue":65535,"isSigned":false,"isFloat":false}}}'; + expected : STRING(1000) := '{"typeName":"STRUCT","identifier":"TIMESTRUCT","members":{"wYear":{"typeName":"WORD","minValue":0,"maxValue":65535,"isSigned":false,"isFloat":false},"wMonth":{"typeName":"WORD","minValue":0,"maxValue":65535,"isSigned":false,"isFloat":false},"wDayOfWeek":{"typeName":"WORD","minValue":0,"maxValue":65535,"isSigned":false,"isFloat":false},"wDay":{"typeName":"WORD","minValue":0,"maxValue":65535,"isSigned":false,"isFloat":false},"wHour":{"typeName":"WORD","minValue":0,"maxValue":65535,"isSigned":false,"isFloat":false},"wMinute":{"typeName":"WORD","minValue":0,"maxValue":65535,"isSigned":false,"isFloat":false},"wSecond":{"typeName":"WORD","minValue":0,"maxValue":65535,"isSigned":false,"isFloat":false},"wMilliseconds":{"typeName":"WORD","minValue":0,"maxValue":65535,"isSigned":false,"isFloat":false}}}'; actual : STRING(1000); END_VAR ]]> @@ -217,7 +217,7 @@ TEST_FINISHED(); VAR _type : _TIMESTRUCT; serializer : JsonSerializer; - expected : STRING(500) := '{"wDay":3,"wDayOfWeek":2,"wHour":4,"wMilliseconds":7,"wMinute":5,"wMonth":1,"wSecond":6,"wYear":2000}'; + expected : STRING(500) := '{"wYear":2000,"wMonth":1,"wDayOfWeek":2,"wDay":3,"wHour":4,"wMinute":5,"wSecond":6,"wMilliseconds":7}'; actual : STRING(500); END_VAR ]]> diff --git a/src/mobject-basic-datatypes/mobject-basic-datatypes-test-project/_Config/PLC/Main.xti b/src/mobject-basic-datatypes/mobject-basic-datatypes-test-project/_Config/PLC/Main.xti index a56f8ac..66bb4ba 100644 --- a/src/mobject-basic-datatypes/mobject-basic-datatypes-test-project/_Config/PLC/Main.xti +++ b/src/mobject-basic-datatypes/mobject-basic-datatypes-test-project/_Config/PLC/Main.xti @@ -1,7 +1,7 @@ - + Main Instance {08500001-0000-0000-F000-000000000064} diff --git a/src/mobject-basic-datatypes/mobject-basic-datatypes/mobject-basic-datatypes/mobject-basic-datatypes.plcproj b/src/mobject-basic-datatypes/mobject-basic-datatypes/mobject-basic-datatypes/mobject-basic-datatypes.plcproj index a36bd24..e19ec23 100644 --- a/src/mobject-basic-datatypes/mobject-basic-datatypes/mobject-basic-datatypes/mobject-basic-datatypes.plcproj +++ b/src/mobject-basic-datatypes/mobject-basic-datatypes/mobject-basic-datatypes/mobject-basic-datatypes.plcproj @@ -19,7 +19,7 @@ mobject false mobject-basic-datatypes - 0.3.0 + 0.4.0 mobject-basic-datatypes mobject-basic-datatypes mobject dev team @@ -61,10 +61,10 @@ mobject_constants_datatype_limits - + mobject_datatypes - + mobject_deserialization