From 359ed20f735bdc7d4d630dcffeb6f07c87a09dd2 Mon Sep 17 00:00:00 2001 From: Alex Robenko Date: Mon, 30 Sep 2024 09:06:20 +1000 Subject: [PATCH 1/9] Updating boost configuration in github actions. --- .github/workflows/actions_build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/actions_build.yml b/.github/workflows/actions_build.yml index 23389f1d..0a1ef05e 100644 --- a/.github/workflows/actions_build.yml +++ b/.github/workflows/actions_build.yml @@ -474,7 +474,7 @@ jobs: fail-fast: false matrix: type: [Debug, Release, MinSizeRel] - arch: [Win32, x64] + arch: [x64] cpp: [11, 14, 17] steps: @@ -486,7 +486,7 @@ jobs: - name: Install Boost shell: cmd run: | - choco install boost-msvc-14.2 + choco install boost-msvc-14.2 --version=1.85.0 - name: Prepare externals shell: cmd From 9e3a151459f2c4c264bc3096a3d8776f3eb18123 Mon Sep 17 00:00:00 2001 From: Alex Robenko Date: Thu, 23 Jan 2025 08:11:52 +1000 Subject: [PATCH 2/9] Using commsdsl v7.0.2 to generate code. --- .github/workflows/actions_build.yml | 8 +- CMakeLists.txt | 2 +- howtos/howto1/include/howto1/Interface.h | 8 +- .../howto1/include/howto1/InterfaceCommon.h | 2 +- howtos/howto1/include/howto1/MsgId.h | 2 +- howtos/howto1/include/howto1/Version.h | 4 +- .../dispatch/DispatchClientInputMessage.h | 2 +- .../include/howto1/dispatch/DispatchMessage.h | 2 +- .../dispatch/DispatchServerInputMessage.h | 2 +- .../factory/AllMessagesDynMemMsgFactory.h | 2 +- .../ClientInputMessagesDynMemMsgFactory.h | 2 +- .../ServerInputMessagesDynMemMsgFactory.h | 2 +- .../howto1/include/howto1/field/FieldBase.h | 2 +- .../include/howto1/field/InterfaceFlags.h | 15 ++- .../howto1/field/InterfaceFlagsCommon.h | 2 +- howtos/howto1/include/howto1/field/MsgId.h | 4 +- .../howto1/include/howto1/field/MsgIdCommon.h | 2 +- howtos/howto1/include/howto1/frame/Frame.h | 30 ++++- .../howto1/include/howto1/frame/FrameCommon.h | 2 +- .../howto1/include/howto1/input/AllMessages.h | 2 +- .../howto1/input/ClientInputMessages.h | 2 +- .../howto1/input/ServerInputMessages.h | 2 +- howtos/howto1/include/howto1/message/Msg1.h | 22 ++-- .../include/howto1/message/Msg1Common.h | 2 +- howtos/howto1/include/howto1/message/Msg2.h | 18 ++- .../include/howto1/message/Msg2Common.h | 2 +- ...llMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../howto1/options/BareMetalDefaultOptions.h | 17 +-- .../howto1/options/ClientDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../howto1/options/DataViewDefaultOptions.h | 17 +-- .../include/howto1/options/DefaultOptions.h | 15 ++- .../howto1/options/ServerDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- howtos/howto10/include/howto10/Interface.h | 5 +- .../howto10/include/howto10/InterfaceCommon.h | 2 +- howtos/howto10/include/howto10/MsgId.h | 2 +- howtos/howto10/include/howto10/Version.h | 4 +- .../dispatch/DispatchClientInputMessage.h | 2 +- .../howto10/dispatch/DispatchMessage.h | 2 +- .../dispatch/DispatchServerInputMessage.h | 2 +- .../factory/AllMessagesDynMemMsgFactory.h | 2 +- .../ClientInputMessagesDynMemMsgFactory.h | 2 +- .../ServerInputMessagesDynMemMsgFactory.h | 2 +- .../howto10/include/howto10/field/FieldBase.h | 2 +- howtos/howto10/include/howto10/field/Flags.h | 15 ++- .../include/howto10/field/FlagsCommon.h | 2 +- howtos/howto10/include/howto10/field/MsgId.h | 4 +- .../include/howto10/field/MsgIdCommon.h | 2 +- howtos/howto10/include/howto10/frame/Frame.h | 38 +++++- .../include/howto10/frame/FrameCommon.h | 2 +- .../include/howto10/input/AllMessages.h | 2 +- .../howto10/input/ClientInputMessages.h | 2 +- .../howto10/input/ServerInputMessages.h | 2 +- howtos/howto10/include/howto10/message/Msg1.h | 8 +- .../include/howto10/message/Msg1Common.h | 2 +- howtos/howto10/include/howto10/message/Msg2.h | 8 +- .../include/howto10/message/Msg2Common.h | 2 +- howtos/howto10/include/howto10/message/Msg3.h | 10 +- .../include/howto10/message/Msg3Common.h | 2 +- ...llMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../howto10/options/BareMetalDefaultOptions.h | 17 +-- .../howto10/options/ClientDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../howto10/options/DataViewDefaultOptions.h | 17 +-- .../include/howto10/options/DefaultOptions.h | 15 ++- .../howto10/options/ServerDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- howtos/howto2/include/howto2/Message.h | 2 +- howtos/howto2/include/howto2/MsgId.h | 2 +- howtos/howto2/include/howto2/Version.h | 4 +- .../dispatch/DispatchClientInputMessage.h | 2 +- .../include/howto2/dispatch/DispatchMessage.h | 2 +- .../dispatch/DispatchServerInputMessage.h | 2 +- .../factory/AllMessagesDynMemMsgFactory.h | 2 +- .../ClientInputMessagesDynMemMsgFactory.h | 2 +- .../ServerInputMessagesDynMemMsgFactory.h | 2 +- .../howto2/include/howto2/field/FieldBase.h | 2 +- howtos/howto2/include/howto2/field/MsgId.h | 4 +- .../howto2/include/howto2/field/MsgIdCommon.h | 2 +- howtos/howto2/include/howto2/frame/Frame.h | 29 ++++- .../howto2/include/howto2/frame/FrameCommon.h | 2 +- .../howto2/include/howto2/input/AllMessages.h | 2 +- .../howto2/input/ClientInputMessages.h | 2 +- .../howto2/input/ServerInputMessages.h | 2 +- howtos/howto2/include/howto2/message/Msg1.h | 8 +- .../include/howto2/message/Msg1Common.h | 2 +- howtos/howto2/include/howto2/message/Msg2.h | 6 +- .../include/howto2/message/Msg2Common.h | 2 +- howtos/howto2/include/howto2/message/Msg3.h | 8 +- .../include/howto2/message/Msg3Common.h | 2 +- howtos/howto2/include/howto2/message/Msg4.h | 6 +- .../include/howto2/message/Msg4Common.h | 2 +- ...llMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../howto2/options/BareMetalDefaultOptions.h | 17 +-- .../howto2/options/ClientDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../howto2/options/DataViewDefaultOptions.h | 17 +-- .../include/howto2/options/DefaultOptions.h | 15 ++- .../howto2/options/ServerDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- howtos/howto3/include/howto3/Message.h | 2 +- howtos/howto3/include/howto3/MsgId.h | 2 +- howtos/howto3/include/howto3/Version.h | 4 +- .../dispatch/DispatchClientInputMessage.h | 2 +- .../include/howto3/dispatch/DispatchMessage.h | 2 +- .../dispatch/DispatchServerInputMessage.h | 2 +- .../factory/AllMessagesDynMemMsgFactory.h | 2 +- .../ClientInputMessagesDynMemMsgFactory.h | 2 +- .../ServerInputMessagesDynMemMsgFactory.h | 2 +- .../howto3/include/howto3/field/FieldBase.h | 2 +- howtos/howto3/include/howto3/field/MsgId.h | 4 +- .../howto3/include/howto3/field/MsgIdCommon.h | 2 +- howtos/howto3/include/howto3/frame/Frame.h | 24 +++- .../howto3/include/howto3/input/AllMessages.h | 2 +- .../howto3/input/ClientInputMessages.h | 2 +- .../howto3/input/ServerInputMessages.h | 2 +- howtos/howto3/include/howto3/message/Msg1.h | 8 +- .../include/howto3/message/Msg1Common.h | 2 +- howtos/howto3/include/howto3/message/Msg2.h | 8 +- .../include/howto3/message/Msg2Common.h | 2 +- howtos/howto3/include/howto3/message/Msg3.h | 8 +- .../include/howto3/message/Msg3Common.h | 2 +- ...llMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../howto3/options/BareMetalDefaultOptions.h | 17 +-- .../howto3/options/ClientDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../howto3/options/DataViewDefaultOptions.h | 17 +-- .../include/howto3/options/DefaultOptions.h | 15 ++- .../howto3/options/ServerDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- howtos/howto4/include/howto4/Message.h | 2 +- howtos/howto4/include/howto4/MsgId.h | 2 +- howtos/howto4/include/howto4/Version.h | 4 +- .../dispatch/DispatchClientInputMessage.h | 2 +- .../include/howto4/dispatch/DispatchMessage.h | 2 +- .../dispatch/DispatchServerInputMessage.h | 2 +- .../factory/AllMessagesDynMemMsgFactory.h | 2 +- .../ClientInputMessagesDynMemMsgFactory.h | 2 +- .../ServerInputMessagesDynMemMsgFactory.h | 2 +- .../howto4/include/howto4/field/FieldBase.h | 2 +- howtos/howto4/include/howto4/field/TlvProp.h | 97 ++++++++++++--- .../include/howto4/field/TlvPropCommon.h | 37 +++++- howtos/howto4/include/howto4/frame/Frame.h | 36 +++++- .../howto4/include/howto4/frame/FrameCommon.h | 2 +- .../howto4/include/howto4/input/AllMessages.h | 2 +- .../howto4/input/ClientInputMessages.h | 2 +- .../howto4/input/ServerInputMessages.h | 2 +- howtos/howto4/include/howto4/message/Msg.h | 8 +- .../howto4/include/howto4/message/MsgCommon.h | 2 +- ...llMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../howto4/options/BareMetalDefaultOptions.h | 17 +-- .../howto4/options/ClientDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../howto4/options/DataViewDefaultOptions.h | 17 +-- .../include/howto4/options/DefaultOptions.h | 17 +-- .../howto4/options/ServerDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- howtos/howto5/include/howto5/Interface.h | 11 +- .../howto5/include/howto5/InterfaceCommon.h | 2 +- howtos/howto5/include/howto5/MsgId.h | 2 +- howtos/howto5/include/howto5/Version.h | 4 +- .../dispatch/DispatchClientInputMessage.h | 2 +- .../include/howto5/dispatch/DispatchMessage.h | 2 +- .../dispatch/DispatchServerInputMessage.h | 2 +- .../factory/AllMessagesDynMemMsgFactory.h | 2 +- .../ClientInputMessagesDynMemMsgFactory.h | 2 +- .../ServerInputMessagesDynMemMsgFactory.h | 2 +- .../howto5/include/howto5/field/FieldBase.h | 2 +- .../include/howto5/field/InterfaceFlags.h | 15 ++- .../howto5/field/InterfaceFlagsCommon.h | 2 +- howtos/howto5/include/howto5/field/MsgId.h | 4 +- .../howto5/include/howto5/field/MsgIdCommon.h | 2 +- howtos/howto5/include/howto5/field/Version.h | 4 +- .../include/howto5/field/VersionCommon.h | 2 +- .../include/howto5/field/VersionWithFlags.h | 7 +- .../howto5/field/VersionWithFlagsCommon.h | 2 +- howtos/howto5/include/howto5/frame/Frame.h | 30 ++++- .../howto5/include/howto5/frame/FrameCommon.h | 2 +- .../howto5/include/howto5/input/AllMessages.h | 2 +- .../howto5/input/ClientInputMessages.h | 2 +- .../howto5/input/ServerInputMessages.h | 2 +- howtos/howto5/include/howto5/message/Msg1.h | 26 ++-- .../include/howto5/message/Msg1Common.h | 2 +- howtos/howto5/include/howto5/message/Msg2.h | 28 +++-- .../include/howto5/message/Msg2Common.h | 2 +- ...llMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../howto5/options/BareMetalDefaultOptions.h | 17 +-- .../howto5/options/ClientDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../howto5/options/DataViewDefaultOptions.h | 17 +-- .../include/howto5/options/DefaultOptions.h | 15 ++- .../howto5/options/ServerDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- howtos/howto6/include/howto6/Interface.h | 5 +- .../howto6/include/howto6/InterfaceCommon.h | 2 +- howtos/howto6/include/howto6/MsgId.h | 2 +- howtos/howto6/include/howto6/Version.h | 4 +- .../dispatch/DispatchClientInputMessage.h | 2 +- .../include/howto6/dispatch/DispatchMessage.h | 2 +- .../dispatch/DispatchServerInputMessage.h | 2 +- .../factory/AllMessagesDynMemMsgFactory.h | 2 +- .../ClientInputMessagesDynMemMsgFactory.h | 2 +- .../ServerInputMessagesDynMemMsgFactory.h | 2 +- .../include/howto6/field/ChecksumType.h | 4 +- .../include/howto6/field/ChecksumTypeCommon.h | 2 +- .../howto6/include/howto6/field/FieldBase.h | 2 +- howtos/howto6/include/howto6/field/MsgId.h | 4 +- .../howto6/include/howto6/field/MsgIdCommon.h | 2 +- howtos/howto6/include/howto6/frame/Frame.h | 38 +++++- .../howto6/include/howto6/frame/FrameCommon.h | 2 +- .../howto6/include/howto6/input/AllMessages.h | 2 +- .../howto6/input/ClientInputMessages.h | 2 +- .../howto6/input/ServerInputMessages.h | 2 +- howtos/howto6/include/howto6/message/Msg1.h | 8 +- .../include/howto6/message/Msg1Common.h | 2 +- howtos/howto6/include/howto6/message/Msg2.h | 8 +- .../include/howto6/message/Msg2Common.h | 2 +- howtos/howto6/include/howto6/message/Msg3.h | 10 +- .../include/howto6/message/Msg3Common.h | 2 +- ...llMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../howto6/options/BareMetalDefaultOptions.h | 17 +-- .../howto6/options/ClientDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../howto6/options/DataViewDefaultOptions.h | 17 +-- .../include/howto6/options/DefaultOptions.h | 15 ++- .../howto6/options/ServerDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- howtos/howto7/include/howto7/Message.h | 2 +- howtos/howto7/include/howto7/MsgId.h | 2 +- howtos/howto7/include/howto7/Version.h | 4 +- .../dispatch/DispatchClientInputMessage.h | 2 +- .../include/howto7/dispatch/DispatchMessage.h | 2 +- .../dispatch/DispatchServerInputMessage.h | 2 +- .../factory/AllMessagesDynMemMsgFactory.h | 2 +- .../ClientInputMessagesDynMemMsgFactory.h | 2 +- .../ServerInputMessagesDynMemMsgFactory.h | 2 +- .../howto7/include/howto7/field/FieldBase.h | 2 +- howtos/howto7/include/howto7/field/MsgId.h | 4 +- .../howto7/include/howto7/field/MsgIdCommon.h | 2 +- howtos/howto7/include/howto7/frame/Frame.h | 36 +++++- .../howto7/include/howto7/frame/FrameCommon.h | 2 +- .../howto7/include/howto7/input/AllMessages.h | 2 +- .../howto7/input/ClientInputMessages.h | 2 +- .../howto7/input/ServerInputMessages.h | 2 +- howtos/howto7/include/howto7/message/Msg1.h | 8 +- .../include/howto7/message/Msg1Common.h | 2 +- howtos/howto7/include/howto7/message/Msg2.h | 8 +- .../include/howto7/message/Msg2Common.h | 2 +- howtos/howto7/include/howto7/message/Msg3.h | 10 +- .../include/howto7/message/Msg3Common.h | 2 +- ...llMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../howto7/options/BareMetalDefaultOptions.h | 17 +-- .../howto7/options/ClientDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../howto7/options/DataViewDefaultOptions.h | 17 +-- .../include/howto7/options/DefaultOptions.h | 15 ++- .../howto7/options/ServerDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- howtos/howto8/include/howto8/Interface.h | 5 +- .../howto8/include/howto8/InterfaceCommon.h | 2 +- howtos/howto8/include/howto8/MsgId.h | 2 +- howtos/howto8/include/howto8/Version.h | 4 +- .../dispatch/DispatchClientInputMessage.h | 2 +- .../include/howto8/dispatch/DispatchMessage.h | 2 +- .../dispatch/DispatchServerInputMessage.h | 2 +- .../factory/AllMessagesDynMemMsgFactory.h | 2 +- .../ClientInputMessagesDynMemMsgFactory.h | 2 +- .../ServerInputMessagesDynMemMsgFactory.h | 2 +- .../howto8/include/howto8/field/FieldBase.h | 2 +- howtos/howto8/include/howto8/field/Flags.h | 15 ++- .../howto8/include/howto8/field/FlagsCommon.h | 2 +- howtos/howto8/include/howto8/field/MsgId.h | 4 +- .../howto8/include/howto8/field/MsgIdCommon.h | 2 +- howtos/howto8/include/howto8/frame/Frame.h | 48 ++++++-- .../howto8/include/howto8/frame/FrameCommon.h | 2 +- .../howto8/include/howto8/input/AllMessages.h | 2 +- .../howto8/input/ClientInputMessages.h | 2 +- .../howto8/input/ServerInputMessages.h | 2 +- howtos/howto8/include/howto8/message/Msg1.h | 16 ++- .../include/howto8/message/Msg1Common.h | 2 +- howtos/howto8/include/howto8/message/Msg2.h | 16 ++- .../include/howto8/message/Msg2Common.h | 2 +- ...llMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../howto8/options/BareMetalDefaultOptions.h | 17 +-- .../howto8/options/ClientDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../howto8/options/DataViewDefaultOptions.h | 17 +-- .../include/howto8/options/DefaultOptions.h | 13 +- .../howto8/options/ServerDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- howtos/howto9/include/howto9/Message.h | 2 +- howtos/howto9/include/howto9/MsgId.h | 2 +- howtos/howto9/include/howto9/Version.h | 4 +- .../dispatch/DispatchClientInputMessage.h | 2 +- .../include/howto9/dispatch/DispatchMessage.h | 2 +- .../dispatch/DispatchServerInputMessage.h | 2 +- .../factory/AllMessagesDynMemMsgFactory.h | 2 +- .../ClientInputMessagesDynMemMsgFactory.h | 2 +- .../ServerInputMessagesDynMemMsgFactory.h | 2 +- .../howto9/include/howto9/field/FieldBase.h | 2 +- howtos/howto9/include/howto9/field/MsgId.h | 4 +- .../howto9/include/howto9/field/MsgIdCommon.h | 2 +- .../howto9/include/howto9/field/SizeField.h | 8 +- .../include/howto9/field/SizeFieldCommon.h | 2 +- .../howto9/include/howto9/field/SyncField.h | 4 +- .../include/howto9/field/SyncFieldCommon.h | 2 +- howtos/howto9/include/howto9/frame/Frame.h | 30 ++++- .../howto9/include/howto9/frame/FrameCommon.h | 2 +- .../howto9/include/howto9/input/AllMessages.h | 2 +- .../howto9/input/ClientInputMessages.h | 2 +- .../howto9/input/ServerInputMessages.h | 2 +- howtos/howto9/include/howto9/message/Msg1.h | 8 +- .../include/howto9/message/Msg1Common.h | 2 +- howtos/howto9/include/howto9/message/Msg2.h | 8 +- .../include/howto9/message/Msg2Common.h | 2 +- howtos/howto9/include/howto9/message/Msg3.h | 10 +- .../include/howto9/message/Msg3Common.h | 2 +- ...llMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../howto9/options/BareMetalDefaultOptions.h | 17 +-- .../howto9/options/ClientDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../howto9/options/DataViewDefaultOptions.h | 17 +-- .../include/howto9/options/DefaultOptions.h | 15 ++- .../howto9/options/ServerDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../tutorial1/include/tutorial1/Message.h | 2 +- tutorials/tutorial1/include/tutorial1/MsgId.h | 2 +- .../tutorial1/include/tutorial1/Version.h | 4 +- .../dispatch/DispatchClientInputMessage.h | 2 +- .../tutorial1/dispatch/DispatchMessage.h | 2 +- .../dispatch/DispatchServerInputMessage.h | 2 +- .../factory/AllMessagesDynMemMsgFactory.h | 2 +- .../ClientInputMessagesDynMemMsgFactory.h | 2 +- .../ServerInputMessagesDynMemMsgFactory.h | 2 +- .../include/tutorial1/field/FieldBase.h | 2 +- .../tutorial1/include/tutorial1/field/MsgId.h | 4 +- .../include/tutorial1/field/MsgIdCommon.h | 2 +- .../tutorial1/include/tutorial1/frame/Frame.h | 24 +++- .../include/tutorial1/input/AllMessages.h | 2 +- .../tutorial1/input/ClientInputMessages.h | 2 +- .../tutorial1/input/ServerInputMessages.h | 2 +- .../include/tutorial1/message/Msg1.h | 2 +- .../include/tutorial1/message/Msg1Common.h | 2 +- .../include/tutorial1/message/Msg2.h | 2 +- .../include/tutorial1/message/Msg2Common.h | 2 +- ...llMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../options/BareMetalDefaultOptions.h | 18 +-- .../tutorial1/options/ClientDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../options/DataViewDefaultOptions.h | 18 +-- .../tutorial1/options/DefaultOptions.h | 12 +- .../tutorial1/options/ServerDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../tutorial10/include/tutorial10/Message.h | 2 +- .../tutorial10/include/tutorial10/MsgId.h | 2 +- .../tutorial10/include/tutorial10/Version.h | 4 +- .../dispatch/DispatchClientInputMessage.h | 2 +- .../tutorial10/dispatch/DispatchMessage.h | 2 +- .../dispatch/DispatchServerInputMessage.h | 2 +- .../factory/AllMessagesDynMemMsgFactory.h | 2 +- .../ClientInputMessagesDynMemMsgFactory.h | 2 +- .../ServerInputMessagesDynMemMsgFactory.h | 2 +- .../include/tutorial10/field/FieldBase.h | 2 +- .../include/tutorial10/field/MsgId.h | 4 +- .../include/tutorial10/field/MsgIdCommon.h | 2 +- .../include/tutorial10/frame/Frame.h | 30 ++++- .../include/tutorial10/frame/FrameCommon.h | 2 +- .../include/tutorial10/input/AllMessages.h | 2 +- .../tutorial10/input/ClientInputMessages.h | 2 +- .../tutorial10/input/ServerInputMessages.h | 2 +- .../include/tutorial10/message/Msg1.h | 2 +- .../include/tutorial10/message/Msg1Common.h | 2 +- .../include/tutorial10/message/Msg2.h | 2 +- .../include/tutorial10/message/Msg2Common.h | 2 +- .../include/tutorial10/message/Msg3.h | 2 +- .../include/tutorial10/message/Msg3Common.h | 2 +- .../include/tutorial10/message/Msg4.h | 2 +- .../include/tutorial10/message/Msg4Common.h | 2 +- .../include/tutorial10/message/Msg5.h | 2 +- .../include/tutorial10/message/Msg5Common.h | 2 +- ...llMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../options/BareMetalDefaultOptions.h | 18 +-- .../tutorial10/options/ClientDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../options/DataViewDefaultOptions.h | 18 +-- .../tutorial10/options/DefaultOptions.h | 16 +-- .../tutorial10/options/ServerDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../tutorial11/include/tutorial11/Message.h | 2 +- .../tutorial11/include/tutorial11/MsgId.h | 2 +- .../tutorial11/include/tutorial11/Version.h | 4 +- .../dispatch/DispatchClientInputMessage.h | 2 +- .../tutorial11/dispatch/DispatchMessage.h | 2 +- .../dispatch/DispatchServerInputMessage.h | 2 +- .../factory/AllMessagesDynMemMsgFactory.h | 2 +- .../ClientInputMessagesDynMemMsgFactory.h | 2 +- .../ServerInputMessagesDynMemMsgFactory.h | 2 +- .../include/tutorial11/field/FieldBase.h | 2 +- .../include/tutorial11/field/MsgId.h | 4 +- .../include/tutorial11/field/MsgIdCommon.h | 2 +- .../include/tutorial11/frame/Frame.h | 30 ++++- .../include/tutorial11/frame/FrameCommon.h | 2 +- .../include/tutorial11/input/AllMessages.h | 2 +- .../tutorial11/input/ClientInputMessages.h | 2 +- .../tutorial11/input/ServerInputMessages.h | 2 +- .../include/tutorial11/message/Msg1.h | 2 +- .../include/tutorial11/message/Msg1Common.h | 2 +- .../include/tutorial11/message/Msg2.h | 2 +- .../include/tutorial11/message/Msg2Common.h | 2 +- .../include/tutorial11/message/Msg3.h | 2 +- .../include/tutorial11/message/Msg3Common.h | 2 +- ...llMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../options/BareMetalDefaultOptions.h | 18 +-- .../tutorial11/options/ClientDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../options/DataViewDefaultOptions.h | 18 +-- .../tutorial11/options/DefaultOptions.h | 12 +- .../tutorial11/options/ServerDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../tutorial12/include/tutorial12/Message.h | 2 +- .../tutorial12/include/tutorial12/MsgId.h | 2 +- .../tutorial12/include/tutorial12/Version.h | 4 +- .../dispatch/DispatchClientInputMessage.h | 2 +- .../tutorial12/dispatch/DispatchMessage.h | 2 +- .../dispatch/DispatchServerInputMessage.h | 2 +- .../factory/AllMessagesDynMemMsgFactory.h | 2 +- .../ClientInputMessagesDynMemMsgFactory.h | 2 +- .../ServerInputMessagesDynMemMsgFactory.h | 2 +- .../include/tutorial12/field/FieldBase.h | 2 +- .../include/tutorial12/field/Length.h | 8 +- .../include/tutorial12/field/LengthCommon.h | 2 +- .../include/tutorial12/field/MsgId.h | 4 +- .../include/tutorial12/field/MsgIdCommon.h | 2 +- .../include/tutorial12/frame/Frame.h | 30 ++++- .../include/tutorial12/frame/FrameCommon.h | 2 +- .../include/tutorial12/input/AllMessages.h | 2 +- .../tutorial12/input/ClientInputMessages.h | 2 +- .../tutorial12/input/ServerInputMessages.h | 2 +- .../include/tutorial12/message/Msg1.h | 6 +- .../include/tutorial12/message/Msg1Common.h | 2 +- .../include/tutorial12/message/Msg2.h | 6 +- .../include/tutorial12/message/Msg2Common.h | 2 +- .../include/tutorial12/message/Msg3.h | 18 ++- .../include/tutorial12/message/Msg3Common.h | 2 +- ...llMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../options/BareMetalDefaultOptions.h | 18 +-- .../tutorial12/options/ClientDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../options/DataViewDefaultOptions.h | 18 +-- .../tutorial12/options/DefaultOptions.h | 24 ++-- .../tutorial12/options/ServerDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../tutorial13/include/tutorial13/Message.h | 2 +- .../tutorial13/include/tutorial13/MsgId.h | 2 +- .../tutorial13/include/tutorial13/Version.h | 4 +- .../dispatch/DispatchClientInputMessage.h | 2 +- .../tutorial13/dispatch/DispatchMessage.h | 2 +- .../dispatch/DispatchServerInputMessage.h | 2 +- .../factory/AllMessagesDynMemMsgFactory.h | 2 +- .../ClientInputMessagesDynMemMsgFactory.h | 2 +- .../ServerInputMessagesDynMemMsgFactory.h | 2 +- .../include/tutorial13/field/FieldBase.h | 2 +- .../include/tutorial13/field/MsgId.h | 4 +- .../include/tutorial13/field/MsgIdCommon.h | 2 +- .../include/tutorial13/frame/Frame.h | 30 ++++- .../include/tutorial13/frame/FrameCommon.h | 2 +- .../include/tutorial13/input/AllMessages.h | 2 +- .../tutorial13/input/ClientInputMessages.h | 2 +- .../tutorial13/input/ServerInputMessages.h | 2 +- .../include/tutorial13/message/Msg1_1.h | 8 +- .../include/tutorial13/message/Msg1_1Common.h | 2 +- .../include/tutorial13/message/Msg1_2.h | 8 +- .../include/tutorial13/message/Msg1_2Common.h | 2 +- .../include/tutorial13/message/Msg1_3.h | 8 +- .../include/tutorial13/message/Msg1_3Common.h | 2 +- .../include/tutorial13/message/Msg2_1.h | 10 +- .../include/tutorial13/message/Msg2_1Common.h | 2 +- .../include/tutorial13/message/Msg2_2.h | 10 +- .../include/tutorial13/message/Msg2_2Common.h | 2 +- .../include/tutorial13/message/Msg2_3.h | 10 +- .../include/tutorial13/message/Msg2_3Common.h | 2 +- ...llMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../options/BareMetalDefaultOptions.h | 18 +-- .../tutorial13/options/ClientDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../options/DataViewDefaultOptions.h | 18 +-- .../tutorial13/options/DefaultOptions.h | 12 +- .../tutorial13/options/ServerDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../tutorial14/include/tutorial14/Message.h | 2 +- .../tutorial14/include/tutorial14/MsgId.h | 2 +- .../tutorial14/include/tutorial14/Version.h | 4 +- .../dispatch/DispatchClientInputMessage.h | 2 +- .../tutorial14/dispatch/DispatchMessage.h | 2 +- .../dispatch/DispatchServerInputMessage.h | 2 +- .../factory/AllMessagesDynMemMsgFactory.h | 2 +- .../ClientInputMessagesDynMemMsgFactory.h | 2 +- .../ServerInputMessagesDynMemMsgFactory.h | 2 +- .../include/tutorial14/field/FieldBase.h | 2 +- .../include/tutorial14/field/MsgId.h | 4 +- .../include/tutorial14/field/MsgIdCommon.h | 2 +- .../include/tutorial14/frame/Frame.h | 34 +++++- .../include/tutorial14/frame/FrameCommon.h | 2 +- .../include/tutorial14/input/AllMessages.h | 2 +- .../tutorial14/input/ClientInputMessages.h | 2 +- .../tutorial14/input/ServerInputMessages.h | 2 +- .../include/tutorial14/message/Msg1.h | 39 ++++-- .../include/tutorial14/message/Msg1Common.h | 2 +- .../include/tutorial14/message/Msg2.h | 8 +- .../include/tutorial14/message/Msg2Common.h | 2 +- ...llMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../options/BareMetalDefaultOptions.h | 18 +-- .../tutorial14/options/ClientDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../options/DataViewDefaultOptions.h | 18 +-- .../tutorial14/options/DefaultOptions.h | 12 +- .../tutorial14/options/ServerDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../tutorial15/include/tutorial15/Message.h | 2 +- .../tutorial15/include/tutorial15/MsgId.h | 2 +- .../tutorial15/include/tutorial15/Version.h | 4 +- .../dispatch/DispatchClientInputMessage.h | 2 +- .../tutorial15/dispatch/DispatchMessage.h | 2 +- .../dispatch/DispatchServerInputMessage.h | 2 +- .../factory/AllMessagesDynMemMsgFactory.h | 2 +- .../ClientInputMessagesDynMemMsgFactory.h | 2 +- .../ServerInputMessagesDynMemMsgFactory.h | 2 +- .../include/tutorial15/field/FieldBase.h | 2 +- .../include/tutorial15/field/MsgId.h | 4 +- .../include/tutorial15/field/MsgIdCommon.h | 2 +- .../include/tutorial15/frame/Frame.h | 30 ++++- .../include/tutorial15/frame/FrameCommon.h | 2 +- .../include/tutorial15/input/AllMessages.h | 2 +- .../tutorial15/input/ClientInputMessages.h | 2 +- .../tutorial15/input/ServerInputMessages.h | 2 +- .../include/tutorial15/message/Msg1.h | 4 +- .../include/tutorial15/message/Msg1Common.h | 2 +- .../include/tutorial15/message/Msg2.h | 10 +- .../include/tutorial15/message/Msg2Common.h | 2 +- .../include/tutorial15/message/Msg3.h | 10 +- .../include/tutorial15/message/Msg3Common.h | 2 +- ...llMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../options/BareMetalDefaultOptions.h | 18 +-- .../tutorial15/options/ClientDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../options/DataViewDefaultOptions.h | 18 +-- .../tutorial15/options/DefaultOptions.h | 18 +-- .../tutorial15/options/ServerDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../tutorial16/include/tutorial16/Interface.h | 8 +- .../include/tutorial16/InterfaceCommon.h | 2 +- .../tutorial16/include/tutorial16/MsgId.h | 2 +- .../tutorial16/include/tutorial16/Version.h | 4 +- .../dispatch/DispatchClientInputMessage.h | 2 +- .../tutorial16/dispatch/DispatchMessage.h | 2 +- .../dispatch/DispatchServerInputMessage.h | 2 +- .../factory/AllMessagesDynMemMsgFactory.h | 2 +- .../ClientInputMessagesDynMemMsgFactory.h | 2 +- .../ServerInputMessagesDynMemMsgFactory.h | 2 +- .../include/tutorial16/field/FieldBase.h | 2 +- .../include/tutorial16/field/InterfaceFlags.h | 15 ++- .../tutorial16/field/InterfaceFlagsCommon.h | 2 +- .../include/tutorial16/field/MsgId.h | 4 +- .../include/tutorial16/field/MsgIdCommon.h | 2 +- .../include/tutorial16/frame/Frame.h | 36 +++++- .../include/tutorial16/frame/FrameCommon.h | 2 +- .../include/tutorial16/input/AllMessages.h | 2 +- .../tutorial16/input/ClientInputMessages.h | 2 +- .../tutorial16/input/ServerInputMessages.h | 2 +- .../include/tutorial16/message/Msg1.h | 22 ++-- .../include/tutorial16/message/Msg1Common.h | 2 +- .../include/tutorial16/message/Msg2.h | 18 ++- .../include/tutorial16/message/Msg2Common.h | 2 +- .../include/tutorial16/message/Msg3.h | 8 +- .../include/tutorial16/message/Msg3Common.h | 2 +- .../include/tutorial16/message/Msg4.h | 8 +- .../include/tutorial16/message/Msg4Common.h | 2 +- ...llMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../options/BareMetalDefaultOptions.h | 18 +-- .../tutorial16/options/ClientDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../options/DataViewDefaultOptions.h | 18 +-- .../tutorial16/options/DefaultOptions.h | 14 ++- .../tutorial16/options/ServerDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../tutorial17/include/tutorial17/Interface.h | 15 ++- .../include/tutorial17/InterfaceCommon.h | 2 +- .../tutorial17/include/tutorial17/MsgId.h | 2 +- .../tutorial17/include/tutorial17/Version.h | 4 +- .../dispatch/DispatchClientInputMessage.h | 2 +- .../tutorial17/dispatch/DispatchMessage.h | 2 +- .../dispatch/DispatchServerInputMessage.h | 2 +- .../factory/AllMessagesDynMemMsgFactory.h | 2 +- .../ClientInputMessagesDynMemMsgFactory.h | 2 +- .../ServerInputMessagesDynMemMsgFactory.h | 2 +- .../include/tutorial17/field/FieldBase.h | 2 +- .../include/tutorial17/field/MsgId.h | 4 +- .../include/tutorial17/field/MsgIdCommon.h | 2 +- .../include/tutorial17/frame/Frame.h | 57 +++++++-- .../include/tutorial17/frame/FrameCommon.h | 2 +- .../include/tutorial17/input/AllMessages.h | 2 +- .../tutorial17/input/ClientInputMessages.h | 2 +- .../tutorial17/input/ServerInputMessages.h | 2 +- .../include/tutorial17/message/Msg1.h | 22 ++-- .../include/tutorial17/message/Msg1Common.h | 2 +- .../include/tutorial17/message/Msg2.h | 18 ++- .../include/tutorial17/message/Msg2Common.h | 2 +- ...llMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../options/BareMetalDefaultOptions.h | 18 +-- .../tutorial17/options/ClientDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../options/DataViewDefaultOptions.h | 18 +-- .../tutorial17/options/DefaultOptions.h | 16 +-- .../tutorial17/options/ServerDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../tutorial18/include/tutorial18/Message.h | 2 +- .../tutorial18/include/tutorial18/MsgId.h | 2 +- .../tutorial18/include/tutorial18/Version.h | 4 +- .../dispatch/DispatchClientInputMessage.h | 2 +- .../tutorial18/dispatch/DispatchMessage.h | 2 +- .../dispatch/DispatchServerInputMessage.h | 2 +- .../factory/AllMessagesDynMemMsgFactory.h | 2 +- .../ClientInputMessagesDynMemMsgFactory.h | 2 +- .../ServerInputMessagesDynMemMsgFactory.h | 2 +- .../include/tutorial18/field/FieldBase.h | 2 +- .../include/tutorial18/field/MsgId.h | 4 +- .../include/tutorial18/field/MsgIdCommon.h | 2 +- .../include/tutorial18/frame/Frame.h | 34 +++++- .../include/tutorial18/frame/FrameCommon.h | 2 +- .../include/tutorial18/input/AllMessages.h | 2 +- .../tutorial18/input/ClientInputMessages.h | 2 +- .../tutorial18/input/ServerInputMessages.h | 2 +- .../include/tutorial18/message/Msg1_1.h | 8 +- .../include/tutorial18/message/Msg1_1Common.h | 2 +- .../include/tutorial18/message/Msg1_2.h | 8 +- .../include/tutorial18/message/Msg1_2Common.h | 2 +- .../include/tutorial18/message/Msg1_3.h | 8 +- .../include/tutorial18/message/Msg1_3Common.h | 2 +- .../include/tutorial18/message/Msg2_1.h | 10 +- .../include/tutorial18/message/Msg2_1Common.h | 2 +- .../include/tutorial18/message/Msg2_2.h | 10 +- .../include/tutorial18/message/Msg2_2Common.h | 2 +- .../include/tutorial18/message/Msg2_3.h | 10 +- .../include/tutorial18/message/Msg2_3Common.h | 2 +- ...llMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../options/BareMetalDefaultOptions.h | 18 +-- .../tutorial18/options/ClientDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../options/DataViewDefaultOptions.h | 18 +-- .../tutorial18/options/DefaultOptions.h | 12 +- .../tutorial18/options/ServerDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../tutorial19/include/tutorial19/Interface.h | 4 +- .../include/tutorial19/InterfaceCommon.h | 2 +- .../tutorial19/include/tutorial19/MsgId.h | 2 +- .../tutorial19/include/tutorial19/Version.h | 4 +- .../dispatch/DispatchClientInputMessage.h | 2 +- .../tutorial19/dispatch/DispatchMessage.h | 2 +- .../dispatch/DispatchServerInputMessage.h | 2 +- .../factory/AllMessagesDynMemMsgFactory.h | 2 +- .../ClientInputMessagesDynMemMsgFactory.h | 2 +- .../ServerInputMessagesDynMemMsgFactory.h | 2 +- .../include/tutorial19/field/FieldBase.h | 2 +- .../include/tutorial19/field/MsgId.h | 4 +- .../include/tutorial19/field/MsgIdCommon.h | 2 +- .../include/tutorial19/frame/Frame.h | 32 ++++- .../include/tutorial19/frame/FrameCommon.h | 2 +- .../include/tutorial19/input/AllMessages.h | 2 +- .../tutorial19/input/ClientInputMessages.h | 2 +- .../tutorial19/input/ServerInputMessages.h | 2 +- .../include/tutorial19/message/Msg1.h | 28 +++-- .../include/tutorial19/message/Msg1Common.h | 2 +- .../include/tutorial19/message/Msg2.h | 14 ++- .../include/tutorial19/message/Msg2Common.h | 2 +- .../include/tutorial19/message/Msg3.h | 41 +++++-- .../include/tutorial19/message/Msg3Common.h | 2 +- ...llMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../options/BareMetalDefaultOptions.h | 18 +-- .../tutorial19/options/ClientDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../options/DataViewDefaultOptions.h | 18 +-- .../tutorial19/options/DefaultOptions.h | 12 +- .../tutorial19/options/ServerDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../tutorial2/include/tutorial2/Message.h | 2 +- tutorials/tutorial2/include/tutorial2/MsgId.h | 2 +- .../tutorial2/include/tutorial2/Version.h | 4 +- .../dispatch/DispatchClientInputMessage.h | 2 +- .../tutorial2/dispatch/DispatchMessage.h | 2 +- .../dispatch/DispatchServerInputMessage.h | 2 +- .../factory/AllMessagesDynMemMsgFactory.h | 2 +- .../ClientInputMessagesDynMemMsgFactory.h | 2 +- .../ServerInputMessagesDynMemMsgFactory.h | 2 +- .../tutorial2/include/tutorial2/field/B8_1.h | 14 ++- .../include/tutorial2/field/B8_1Common.h | 2 +- .../tutorial2/include/tutorial2/field/B8_2.h | 31 +++-- .../include/tutorial2/field/B8_2Common.h | 2 +- .../tutorial2/include/tutorial2/field/B9_1.h | 21 +++- .../include/tutorial2/field/B9_1Common.h | 2 +- .../tutorial2/include/tutorial2/field/B9_2.h | 21 +++- .../include/tutorial2/field/B9_2Common.h | 2 +- .../tutorial2/include/tutorial2/field/D7_1.h | 4 +- .../include/tutorial2/field/D7_1Common.h | 2 +- .../tutorial2/include/tutorial2/field/D7_2.h | 10 +- .../include/tutorial2/field/D7_2Common.h | 2 +- .../tutorial2/include/tutorial2/field/E2_1.h | 4 +- .../include/tutorial2/field/E2_1Common.h | 2 +- .../tutorial2/include/tutorial2/field/E2_2.h | 4 +- .../include/tutorial2/field/E2_2Common.h | 2 +- .../tutorial2/include/tutorial2/field/F11_1.h | 8 +- .../include/tutorial2/field/F11_1Common.h | 2 +- .../tutorial2/include/tutorial2/field/F11_2.h | 4 +- .../include/tutorial2/field/F11_2Common.h | 2 +- .../tutorial2/include/tutorial2/field/F11_3.h | 7 +- .../include/tutorial2/field/F11_3Common.h | 2 +- .../tutorial2/include/tutorial2/field/F5_1.h | 8 +- .../include/tutorial2/field/F5_1Common.h | 2 +- .../tutorial2/include/tutorial2/field/F5_2.h | 8 +- .../include/tutorial2/field/F5_2Common.h | 2 +- .../include/tutorial2/field/FieldBase.h | 2 +- .../tutorial2/include/tutorial2/field/I1.h | 8 +- .../include/tutorial2/field/I1Common.h | 2 +- .../tutorial2/include/tutorial2/field/I3_1.h | 4 +- .../include/tutorial2/field/I3_1Common.h | 2 +- .../tutorial2/include/tutorial2/field/I3_2.h | 4 +- .../include/tutorial2/field/I3_2Common.h | 2 +- .../tutorial2/include/tutorial2/field/I3_3.h | 4 +- .../include/tutorial2/field/I3_3Common.h | 2 +- .../tutorial2/include/tutorial2/field/I3_4.h | 4 +- .../include/tutorial2/field/I3_4Common.h | 2 +- .../tutorial2/include/tutorial2/field/I3_5.h | 4 +- .../include/tutorial2/field/I3_5Common.h | 2 +- .../tutorial2/include/tutorial2/field/L10_1.h | 10 +- .../include/tutorial2/field/L10_1Common.h | 2 +- .../tutorial2/include/tutorial2/field/L10_2.h | 12 +- .../include/tutorial2/field/L10_2Common.h | 2 +- .../tutorial2/include/tutorial2/field/L10_3.h | 20 +++- .../include/tutorial2/field/L10_3Common.h | 2 +- .../tutorial2/include/tutorial2/field/L10_4.h | 32 +++-- .../include/tutorial2/field/L10_4Common.h | 2 +- .../tutorial2/include/tutorial2/field/L6_3.h | 4 +- .../include/tutorial2/field/L6_3Common.h | 2 +- .../tutorial2/include/tutorial2/field/MsgId.h | 4 +- .../include/tutorial2/field/MsgIdCommon.h | 2 +- .../tutorial2/include/tutorial2/field/S4_1.h | 15 ++- .../include/tutorial2/field/S4_1Common.h | 2 +- .../tutorial2/include/tutorial2/field/S4_2.h | 15 ++- .../include/tutorial2/field/S4_2Common.h | 2 +- .../tutorial2/include/tutorial2/field/S4_3.h | 15 ++- .../include/tutorial2/field/S4_3Common.h | 2 +- .../tutorial2/include/tutorial2/field/S6_1.h | 4 +- .../include/tutorial2/field/S6_1Common.h | 2 +- .../tutorial2/include/tutorial2/field/S6_2.h | 10 +- .../include/tutorial2/field/S6_2Common.h | 2 +- .../tutorial2/include/tutorial2/field/S6_3.h | 4 +- .../include/tutorial2/field/S6_3Common.h | 2 +- .../tutorial2/include/tutorial2/field/S6_4.h | 4 +- .../include/tutorial2/field/S6_4Common.h | 2 +- .../tutorial2/include/tutorial2/frame/Frame.h | 30 ++++- .../include/tutorial2/frame/FrameCommon.h | 2 +- .../include/tutorial2/input/AllMessages.h | 2 +- .../tutorial2/input/ClientInputMessages.h | 2 +- .../tutorial2/input/ServerInputMessages.h | 2 +- .../include/tutorial2/message/Msg1.h | 14 ++- .../include/tutorial2/message/Msg10.h | 26 ++-- .../include/tutorial2/message/Msg10Common.h | 2 +- .../include/tutorial2/message/Msg11.h | 14 ++- .../include/tutorial2/message/Msg11Common.h | 2 +- .../include/tutorial2/message/Msg12.h | 14 ++- .../include/tutorial2/message/Msg12Common.h | 2 +- .../include/tutorial2/message/Msg13.h | 31 +++-- .../include/tutorial2/message/Msg13Common.h | 2 +- .../include/tutorial2/message/Msg14.h | 22 ++-- .../include/tutorial2/message/Msg14Common.h | 2 +- .../include/tutorial2/message/Msg15.h | 20 ++-- .../include/tutorial2/message/Msg15Common.h | 2 +- .../include/tutorial2/message/Msg16.h | 20 ++-- .../include/tutorial2/message/Msg16Common.h | 2 +- .../include/tutorial2/message/Msg17.h | 24 ++-- .../include/tutorial2/message/Msg17Common.h | 2 +- .../include/tutorial2/message/Msg18.h | 26 ++-- .../include/tutorial2/message/Msg18Common.h | 2 +- .../include/tutorial2/message/Msg1Common.h | 2 +- .../include/tutorial2/message/Msg2.h | 18 ++- .../include/tutorial2/message/Msg2Common.h | 2 +- .../include/tutorial2/message/Msg3.h | 32 +++-- .../include/tutorial2/message/Msg3Common.h | 2 +- .../include/tutorial2/message/Msg4.h | 20 ++-- .../include/tutorial2/message/Msg4Common.h | 2 +- .../include/tutorial2/message/Msg5.h | 14 ++- .../include/tutorial2/message/Msg5Common.h | 2 +- .../include/tutorial2/message/Msg6.h | 32 +++-- .../include/tutorial2/message/Msg6Common.h | 2 +- .../include/tutorial2/message/Msg7.h | 20 ++-- .../include/tutorial2/message/Msg7Common.h | 2 +- .../include/tutorial2/message/Msg8.h | 14 ++- .../include/tutorial2/message/Msg8Common.h | 2 +- .../include/tutorial2/message/Msg9.h | 14 ++- .../include/tutorial2/message/Msg9Common.h | 2 +- ...llMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../options/BareMetalDefaultOptions.h | 18 +-- .../tutorial2/options/ClientDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../options/DataViewDefaultOptions.h | 18 +-- .../tutorial2/options/DefaultOptions.h | 66 +++++----- .../tutorial2/options/ServerDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../tutorial20/include/tutorial20/Interface.h | 5 +- .../include/tutorial20/InterfaceCommon.h | 2 +- .../tutorial20/include/tutorial20/MsgId.h | 2 +- .../tutorial20/include/tutorial20/Version.h | 4 +- .../dispatch/DispatchClientInputMessage.h | 2 +- .../tutorial20/dispatch/DispatchMessage.h | 2 +- .../dispatch/DispatchServerInputMessage.h | 2 +- .../factory/AllMessagesDynMemMsgFactory.h | 2 +- .../ClientInputMessagesDynMemMsgFactory.h | 2 +- .../ServerInputMessagesDynMemMsgFactory.h | 2 +- .../include/tutorial20/field/FieldBase.h | 2 +- .../include/tutorial20/field/MsgId.h | 4 +- .../include/tutorial20/field/MsgIdCommon.h | 2 +- .../include/tutorial20/field/Version.h | 4 +- .../include/tutorial20/field/VersionCommon.h | 2 +- .../include/tutorial20/frame/Frame.h | 30 ++++- .../include/tutorial20/frame/FrameCommon.h | 2 +- .../include/tutorial20/input/AllMessages.h | 2 +- .../tutorial20/input/ClientInputMessages.h | 2 +- .../tutorial20/input/ServerInputMessages.h | 2 +- .../include/tutorial20/message/Connect.h | 5 +- .../tutorial20/message/ConnectCommon.h | 2 +- .../include/tutorial20/message/Msg1.h | 28 +++-- .../include/tutorial20/message/Msg1Common.h | 2 +- .../include/tutorial20/message/Msg2.h | 14 ++- .../include/tutorial20/message/Msg2Common.h | 2 +- .../include/tutorial20/message/Msg3.h | 41 +++++-- .../include/tutorial20/message/Msg3Common.h | 2 +- ...llMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../options/BareMetalDefaultOptions.h | 18 +-- .../tutorial20/options/ClientDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../options/DataViewDefaultOptions.h | 18 +-- .../tutorial20/options/DefaultOptions.h | 14 ++- .../tutorial20/options/ServerDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../tutorial21/include/tutorial21/Interface.h | 5 +- .../include/tutorial21/InterfaceCommon.h | 2 +- .../tutorial21/include/tutorial21/MsgId.h | 2 +- .../tutorial21/include/tutorial21/Version.h | 4 +- .../dispatch/DispatchClientInputMessage.h | 2 +- .../tutorial21/dispatch/DispatchMessage.h | 2 +- .../dispatch/DispatchServerInputMessage.h | 2 +- .../factory/AllMessagesDynMemMsgFactory.h | 2 +- .../ClientInputMessagesDynMemMsgFactory.h | 2 +- .../ServerInputMessagesDynMemMsgFactory.h | 2 +- .../include/tutorial21/field/BasicFlags.h | 8 +- .../tutorial21/field/BasicFlagsCommon.h | 2 +- .../include/tutorial21/field/FieldBase.h | 2 +- .../include/tutorial21/field/Msg1Flags.h | 15 ++- .../tutorial21/field/Msg1FlagsCommon.h | 2 +- .../include/tutorial21/field/Msg2Flags.h | 8 +- .../tutorial21/field/Msg2FlagsCommon.h | 2 +- .../include/tutorial21/field/MsgId.h | 4 +- .../include/tutorial21/field/MsgIdCommon.h | 2 +- .../include/tutorial21/frame/Frame.h | 30 ++++- .../include/tutorial21/frame/FrameCommon.h | 2 +- .../include/tutorial21/input/AllMessages.h | 2 +- .../tutorial21/input/ClientInputMessages.h | 2 +- .../tutorial21/input/ServerInputMessages.h | 2 +- .../include/tutorial21/message/Msg1.h | 2 +- .../include/tutorial21/message/Msg1Common.h | 2 +- .../include/tutorial21/message/Msg2.h | 2 +- .../include/tutorial21/message/Msg2Common.h | 2 +- ...llMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../options/BareMetalDefaultOptions.h | 18 +-- .../tutorial21/options/ClientDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../options/DataViewDefaultOptions.h | 18 +-- .../tutorial21/options/DefaultOptions.h | 12 +- .../tutorial21/options/ServerDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../tutorial22/include/tutorial22/Message.h | 2 +- .../tutorial22/include/tutorial22/MsgId.h | 2 +- .../tutorial22/include/tutorial22/Version.h | 4 +- .../dispatch/DispatchClientInputMessage.h | 2 +- .../tutorial22/dispatch/DispatchMessage.h | 2 +- .../dispatch/DispatchServerInputMessage.h | 2 +- .../factory/AllMessagesDynMemMsgFactory.h | 2 +- .../ClientInputMessagesDynMemMsgFactory.h | 2 +- .../ServerInputMessagesDynMemMsgFactory.h | 2 +- .../include/tutorial22/field/FieldBase.h | 2 +- .../include/tutorial22/field/Length.h | 18 ++- .../include/tutorial22/field/LengthCommon.h | 2 +- .../include/tutorial22/field/MsgId.h | 4 +- .../include/tutorial22/field/MsgIdCommon.h | 2 +- .../include/tutorial22/field/TlvProp.h | 75 ++++++++++-- .../include/tutorial22/field/TlvPropCommon.h | 36 +++++- .../include/tutorial22/frame/Frame.h | 26 +++- .../include/tutorial22/frame/FrameCommon.h | 2 +- .../include/tutorial22/input/AllMessages.h | 2 +- .../tutorial22/input/ClientInputMessages.h | 2 +- .../tutorial22/input/ServerInputMessages.h | 2 +- .../include/tutorial22/message/Msg1.h | 8 +- .../include/tutorial22/message/Msg1Common.h | 2 +- ...llMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../options/BareMetalDefaultOptions.h | 18 +-- .../tutorial22/options/ClientDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../options/DataViewDefaultOptions.h | 18 +-- .../tutorial22/options/DefaultOptions.h | 18 +-- .../tutorial22/options/ServerDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../tutorial23/include/t23_ext/Version.h | 4 +- .../include/t23_ext/field/FieldBase.h | 2 +- .../tutorial23/include/t23_ext/ns1/field/I1.h | 8 +- .../include/t23_ext/ns1/field/I1Common.h | 2 +- .../tutorial23/include/t23_ext/ns1/field/S1.h | 10 +- .../include/t23_ext/ns1/field/S1Common.h | 2 +- .../t23_ext/options/BareMetalDefaultOptions.h | 2 +- .../t23_ext/options/ClientDefaultOptions.h | 2 +- .../t23_ext/options/DataViewDefaultOptions.h | 2 +- .../include/t23_ext/options/DefaultOptions.h | 4 +- .../t23_ext/options/ServerDefaultOptions.h | 2 +- .../tutorial23/include/tutorial23/Message.h | 2 +- .../tutorial23/include/tutorial23/MsgId.h | 2 +- .../tutorial23/include/tutorial23/Version.h | 4 +- .../dispatch/DispatchClientInputMessage.h | 2 +- .../tutorial23/dispatch/DispatchMessage.h | 2 +- .../dispatch/DispatchServerInputMessage.h | 2 +- .../factory/AllMessagesDynMemMsgFactory.h | 2 +- .../ClientInputMessagesDynMemMsgFactory.h | 2 +- .../ServerInputMessagesDynMemMsgFactory.h | 2 +- .../include/tutorial23/field/FieldBase.h | 2 +- .../tutorial23/include/tutorial23/field/I1.h | 5 +- .../include/tutorial23/field/I1Common.h | 2 +- .../include/tutorial23/field/Length.h | 18 ++- .../include/tutorial23/field/LengthCommon.h | 2 +- .../include/tutorial23/field/MsgId.h | 4 +- .../include/tutorial23/field/MsgIdCommon.h | 2 +- .../include/tutorial23/frame/Frame.h | 26 +++- .../include/tutorial23/frame/FrameCommon.h | 2 +- .../include/tutorial23/input/AllMessages.h | 2 +- .../tutorial23/input/ClientInputMessages.h | 2 +- .../tutorial23/input/ServerInputMessages.h | 2 +- .../include/tutorial23/message/Msg1.h | 14 ++- .../include/tutorial23/message/Msg1Common.h | 2 +- ...llMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../options/BareMetalDefaultOptions.h | 18 +-- .../tutorial23/options/ClientDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../options/DataViewDefaultOptions.h | 18 +-- .../tutorial23/options/DefaultOptions.h | 14 ++- .../tutorial23/options/ServerDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../tutorial24/include/tutorial24/Message.h | 2 +- .../tutorial24/include/tutorial24/MsgId.h | 2 +- .../tutorial24/include/tutorial24/Version.h | 4 +- .../dispatch/DispatchClientInputMessage.h | 2 +- .../tutorial24/dispatch/DispatchMessage.h | 2 +- .../dispatch/DispatchServerInputMessage.h | 2 +- .../factory/AllMessagesDynMemMsgFactory.h | 2 +- .../ClientInputMessagesDynMemMsgFactory.h | 2 +- .../ServerInputMessagesDynMemMsgFactory.h | 2 +- .../include/tutorial24/field/FieldBase.h | 2 +- .../include/tutorial24/field/MsgId.h | 4 +- .../include/tutorial24/field/MsgIdCommon.h | 2 +- .../include/tutorial24/frame/Frame.h | 30 ++++- .../include/tutorial24/frame/FrameCommon.h | 2 +- .../include/tutorial24/input/AllMessages.h | 2 +- .../tutorial24/input/ClientInputMessages.h | 2 +- .../tutorial24/input/ServerInputMessages.h | 2 +- .../include/tutorial24/message/Msg1.h | 14 ++- .../include/tutorial24/message/Msg1Common.h | 2 +- .../include/tutorial24/message/Msg2.h | 6 +- .../include/tutorial24/message/Msg2Common.h | 2 +- ...llMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../options/BareMetalDefaultOptions.h | 18 +-- .../tutorial24/options/ClientDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../options/DataViewDefaultOptions.h | 18 +-- .../tutorial24/options/DefaultOptions.h | 12 +- .../tutorial24/options/ServerDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../tutorial25/include/tutorial25/Message.h | 2 +- .../tutorial25/include/tutorial25/MsgId.h | 2 +- .../tutorial25/include/tutorial25/Version.h | 4 +- .../dispatch/DispatchClientInputMessage.h | 2 +- .../tutorial25/dispatch/DispatchMessage.h | 2 +- .../dispatch/DispatchServerInputMessage.h | 2 +- .../factory/AllMessagesDynMemMsgFactory.h | 2 +- .../ClientInputMessagesDynMemMsgFactory.h | 2 +- .../ServerInputMessagesDynMemMsgFactory.h | 2 +- .../include/tutorial25/field/FieldBase.h | 2 +- .../include/tutorial25/field/MsgId.h | 4 +- .../include/tutorial25/field/MsgIdCommon.h | 2 +- .../include/tutorial25/frame/Frame.h | 30 ++++- .../include/tutorial25/frame/FrameCommon.h | 2 +- .../include/tutorial25/input/AllMessages.h | 2 +- .../tutorial25/input/ClientInputMessages.h | 2 +- .../tutorial25/input/ServerInputMessages.h | 2 +- .../include/tutorial25/message/Msg1.h | 2 +- .../include/tutorial25/message/Msg10.h | 2 +- .../include/tutorial25/message/Msg10Common.h | 2 +- .../include/tutorial25/message/Msg1Common.h | 2 +- .../include/tutorial25/message/Msg2.h | 2 +- .../include/tutorial25/message/Msg2Common.h | 2 +- .../include/tutorial25/message/Msg3.h | 2 +- .../include/tutorial25/message/Msg3Common.h | 2 +- .../include/tutorial25/message/Msg4.h | 2 +- .../include/tutorial25/message/Msg4Common.h | 2 +- .../include/tutorial25/message/Msg5.h | 2 +- .../include/tutorial25/message/Msg5Common.h | 2 +- .../include/tutorial25/message/Msg6.h | 2 +- .../include/tutorial25/message/Msg6Common.h | 2 +- .../include/tutorial25/message/Msg7.h | 2 +- .../include/tutorial25/message/Msg7Common.h | 2 +- .../include/tutorial25/message/Msg8.h | 2 +- .../include/tutorial25/message/Msg8Common.h | 2 +- .../include/tutorial25/message/Msg9.h | 2 +- .../include/tutorial25/message/Msg9Common.h | 2 +- ...llMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../options/BareMetalDefaultOptions.h | 18 +-- .../tutorial25/options/ClientDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../options/DataViewDefaultOptions.h | 18 +-- .../tutorial25/options/DefaultOptions.h | 12 +- .../tutorial25/options/ServerDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../tutorial3/include/tutorial3/Message.h | 2 +- tutorials/tutorial3/include/tutorial3/MsgId.h | 2 +- .../tutorial3/include/tutorial3/Version.h | 4 +- .../dispatch/DispatchClientInputMessage.h | 2 +- .../tutorial3/dispatch/DispatchMessage.h | 2 +- .../dispatch/DispatchServerInputMessage.h | 2 +- .../factory/AllMessagesDynMemMsgFactory.h | 2 +- .../ClientInputMessagesDynMemMsgFactory.h | 2 +- .../ServerInputMessagesDynMemMsgFactory.h | 2 +- .../include/tutorial3/field/FieldBase.h | 2 +- .../tutorial3/include/tutorial3/field/MsgId.h | 4 +- .../include/tutorial3/field/MsgIdCommon.h | 2 +- .../tutorial3/include/tutorial3/frame/Frame.h | 30 ++++- .../include/tutorial3/frame/FrameCommon.h | 2 +- .../include/tutorial3/input/AllMessages.h | 2 +- .../tutorial3/input/ClientInputMessages.h | 2 +- .../tutorial3/input/ServerInputMessages.h | 2 +- .../include/tutorial3/message/Msg1.h | 6 +- .../include/tutorial3/message/Msg1Common.h | 2 +- .../include/tutorial3/message/Msg2.h | 6 +- .../include/tutorial3/message/Msg2Common.h | 2 +- .../include/tutorial3/message/Msg3.h | 4 +- .../include/tutorial3/message/Msg3Common.h | 2 +- ...llMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../options/BareMetalDefaultOptions.h | 18 +-- .../tutorial3/options/ClientDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../options/DataViewDefaultOptions.h | 18 +-- .../tutorial3/options/DefaultOptions.h | 12 +- .../tutorial3/options/ServerDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../tutorial4/include/tutorial4/Message.h | 2 +- tutorials/tutorial4/include/tutorial4/MsgId.h | 2 +- .../tutorial4/include/tutorial4/Version.h | 4 +- .../dispatch/DispatchClientInputMessage.h | 2 +- .../tutorial4/dispatch/DispatchMessage.h | 2 +- .../dispatch/DispatchServerInputMessage.h | 2 +- .../factory/AllMessagesDynMemMsgFactory.h | 2 +- .../ClientInputMessagesDynMemMsgFactory.h | 2 +- .../ServerInputMessagesDynMemMsgFactory.h | 2 +- .../include/tutorial4/field/FieldBase.h | 2 +- .../include/tutorial4/field/KeyValueProp.h | 65 ++++++++-- .../tutorial4/field/KeyValuePropCommon.h | 36 +++++- .../tutorial4/include/tutorial4/field/MsgId.h | 4 +- .../include/tutorial4/field/MsgIdCommon.h | 2 +- .../include/tutorial4/field/TlvProp.h | 113 ++++++++++++++---- .../include/tutorial4/field/TlvPropCommon.h | 38 +++++- .../tutorial4/include/tutorial4/frame/Frame.h | 30 ++++- .../include/tutorial4/frame/FrameCommon.h | 2 +- .../include/tutorial4/input/AllMessages.h | 2 +- .../tutorial4/input/ClientInputMessages.h | 2 +- .../tutorial4/input/ServerInputMessages.h | 2 +- .../include/tutorial4/message/Msg1.h | 10 +- .../include/tutorial4/message/Msg1Common.h | 2 +- .../include/tutorial4/message/Msg2.h | 8 +- .../include/tutorial4/message/Msg2Common.h | 2 +- ...llMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../options/BareMetalDefaultOptions.h | 18 +-- .../tutorial4/options/ClientDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../options/DataViewDefaultOptions.h | 18 +-- .../tutorial4/options/DefaultOptions.h | 22 ++-- .../tutorial4/options/ServerDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../tutorial5/include/tutorial5/Message.h | 2 +- tutorials/tutorial5/include/tutorial5/MsgId.h | 2 +- .../tutorial5/include/tutorial5/Version.h | 4 +- .../dispatch/DispatchClientInputMessage.h | 2 +- .../tutorial5/dispatch/DispatchMessage.h | 2 +- .../dispatch/DispatchServerInputMessage.h | 2 +- .../factory/AllMessagesDynMemMsgFactory.h | 2 +- .../ClientInputMessagesDynMemMsgFactory.h | 2 +- .../ServerInputMessagesDynMemMsgFactory.h | 2 +- .../include/tutorial5/field/FieldBase.h | 2 +- .../tutorial5/include/tutorial5/field/MsgId.h | 4 +- .../include/tutorial5/field/MsgIdCommon.h | 2 +- .../tutorial5/frame/ClientToServerFrame.h | 40 ++++++- .../frame/ClientToServerFrameCommon.h | 2 +- .../tutorial5/frame/ServerToClientFrame.h | 30 ++++- .../frame/ServerToClientFrameCommon.h | 2 +- .../include/tutorial5/input/AllMessages.h | 2 +- .../tutorial5/input/ClientInputMessages.h | 2 +- .../tutorial5/input/ServerInputMessages.h | 2 +- .../include/tutorial5/message/Msg1.h | 2 +- .../include/tutorial5/message/Msg1Common.h | 2 +- .../include/tutorial5/message/Msg2.h | 2 +- .../include/tutorial5/message/Msg2Common.h | 2 +- .../include/tutorial5/message/Msg3.h | 2 +- .../include/tutorial5/message/Msg3Common.h | 2 +- ...llMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../options/BareMetalDefaultOptions.h | 34 +++--- .../tutorial5/options/ClientDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../options/DataViewDefaultOptions.h | 34 +++--- .../tutorial5/options/DefaultOptions.h | 22 ++-- .../tutorial5/options/ServerDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../tutorial6/include/tutorial6/Message.h | 2 +- tutorials/tutorial6/include/tutorial6/MsgId.h | 2 +- .../tutorial6/include/tutorial6/Version.h | 4 +- .../dispatch/DispatchClientInputMessage.h | 2 +- .../tutorial6/dispatch/DispatchMessage.h | 2 +- .../dispatch/DispatchServerInputMessage.h | 2 +- .../factory/AllMessagesDynMemMsgFactory.h | 2 +- .../ClientInputMessagesDynMemMsgFactory.h | 2 +- .../ServerInputMessagesDynMemMsgFactory.h | 2 +- .../include/tutorial6/field/FieldBase.h | 2 +- .../tutorial6/include/tutorial6/field/MsgId.h | 4 +- .../include/tutorial6/field/MsgIdCommon.h | 2 +- .../tutorial6/include/tutorial6/frame/Frame.h | 30 ++++- .../include/tutorial6/frame/FrameCommon.h | 2 +- .../include/tutorial6/input/AllMessages.h | 2 +- .../tutorial6/input/ClientInputMessages.h | 2 +- .../tutorial6/input/ServerInputMessages.h | 2 +- .../include/tutorial6/message/Msg1.h | 2 +- .../include/tutorial6/message/Msg1Common.h | 2 +- .../include/tutorial6/message/Msg2.h | 2 +- .../include/tutorial6/message/Msg2Common.h | 2 +- .../include/tutorial6/message/Msg3.h | 2 +- .../include/tutorial6/message/Msg3Common.h | 2 +- ...llMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../options/BareMetalDefaultOptions.h | 18 +-- .../tutorial6/options/ClientDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../options/DataViewDefaultOptions.h | 18 +-- .../tutorial6/options/DefaultOptions.h | 12 +- .../tutorial6/options/ServerDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../tutorial7/include/tutorial7/Message.h | 2 +- tutorials/tutorial7/include/tutorial7/MsgId.h | 2 +- .../tutorial7/include/tutorial7/Version.h | 4 +- .../dispatch/DispatchClientInputMessage.h | 2 +- .../tutorial7/dispatch/DispatchMessage.h | 2 +- .../dispatch/DispatchServerInputMessage.h | 2 +- .../factory/AllMessagesDynMemMsgFactory.h | 2 +- .../ClientInputMessagesDynMemMsgFactory.h | 2 +- .../ServerInputMessagesDynMemMsgFactory.h | 2 +- .../include/tutorial7/field/FieldBase.h | 2 +- .../tutorial7/include/tutorial7/field/MsgId.h | 4 +- .../include/tutorial7/field/MsgIdCommon.h | 2 +- .../tutorial7/include/tutorial7/frame/Frame.h | 30 ++++- .../include/tutorial7/frame/FrameCommon.h | 2 +- .../include/tutorial7/input/AllMessages.h | 2 +- .../tutorial7/input/ClientInputMessages.h | 2 +- .../tutorial7/input/ServerInputMessages.h | 2 +- .../include/tutorial7/message/Msg1.h | 2 +- .../include/tutorial7/message/Msg1Common.h | 2 +- .../include/tutorial7/message/Msg2.h | 2 +- .../include/tutorial7/message/Msg2Common.h | 2 +- .../include/tutorial7/message/Msg3.h | 2 +- .../include/tutorial7/message/Msg3Common.h | 2 +- ...llMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../options/BareMetalDefaultOptions.h | 18 +-- .../tutorial7/options/ClientDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../options/DataViewDefaultOptions.h | 18 +-- .../tutorial7/options/DefaultOptions.h | 12 +- .../tutorial7/options/ServerDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../tutorial8/include/tutorial8/Message.h | 2 +- tutorials/tutorial8/include/tutorial8/MsgId.h | 2 +- .../tutorial8/include/tutorial8/Version.h | 4 +- .../dispatch/DispatchClientInputMessage.h | 2 +- .../tutorial8/dispatch/DispatchMessage.h | 2 +- .../dispatch/DispatchServerInputMessage.h | 2 +- .../factory/AllMessagesDynMemMsgFactory.h | 2 +- .../ClientInputMessagesDynMemMsgFactory.h | 2 +- .../ServerInputMessagesDynMemMsgFactory.h | 2 +- .../include/tutorial8/field/FieldBase.h | 2 +- .../tutorial8/include/tutorial8/field/MsgId.h | 4 +- .../include/tutorial8/field/MsgIdCommon.h | 2 +- .../tutorial8/include/tutorial8/frame/Frame.h | 30 ++++- .../include/tutorial8/frame/FrameCommon.h | 2 +- .../include/tutorial8/input/AllMessages.h | 2 +- .../tutorial8/input/ClientInputMessages.h | 2 +- .../tutorial8/input/ServerInputMessages.h | 2 +- .../include/tutorial8/message/Msg1.h | 2 +- .../include/tutorial8/message/Msg1Common.h | 2 +- .../include/tutorial8/message/Msg2.h | 2 +- .../include/tutorial8/message/Msg2Common.h | 2 +- .../include/tutorial8/message/Msg3.h | 2 +- .../include/tutorial8/message/Msg3Common.h | 2 +- ...llMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../options/BareMetalDefaultOptions.h | 18 +-- .../tutorial8/options/ClientDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../options/DataViewDefaultOptions.h | 18 +-- .../tutorial8/options/DefaultOptions.h | 12 +- .../tutorial8/options/ServerDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../tutorial9/include/tutorial9/Message.h | 2 +- tutorials/tutorial9/include/tutorial9/MsgId.h | 2 +- .../tutorial9/include/tutorial9/Version.h | 4 +- .../dispatch/DispatchClientInputMessage.h | 2 +- .../tutorial9/dispatch/DispatchMessage.h | 2 +- .../dispatch/DispatchServerInputMessage.h | 2 +- .../factory/AllMessagesDynMemMsgFactory.h | 2 +- .../ClientInputMessagesDynMemMsgFactory.h | 2 +- .../ServerInputMessagesDynMemMsgFactory.h | 2 +- .../include/tutorial9/field/FieldBase.h | 2 +- .../tutorial9/include/tutorial9/field/MsgId.h | 4 +- .../include/tutorial9/field/MsgIdCommon.h | 2 +- .../tutorial9/include/tutorial9/frame/Frame.h | 30 ++++- .../include/tutorial9/frame/FrameCommon.h | 2 +- .../include/tutorial9/input/AllMessages.h | 2 +- .../tutorial9/input/ClientInputMessages.h | 2 +- .../tutorial9/input/ServerInputMessages.h | 2 +- .../include/tutorial9/message/Msg1.h | 2 +- .../include/tutorial9/message/Msg1Common.h | 2 +- .../include/tutorial9/message/Msg2.h | 2 +- .../include/tutorial9/message/Msg2Common.h | 2 +- .../include/tutorial9/message/Msg3.h | 2 +- .../include/tutorial9/message/Msg3Common.h | 2 +- .../include/tutorial9/message/Msg4.h | 2 +- .../include/tutorial9/message/Msg4Common.h | 2 +- ...llMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../options/BareMetalDefaultOptions.h | 18 +-- .../tutorial9/options/ClientDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- .../options/DataViewDefaultOptions.h | 18 +-- .../tutorial9/options/DefaultOptions.h | 20 ++-- .../tutorial9/options/ServerDefaultOptions.h | 2 +- ...utMessagesDynMemMsgFactoryDefaultOptions.h | 2 +- 1250 files changed, 4799 insertions(+), 2563 deletions(-) diff --git a/.github/workflows/actions_build.yml b/.github/workflows/actions_build.yml index 0a1ef05e..a28dfff7 100644 --- a/.github/workflows/actions_build.yml +++ b/.github/workflows/actions_build.yml @@ -3,8 +3,8 @@ name: Github Actions Build on: [push] env: - COMMS_TAG: v5.2.7 - COMMSDSL_TAG: v6.3.4 + COMMS_TAG: v5.3 + COMMSDSL_TAG: v7.0.2 jobs: @@ -473,7 +473,7 @@ jobs: strategy: fail-fast: false matrix: - type: [Debug, Release, MinSizeRel] + type: [Debug, Release] arch: [x64] cpp: [11, 14, 17] @@ -524,7 +524,7 @@ jobs: strategy: fail-fast: false matrix: - type: [Debug, Release, MinSizeRel] + type: [Debug, Release] arch: [x64] cpp: [11, 14, 17, 20] diff --git a/CMakeLists.txt b/CMakeLists.txt index 110320d1..089c980d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ option (OPT_USE_SANITIZERS "Compile with sanitizers." OFF) ##################################################### -set (MIN_COMMSDSL_VERSION "6.3.4") +set (MIN_COMMSDSL_VERSION "7.0.2") if ("${CMAKE_CXX_STANDARD}" STREQUAL "") set(CMAKE_CXX_STANDARD 11) diff --git a/howtos/howto1/include/howto1/Interface.h b/howtos/howto1/include/howto1/Interface.h index 09a58b49..f99c42e7 100644 --- a/howtos/howto1/include/howto1/Interface.h +++ b/howtos/howto1/include/howto1/Interface.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Interface" interface class. @@ -24,12 +24,14 @@ struct InterfaceFields /// @brief Definition of "Flags" field. class Flags : public howto1::field::InterfaceFlags< - howto1::options::DefaultOptions + howto1::options::DefaultOptions, + comms::option::def::HasName > { using Base = howto1::field::InterfaceFlags< - howto1::options::DefaultOptions + howto1::options::DefaultOptions, + comms::option::def::HasName >; public: /// @brief Name of the field. diff --git a/howtos/howto1/include/howto1/InterfaceCommon.h b/howtos/howto1/include/howto1/InterfaceCommon.h index 79374459..c89dcea1 100644 --- a/howtos/howto1/include/howto1/InterfaceCommon.h +++ b/howtos/howto1/include/howto1/InterfaceCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto1/include/howto1/MsgId.h b/howtos/howto1/include/howto1/MsgId.h index c2d5d832..7fd7676c 100644 --- a/howtos/howto1/include/howto1/MsgId.h +++ b/howtos/howto1/include/howto1/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of message ids enumeration. diff --git a/howtos/howto1/include/howto1/Version.h b/howtos/howto1/include/howto1/Version.h index ec2a717c..ef2239e5 100644 --- a/howtos/howto1/include/howto1/Version.h +++ b/howtos/howto1/include/howto1/Version.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains protocol version definition. @@ -22,5 +22,5 @@ inline constexpr unsigned specVersion() } // namespace howto1 // Generated compile time check for minimal supported version of the COMMS library -static_assert(COMMS_MAKE_VERSION(5, 2, 7) <= comms::version(), +static_assert(COMMS_MAKE_VERSION(5, 3, 0) <= comms::version(), "The version of COMMS library is too old"); diff --git a/howtos/howto1/include/howto1/dispatch/DispatchClientInputMessage.h b/howtos/howto1/include/howto1/dispatch/DispatchClientInputMessage.h index 4d71c684..85027b11 100644 --- a/howtos/howto1/include/howto1/dispatch/DispatchClientInputMessage.h +++ b/howtos/howto1/include/howto1/dispatch/DispatchClientInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/howtos/howto1/include/howto1/dispatch/DispatchMessage.h b/howtos/howto1/include/howto1/dispatch/DispatchMessage.h index 07f62f48..318214f8 100644 --- a/howtos/howto1/include/howto1/dispatch/DispatchMessage.h +++ b/howtos/howto1/include/howto1/dispatch/DispatchMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for all input messages. diff --git a/howtos/howto1/include/howto1/dispatch/DispatchServerInputMessage.h b/howtos/howto1/include/howto1/dispatch/DispatchServerInputMessage.h index 7a27701c..18aa6a78 100644 --- a/howtos/howto1/include/howto1/dispatch/DispatchServerInputMessage.h +++ b/howtos/howto1/include/howto1/dispatch/DispatchServerInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/howtos/howto1/include/howto1/factory/AllMessagesDynMemMsgFactory.h b/howtos/howto1/include/howto1/factory/AllMessagesDynMemMsgFactory.h index d4b607f1..e2806b3d 100644 --- a/howtos/howto1/include/howto1/factory/AllMessagesDynMemMsgFactory.h +++ b/howtos/howto1/include/howto1/factory/AllMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for all the messages. diff --git a/howtos/howto1/include/howto1/factory/ClientInputMessagesDynMemMsgFactory.h b/howtos/howto1/include/howto1/factory/ClientInputMessagesDynMemMsgFactory.h index d560d950..d95a81f4 100644 --- a/howtos/howto1/include/howto1/factory/ClientInputMessagesDynMemMsgFactory.h +++ b/howtos/howto1/include/howto1/factory/ClientInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the client input messages. diff --git a/howtos/howto1/include/howto1/factory/ServerInputMessagesDynMemMsgFactory.h b/howtos/howto1/include/howto1/factory/ServerInputMessagesDynMemMsgFactory.h index b0919c2f..239ddc98 100644 --- a/howtos/howto1/include/howto1/factory/ServerInputMessagesDynMemMsgFactory.h +++ b/howtos/howto1/include/howto1/factory/ServerInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the server input messages. diff --git a/howtos/howto1/include/howto1/field/FieldBase.h b/howtos/howto1/include/howto1/field/FieldBase.h index 1f8586db..498b8f36 100644 --- a/howtos/howto1/include/howto1/field/FieldBase.h +++ b/howtos/howto1/include/howto1/field/FieldBase.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of base class of all the fields. diff --git a/howtos/howto1/include/howto1/field/InterfaceFlags.h b/howtos/howto1/include/howto1/field/InterfaceFlags.h index 342211ee..bafd20a9 100644 --- a/howtos/howto1/include/howto1/field/InterfaceFlags.h +++ b/howtos/howto1/include/howto1/field/InterfaceFlags.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "InterfaceFlags" field. @@ -25,6 +25,7 @@ class InterfaceFlags : public comms::field::BitmaskValue< howto1::field::FieldBase<>, TExtraOpts..., + comms::option::def::HasName, comms::option::def::FixedLength<1U>, comms::option::def::BitmaskReservedBits<0xFCU, 0x0U> > @@ -33,6 +34,7 @@ class InterfaceFlags : public comms::field::BitmaskValue< howto1::field::FieldBase<>, TExtraOpts..., + comms::option::def::HasName, comms::option::def::FixedLength<1U>, comms::option::def::BitmaskReservedBits<0xFCU, 0x0U> >; @@ -50,13 +52,18 @@ class InterfaceFlags : public B1 ); + /// @brief Retrieve name of the bit. + /// @see @ref howto1::field::InterfaceFlagsCommon::bitName(). + static const char* bitName(std::size_t idx) + { + return howto1::field::InterfaceFlagsCommon::bitName(idx); + } + /// @brief Retrieve name of the bit. /// @see @ref howto1::field::InterfaceFlagsCommon::bitName(). static const char* bitName(BitIdx idx) { - return - howto1::field::InterfaceFlagsCommon::bitName( - static_cast(idx)); + return bitName(static_cast(idx)); } /// @brief Name of the field. diff --git a/howtos/howto1/include/howto1/field/InterfaceFlagsCommon.h b/howtos/howto1/include/howto1/field/InterfaceFlagsCommon.h index 0f51e87f..65693904 100644 --- a/howtos/howto1/include/howto1/field/InterfaceFlagsCommon.h +++ b/howtos/howto1/include/howto1/field/InterfaceFlagsCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto1/include/howto1/field/MsgId.h b/howtos/howto1/include/howto1/field/MsgId.h index 30dd41a4..4a3e8f09 100644 --- a/howtos/howto1/include/howto1/field/MsgId.h +++ b/howtos/howto1/include/howto1/field/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "MsgId" field. @@ -27,6 +27,7 @@ class MsgId : public howto1::field::FieldBase<>, howto1::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 2> > { @@ -35,6 +36,7 @@ class MsgId : public howto1::field::FieldBase<>, howto1::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 2> >; public: diff --git a/howtos/howto1/include/howto1/field/MsgIdCommon.h b/howtos/howto1/include/howto1/field/MsgIdCommon.h index 6679e58b..8998e3fa 100644 --- a/howtos/howto1/include/howto1/field/MsgIdCommon.h +++ b/howtos/howto1/include/howto1/field/MsgIdCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto1/include/howto1/frame/Frame.h b/howtos/howto1/include/howto1/frame/Frame.h index 5825e2a7..89626f94 100644 --- a/howtos/howto1/include/howto1/frame/Frame.h +++ b/howtos/howto1/include/howto1/frame/Frame.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Frame" frame class. @@ -34,10 +34,30 @@ namespace frame template struct FrameLayers { + /// @brief Scope for field(s) of @ref Data layer. + struct DataMembers + { + /// @brief Custom field for @ref howto1::frame::FrameLayers::Data layer + class Field : public + comms::field::ArrayList< + howto1::field::FieldBase<>, + std::uint8_t, + typename TOpt::frame::FrameLayers::DataMembers::Field, + comms::option::def::HasName + > + { + public: + static const char* name() + { + return "Data"; + } + }; + }; + /// @brief Definition of layer "Data". using Data = comms::protocol::MsgDataLayer< - typename TOpt::frame::FrameLayers::Data + comms::option::def::FieldType >; /// @brief Definition of layer "Flags". @@ -77,6 +97,7 @@ struct FrameLayers comms::field::IntValue< howto1::field::FieldBase<>, std::uint16_t, + comms::option::def::HasName, comms::option::def::FixedBitLength<12U> > { @@ -84,6 +105,7 @@ struct FrameLayers comms::field::IntValue< howto1::field::FieldBase<>, std::uint16_t, + comms::option::def::HasName, comms::option::def::FixedBitLength<12U> >; public: @@ -107,12 +129,14 @@ struct FrameLayers class Flags : public howto1::field::InterfaceFlags< TOpt, + comms::option::def::HasName, comms::option::def::FixedBitLength<4U> > { using Base = howto1::field::InterfaceFlags< TOpt, + comms::option::def::HasName, comms::option::def::FixedBitLength<4U> >; public: @@ -136,6 +160,7 @@ struct FrameLayers comms::field::Bitfield< howto1::field::FieldBase<>, typename FieldMembers::All, + comms::option::def::HasName, comms::option::def::HasVersionDependentMembers > { @@ -143,6 +168,7 @@ struct FrameLayers comms::field::Bitfield< howto1::field::FieldBase<>, typename FieldMembers::All, + comms::option::def::HasName, comms::option::def::HasVersionDependentMembers >; public: diff --git a/howtos/howto1/include/howto1/frame/FrameCommon.h b/howtos/howto1/include/howto1/frame/FrameCommon.h index 264ad3ec..f6c9b91b 100644 --- a/howtos/howto1/include/howto1/frame/FrameCommon.h +++ b/howtos/howto1/include/howto1/frame/FrameCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto1/include/howto1/input/AllMessages.h b/howtos/howto1/include/howto1/input/AllMessages.h index 0ee8e444..65bdb4cd 100644 --- a/howtos/howto1/include/howto1/input/AllMessages.h +++ b/howtos/howto1/include/howto1/input/AllMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the AllMessages messages bundle. diff --git a/howtos/howto1/include/howto1/input/ClientInputMessages.h b/howtos/howto1/include/howto1/input/ClientInputMessages.h index a3b3c00d..45084c8e 100644 --- a/howtos/howto1/include/howto1/input/ClientInputMessages.h +++ b/howtos/howto1/include/howto1/input/ClientInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ClientInputMessages messages bundle. diff --git a/howtos/howto1/include/howto1/input/ServerInputMessages.h b/howtos/howto1/include/howto1/input/ServerInputMessages.h index 7595259a..6839ce47 100644 --- a/howtos/howto1/include/howto1/input/ServerInputMessages.h +++ b/howtos/howto1/include/howto1/input/ServerInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ServerInputMessages messages bundle. diff --git a/howtos/howto1/include/howto1/message/Msg1.h b/howtos/howto1/include/howto1/message/Msg1.h index 8720e2a5..68075f59 100644 --- a/howtos/howto1/include/howto1/message/Msg1.h +++ b/howtos/howto1/include/howto1/message/Msg1.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 1" message and its fields. @@ -33,13 +33,15 @@ struct Msg1Fields class F1 : public comms::field::IntValue< howto1::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< howto1::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -62,13 +64,15 @@ struct Msg1Fields class F2 : public comms::field::IntValue< howto1::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< howto1::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -95,13 +99,15 @@ struct Msg1Fields class Field : public comms::field::IntValue< howto1::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< howto1::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -127,12 +133,14 @@ struct Msg1Fields class F3 : public comms::field::Optional< typename F3Members::Field, + comms::option::def::HasName, comms::option::def::MissingByDefault > { using Base = comms::field::Optional< typename F3Members::Field, + comms::option::def::HasName, comms::option::def::MissingByDefault >; public: diff --git a/howtos/howto1/include/howto1/message/Msg1Common.h b/howtos/howto1/include/howto1/message/Msg1Common.h index ac7abaf1..5584e1d0 100644 --- a/howtos/howto1/include/howto1/message/Msg1Common.h +++ b/howtos/howto1/include/howto1/message/Msg1Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto1/include/howto1/message/Msg2.h b/howtos/howto1/include/howto1/message/Msg2.h index 3c1066ea..3fb35971 100644 --- a/howtos/howto1/include/howto1/message/Msg2.h +++ b/howtos/howto1/include/howto1/message/Msg2.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 2" message and its fields. @@ -38,13 +38,15 @@ struct Msg2Fields class Length : public comms::field::IntValue< howto1::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< howto1::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -69,6 +71,7 @@ struct Msg2Fields comms::field::String< howto1::field::FieldBase<>, typename TOpt::message::Msg2Fields::F1, + comms::option::def::HasName, comms::option::def::SequenceSerLengthFieldPrefix > { @@ -76,6 +79,7 @@ struct Msg2Fields comms::field::String< howto1::field::FieldBase<>, typename TOpt::message::Msg2Fields::F1, + comms::option::def::HasName, comms::option::def::SequenceSerLengthFieldPrefix >; public: @@ -102,13 +106,15 @@ struct Msg2Fields class Field : public comms::field::IntValue< howto1::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< howto1::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -134,12 +140,14 @@ struct Msg2Fields class F2 : public comms::field::Optional< typename F2Members::Field, + comms::option::def::HasName, comms::option::def::MissingByDefault > { using Base = comms::field::Optional< typename F2Members::Field, + comms::option::def::HasName, comms::option::def::MissingByDefault >; public: diff --git a/howtos/howto1/include/howto1/message/Msg2Common.h b/howtos/howto1/include/howto1/message/Msg2Common.h index 9f81a0f1..5a614f56 100644 --- a/howtos/howto1/include/howto1/message/Msg2Common.h +++ b/howtos/howto1/include/howto1/message/Msg2Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto1/include/howto1/options/AllMessagesDynMemMsgFactoryDefaultOptions.h b/howtos/howto1/include/howto1/options/AllMessagesDynMemMsgFactoryDefaultOptions.h index f2a6f506..0746d29f 100644 --- a/howtos/howto1/include/howto1/options/AllMessagesDynMemMsgFactoryDefaultOptions.h +++ b/howtos/howto1/include/howto1/options/AllMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol all messages dynamic memory allocation message factory options. diff --git a/howtos/howto1/include/howto1/options/BareMetalDefaultOptions.h b/howtos/howto1/include/howto1/options/BareMetalDefaultOptions.h index c029ae8b..a84ab9ea 100644 --- a/howtos/howto1/include/howto1/options/BareMetalDefaultOptions.h +++ b/howtos/howto1/include/howto1/options/BareMetalDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol bare metal default options. @@ -48,12 +48,15 @@ struct BareMetalDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// howto1::frame::FrameLayers::Data layer. - using Data = - std::tuple< - comms::option::app::FixedSizeStorage, - typename TBase::frame::FrameLayers::Data - >; + /// howto1::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::FixedSizeStorage, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers /// @brief Extra options for @ref /// howto1::frame::FrameLayers::Id layer. diff --git a/howtos/howto1/include/howto1/options/ClientDefaultOptions.h b/howtos/howto1/include/howto1/options/ClientDefaultOptions.h index 40938c56..930d506f 100644 --- a/howtos/howto1/include/howto1/options/ClientDefaultOptions.h +++ b/howtos/howto1/include/howto1/options/ClientDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client default options. diff --git a/howtos/howto1/include/howto1/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h b/howtos/howto1/include/howto1/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h index eaa6861f..eb2258b8 100644 --- a/howtos/howto1/include/howto1/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/howtos/howto1/include/howto1/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client input messages dynamic memory allocation message factory options. diff --git a/howtos/howto1/include/howto1/options/DataViewDefaultOptions.h b/howtos/howto1/include/howto1/options/DataViewDefaultOptions.h index ab7b563a..da226b58 100644 --- a/howtos/howto1/include/howto1/options/DataViewDefaultOptions.h +++ b/howtos/howto1/include/howto1/options/DataViewDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol data view default options. @@ -42,12 +42,15 @@ struct DataViewDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// howto1::frame::FrameLayers::Data layer. - using Data = - std::tuple< - comms::option::app::OrigDataView, - typename TBase::frame::FrameLayers::Data - >; + /// howto1::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::OrigDataView, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers }; // struct FrameLayers }; // struct frame }; diff --git a/howtos/howto1/include/howto1/options/DefaultOptions.h b/howtos/howto1/include/howto1/options/DefaultOptions.h index 2e904a26..19751f41 100644 --- a/howtos/howto1/include/howto1/options/DefaultOptions.h +++ b/howtos/howto1/include/howto1/options/DefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol default options. @@ -29,7 +29,7 @@ struct DefaultOptionsT : public TBase { /// @brief Extra options for @ref /// howto1::message::Msg2Fields::F1 field. - using F1 = comms::option::EmptyOption; + using F1 = comms::option::app::EmptyOption; }; }; // struct message @@ -41,17 +41,20 @@ struct DefaultOptionsT : public TBase struct FrameLayers { /// @brief Extra options for @ref - /// howto1::frame::FrameLayers::Data layer. - using Data = comms::option::EmptyOption; + /// howto1::frame::FrameLayers::DataMembers::Field field. + struct DataMembers + { + using Field = comms::option::app::EmptyOption; + }; // struct DataMembers /// @brief Extra options for @ref /// howto1::frame::FrameLayers::Id layer. - using Id = comms::option::EmptyOption; + using Id = comms::option::app::EmptyOption; /// @brief Extra options for @ref /// howto1::frame::FrameLayers::SizeWithFlags /// layer. - using SizeWithFlags = comms::option::EmptyOption; + using SizeWithFlags = comms::option::app::EmptyOption; }; // struct FrameLayers }; // struct frame }; diff --git a/howtos/howto1/include/howto1/options/ServerDefaultOptions.h b/howtos/howto1/include/howto1/options/ServerDefaultOptions.h index a38bf8f8..6c50b900 100644 --- a/howtos/howto1/include/howto1/options/ServerDefaultOptions.h +++ b/howtos/howto1/include/howto1/options/ServerDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server default options. diff --git a/howtos/howto1/include/howto1/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h b/howtos/howto1/include/howto1/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h index 0dace477..c13ece2c 100644 --- a/howtos/howto1/include/howto1/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/howtos/howto1/include/howto1/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server input messages dynamic memory allocation message factory options. diff --git a/howtos/howto10/include/howto10/Interface.h b/howtos/howto10/include/howto10/Interface.h index cbf392b1..43293742 100644 --- a/howtos/howto10/include/howto10/Interface.h +++ b/howtos/howto10/include/howto10/Interface.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Interface" interface class. @@ -24,7 +24,8 @@ struct InterfaceFields /// @brief Definition of "Flags" field. using Flags = howto10::field::Flags< - howto10::options::DefaultOptions + howto10::options::DefaultOptions, + comms::option::def::HasName >; /// @brief All the fields bundled in std::tuple. diff --git a/howtos/howto10/include/howto10/InterfaceCommon.h b/howtos/howto10/include/howto10/InterfaceCommon.h index 400f9907..aa69e0ef 100644 --- a/howtos/howto10/include/howto10/InterfaceCommon.h +++ b/howtos/howto10/include/howto10/InterfaceCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto10/include/howto10/MsgId.h b/howtos/howto10/include/howto10/MsgId.h index 3a65ad01..2ade532b 100644 --- a/howtos/howto10/include/howto10/MsgId.h +++ b/howtos/howto10/include/howto10/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of message ids enumeration. diff --git a/howtos/howto10/include/howto10/Version.h b/howtos/howto10/include/howto10/Version.h index 9a6d023a..8c557cda 100644 --- a/howtos/howto10/include/howto10/Version.h +++ b/howtos/howto10/include/howto10/Version.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains protocol version definition. @@ -22,5 +22,5 @@ inline constexpr unsigned specVersion() } // namespace howto10 // Generated compile time check for minimal supported version of the COMMS library -static_assert(COMMS_MAKE_VERSION(5, 2, 7) <= comms::version(), +static_assert(COMMS_MAKE_VERSION(5, 3, 0) <= comms::version(), "The version of COMMS library is too old"); diff --git a/howtos/howto10/include/howto10/dispatch/DispatchClientInputMessage.h b/howtos/howto10/include/howto10/dispatch/DispatchClientInputMessage.h index e9632449..b431945b 100644 --- a/howtos/howto10/include/howto10/dispatch/DispatchClientInputMessage.h +++ b/howtos/howto10/include/howto10/dispatch/DispatchClientInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/howtos/howto10/include/howto10/dispatch/DispatchMessage.h b/howtos/howto10/include/howto10/dispatch/DispatchMessage.h index 1a45073d..ddddaa76 100644 --- a/howtos/howto10/include/howto10/dispatch/DispatchMessage.h +++ b/howtos/howto10/include/howto10/dispatch/DispatchMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for all input messages. diff --git a/howtos/howto10/include/howto10/dispatch/DispatchServerInputMessage.h b/howtos/howto10/include/howto10/dispatch/DispatchServerInputMessage.h index 24249aa8..81c5af25 100644 --- a/howtos/howto10/include/howto10/dispatch/DispatchServerInputMessage.h +++ b/howtos/howto10/include/howto10/dispatch/DispatchServerInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/howtos/howto10/include/howto10/factory/AllMessagesDynMemMsgFactory.h b/howtos/howto10/include/howto10/factory/AllMessagesDynMemMsgFactory.h index acab8056..a6d8fe03 100644 --- a/howtos/howto10/include/howto10/factory/AllMessagesDynMemMsgFactory.h +++ b/howtos/howto10/include/howto10/factory/AllMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for all the messages. diff --git a/howtos/howto10/include/howto10/factory/ClientInputMessagesDynMemMsgFactory.h b/howtos/howto10/include/howto10/factory/ClientInputMessagesDynMemMsgFactory.h index 25a587cc..82112fcb 100644 --- a/howtos/howto10/include/howto10/factory/ClientInputMessagesDynMemMsgFactory.h +++ b/howtos/howto10/include/howto10/factory/ClientInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the client input messages. diff --git a/howtos/howto10/include/howto10/factory/ServerInputMessagesDynMemMsgFactory.h b/howtos/howto10/include/howto10/factory/ServerInputMessagesDynMemMsgFactory.h index cc1f9148..8105c174 100644 --- a/howtos/howto10/include/howto10/factory/ServerInputMessagesDynMemMsgFactory.h +++ b/howtos/howto10/include/howto10/factory/ServerInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the server input messages. diff --git a/howtos/howto10/include/howto10/field/FieldBase.h b/howtos/howto10/include/howto10/field/FieldBase.h index b49f13c2..a29d2e6a 100644 --- a/howtos/howto10/include/howto10/field/FieldBase.h +++ b/howtos/howto10/include/howto10/field/FieldBase.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of base class of all the fields. diff --git a/howtos/howto10/include/howto10/field/Flags.h b/howtos/howto10/include/howto10/field/Flags.h index 69324593..b5854972 100644 --- a/howtos/howto10/include/howto10/field/Flags.h +++ b/howtos/howto10/include/howto10/field/Flags.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Flags" field. @@ -25,6 +25,7 @@ class Flags : public comms::field::BitmaskValue< howto10::field::FieldBase<>, TExtraOpts..., + comms::option::def::HasName, comms::option::def::FixedLength<1U>, comms::option::def::BitmaskReservedBits<0xFCU, 0x0U> > @@ -33,6 +34,7 @@ class Flags : public comms::field::BitmaskValue< howto10::field::FieldBase<>, TExtraOpts..., + comms::option::def::HasName, comms::option::def::FixedLength<1U>, comms::option::def::BitmaskReservedBits<0xFCU, 0x0U> >; @@ -50,13 +52,18 @@ class Flags : public B1 ); + /// @brief Retrieve name of the bit. + /// @see @ref howto10::field::FlagsCommon::bitName(). + static const char* bitName(std::size_t idx) + { + return howto10::field::FlagsCommon::bitName(idx); + } + /// @brief Retrieve name of the bit. /// @see @ref howto10::field::FlagsCommon::bitName(). static const char* bitName(BitIdx idx) { - return - howto10::field::FlagsCommon::bitName( - static_cast(idx)); + return bitName(static_cast(idx)); } /// @brief Name of the field. diff --git a/howtos/howto10/include/howto10/field/FlagsCommon.h b/howtos/howto10/include/howto10/field/FlagsCommon.h index 498edaaa..40156d59 100644 --- a/howtos/howto10/include/howto10/field/FlagsCommon.h +++ b/howtos/howto10/include/howto10/field/FlagsCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto10/include/howto10/field/MsgId.h b/howtos/howto10/include/howto10/field/MsgId.h index 46eee494..69d7e23f 100644 --- a/howtos/howto10/include/howto10/field/MsgId.h +++ b/howtos/howto10/include/howto10/field/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "MsgId" field. @@ -27,6 +27,7 @@ class MsgId : public howto10::field::FieldBase<>, howto10::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 3> > { @@ -35,6 +36,7 @@ class MsgId : public howto10::field::FieldBase<>, howto10::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 3> >; public: diff --git a/howtos/howto10/include/howto10/field/MsgIdCommon.h b/howtos/howto10/include/howto10/field/MsgIdCommon.h index bd030b50..360800ef 100644 --- a/howtos/howto10/include/howto10/field/MsgIdCommon.h +++ b/howtos/howto10/include/howto10/field/MsgIdCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto10/include/howto10/frame/Frame.h b/howtos/howto10/include/howto10/frame/Frame.h index 471b425a..e6f36969 100644 --- a/howtos/howto10/include/howto10/frame/Frame.h +++ b/howtos/howto10/include/howto10/frame/Frame.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Frame" frame class. @@ -36,10 +36,30 @@ namespace frame template struct FrameLayers { + /// @brief Scope for field(s) of @ref Data layer. + struct DataMembers + { + /// @brief Custom field for @ref howto10::frame::FrameLayers::Data layer + class Field : public + comms::field::ArrayList< + howto10::field::FieldBase<>, + std::uint8_t, + typename TOpt::frame::FrameLayers::DataMembers::Field, + comms::option::def::HasName + > + { + public: + static const char* name() + { + return "Data"; + } + }; + }; + /// @brief Definition of layer "Data". using Data = comms::protocol::MsgDataLayer< - typename TOpt::frame::FrameLayers::Data + comms::option::def::FieldType >; /// @brief Scope for field(s) of @ref Checksum layer. @@ -49,13 +69,15 @@ struct FrameLayers class ChecksumField : public comms::field::IntValue< howto10::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< howto10::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -127,13 +149,15 @@ struct FrameLayers class SizeField : public comms::field::IntValue< howto10::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< howto10::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -169,6 +193,7 @@ struct FrameLayers comms::field::IntValue< howto10::field::FieldBase<>, std::uint16_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid, comms::option::def::DefaultNumValue<43981L> > @@ -177,6 +202,7 @@ struct FrameLayers comms::field::IntValue< howto10::field::FieldBase<>, std::uint16_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid, comms::option::def::DefaultNumValue<43981L> >; diff --git a/howtos/howto10/include/howto10/frame/FrameCommon.h b/howtos/howto10/include/howto10/frame/FrameCommon.h index 77003b0f..34ba978f 100644 --- a/howtos/howto10/include/howto10/frame/FrameCommon.h +++ b/howtos/howto10/include/howto10/frame/FrameCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto10/include/howto10/input/AllMessages.h b/howtos/howto10/include/howto10/input/AllMessages.h index d47aa5b4..de11c61b 100644 --- a/howtos/howto10/include/howto10/input/AllMessages.h +++ b/howtos/howto10/include/howto10/input/AllMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the AllMessages messages bundle. diff --git a/howtos/howto10/include/howto10/input/ClientInputMessages.h b/howtos/howto10/include/howto10/input/ClientInputMessages.h index 3dc865f1..12851be5 100644 --- a/howtos/howto10/include/howto10/input/ClientInputMessages.h +++ b/howtos/howto10/include/howto10/input/ClientInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ClientInputMessages messages bundle. diff --git a/howtos/howto10/include/howto10/input/ServerInputMessages.h b/howtos/howto10/include/howto10/input/ServerInputMessages.h index 67a2ee4e..98b24f8a 100644 --- a/howtos/howto10/include/howto10/input/ServerInputMessages.h +++ b/howtos/howto10/include/howto10/input/ServerInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ServerInputMessages messages bundle. diff --git a/howtos/howto10/include/howto10/message/Msg1.h b/howtos/howto10/include/howto10/message/Msg1.h index a2b2a191..6ffe8629 100644 --- a/howtos/howto10/include/howto10/message/Msg1.h +++ b/howtos/howto10/include/howto10/message/Msg1.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 1" message and its fields. @@ -32,13 +32,15 @@ struct Msg1Fields class F1 : public comms::field::IntValue< howto10::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< howto10::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/howtos/howto10/include/howto10/message/Msg1Common.h b/howtos/howto10/include/howto10/message/Msg1Common.h index e67f66ec..9f18b32f 100644 --- a/howtos/howto10/include/howto10/message/Msg1Common.h +++ b/howtos/howto10/include/howto10/message/Msg1Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto10/include/howto10/message/Msg2.h b/howtos/howto10/include/howto10/message/Msg2.h index 7f71b933..9b8006f6 100644 --- a/howtos/howto10/include/howto10/message/Msg2.h +++ b/howtos/howto10/include/howto10/message/Msg2.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 2" message and its fields. @@ -32,13 +32,15 @@ struct Msg2Fields class F1 : public comms::field::IntValue< howto10::field::FieldBase<>, - std::uint32_t + std::uint32_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< howto10::field::FieldBase<>, - std::uint32_t + std::uint32_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/howtos/howto10/include/howto10/message/Msg2Common.h b/howtos/howto10/include/howto10/message/Msg2Common.h index dc16ed05..820d380a 100644 --- a/howtos/howto10/include/howto10/message/Msg2Common.h +++ b/howtos/howto10/include/howto10/message/Msg2Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto10/include/howto10/message/Msg3.h b/howtos/howto10/include/howto10/message/Msg3.h index 2298e099..a59f2eac 100644 --- a/howtos/howto10/include/howto10/message/Msg3.h +++ b/howtos/howto10/include/howto10/message/Msg3.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 3" message and its fields. @@ -37,13 +37,15 @@ struct Msg3Fields class Length : public comms::field::IntValue< howto10::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< howto10::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -68,6 +70,7 @@ struct Msg3Fields comms::field::String< howto10::field::FieldBase<>, typename TOpt::message::Msg3Fields::F1, + comms::option::def::HasName, comms::option::def::SequenceSerLengthFieldPrefix > { @@ -75,6 +78,7 @@ struct Msg3Fields comms::field::String< howto10::field::FieldBase<>, typename TOpt::message::Msg3Fields::F1, + comms::option::def::HasName, comms::option::def::SequenceSerLengthFieldPrefix >; public: diff --git a/howtos/howto10/include/howto10/message/Msg3Common.h b/howtos/howto10/include/howto10/message/Msg3Common.h index 66d472be..35ba54cb 100644 --- a/howtos/howto10/include/howto10/message/Msg3Common.h +++ b/howtos/howto10/include/howto10/message/Msg3Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto10/include/howto10/options/AllMessagesDynMemMsgFactoryDefaultOptions.h b/howtos/howto10/include/howto10/options/AllMessagesDynMemMsgFactoryDefaultOptions.h index 0f18663e..dcac853c 100644 --- a/howtos/howto10/include/howto10/options/AllMessagesDynMemMsgFactoryDefaultOptions.h +++ b/howtos/howto10/include/howto10/options/AllMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol all messages dynamic memory allocation message factory options. diff --git a/howtos/howto10/include/howto10/options/BareMetalDefaultOptions.h b/howtos/howto10/include/howto10/options/BareMetalDefaultOptions.h index b4b04a2e..62f898b0 100644 --- a/howtos/howto10/include/howto10/options/BareMetalDefaultOptions.h +++ b/howtos/howto10/include/howto10/options/BareMetalDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol bare metal default options. @@ -48,12 +48,15 @@ struct BareMetalDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// howto10::frame::FrameLayers::Data layer. - using Data = - std::tuple< - comms::option::app::FixedSizeStorage, - typename TBase::frame::FrameLayers::Data - >; + /// howto10::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::FixedSizeStorage, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers /// @brief Extra options for @ref /// howto10::frame::FrameLayers::Id layer. diff --git a/howtos/howto10/include/howto10/options/ClientDefaultOptions.h b/howtos/howto10/include/howto10/options/ClientDefaultOptions.h index 644450a7..afc6f67e 100644 --- a/howtos/howto10/include/howto10/options/ClientDefaultOptions.h +++ b/howtos/howto10/include/howto10/options/ClientDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client default options. diff --git a/howtos/howto10/include/howto10/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h b/howtos/howto10/include/howto10/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h index 9d71bbbc..d04e49e0 100644 --- a/howtos/howto10/include/howto10/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/howtos/howto10/include/howto10/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client input messages dynamic memory allocation message factory options. diff --git a/howtos/howto10/include/howto10/options/DataViewDefaultOptions.h b/howtos/howto10/include/howto10/options/DataViewDefaultOptions.h index ad236e8f..982b2fe9 100644 --- a/howtos/howto10/include/howto10/options/DataViewDefaultOptions.h +++ b/howtos/howto10/include/howto10/options/DataViewDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol data view default options. @@ -42,12 +42,15 @@ struct DataViewDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// howto10::frame::FrameLayers::Data layer. - using Data = - std::tuple< - comms::option::app::OrigDataView, - typename TBase::frame::FrameLayers::Data - >; + /// howto10::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::OrigDataView, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers }; // struct FrameLayers }; // struct frame }; diff --git a/howtos/howto10/include/howto10/options/DefaultOptions.h b/howtos/howto10/include/howto10/options/DefaultOptions.h index 3fb54384..349ecbbb 100644 --- a/howtos/howto10/include/howto10/options/DefaultOptions.h +++ b/howtos/howto10/include/howto10/options/DefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol default options. @@ -29,7 +29,7 @@ struct DefaultOptionsT : public TBase { /// @brief Extra options for @ref /// howto10::message::Msg3Fields::F1 field. - using F1 = comms::option::EmptyOption; + using F1 = comms::option::app::EmptyOption; }; }; // struct message @@ -41,17 +41,20 @@ struct DefaultOptionsT : public TBase struct FrameLayers { /// @brief Extra options for @ref - /// howto10::frame::FrameLayers::Data layer. - using Data = comms::option::EmptyOption; + /// howto10::frame::FrameLayers::DataMembers::Field field. + struct DataMembers + { + using Field = comms::option::app::EmptyOption; + }; // struct DataMembers /// @brief Extra options for @ref /// howto10::frame::FrameLayers::Id layer. - using Id = comms::option::EmptyOption; + using Id = comms::option::app::EmptyOption; /// @brief Extra options for @ref /// howto10::frame::FrameLayers::Flags /// layer. - using Flags = comms::option::EmptyOption; + using Flags = comms::option::app::EmptyOption; }; // struct FrameLayers }; // struct frame }; diff --git a/howtos/howto10/include/howto10/options/ServerDefaultOptions.h b/howtos/howto10/include/howto10/options/ServerDefaultOptions.h index dc46770b..2202d724 100644 --- a/howtos/howto10/include/howto10/options/ServerDefaultOptions.h +++ b/howtos/howto10/include/howto10/options/ServerDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server default options. diff --git a/howtos/howto10/include/howto10/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h b/howtos/howto10/include/howto10/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h index 237ec5b8..68bc44c6 100644 --- a/howtos/howto10/include/howto10/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/howtos/howto10/include/howto10/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server input messages dynamic memory allocation message factory options. diff --git a/howtos/howto2/include/howto2/Message.h b/howtos/howto2/include/howto2/Message.h index efe17b43..c6b54852 100644 --- a/howtos/howto2/include/howto2/Message.h +++ b/howtos/howto2/include/howto2/Message.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message" interface class. diff --git a/howtos/howto2/include/howto2/MsgId.h b/howtos/howto2/include/howto2/MsgId.h index 93581878..d2a866be 100644 --- a/howtos/howto2/include/howto2/MsgId.h +++ b/howtos/howto2/include/howto2/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of message ids enumeration. diff --git a/howtos/howto2/include/howto2/Version.h b/howtos/howto2/include/howto2/Version.h index 20e65cea..ab1a7d90 100644 --- a/howtos/howto2/include/howto2/Version.h +++ b/howtos/howto2/include/howto2/Version.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains protocol version definition. @@ -22,5 +22,5 @@ inline constexpr unsigned specVersion() } // namespace howto2 // Generated compile time check for minimal supported version of the COMMS library -static_assert(COMMS_MAKE_VERSION(5, 2, 7) <= comms::version(), +static_assert(COMMS_MAKE_VERSION(5, 3, 0) <= comms::version(), "The version of COMMS library is too old"); diff --git a/howtos/howto2/include/howto2/dispatch/DispatchClientInputMessage.h b/howtos/howto2/include/howto2/dispatch/DispatchClientInputMessage.h index 8e435b6f..858045d5 100644 --- a/howtos/howto2/include/howto2/dispatch/DispatchClientInputMessage.h +++ b/howtos/howto2/include/howto2/dispatch/DispatchClientInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/howtos/howto2/include/howto2/dispatch/DispatchMessage.h b/howtos/howto2/include/howto2/dispatch/DispatchMessage.h index a904ba41..ba3b29ce 100644 --- a/howtos/howto2/include/howto2/dispatch/DispatchMessage.h +++ b/howtos/howto2/include/howto2/dispatch/DispatchMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for all input messages. diff --git a/howtos/howto2/include/howto2/dispatch/DispatchServerInputMessage.h b/howtos/howto2/include/howto2/dispatch/DispatchServerInputMessage.h index 5c635053..787f99ea 100644 --- a/howtos/howto2/include/howto2/dispatch/DispatchServerInputMessage.h +++ b/howtos/howto2/include/howto2/dispatch/DispatchServerInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/howtos/howto2/include/howto2/factory/AllMessagesDynMemMsgFactory.h b/howtos/howto2/include/howto2/factory/AllMessagesDynMemMsgFactory.h index c10940ce..ffb1656c 100644 --- a/howtos/howto2/include/howto2/factory/AllMessagesDynMemMsgFactory.h +++ b/howtos/howto2/include/howto2/factory/AllMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for all the messages. diff --git a/howtos/howto2/include/howto2/factory/ClientInputMessagesDynMemMsgFactory.h b/howtos/howto2/include/howto2/factory/ClientInputMessagesDynMemMsgFactory.h index 58c46257..6fc96aff 100644 --- a/howtos/howto2/include/howto2/factory/ClientInputMessagesDynMemMsgFactory.h +++ b/howtos/howto2/include/howto2/factory/ClientInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the client input messages. diff --git a/howtos/howto2/include/howto2/factory/ServerInputMessagesDynMemMsgFactory.h b/howtos/howto2/include/howto2/factory/ServerInputMessagesDynMemMsgFactory.h index 300d39dc..7ac0e323 100644 --- a/howtos/howto2/include/howto2/factory/ServerInputMessagesDynMemMsgFactory.h +++ b/howtos/howto2/include/howto2/factory/ServerInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the server input messages. diff --git a/howtos/howto2/include/howto2/field/FieldBase.h b/howtos/howto2/include/howto2/field/FieldBase.h index fd1980d3..be181cc2 100644 --- a/howtos/howto2/include/howto2/field/FieldBase.h +++ b/howtos/howto2/include/howto2/field/FieldBase.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of base class of all the fields. diff --git a/howtos/howto2/include/howto2/field/MsgId.h b/howtos/howto2/include/howto2/field/MsgId.h index 472325f3..0c05985d 100644 --- a/howtos/howto2/include/howto2/field/MsgId.h +++ b/howtos/howto2/include/howto2/field/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "MsgId" field. @@ -27,6 +27,7 @@ class MsgId : public howto2::field::FieldBase<>, howto2::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 4> > { @@ -35,6 +36,7 @@ class MsgId : public howto2::field::FieldBase<>, howto2::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 4> >; public: diff --git a/howtos/howto2/include/howto2/field/MsgIdCommon.h b/howtos/howto2/include/howto2/field/MsgIdCommon.h index ade7daec..50365417 100644 --- a/howtos/howto2/include/howto2/field/MsgIdCommon.h +++ b/howtos/howto2/include/howto2/field/MsgIdCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto2/include/howto2/frame/Frame.h b/howtos/howto2/include/howto2/frame/Frame.h index a0a9657d..eaa5e05b 100644 --- a/howtos/howto2/include/howto2/frame/Frame.h +++ b/howtos/howto2/include/howto2/frame/Frame.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Frame" frame class. @@ -31,10 +31,30 @@ namespace frame template struct FrameLayers { + /// @brief Scope for field(s) of @ref Data layer. + struct DataMembers + { + /// @brief Custom field for @ref howto2::frame::FrameLayers::Data layer + class Field : public + comms::field::ArrayList< + howto2::field::FieldBase<>, + std::uint8_t, + typename TOpt::frame::FrameLayers::DataMembers::Field, + comms::option::def::HasName + > + { + public: + static const char* name() + { + return "Data"; + } + }; + }; + /// @brief Definition of layer "Data". using Data = comms::protocol::MsgDataLayer< - typename TOpt::frame::FrameLayers::Data + comms::option::def::FieldType >; /// @brief Scope for field(s) of @ref IdWithSize layer. @@ -49,6 +69,7 @@ struct FrameLayers comms::field::IntValue< howto2::field::FieldBase<>, std::uint16_t, + comms::option::def::HasName, comms::option::def::FixedBitLength<12U> > { @@ -56,6 +77,7 @@ struct FrameLayers comms::field::IntValue< howto2::field::FieldBase<>, std::uint16_t, + comms::option::def::HasName, comms::option::def::FixedBitLength<12U> >; public: @@ -79,6 +101,7 @@ struct FrameLayers using MsgId = howto2::field::MsgId< TOpt, + comms::option::def::HasName, comms::option::def::FixedBitLength<4U> >; @@ -95,6 +118,7 @@ struct FrameLayers comms::field::Bitfield< howto2::field::FieldBase<>, typename FieldMembers::All, + comms::option::def::HasName, comms::option::def::HasVersionDependentMembers > { @@ -102,6 +126,7 @@ struct FrameLayers comms::field::Bitfield< howto2::field::FieldBase<>, typename FieldMembers::All, + comms::option::def::HasName, comms::option::def::HasVersionDependentMembers >; public: diff --git a/howtos/howto2/include/howto2/frame/FrameCommon.h b/howtos/howto2/include/howto2/frame/FrameCommon.h index 0c3c516d..9c7a64b3 100644 --- a/howtos/howto2/include/howto2/frame/FrameCommon.h +++ b/howtos/howto2/include/howto2/frame/FrameCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto2/include/howto2/input/AllMessages.h b/howtos/howto2/include/howto2/input/AllMessages.h index 1d92df6b..008aa7ae 100644 --- a/howtos/howto2/include/howto2/input/AllMessages.h +++ b/howtos/howto2/include/howto2/input/AllMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the AllMessages messages bundle. diff --git a/howtos/howto2/include/howto2/input/ClientInputMessages.h b/howtos/howto2/include/howto2/input/ClientInputMessages.h index 00089ae8..2972bedc 100644 --- a/howtos/howto2/include/howto2/input/ClientInputMessages.h +++ b/howtos/howto2/include/howto2/input/ClientInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ClientInputMessages messages bundle. diff --git a/howtos/howto2/include/howto2/input/ServerInputMessages.h b/howtos/howto2/include/howto2/input/ServerInputMessages.h index 12abe94b..26f73d0c 100644 --- a/howtos/howto2/include/howto2/input/ServerInputMessages.h +++ b/howtos/howto2/include/howto2/input/ServerInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ServerInputMessages messages bundle. diff --git a/howtos/howto2/include/howto2/message/Msg1.h b/howtos/howto2/include/howto2/message/Msg1.h index 11664444..f52b8a74 100644 --- a/howtos/howto2/include/howto2/message/Msg1.h +++ b/howtos/howto2/include/howto2/message/Msg1.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 1" message and its fields. @@ -31,13 +31,15 @@ struct Msg1Fields class F1 : public comms::field::String< howto2::field::FieldBase<>, - typename TOpt::message::Msg1Fields::F1 + typename TOpt::message::Msg1Fields::F1, + comms::option::def::HasName > { using Base = comms::field::String< howto2::field::FieldBase<>, - typename TOpt::message::Msg1Fields::F1 + typename TOpt::message::Msg1Fields::F1, + comms::option::def::HasName >; public: /// @brief Default constructor. diff --git a/howtos/howto2/include/howto2/message/Msg1Common.h b/howtos/howto2/include/howto2/message/Msg1Common.h index bf975ddb..2b2f5f72 100644 --- a/howtos/howto2/include/howto2/message/Msg1Common.h +++ b/howtos/howto2/include/howto2/message/Msg1Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto2/include/howto2/message/Msg2.h b/howtos/howto2/include/howto2/message/Msg2.h index 36f82f6d..b27099d3 100644 --- a/howtos/howto2/include/howto2/message/Msg2.h +++ b/howtos/howto2/include/howto2/message/Msg2.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 2" message and its fields. @@ -33,6 +33,7 @@ struct Msg2Fields comms::field::IntValue< howto2::field::FieldBase<>, std::uint16_t, + comms::option::def::HasName, comms::option::def::DefaultNumValue<12345> > { @@ -40,6 +41,7 @@ struct Msg2Fields comms::field::IntValue< howto2::field::FieldBase<>, std::uint16_t, + comms::option::def::HasName, comms::option::def::DefaultNumValue<12345> >; public: @@ -64,6 +66,7 @@ struct Msg2Fields comms::field::IntValue< howto2::field::FieldBase<>, std::uint16_t, + comms::option::def::HasName, comms::option::def::DefaultNumValue<45678L> > { @@ -71,6 +74,7 @@ struct Msg2Fields comms::field::IntValue< howto2::field::FieldBase<>, std::uint16_t, + comms::option::def::HasName, comms::option::def::DefaultNumValue<45678L> >; public: diff --git a/howtos/howto2/include/howto2/message/Msg2Common.h b/howtos/howto2/include/howto2/message/Msg2Common.h index d6297905..2c591b0e 100644 --- a/howtos/howto2/include/howto2/message/Msg2Common.h +++ b/howtos/howto2/include/howto2/message/Msg2Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto2/include/howto2/message/Msg3.h b/howtos/howto2/include/howto2/message/Msg3.h index b15cf543..cee21c2f 100644 --- a/howtos/howto2/include/howto2/message/Msg3.h +++ b/howtos/howto2/include/howto2/message/Msg3.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 3" message and its fields. @@ -31,13 +31,15 @@ struct Msg3Fields class F1 : public comms::field::String< howto2::field::FieldBase<>, - typename TOpt::message::Msg3Fields::F1 + typename TOpt::message::Msg3Fields::F1, + comms::option::def::HasName > { using Base = comms::field::String< howto2::field::FieldBase<>, - typename TOpt::message::Msg3Fields::F1 + typename TOpt::message::Msg3Fields::F1, + comms::option::def::HasName >; public: /// @brief Default constructor. diff --git a/howtos/howto2/include/howto2/message/Msg3Common.h b/howtos/howto2/include/howto2/message/Msg3Common.h index 8e8c8566..96f086b2 100644 --- a/howtos/howto2/include/howto2/message/Msg3Common.h +++ b/howtos/howto2/include/howto2/message/Msg3Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto2/include/howto2/message/Msg4.h b/howtos/howto2/include/howto2/message/Msg4.h index 14c9f2f0..daab51eb 100644 --- a/howtos/howto2/include/howto2/message/Msg4.h +++ b/howtos/howto2/include/howto2/message/Msg4.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 4" message and its fields. @@ -33,6 +33,7 @@ struct Msg4Fields comms::field::IntValue< howto2::field::FieldBase<>, std::uint16_t, + comms::option::def::HasName, comms::option::def::DefaultNumValue<60000L> > { @@ -40,6 +41,7 @@ struct Msg4Fields comms::field::IntValue< howto2::field::FieldBase<>, std::uint16_t, + comms::option::def::HasName, comms::option::def::DefaultNumValue<60000L> >; public: @@ -64,6 +66,7 @@ struct Msg4Fields comms::field::IntValue< howto2::field::FieldBase<>, std::uint16_t, + comms::option::def::HasName, comms::option::def::DefaultNumValue<22222> > { @@ -71,6 +74,7 @@ struct Msg4Fields comms::field::IntValue< howto2::field::FieldBase<>, std::uint16_t, + comms::option::def::HasName, comms::option::def::DefaultNumValue<22222> >; public: diff --git a/howtos/howto2/include/howto2/message/Msg4Common.h b/howtos/howto2/include/howto2/message/Msg4Common.h index 9d9126b3..80857451 100644 --- a/howtos/howto2/include/howto2/message/Msg4Common.h +++ b/howtos/howto2/include/howto2/message/Msg4Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto2/include/howto2/options/AllMessagesDynMemMsgFactoryDefaultOptions.h b/howtos/howto2/include/howto2/options/AllMessagesDynMemMsgFactoryDefaultOptions.h index 9ca4ced7..50a10b6d 100644 --- a/howtos/howto2/include/howto2/options/AllMessagesDynMemMsgFactoryDefaultOptions.h +++ b/howtos/howto2/include/howto2/options/AllMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol all messages dynamic memory allocation message factory options. diff --git a/howtos/howto2/include/howto2/options/BareMetalDefaultOptions.h b/howtos/howto2/include/howto2/options/BareMetalDefaultOptions.h index 6e0da329..98025118 100644 --- a/howtos/howto2/include/howto2/options/BareMetalDefaultOptions.h +++ b/howtos/howto2/include/howto2/options/BareMetalDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol bare metal default options. @@ -61,12 +61,15 @@ struct BareMetalDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// howto2::frame::FrameLayers::Data layer. - using Data = - std::tuple< - comms::option::app::FixedSizeStorage, - typename TBase::frame::FrameLayers::Data - >; + /// howto2::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::FixedSizeStorage, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers /// @brief Extra options for @ref /// howto2::frame::FrameLayers::IdWithSize diff --git a/howtos/howto2/include/howto2/options/ClientDefaultOptions.h b/howtos/howto2/include/howto2/options/ClientDefaultOptions.h index c51d436e..2f3fa34b 100644 --- a/howtos/howto2/include/howto2/options/ClientDefaultOptions.h +++ b/howtos/howto2/include/howto2/options/ClientDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client default options. diff --git a/howtos/howto2/include/howto2/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h b/howtos/howto2/include/howto2/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h index 04755b9d..1ea84d6a 100644 --- a/howtos/howto2/include/howto2/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/howtos/howto2/include/howto2/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client input messages dynamic memory allocation message factory options. diff --git a/howtos/howto2/include/howto2/options/DataViewDefaultOptions.h b/howtos/howto2/include/howto2/options/DataViewDefaultOptions.h index c177d41f..009df107 100644 --- a/howtos/howto2/include/howto2/options/DataViewDefaultOptions.h +++ b/howtos/howto2/include/howto2/options/DataViewDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol data view default options. @@ -55,12 +55,15 @@ struct DataViewDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// howto2::frame::FrameLayers::Data layer. - using Data = - std::tuple< - comms::option::app::OrigDataView, - typename TBase::frame::FrameLayers::Data - >; + /// howto2::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::OrigDataView, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers }; // struct FrameLayers }; // struct frame }; diff --git a/howtos/howto2/include/howto2/options/DefaultOptions.h b/howtos/howto2/include/howto2/options/DefaultOptions.h index 8986b503..43d42763 100644 --- a/howtos/howto2/include/howto2/options/DefaultOptions.h +++ b/howtos/howto2/include/howto2/options/DefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol default options. @@ -29,7 +29,7 @@ struct DefaultOptionsT : public TBase { /// @brief Extra options for @ref /// howto2::message::Msg1Fields::F1 field. - using F1 = comms::option::EmptyOption; + using F1 = comms::option::app::EmptyOption; }; /// @brief Extra options for fields of @@ -38,7 +38,7 @@ struct DefaultOptionsT : public TBase { /// @brief Extra options for @ref /// howto2::message::Msg3Fields::F1 field. - using F1 = comms::option::EmptyOption; + using F1 = comms::option::app::EmptyOption; }; }; // struct message @@ -50,13 +50,16 @@ struct DefaultOptionsT : public TBase struct FrameLayers { /// @brief Extra options for @ref - /// howto2::frame::FrameLayers::Data layer. - using Data = comms::option::EmptyOption; + /// howto2::frame::FrameLayers::DataMembers::Field field. + struct DataMembers + { + using Field = comms::option::app::EmptyOption; + }; // struct DataMembers /// @brief Extra options for @ref /// howto2::frame::FrameLayers::IdWithSize /// layer. - using IdWithSize = comms::option::EmptyOption; + using IdWithSize = comms::option::app::EmptyOption; }; // struct FrameLayers }; // struct frame }; diff --git a/howtos/howto2/include/howto2/options/ServerDefaultOptions.h b/howtos/howto2/include/howto2/options/ServerDefaultOptions.h index 52e01694..e1be87df 100644 --- a/howtos/howto2/include/howto2/options/ServerDefaultOptions.h +++ b/howtos/howto2/include/howto2/options/ServerDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server default options. diff --git a/howtos/howto2/include/howto2/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h b/howtos/howto2/include/howto2/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h index e5fd73d2..6b9723bb 100644 --- a/howtos/howto2/include/howto2/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/howtos/howto2/include/howto2/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server input messages dynamic memory allocation message factory options. diff --git a/howtos/howto3/include/howto3/Message.h b/howtos/howto3/include/howto3/Message.h index 79918079..f1f78070 100644 --- a/howtos/howto3/include/howto3/Message.h +++ b/howtos/howto3/include/howto3/Message.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message" interface class. diff --git a/howtos/howto3/include/howto3/MsgId.h b/howtos/howto3/include/howto3/MsgId.h index 413c8404..e1b0036f 100644 --- a/howtos/howto3/include/howto3/MsgId.h +++ b/howtos/howto3/include/howto3/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of message ids enumeration. diff --git a/howtos/howto3/include/howto3/Version.h b/howtos/howto3/include/howto3/Version.h index 5b9535c3..311aa05b 100644 --- a/howtos/howto3/include/howto3/Version.h +++ b/howtos/howto3/include/howto3/Version.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains protocol version definition. @@ -22,5 +22,5 @@ inline constexpr unsigned specVersion() } // namespace howto3 // Generated compile time check for minimal supported version of the COMMS library -static_assert(COMMS_MAKE_VERSION(5, 2, 7) <= comms::version(), +static_assert(COMMS_MAKE_VERSION(5, 3, 0) <= comms::version(), "The version of COMMS library is too old"); diff --git a/howtos/howto3/include/howto3/dispatch/DispatchClientInputMessage.h b/howtos/howto3/include/howto3/dispatch/DispatchClientInputMessage.h index d983dafd..0c21bf11 100644 --- a/howtos/howto3/include/howto3/dispatch/DispatchClientInputMessage.h +++ b/howtos/howto3/include/howto3/dispatch/DispatchClientInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/howtos/howto3/include/howto3/dispatch/DispatchMessage.h b/howtos/howto3/include/howto3/dispatch/DispatchMessage.h index c12d3a88..938990a2 100644 --- a/howtos/howto3/include/howto3/dispatch/DispatchMessage.h +++ b/howtos/howto3/include/howto3/dispatch/DispatchMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for all input messages. diff --git a/howtos/howto3/include/howto3/dispatch/DispatchServerInputMessage.h b/howtos/howto3/include/howto3/dispatch/DispatchServerInputMessage.h index d59a2604..8a1f1869 100644 --- a/howtos/howto3/include/howto3/dispatch/DispatchServerInputMessage.h +++ b/howtos/howto3/include/howto3/dispatch/DispatchServerInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/howtos/howto3/include/howto3/factory/AllMessagesDynMemMsgFactory.h b/howtos/howto3/include/howto3/factory/AllMessagesDynMemMsgFactory.h index d675b4cc..46143fa7 100644 --- a/howtos/howto3/include/howto3/factory/AllMessagesDynMemMsgFactory.h +++ b/howtos/howto3/include/howto3/factory/AllMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for all the messages. diff --git a/howtos/howto3/include/howto3/factory/ClientInputMessagesDynMemMsgFactory.h b/howtos/howto3/include/howto3/factory/ClientInputMessagesDynMemMsgFactory.h index 9017ba93..156f0e31 100644 --- a/howtos/howto3/include/howto3/factory/ClientInputMessagesDynMemMsgFactory.h +++ b/howtos/howto3/include/howto3/factory/ClientInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the client input messages. diff --git a/howtos/howto3/include/howto3/factory/ServerInputMessagesDynMemMsgFactory.h b/howtos/howto3/include/howto3/factory/ServerInputMessagesDynMemMsgFactory.h index 18bdfd83..d505dc57 100644 --- a/howtos/howto3/include/howto3/factory/ServerInputMessagesDynMemMsgFactory.h +++ b/howtos/howto3/include/howto3/factory/ServerInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the server input messages. diff --git a/howtos/howto3/include/howto3/field/FieldBase.h b/howtos/howto3/include/howto3/field/FieldBase.h index ccb0cab8..d2629811 100644 --- a/howtos/howto3/include/howto3/field/FieldBase.h +++ b/howtos/howto3/include/howto3/field/FieldBase.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of base class of all the fields. diff --git a/howtos/howto3/include/howto3/field/MsgId.h b/howtos/howto3/include/howto3/field/MsgId.h index cba0f046..53cfe9f1 100644 --- a/howtos/howto3/include/howto3/field/MsgId.h +++ b/howtos/howto3/include/howto3/field/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "MsgId" field. @@ -27,6 +27,7 @@ class MsgId : public howto3::field::FieldBase<>, howto3::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 4> > { @@ -35,6 +36,7 @@ class MsgId : public howto3::field::FieldBase<>, howto3::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 4> >; public: diff --git a/howtos/howto3/include/howto3/field/MsgIdCommon.h b/howtos/howto3/include/howto3/field/MsgIdCommon.h index e5e5ea68..2720ea55 100644 --- a/howtos/howto3/include/howto3/field/MsgIdCommon.h +++ b/howtos/howto3/include/howto3/field/MsgIdCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto3/include/howto3/frame/Frame.h b/howtos/howto3/include/howto3/frame/Frame.h index d9977396..fa990724 100644 --- a/howtos/howto3/include/howto3/frame/Frame.h +++ b/howtos/howto3/include/howto3/frame/Frame.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Frame" frame class. @@ -24,10 +24,30 @@ namespace frame template struct FrameLayers { + /// @brief Scope for field(s) of @ref Data layer. + struct DataMembers + { + /// @brief Custom field for @ref howto3::frame::FrameLayers::Data layer + class Field : public + comms::field::ArrayList< + howto3::field::FieldBase<>, + std::uint8_t, + typename TOpt::frame::FrameLayers::DataMembers::Field, + comms::option::def::HasName + > + { + public: + static const char* name() + { + return "Data"; + } + }; + }; + /// @brief Definition of layer "Data". using Data = comms::protocol::MsgDataLayer< - typename TOpt::frame::FrameLayers::Data + comms::option::def::FieldType >; /// @brief Definition of layer "Id". diff --git a/howtos/howto3/include/howto3/input/AllMessages.h b/howtos/howto3/include/howto3/input/AllMessages.h index c8212720..26f18832 100644 --- a/howtos/howto3/include/howto3/input/AllMessages.h +++ b/howtos/howto3/include/howto3/input/AllMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the AllMessages messages bundle. diff --git a/howtos/howto3/include/howto3/input/ClientInputMessages.h b/howtos/howto3/include/howto3/input/ClientInputMessages.h index 4415dd26..658e7ae7 100644 --- a/howtos/howto3/include/howto3/input/ClientInputMessages.h +++ b/howtos/howto3/include/howto3/input/ClientInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ClientInputMessages messages bundle. diff --git a/howtos/howto3/include/howto3/input/ServerInputMessages.h b/howtos/howto3/include/howto3/input/ServerInputMessages.h index 1afedd56..ed0b0e94 100644 --- a/howtos/howto3/include/howto3/input/ServerInputMessages.h +++ b/howtos/howto3/include/howto3/input/ServerInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ServerInputMessages messages bundle. diff --git a/howtos/howto3/include/howto3/message/Msg1.h b/howtos/howto3/include/howto3/message/Msg1.h index 4fbeb47b..5704044e 100644 --- a/howtos/howto3/include/howto3/message/Msg1.h +++ b/howtos/howto3/include/howto3/message/Msg1.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 1" message and its fields. @@ -31,13 +31,15 @@ struct Msg1Fields class F1 : public comms::field::String< howto3::field::FieldBase<>, - typename TOpt::message::Msg1Fields::F1 + typename TOpt::message::Msg1Fields::F1, + comms::option::def::HasName > { using Base = comms::field::String< howto3::field::FieldBase<>, - typename TOpt::message::Msg1Fields::F1 + typename TOpt::message::Msg1Fields::F1, + comms::option::def::HasName >; public: /// @brief Name of the field. diff --git a/howtos/howto3/include/howto3/message/Msg1Common.h b/howtos/howto3/include/howto3/message/Msg1Common.h index e9845d16..fcd4afc8 100644 --- a/howtos/howto3/include/howto3/message/Msg1Common.h +++ b/howtos/howto3/include/howto3/message/Msg1Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto3/include/howto3/message/Msg2.h b/howtos/howto3/include/howto3/message/Msg2.h index a205a721..b9cb1354 100644 --- a/howtos/howto3/include/howto3/message/Msg2.h +++ b/howtos/howto3/include/howto3/message/Msg2.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 2" message and its fields. @@ -33,14 +33,16 @@ struct Msg2Fields comms::field::ArrayList< howto3::field::FieldBase<>, std::uint8_t, - typename TOpt::message::Msg2Fields::F1 + typename TOpt::message::Msg2Fields::F1, + comms::option::def::HasName > { using Base = comms::field::ArrayList< howto3::field::FieldBase<>, std::uint8_t, - typename TOpt::message::Msg2Fields::F1 + typename TOpt::message::Msg2Fields::F1, + comms::option::def::HasName >; public: /// @brief Name of the field. diff --git a/howtos/howto3/include/howto3/message/Msg2Common.h b/howtos/howto3/include/howto3/message/Msg2Common.h index d80df7df..b3b9d076 100644 --- a/howtos/howto3/include/howto3/message/Msg2Common.h +++ b/howtos/howto3/include/howto3/message/Msg2Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto3/include/howto3/message/Msg3.h b/howtos/howto3/include/howto3/message/Msg3.h index 5707dce7..aa683de8 100644 --- a/howtos/howto3/include/howto3/message/Msg3.h +++ b/howtos/howto3/include/howto3/message/Msg3.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 3" message and its fields. @@ -32,13 +32,15 @@ struct Msg3Fields class F1 : public comms::field::IntValue< howto3::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< howto3::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/howtos/howto3/include/howto3/message/Msg3Common.h b/howtos/howto3/include/howto3/message/Msg3Common.h index ad837eda..883ad9cc 100644 --- a/howtos/howto3/include/howto3/message/Msg3Common.h +++ b/howtos/howto3/include/howto3/message/Msg3Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto3/include/howto3/options/AllMessagesDynMemMsgFactoryDefaultOptions.h b/howtos/howto3/include/howto3/options/AllMessagesDynMemMsgFactoryDefaultOptions.h index 77077e88..f2d11557 100644 --- a/howtos/howto3/include/howto3/options/AllMessagesDynMemMsgFactoryDefaultOptions.h +++ b/howtos/howto3/include/howto3/options/AllMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol all messages dynamic memory allocation message factory options. diff --git a/howtos/howto3/include/howto3/options/BareMetalDefaultOptions.h b/howtos/howto3/include/howto3/options/BareMetalDefaultOptions.h index 5f182043..4103d8c3 100644 --- a/howtos/howto3/include/howto3/options/BareMetalDefaultOptions.h +++ b/howtos/howto3/include/howto3/options/BareMetalDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol bare metal default options. @@ -61,12 +61,15 @@ struct BareMetalDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// howto3::frame::FrameLayers::Data layer. - using Data = - std::tuple< - comms::option::app::FixedSizeStorage, - typename TBase::frame::FrameLayers::Data - >; + /// howto3::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::FixedSizeStorage, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers /// @brief Extra options for @ref /// howto3::frame::FrameLayers::Id layer. diff --git a/howtos/howto3/include/howto3/options/ClientDefaultOptions.h b/howtos/howto3/include/howto3/options/ClientDefaultOptions.h index e1c474de..72b5440f 100644 --- a/howtos/howto3/include/howto3/options/ClientDefaultOptions.h +++ b/howtos/howto3/include/howto3/options/ClientDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client default options. diff --git a/howtos/howto3/include/howto3/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h b/howtos/howto3/include/howto3/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h index 4e5e83a9..e63fc57e 100644 --- a/howtos/howto3/include/howto3/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/howtos/howto3/include/howto3/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client input messages dynamic memory allocation message factory options. diff --git a/howtos/howto3/include/howto3/options/DataViewDefaultOptions.h b/howtos/howto3/include/howto3/options/DataViewDefaultOptions.h index 94ef51b6..59319f0c 100644 --- a/howtos/howto3/include/howto3/options/DataViewDefaultOptions.h +++ b/howtos/howto3/include/howto3/options/DataViewDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol data view default options. @@ -55,12 +55,15 @@ struct DataViewDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// howto3::frame::FrameLayers::Data layer. - using Data = - std::tuple< - comms::option::app::OrigDataView, - typename TBase::frame::FrameLayers::Data - >; + /// howto3::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::OrigDataView, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers }; // struct FrameLayers }; // struct frame }; diff --git a/howtos/howto3/include/howto3/options/DefaultOptions.h b/howtos/howto3/include/howto3/options/DefaultOptions.h index d087f474..2364bf30 100644 --- a/howtos/howto3/include/howto3/options/DefaultOptions.h +++ b/howtos/howto3/include/howto3/options/DefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol default options. @@ -29,7 +29,7 @@ struct DefaultOptionsT : public TBase { /// @brief Extra options for @ref /// howto3::message::Msg1Fields::F1 field. - using F1 = comms::option::EmptyOption; + using F1 = comms::option::app::EmptyOption; }; /// @brief Extra options for fields of @@ -38,7 +38,7 @@ struct DefaultOptionsT : public TBase { /// @brief Extra options for @ref /// howto3::message::Msg2Fields::F1 field. - using F1 = comms::option::EmptyOption; + using F1 = comms::option::app::EmptyOption; }; }; // struct message @@ -50,12 +50,15 @@ struct DefaultOptionsT : public TBase struct FrameLayers { /// @brief Extra options for @ref - /// howto3::frame::FrameLayers::Data layer. - using Data = comms::option::EmptyOption; + /// howto3::frame::FrameLayers::DataMembers::Field field. + struct DataMembers + { + using Field = comms::option::app::EmptyOption; + }; // struct DataMembers /// @brief Extra options for @ref /// howto3::frame::FrameLayers::Id layer. - using Id = comms::option::EmptyOption; + using Id = comms::option::app::EmptyOption; }; // struct FrameLayers }; // struct frame }; diff --git a/howtos/howto3/include/howto3/options/ServerDefaultOptions.h b/howtos/howto3/include/howto3/options/ServerDefaultOptions.h index 450829bd..08fe6802 100644 --- a/howtos/howto3/include/howto3/options/ServerDefaultOptions.h +++ b/howtos/howto3/include/howto3/options/ServerDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server default options. diff --git a/howtos/howto3/include/howto3/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h b/howtos/howto3/include/howto3/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h index 665724da..be2a0ab2 100644 --- a/howtos/howto3/include/howto3/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/howtos/howto3/include/howto3/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server input messages dynamic memory allocation message factory options. diff --git a/howtos/howto4/include/howto4/Message.h b/howtos/howto4/include/howto4/Message.h index 71c518d2..aff2efd8 100644 --- a/howtos/howto4/include/howto4/Message.h +++ b/howtos/howto4/include/howto4/Message.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message" interface class. diff --git a/howtos/howto4/include/howto4/MsgId.h b/howtos/howto4/include/howto4/MsgId.h index 3ced80e4..9868767e 100644 --- a/howtos/howto4/include/howto4/MsgId.h +++ b/howtos/howto4/include/howto4/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of message ids enumeration. diff --git a/howtos/howto4/include/howto4/Version.h b/howtos/howto4/include/howto4/Version.h index 373572f9..ef9fe2fe 100644 --- a/howtos/howto4/include/howto4/Version.h +++ b/howtos/howto4/include/howto4/Version.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains protocol version definition. @@ -22,5 +22,5 @@ inline constexpr unsigned specVersion() } // namespace howto4 // Generated compile time check for minimal supported version of the COMMS library -static_assert(COMMS_MAKE_VERSION(5, 2, 7) <= comms::version(), +static_assert(COMMS_MAKE_VERSION(5, 3, 0) <= comms::version(), "The version of COMMS library is too old"); diff --git a/howtos/howto4/include/howto4/dispatch/DispatchClientInputMessage.h b/howtos/howto4/include/howto4/dispatch/DispatchClientInputMessage.h index e8b75bca..d6b666d0 100644 --- a/howtos/howto4/include/howto4/dispatch/DispatchClientInputMessage.h +++ b/howtos/howto4/include/howto4/dispatch/DispatchClientInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/howtos/howto4/include/howto4/dispatch/DispatchMessage.h b/howtos/howto4/include/howto4/dispatch/DispatchMessage.h index 6944b6c0..da3e00fb 100644 --- a/howtos/howto4/include/howto4/dispatch/DispatchMessage.h +++ b/howtos/howto4/include/howto4/dispatch/DispatchMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for all input messages. diff --git a/howtos/howto4/include/howto4/dispatch/DispatchServerInputMessage.h b/howtos/howto4/include/howto4/dispatch/DispatchServerInputMessage.h index b08c41d7..09d79146 100644 --- a/howtos/howto4/include/howto4/dispatch/DispatchServerInputMessage.h +++ b/howtos/howto4/include/howto4/dispatch/DispatchServerInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/howtos/howto4/include/howto4/factory/AllMessagesDynMemMsgFactory.h b/howtos/howto4/include/howto4/factory/AllMessagesDynMemMsgFactory.h index fe8f3980..27756816 100644 --- a/howtos/howto4/include/howto4/factory/AllMessagesDynMemMsgFactory.h +++ b/howtos/howto4/include/howto4/factory/AllMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for all the messages. diff --git a/howtos/howto4/include/howto4/factory/ClientInputMessagesDynMemMsgFactory.h b/howtos/howto4/include/howto4/factory/ClientInputMessagesDynMemMsgFactory.h index 74d0508f..7e51ba7f 100644 --- a/howtos/howto4/include/howto4/factory/ClientInputMessagesDynMemMsgFactory.h +++ b/howtos/howto4/include/howto4/factory/ClientInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the client input messages. diff --git a/howtos/howto4/include/howto4/factory/ServerInputMessagesDynMemMsgFactory.h b/howtos/howto4/include/howto4/factory/ServerInputMessagesDynMemMsgFactory.h index a1110c6a..91b15694 100644 --- a/howtos/howto4/include/howto4/factory/ServerInputMessagesDynMemMsgFactory.h +++ b/howtos/howto4/include/howto4/factory/ServerInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the server input messages. diff --git a/howtos/howto4/include/howto4/field/FieldBase.h b/howtos/howto4/include/howto4/field/FieldBase.h index 1fc0525a..31ede80b 100644 --- a/howtos/howto4/include/howto4/field/FieldBase.h +++ b/howtos/howto4/include/howto4/field/FieldBase.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of base class of all the fields. diff --git a/howtos/howto4/include/howto4/field/TlvProp.h b/howtos/howto4/include/howto4/field/TlvProp.h index 28ad72c9..7f487fab 100644 --- a/howtos/howto4/include/howto4/field/TlvProp.h +++ b/howtos/howto4/include/howto4/field/TlvProp.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "TlvProp" field. @@ -43,6 +43,7 @@ struct TlvPropMembers comms::field::IntValue< howto4::field::FieldBase<>, std::uint8_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid<>, comms::option::def::ValidNumValue<0>, comms::option::def::HasCustomRefresh @@ -52,6 +53,7 @@ struct TlvPropMembers comms::field::IntValue< howto4::field::FieldBase<>, std::uint8_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid<>, comms::option::def::ValidNumValue<0>, comms::option::def::HasCustomRefresh @@ -88,13 +90,15 @@ struct TlvPropMembers class Length : public comms::field::IntValue< howto4::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< howto4::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -117,13 +121,15 @@ struct TlvPropMembers class Val : public comms::field::IntValue< howto4::field::FieldBase<>, - std::uint32_t + std::uint32_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< howto4::field::FieldBase<>, - std::uint32_t + std::uint32_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -156,6 +162,7 @@ struct TlvPropMembers comms::field::Bundle< howto4::field::FieldBase<>, typename Prop1Members::All, + comms::option::def::HasName, comms::option::def::RemLengthMemberField<1U>, comms::option::def::HasVersionDependentMembers > @@ -164,6 +171,7 @@ struct TlvPropMembers comms::field::Bundle< howto4::field::FieldBase<>, typename Prop1Members::All, + comms::option::def::HasName, comms::option::def::RemLengthMemberField<1U>, comms::option::def::HasVersionDependentMembers >; @@ -202,6 +210,7 @@ struct TlvPropMembers comms::field::IntValue< howto4::field::FieldBase<>, std::uint8_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid<>, comms::option::def::DefaultNumValue<2>, comms::option::def::ValidNumValue<2>, @@ -212,6 +221,7 @@ struct TlvPropMembers comms::field::IntValue< howto4::field::FieldBase<>, std::uint8_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid<>, comms::option::def::DefaultNumValue<2>, comms::option::def::ValidNumValue<2>, @@ -249,13 +259,15 @@ struct TlvPropMembers class Length : public comms::field::IntValue< howto4::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< howto4::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -278,13 +290,15 @@ struct TlvPropMembers class Val : public comms::field::FloatValue< howto4::field::FieldBase<>, - double + double, + comms::option::def::HasName > { using Base = comms::field::FloatValue< howto4::field::FieldBase<>, - double + double, + comms::option::def::HasName >; public: /// @brief Default constructor. @@ -330,6 +344,7 @@ struct TlvPropMembers comms::field::Bundle< howto4::field::FieldBase<>, typename Prop2Members::All, + comms::option::def::HasName, comms::option::def::RemLengthMemberField<1U>, comms::option::def::HasVersionDependentMembers > @@ -338,6 +353,7 @@ struct TlvPropMembers comms::field::Bundle< howto4::field::FieldBase<>, typename Prop2Members::All, + comms::option::def::HasName, comms::option::def::RemLengthMemberField<1U>, comms::option::def::HasVersionDependentMembers >; @@ -376,6 +392,7 @@ struct TlvPropMembers comms::field::IntValue< howto4::field::FieldBase<>, std::uint8_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid<>, comms::option::def::DefaultNumValue<5>, comms::option::def::ValidNumValue<5>, @@ -386,6 +403,7 @@ struct TlvPropMembers comms::field::IntValue< howto4::field::FieldBase<>, std::uint8_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid<>, comms::option::def::DefaultNumValue<5>, comms::option::def::ValidNumValue<5>, @@ -423,13 +441,15 @@ struct TlvPropMembers class Length : public comms::field::IntValue< howto4::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< howto4::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -452,13 +472,15 @@ struct TlvPropMembers class Val : public comms::field::String< howto4::field::FieldBase<>, - typename TOpt::field::TlvPropMembers::Prop3Members::Val + typename TOpt::field::TlvPropMembers::Prop3Members::Val, + comms::option::def::HasName > { using Base = comms::field::String< howto4::field::FieldBase<>, - typename TOpt::field::TlvPropMembers::Prop3Members::Val + typename TOpt::field::TlvPropMembers::Prop3Members::Val, + comms::option::def::HasName >; public: /// @brief Name of the field. @@ -482,6 +504,7 @@ struct TlvPropMembers comms::field::Bundle< howto4::field::FieldBase<>, typename Prop3Members::All, + comms::option::def::HasName, comms::option::def::RemLengthMemberField<1U>, comms::option::def::HasVersionDependentMembers > @@ -490,6 +513,7 @@ struct TlvPropMembers comms::field::Bundle< howto4::field::FieldBase<>, typename Prop3Members::All, + comms::option::def::HasName, comms::option::def::RemLengthMemberField<1U>, comms::option::def::HasVersionDependentMembers >; @@ -528,6 +552,7 @@ struct TlvPropMembers comms::field::IntValue< howto4::field::FieldBase<>, std::uint8_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid<> > { @@ -535,6 +560,7 @@ struct TlvPropMembers comms::field::IntValue< howto4::field::FieldBase<>, std::uint8_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid<> >; public: @@ -558,13 +584,15 @@ struct TlvPropMembers class Length : public comms::field::IntValue< howto4::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< howto4::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -588,14 +616,16 @@ struct TlvPropMembers comms::field::ArrayList< howto4::field::FieldBase<>, std::uint8_t, - typename TOpt::field::TlvPropMembers::AnyMembers::Val + typename TOpt::field::TlvPropMembers::AnyMembers::Val, + comms::option::def::HasName > { using Base = comms::field::ArrayList< howto4::field::FieldBase<>, std::uint8_t, - typename TOpt::field::TlvPropMembers::AnyMembers::Val + typename TOpt::field::TlvPropMembers::AnyMembers::Val, + comms::option::def::HasName >; public: /// @brief Name of the field. @@ -619,6 +649,7 @@ struct TlvPropMembers comms::field::Bundle< howto4::field::FieldBase<>, typename AnyMembers::All, + comms::option::def::HasName, comms::option::def::RemLengthMemberField<1U>, comms::option::def::HasVersionDependentMembers > @@ -627,6 +658,7 @@ struct TlvPropMembers comms::field::Bundle< howto4::field::FieldBase<>, typename AnyMembers::All, + comms::option::def::HasName, comms::option::def::RemLengthMemberField<1U>, comms::option::def::HasVersionDependentMembers >; @@ -677,6 +709,7 @@ class TlvProp : public howto4::field::FieldBase<>, typename TlvPropMembers::All, TExtraOpts..., + comms::option::def::HasName, comms::option::def::HasCustomRead, comms::option::def::HasCustomWrite, comms::option::def::HasCustomRefresh, @@ -689,6 +722,7 @@ class TlvProp : public howto4::field::FieldBase<>, typename TlvPropMembers::All, TExtraOpts..., + comms::option::def::HasName, comms::option::def::HasCustomRead, comms::option::def::HasCustomWrite, comms::option::def::HasCustomRefresh, @@ -705,6 +739,13 @@ class TlvProp : public reset(); } + /// @brief Single member name info entry + using MemberNameInfo = howto4::field::TlvPropCommon::MemberNameInfo; + + /// @brief Type returned from @ref memberNamesMap() member function. + /// @see @ref howto4::field::TlvPropCommon::MemberNamesMapInfo. + using MemberNamesMapInfo = howto4::field::TlvPropCommon::MemberNamesMapInfo; + /// @brief Allow access to internal fields. /// @details See definition of @b COMMS_VARIANT_MEMBERS_NAMES macro /// related to @b comms::field::Variant class from COMMS library @@ -810,7 +851,6 @@ class TlvProp : public } if (Base::currentField() != other.currentField()) { - return false; } @@ -995,6 +1035,27 @@ class TlvProp : public return false; } + /// @brief Retrieve name of the member + /// @see @ref howto4::field::TlvPropCommon::memberName(). + static const char* memberName(std::size_t idx) + { + return howto4::field::TlvPropCommon::memberName(idx); + } + + /// @brief Retrieve name of the member + /// @see @ref howto4::field::TlvPropCommon::memberName(). + static const char* memberName(FieldIdx idx) + { + return memberName(static_cast(idx)); + } + + /// @brief Retrieve map of members names + /// @see @ref howto4::field::TlvPropCommon::memberNamesMap(). + static MemberNamesMapInfo memberNamesMap() + { + return howto4::field::TlvPropCommon::memberNamesMap(); + } + /// @brief Name of the field. static const char* name() { diff --git a/howtos/howto4/include/howto4/field/TlvPropCommon.h b/howtos/howto4/include/howto4/field/TlvPropCommon.h index dc636c1e..c7ecbab7 100644 --- a/howtos/howto4/include/howto4/field/TlvPropCommon.h +++ b/howtos/howto4/include/howto4/field/TlvPropCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of @@ -7,6 +7,8 @@ #pragma once #include +#include +#include namespace howto4 { @@ -319,11 +321,44 @@ struct TlvPropMembersCommon /// @ref howto4::field::TlvProp field. struct TlvPropCommon { + /// @brief Single member name info entry + using MemberNameInfo = const char*; + + /// @brief Type returned from @ref memberNamesMap() member function. + /// @details The @b first value of the pair is pointer to the map array, + /// The @b second value of the pair is the size of the array. + using MemberNamesMapInfo = std::pair; + /// @brief Name of the @ref howto4::field::TlvProp field. static const char* name() { return "TlvProp"; } + + /// @brief Retrieve name of the member + static const char* memberName(std::size_t idx) + { + auto namesMapInfo = memberNamesMap(); + if (namesMapInfo.second <= idx) { + return nullptr; + } + + return namesMapInfo.first[idx]; + } + + /// @brief Retrieve map of members names + static MemberNamesMapInfo memberNamesMap() + { + static const MemberNameInfo Map[] = { + TlvPropMembersCommon::Prop1Common::name(), + TlvPropMembersCommon::Prop2Common::name(), + TlvPropMembersCommon::Prop3Common::name(), + TlvPropMembersCommon::AnyCommon::name() + }; + static const std::size_t MapSize = std::extent::value; + + return std::make_pair(&Map[0], MapSize); + } }; } // namespace field diff --git a/howtos/howto4/include/howto4/frame/Frame.h b/howtos/howto4/include/howto4/frame/Frame.h index c2acb9bf..e4af6ee3 100644 --- a/howtos/howto4/include/howto4/frame/Frame.h +++ b/howtos/howto4/include/howto4/frame/Frame.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Frame" frame class. @@ -32,10 +32,30 @@ namespace frame template struct FrameLayers { + /// @brief Scope for field(s) of @ref Data layer. + struct DataMembers + { + /// @brief Custom field for @ref howto4::frame::FrameLayers::Data layer + class Field : public + comms::field::ArrayList< + howto4::field::FieldBase<>, + std::uint8_t, + typename TOpt::frame::FrameLayers::DataMembers::Field, + comms::option::def::HasName + > + { + public: + static const char* name() + { + return "Data"; + } + }; + }; + /// @brief Definition of layer "Data". using Data = comms::protocol::MsgDataLayer< - typename TOpt::frame::FrameLayers::Data + comms::option::def::FieldType >; /// @brief Scope for field(s) of @ref Id layer. @@ -46,6 +66,7 @@ struct FrameLayers comms::field::IntValue< howto4::field::FieldBase<>, std::uint8_t, + comms::option::def::HasName, comms::option::def::EmptySerialization > { @@ -53,6 +74,7 @@ struct FrameLayers comms::field::IntValue< howto4::field::FieldBase<>, std::uint8_t, + comms::option::def::HasName, comms::option::def::EmptySerialization >; public: @@ -92,6 +114,7 @@ struct FrameLayers comms::field::IntValue< howto4::field::FieldBase<>, std::uint16_t, + comms::option::def::HasName, comms::option::def::NumValueSerOffset<2> > { @@ -99,6 +122,7 @@ struct FrameLayers comms::field::IntValue< howto4::field::FieldBase<>, std::uint16_t, + comms::option::def::HasName, comms::option::def::NumValueSerOffset<2> >; public: @@ -134,13 +158,15 @@ struct FrameLayers class ChecksumField : public comms::field::IntValue< howto4::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< howto4::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -177,6 +203,7 @@ struct FrameLayers comms::field::IntValue< howto4::field::FieldBase<>, std::uint16_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid, comms::option::def::DefaultNumValue<43981L> > @@ -185,6 +212,7 @@ struct FrameLayers comms::field::IntValue< howto4::field::FieldBase<>, std::uint16_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid, comms::option::def::DefaultNumValue<43981L> >; diff --git a/howtos/howto4/include/howto4/frame/FrameCommon.h b/howtos/howto4/include/howto4/frame/FrameCommon.h index 7b18563e..db828ee7 100644 --- a/howtos/howto4/include/howto4/frame/FrameCommon.h +++ b/howtos/howto4/include/howto4/frame/FrameCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto4/include/howto4/input/AllMessages.h b/howtos/howto4/include/howto4/input/AllMessages.h index d88d7fad..e4bba489 100644 --- a/howtos/howto4/include/howto4/input/AllMessages.h +++ b/howtos/howto4/include/howto4/input/AllMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the AllMessages messages bundle. diff --git a/howtos/howto4/include/howto4/input/ClientInputMessages.h b/howtos/howto4/include/howto4/input/ClientInputMessages.h index 31407b0d..9b839c9e 100644 --- a/howtos/howto4/include/howto4/input/ClientInputMessages.h +++ b/howtos/howto4/include/howto4/input/ClientInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ClientInputMessages messages bundle. diff --git a/howtos/howto4/include/howto4/input/ServerInputMessages.h b/howtos/howto4/include/howto4/input/ServerInputMessages.h index e5f58a61..d1a07736 100644 --- a/howtos/howto4/include/howto4/input/ServerInputMessages.h +++ b/howtos/howto4/include/howto4/input/ServerInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ServerInputMessages messages bundle. diff --git a/howtos/howto4/include/howto4/message/Msg.h b/howtos/howto4/include/howto4/message/Msg.h index 0a36189f..a7e8ab74 100644 --- a/howtos/howto4/include/howto4/message/Msg.h +++ b/howtos/howto4/include/howto4/message/Msg.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message" message and its fields. @@ -33,14 +33,16 @@ struct MsgFields comms::field::ArrayList< howto4::field::FieldBase<>, howto4::field::TlvProp, - typename TOpt::message::MsgFields::Props + typename TOpt::message::MsgFields::Props, + comms::option::def::HasName > { using Base = comms::field::ArrayList< howto4::field::FieldBase<>, howto4::field::TlvProp, - typename TOpt::message::MsgFields::Props + typename TOpt::message::MsgFields::Props, + comms::option::def::HasName >; public: /// @brief Name of the field. diff --git a/howtos/howto4/include/howto4/message/MsgCommon.h b/howtos/howto4/include/howto4/message/MsgCommon.h index c3b57a59..e128186c 100644 --- a/howtos/howto4/include/howto4/message/MsgCommon.h +++ b/howtos/howto4/include/howto4/message/MsgCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto4/include/howto4/options/AllMessagesDynMemMsgFactoryDefaultOptions.h b/howtos/howto4/include/howto4/options/AllMessagesDynMemMsgFactoryDefaultOptions.h index 890595ec..7c0e0a5a 100644 --- a/howtos/howto4/include/howto4/options/AllMessagesDynMemMsgFactoryDefaultOptions.h +++ b/howtos/howto4/include/howto4/options/AllMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol all messages dynamic memory allocation message factory options. diff --git a/howtos/howto4/include/howto4/options/BareMetalDefaultOptions.h b/howtos/howto4/include/howto4/options/BareMetalDefaultOptions.h index 04beb51f..eb89b822 100644 --- a/howtos/howto4/include/howto4/options/BareMetalDefaultOptions.h +++ b/howtos/howto4/include/howto4/options/BareMetalDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol bare metal default options. @@ -79,12 +79,15 @@ struct BareMetalDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// howto4::frame::FrameLayers::Data layer. - using Data = - std::tuple< - comms::option::app::FixedSizeStorage, - typename TBase::frame::FrameLayers::Data - >; + /// howto4::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::FixedSizeStorage, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers /// @brief Extra options for @ref /// howto4::frame::FrameLayers::Id layer. diff --git a/howtos/howto4/include/howto4/options/ClientDefaultOptions.h b/howtos/howto4/include/howto4/options/ClientDefaultOptions.h index ff431c41..13f3cefa 100644 --- a/howtos/howto4/include/howto4/options/ClientDefaultOptions.h +++ b/howtos/howto4/include/howto4/options/ClientDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client default options. diff --git a/howtos/howto4/include/howto4/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h b/howtos/howto4/include/howto4/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h index 2df94246..5ffe955a 100644 --- a/howtos/howto4/include/howto4/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/howtos/howto4/include/howto4/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client input messages dynamic memory allocation message factory options. diff --git a/howtos/howto4/include/howto4/options/DataViewDefaultOptions.h b/howtos/howto4/include/howto4/options/DataViewDefaultOptions.h index 08404acf..2dac34a1 100644 --- a/howtos/howto4/include/howto4/options/DataViewDefaultOptions.h +++ b/howtos/howto4/include/howto4/options/DataViewDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol data view default options. @@ -56,12 +56,15 @@ struct DataViewDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// howto4::frame::FrameLayers::Data layer. - using Data = - std::tuple< - comms::option::app::OrigDataView, - typename TBase::frame::FrameLayers::Data - >; + /// howto4::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::OrigDataView, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers }; // struct FrameLayers }; // struct frame }; diff --git a/howtos/howto4/include/howto4/options/DefaultOptions.h b/howtos/howto4/include/howto4/options/DefaultOptions.h index e5a31487..f2a8985b 100644 --- a/howtos/howto4/include/howto4/options/DefaultOptions.h +++ b/howtos/howto4/include/howto4/options/DefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol default options. @@ -30,7 +30,7 @@ struct DefaultOptionsT : public TBase /// @brief Extra options for @ref /// howto4::field::TlvPropMembers::Prop3Members::Val /// field. - using Val = comms::option::EmptyOption; + using Val = comms::option::app::EmptyOption; }; // struct Prop3Members struct AnyMembers @@ -38,7 +38,7 @@ struct DefaultOptionsT : public TBase /// @brief Extra options for @ref /// howto4::field::TlvPropMembers::AnyMembers::Val /// field. - using Val = comms::option::EmptyOption; + using Val = comms::option::app::EmptyOption; }; // struct AnyMembers }; // struct TlvPropMembers }; // struct field @@ -52,7 +52,7 @@ struct DefaultOptionsT : public TBase { /// @brief Extra options for @ref /// howto4::message::MsgFields::Props field. - using Props = comms::option::EmptyOption; + using Props = comms::option::app::EmptyOption; }; }; // struct message @@ -64,12 +64,15 @@ struct DefaultOptionsT : public TBase struct FrameLayers { /// @brief Extra options for @ref - /// howto4::frame::FrameLayers::Data layer. - using Data = comms::option::EmptyOption; + /// howto4::frame::FrameLayers::DataMembers::Field field. + struct DataMembers + { + using Field = comms::option::app::EmptyOption; + }; // struct DataMembers /// @brief Extra options for @ref /// howto4::frame::FrameLayers::Id layer. - using Id = comms::option::EmptyOption; + using Id = comms::option::app::EmptyOption; }; // struct FrameLayers }; // struct frame }; diff --git a/howtos/howto4/include/howto4/options/ServerDefaultOptions.h b/howtos/howto4/include/howto4/options/ServerDefaultOptions.h index 2be8f4a8..9c2dbe41 100644 --- a/howtos/howto4/include/howto4/options/ServerDefaultOptions.h +++ b/howtos/howto4/include/howto4/options/ServerDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server default options. diff --git a/howtos/howto4/include/howto4/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h b/howtos/howto4/include/howto4/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h index dcaf2f62..a610fd95 100644 --- a/howtos/howto4/include/howto4/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/howtos/howto4/include/howto4/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server input messages dynamic memory allocation message factory options. diff --git a/howtos/howto5/include/howto5/Interface.h b/howtos/howto5/include/howto5/Interface.h index a87888ec..110fd173 100644 --- a/howtos/howto5/include/howto5/Interface.h +++ b/howtos/howto5/include/howto5/Interface.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Interface" interface class. @@ -25,18 +25,21 @@ struct InterfaceFields /// @brief Definition of "Version" field. using Version = howto5::field::Version< - howto5::options::DefaultOptions + howto5::options::DefaultOptions, + comms::option::def::HasName >; /// @brief Definition of "Flags" field. class Flags : public howto5::field::InterfaceFlags< - howto5::options::DefaultOptions + howto5::options::DefaultOptions, + comms::option::def::HasName > { using Base = howto5::field::InterfaceFlags< - howto5::options::DefaultOptions + howto5::options::DefaultOptions, + comms::option::def::HasName >; public: /// @brief Name of the field. diff --git a/howtos/howto5/include/howto5/InterfaceCommon.h b/howtos/howto5/include/howto5/InterfaceCommon.h index 0cf4c7fc..41db3e6b 100644 --- a/howtos/howto5/include/howto5/InterfaceCommon.h +++ b/howtos/howto5/include/howto5/InterfaceCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto5/include/howto5/MsgId.h b/howtos/howto5/include/howto5/MsgId.h index 930ee13b..bbc075f0 100644 --- a/howtos/howto5/include/howto5/MsgId.h +++ b/howtos/howto5/include/howto5/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of message ids enumeration. diff --git a/howtos/howto5/include/howto5/Version.h b/howtos/howto5/include/howto5/Version.h index 37b968af..65b8c87a 100644 --- a/howtos/howto5/include/howto5/Version.h +++ b/howtos/howto5/include/howto5/Version.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains protocol version definition. @@ -22,5 +22,5 @@ inline constexpr unsigned specVersion() } // namespace howto5 // Generated compile time check for minimal supported version of the COMMS library -static_assert(COMMS_MAKE_VERSION(5, 2, 7) <= comms::version(), +static_assert(COMMS_MAKE_VERSION(5, 3, 0) <= comms::version(), "The version of COMMS library is too old"); diff --git a/howtos/howto5/include/howto5/dispatch/DispatchClientInputMessage.h b/howtos/howto5/include/howto5/dispatch/DispatchClientInputMessage.h index 36328810..31238020 100644 --- a/howtos/howto5/include/howto5/dispatch/DispatchClientInputMessage.h +++ b/howtos/howto5/include/howto5/dispatch/DispatchClientInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/howtos/howto5/include/howto5/dispatch/DispatchMessage.h b/howtos/howto5/include/howto5/dispatch/DispatchMessage.h index cbc8e233..82280843 100644 --- a/howtos/howto5/include/howto5/dispatch/DispatchMessage.h +++ b/howtos/howto5/include/howto5/dispatch/DispatchMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for all input messages. diff --git a/howtos/howto5/include/howto5/dispatch/DispatchServerInputMessage.h b/howtos/howto5/include/howto5/dispatch/DispatchServerInputMessage.h index ffc62dd8..e72c54d2 100644 --- a/howtos/howto5/include/howto5/dispatch/DispatchServerInputMessage.h +++ b/howtos/howto5/include/howto5/dispatch/DispatchServerInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/howtos/howto5/include/howto5/factory/AllMessagesDynMemMsgFactory.h b/howtos/howto5/include/howto5/factory/AllMessagesDynMemMsgFactory.h index 0e24c238..a58dd10f 100644 --- a/howtos/howto5/include/howto5/factory/AllMessagesDynMemMsgFactory.h +++ b/howtos/howto5/include/howto5/factory/AllMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for all the messages. diff --git a/howtos/howto5/include/howto5/factory/ClientInputMessagesDynMemMsgFactory.h b/howtos/howto5/include/howto5/factory/ClientInputMessagesDynMemMsgFactory.h index 33732b39..5fc03b71 100644 --- a/howtos/howto5/include/howto5/factory/ClientInputMessagesDynMemMsgFactory.h +++ b/howtos/howto5/include/howto5/factory/ClientInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the client input messages. diff --git a/howtos/howto5/include/howto5/factory/ServerInputMessagesDynMemMsgFactory.h b/howtos/howto5/include/howto5/factory/ServerInputMessagesDynMemMsgFactory.h index d99fcc20..591f8227 100644 --- a/howtos/howto5/include/howto5/factory/ServerInputMessagesDynMemMsgFactory.h +++ b/howtos/howto5/include/howto5/factory/ServerInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the server input messages. diff --git a/howtos/howto5/include/howto5/field/FieldBase.h b/howtos/howto5/include/howto5/field/FieldBase.h index b56e2bd4..ee8ce6d9 100644 --- a/howtos/howto5/include/howto5/field/FieldBase.h +++ b/howtos/howto5/include/howto5/field/FieldBase.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of base class of all the fields. diff --git a/howtos/howto5/include/howto5/field/InterfaceFlags.h b/howtos/howto5/include/howto5/field/InterfaceFlags.h index f272edbb..769b8cd1 100644 --- a/howtos/howto5/include/howto5/field/InterfaceFlags.h +++ b/howtos/howto5/include/howto5/field/InterfaceFlags.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "InterfaceFlags" field. @@ -25,6 +25,7 @@ class InterfaceFlags : public comms::field::BitmaskValue< howto5::field::FieldBase<>, TExtraOpts..., + comms::option::def::HasName, comms::option::def::FixedLength<1U>, comms::option::def::BitmaskReservedBits<0xFCU, 0x0U> > @@ -33,6 +34,7 @@ class InterfaceFlags : public comms::field::BitmaskValue< howto5::field::FieldBase<>, TExtraOpts..., + comms::option::def::HasName, comms::option::def::FixedLength<1U>, comms::option::def::BitmaskReservedBits<0xFCU, 0x0U> >; @@ -50,13 +52,18 @@ class InterfaceFlags : public B1 ); + /// @brief Retrieve name of the bit. + /// @see @ref howto5::field::InterfaceFlagsCommon::bitName(). + static const char* bitName(std::size_t idx) + { + return howto5::field::InterfaceFlagsCommon::bitName(idx); + } + /// @brief Retrieve name of the bit. /// @see @ref howto5::field::InterfaceFlagsCommon::bitName(). static const char* bitName(BitIdx idx) { - return - howto5::field::InterfaceFlagsCommon::bitName( - static_cast(idx)); + return bitName(static_cast(idx)); } /// @brief Name of the field. diff --git a/howtos/howto5/include/howto5/field/InterfaceFlagsCommon.h b/howtos/howto5/include/howto5/field/InterfaceFlagsCommon.h index c67a4c0d..45b79804 100644 --- a/howtos/howto5/include/howto5/field/InterfaceFlagsCommon.h +++ b/howtos/howto5/include/howto5/field/InterfaceFlagsCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto5/include/howto5/field/MsgId.h b/howtos/howto5/include/howto5/field/MsgId.h index 9621a26c..f60da010 100644 --- a/howtos/howto5/include/howto5/field/MsgId.h +++ b/howtos/howto5/include/howto5/field/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "MsgId" field. @@ -27,6 +27,7 @@ class MsgId : public howto5::field::FieldBase<>, howto5::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 2> > { @@ -35,6 +36,7 @@ class MsgId : public howto5::field::FieldBase<>, howto5::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 2> >; public: diff --git a/howtos/howto5/include/howto5/field/MsgIdCommon.h b/howtos/howto5/include/howto5/field/MsgIdCommon.h index 44215284..e7b9f78a 100644 --- a/howtos/howto5/include/howto5/field/MsgIdCommon.h +++ b/howtos/howto5/include/howto5/field/MsgIdCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto5/include/howto5/field/Version.h b/howtos/howto5/include/howto5/field/Version.h index 7c58a155..b107928d 100644 --- a/howtos/howto5/include/howto5/field/Version.h +++ b/howtos/howto5/include/howto5/field/Version.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Version" field. @@ -27,6 +27,7 @@ class Version : public howto5::field::FieldBase<>, std::uint16_t, TExtraOpts..., + comms::option::def::HasName, comms::option::def::DefaultNumValue<5U> > { @@ -35,6 +36,7 @@ class Version : public howto5::field::FieldBase<>, std::uint16_t, TExtraOpts..., + comms::option::def::HasName, comms::option::def::DefaultNumValue<5U> >; public: diff --git a/howtos/howto5/include/howto5/field/VersionCommon.h b/howtos/howto5/include/howto5/field/VersionCommon.h index 3894a911..074d16fb 100644 --- a/howtos/howto5/include/howto5/field/VersionCommon.h +++ b/howtos/howto5/include/howto5/field/VersionCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto5/include/howto5/field/VersionWithFlags.h b/howtos/howto5/include/howto5/field/VersionWithFlags.h index c164a221..91151e39 100644 --- a/howtos/howto5/include/howto5/field/VersionWithFlags.h +++ b/howtos/howto5/include/howto5/field/VersionWithFlags.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "VersionWithFlags" field. @@ -30,6 +30,7 @@ struct VersionWithFlagsMembers using Version = howto5::field::Version< TOpt, + comms::option::def::HasName, comms::option::def::FixedBitLength<12U> >; @@ -37,12 +38,14 @@ struct VersionWithFlagsMembers class Flags : public howto5::field::InterfaceFlags< TOpt, + comms::option::def::HasName, comms::option::def::FixedBitLength<4U> > { using Base = howto5::field::InterfaceFlags< TOpt, + comms::option::def::HasName, comms::option::def::FixedBitLength<4U> >; public: @@ -70,6 +73,7 @@ class VersionWithFlags : public howto5::field::FieldBase<>, typename VersionWithFlagsMembers::All, TExtraOpts..., + comms::option::def::HasName, comms::option::def::HasVersionDependentMembers > { @@ -78,6 +82,7 @@ class VersionWithFlags : public howto5::field::FieldBase<>, typename VersionWithFlagsMembers::All, TExtraOpts..., + comms::option::def::HasName, comms::option::def::HasVersionDependentMembers >; public: diff --git a/howtos/howto5/include/howto5/field/VersionWithFlagsCommon.h b/howtos/howto5/include/howto5/field/VersionWithFlagsCommon.h index ed6e496b..b16fa576 100644 --- a/howtos/howto5/include/howto5/field/VersionWithFlagsCommon.h +++ b/howtos/howto5/include/howto5/field/VersionWithFlagsCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto5/include/howto5/frame/Frame.h b/howtos/howto5/include/howto5/frame/Frame.h index 43b98040..c75afe45 100644 --- a/howtos/howto5/include/howto5/frame/Frame.h +++ b/howtos/howto5/include/howto5/frame/Frame.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Frame" frame class. @@ -32,10 +32,30 @@ namespace frame template struct FrameLayers { + /// @brief Scope for field(s) of @ref Data layer. + struct DataMembers + { + /// @brief Custom field for @ref howto5::frame::FrameLayers::Data layer + class Field : public + comms::field::ArrayList< + howto5::field::FieldBase<>, + std::uint8_t, + typename TOpt::frame::FrameLayers::DataMembers::Field, + comms::option::def::HasName + > + { + public: + static const char* name() + { + return "Data"; + } + }; + }; + /// @brief Definition of layer "Data". using Data = comms::protocol::MsgDataLayer< - typename TOpt::frame::FrameLayers::Data + comms::option::def::FieldType >; /// @brief Definition of layer "VersionWithFlags". @@ -68,13 +88,15 @@ struct FrameLayers class SizeField : public comms::field::IntValue< howto5::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< howto5::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/howtos/howto5/include/howto5/frame/FrameCommon.h b/howtos/howto5/include/howto5/frame/FrameCommon.h index 2a325883..7051abce 100644 --- a/howtos/howto5/include/howto5/frame/FrameCommon.h +++ b/howtos/howto5/include/howto5/frame/FrameCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto5/include/howto5/input/AllMessages.h b/howtos/howto5/include/howto5/input/AllMessages.h index abbb9310..64df3980 100644 --- a/howtos/howto5/include/howto5/input/AllMessages.h +++ b/howtos/howto5/include/howto5/input/AllMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the AllMessages messages bundle. diff --git a/howtos/howto5/include/howto5/input/ClientInputMessages.h b/howtos/howto5/include/howto5/input/ClientInputMessages.h index b100aea2..83db11e7 100644 --- a/howtos/howto5/include/howto5/input/ClientInputMessages.h +++ b/howtos/howto5/include/howto5/input/ClientInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ClientInputMessages messages bundle. diff --git a/howtos/howto5/include/howto5/input/ServerInputMessages.h b/howtos/howto5/include/howto5/input/ServerInputMessages.h index 208a288f..3e302eb4 100644 --- a/howtos/howto5/include/howto5/input/ServerInputMessages.h +++ b/howtos/howto5/include/howto5/input/ServerInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ServerInputMessages messages bundle. diff --git a/howtos/howto5/include/howto5/message/Msg1.h b/howtos/howto5/include/howto5/message/Msg1.h index 941cd7f6..cf31f92f 100644 --- a/howtos/howto5/include/howto5/message/Msg1.h +++ b/howtos/howto5/include/howto5/message/Msg1.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 1" message and its fields. @@ -33,13 +33,15 @@ struct Msg1Fields class F1 : public comms::field::IntValue< howto5::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< howto5::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -66,13 +68,15 @@ struct Msg1Fields class Field : public comms::field::IntValue< howto5::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< howto5::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -98,12 +102,14 @@ struct Msg1Fields class F2 : public comms::field::Optional< typename F2Members::Field, + comms::option::def::HasName, comms::option::def::MissingByDefault > { using Base = comms::field::Optional< typename F2Members::Field, + comms::option::def::HasName, comms::option::def::MissingByDefault >; public: @@ -118,13 +124,15 @@ struct Msg1Fields class F3Field : public comms::field::IntValue< howto5::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< howto5::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -149,8 +157,8 @@ struct Msg1Fields comms::field::Optional< F3Field, comms::option::def::ExistsByDefault, - comms::option::def::ExistsSinceVersion<5U> - > + comms::option::def::ExistsSinceVersion<5U>, + comms::option::def::HasName > { /// @brief Name of the field. static const char* name() diff --git a/howtos/howto5/include/howto5/message/Msg1Common.h b/howtos/howto5/include/howto5/message/Msg1Common.h index 458d0c54..2e436a75 100644 --- a/howtos/howto5/include/howto5/message/Msg1Common.h +++ b/howtos/howto5/include/howto5/message/Msg1Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto5/include/howto5/message/Msg2.h b/howtos/howto5/include/howto5/message/Msg2.h index 92589c12..5b4e8bb0 100644 --- a/howtos/howto5/include/howto5/message/Msg2.h +++ b/howtos/howto5/include/howto5/message/Msg2.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 2" message and its fields. @@ -38,13 +38,15 @@ struct Msg2Fields class Length : public comms::field::IntValue< howto5::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< howto5::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -69,6 +71,7 @@ struct Msg2Fields comms::field::String< howto5::field::FieldBase<>, typename TOpt::message::Msg2Fields::F1, + comms::option::def::HasName, comms::option::def::SequenceSerLengthFieldPrefix > { @@ -76,6 +79,7 @@ struct Msg2Fields comms::field::String< howto5::field::FieldBase<>, typename TOpt::message::Msg2Fields::F1, + comms::option::def::HasName, comms::option::def::SequenceSerLengthFieldPrefix >; public: @@ -102,13 +106,15 @@ struct Msg2Fields class Field : public comms::field::IntValue< howto5::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< howto5::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -134,12 +140,14 @@ struct Msg2Fields class F2 : public comms::field::Optional< typename F2Members::Field, + comms::option::def::HasName, comms::option::def::MissingByDefault > { using Base = comms::field::Optional< typename F2Members::Field, + comms::option::def::HasName, comms::option::def::MissingByDefault >; public: @@ -154,13 +162,15 @@ struct Msg2Fields class F3Field : public comms::field::IntValue< howto5::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< howto5::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -185,8 +195,8 @@ struct Msg2Fields comms::field::Optional< F3Field, comms::option::def::ExistsByDefault, - comms::option::def::ExistsSinceVersion<3U> - > + comms::option::def::ExistsSinceVersion<3U>, + comms::option::def::HasName > { /// @brief Name of the field. static const char* name() diff --git a/howtos/howto5/include/howto5/message/Msg2Common.h b/howtos/howto5/include/howto5/message/Msg2Common.h index e2dd67be..b60f6007 100644 --- a/howtos/howto5/include/howto5/message/Msg2Common.h +++ b/howtos/howto5/include/howto5/message/Msg2Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto5/include/howto5/options/AllMessagesDynMemMsgFactoryDefaultOptions.h b/howtos/howto5/include/howto5/options/AllMessagesDynMemMsgFactoryDefaultOptions.h index 457e7875..ea0fb63f 100644 --- a/howtos/howto5/include/howto5/options/AllMessagesDynMemMsgFactoryDefaultOptions.h +++ b/howtos/howto5/include/howto5/options/AllMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol all messages dynamic memory allocation message factory options. diff --git a/howtos/howto5/include/howto5/options/BareMetalDefaultOptions.h b/howtos/howto5/include/howto5/options/BareMetalDefaultOptions.h index 81d37c68..20c5dd92 100644 --- a/howtos/howto5/include/howto5/options/BareMetalDefaultOptions.h +++ b/howtos/howto5/include/howto5/options/BareMetalDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol bare metal default options. @@ -48,12 +48,15 @@ struct BareMetalDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// howto5::frame::FrameLayers::Data layer. - using Data = - std::tuple< - comms::option::app::FixedSizeStorage, - typename TBase::frame::FrameLayers::Data - >; + /// howto5::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::FixedSizeStorage, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers /// @brief Extra options for @ref /// howto5::frame::FrameLayers::Id layer. diff --git a/howtos/howto5/include/howto5/options/ClientDefaultOptions.h b/howtos/howto5/include/howto5/options/ClientDefaultOptions.h index 4d33229e..5ca563dd 100644 --- a/howtos/howto5/include/howto5/options/ClientDefaultOptions.h +++ b/howtos/howto5/include/howto5/options/ClientDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client default options. diff --git a/howtos/howto5/include/howto5/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h b/howtos/howto5/include/howto5/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h index 0337b6e7..eb8bd74c 100644 --- a/howtos/howto5/include/howto5/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/howtos/howto5/include/howto5/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client input messages dynamic memory allocation message factory options. diff --git a/howtos/howto5/include/howto5/options/DataViewDefaultOptions.h b/howtos/howto5/include/howto5/options/DataViewDefaultOptions.h index 66649f94..c83db749 100644 --- a/howtos/howto5/include/howto5/options/DataViewDefaultOptions.h +++ b/howtos/howto5/include/howto5/options/DataViewDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol data view default options. @@ -42,12 +42,15 @@ struct DataViewDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// howto5::frame::FrameLayers::Data layer. - using Data = - std::tuple< - comms::option::app::OrigDataView, - typename TBase::frame::FrameLayers::Data - >; + /// howto5::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::OrigDataView, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers }; // struct FrameLayers }; // struct frame }; diff --git a/howtos/howto5/include/howto5/options/DefaultOptions.h b/howtos/howto5/include/howto5/options/DefaultOptions.h index c77e22ef..cf550758 100644 --- a/howtos/howto5/include/howto5/options/DefaultOptions.h +++ b/howtos/howto5/include/howto5/options/DefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol default options. @@ -29,7 +29,7 @@ struct DefaultOptionsT : public TBase { /// @brief Extra options for @ref /// howto5::message::Msg2Fields::F1 field. - using F1 = comms::option::EmptyOption; + using F1 = comms::option::app::EmptyOption; }; }; // struct message @@ -41,17 +41,20 @@ struct DefaultOptionsT : public TBase struct FrameLayers { /// @brief Extra options for @ref - /// howto5::frame::FrameLayers::Data layer. - using Data = comms::option::EmptyOption; + /// howto5::frame::FrameLayers::DataMembers::Field field. + struct DataMembers + { + using Field = comms::option::app::EmptyOption; + }; // struct DataMembers /// @brief Extra options for @ref /// howto5::frame::FrameLayers::VersionWithFlags /// layer. - using VersionWithFlags = comms::option::EmptyOption; + using VersionWithFlags = comms::option::app::EmptyOption; /// @brief Extra options for @ref /// howto5::frame::FrameLayers::Id layer. - using Id = comms::option::EmptyOption; + using Id = comms::option::app::EmptyOption; }; // struct FrameLayers }; // struct frame }; diff --git a/howtos/howto5/include/howto5/options/ServerDefaultOptions.h b/howtos/howto5/include/howto5/options/ServerDefaultOptions.h index 829e14fd..80ff0627 100644 --- a/howtos/howto5/include/howto5/options/ServerDefaultOptions.h +++ b/howtos/howto5/include/howto5/options/ServerDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server default options. diff --git a/howtos/howto5/include/howto5/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h b/howtos/howto5/include/howto5/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h index 06e6c534..235f984c 100644 --- a/howtos/howto5/include/howto5/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/howtos/howto5/include/howto5/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server input messages dynamic memory allocation message factory options. diff --git a/howtos/howto6/include/howto6/Interface.h b/howtos/howto6/include/howto6/Interface.h index 5ba8a613..1e935ddb 100644 --- a/howtos/howto6/include/howto6/Interface.h +++ b/howtos/howto6/include/howto6/Interface.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Interface" interface class. @@ -24,7 +24,8 @@ struct InterfaceFields /// @brief Definition of "ChecksumType" field. using ChecksumType = howto6::field::ChecksumType< - howto6::options::DefaultOptions + howto6::options::DefaultOptions, + comms::option::def::HasName >; /// @brief All the fields bundled in std::tuple. diff --git a/howtos/howto6/include/howto6/InterfaceCommon.h b/howtos/howto6/include/howto6/InterfaceCommon.h index 1d523fe8..cf4af23c 100644 --- a/howtos/howto6/include/howto6/InterfaceCommon.h +++ b/howtos/howto6/include/howto6/InterfaceCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto6/include/howto6/MsgId.h b/howtos/howto6/include/howto6/MsgId.h index c1921dbc..cb834de4 100644 --- a/howtos/howto6/include/howto6/MsgId.h +++ b/howtos/howto6/include/howto6/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of message ids enumeration. diff --git a/howtos/howto6/include/howto6/Version.h b/howtos/howto6/include/howto6/Version.h index bd99cf8f..29ff4c8d 100644 --- a/howtos/howto6/include/howto6/Version.h +++ b/howtos/howto6/include/howto6/Version.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains protocol version definition. @@ -22,5 +22,5 @@ inline constexpr unsigned specVersion() } // namespace howto6 // Generated compile time check for minimal supported version of the COMMS library -static_assert(COMMS_MAKE_VERSION(5, 2, 7) <= comms::version(), +static_assert(COMMS_MAKE_VERSION(5, 3, 0) <= comms::version(), "The version of COMMS library is too old"); diff --git a/howtos/howto6/include/howto6/dispatch/DispatchClientInputMessage.h b/howtos/howto6/include/howto6/dispatch/DispatchClientInputMessage.h index e652a930..a69d08b8 100644 --- a/howtos/howto6/include/howto6/dispatch/DispatchClientInputMessage.h +++ b/howtos/howto6/include/howto6/dispatch/DispatchClientInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/howtos/howto6/include/howto6/dispatch/DispatchMessage.h b/howtos/howto6/include/howto6/dispatch/DispatchMessage.h index eb3fcb72..5c6c669d 100644 --- a/howtos/howto6/include/howto6/dispatch/DispatchMessage.h +++ b/howtos/howto6/include/howto6/dispatch/DispatchMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for all input messages. diff --git a/howtos/howto6/include/howto6/dispatch/DispatchServerInputMessage.h b/howtos/howto6/include/howto6/dispatch/DispatchServerInputMessage.h index 12066f35..0778c979 100644 --- a/howtos/howto6/include/howto6/dispatch/DispatchServerInputMessage.h +++ b/howtos/howto6/include/howto6/dispatch/DispatchServerInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/howtos/howto6/include/howto6/factory/AllMessagesDynMemMsgFactory.h b/howtos/howto6/include/howto6/factory/AllMessagesDynMemMsgFactory.h index 10cbc406..d565d437 100644 --- a/howtos/howto6/include/howto6/factory/AllMessagesDynMemMsgFactory.h +++ b/howtos/howto6/include/howto6/factory/AllMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for all the messages. diff --git a/howtos/howto6/include/howto6/factory/ClientInputMessagesDynMemMsgFactory.h b/howtos/howto6/include/howto6/factory/ClientInputMessagesDynMemMsgFactory.h index 1b0d9344..7cde17f6 100644 --- a/howtos/howto6/include/howto6/factory/ClientInputMessagesDynMemMsgFactory.h +++ b/howtos/howto6/include/howto6/factory/ClientInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the client input messages. diff --git a/howtos/howto6/include/howto6/factory/ServerInputMessagesDynMemMsgFactory.h b/howtos/howto6/include/howto6/factory/ServerInputMessagesDynMemMsgFactory.h index 99a5e98f..d80a567a 100644 --- a/howtos/howto6/include/howto6/factory/ServerInputMessagesDynMemMsgFactory.h +++ b/howtos/howto6/include/howto6/factory/ServerInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the server input messages. diff --git a/howtos/howto6/include/howto6/field/ChecksumType.h b/howtos/howto6/include/howto6/field/ChecksumType.h index c1e7da61..fdcb4e59 100644 --- a/howtos/howto6/include/howto6/field/ChecksumType.h +++ b/howtos/howto6/include/howto6/field/ChecksumType.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "ChecksumType" field. @@ -27,6 +27,7 @@ class ChecksumType : public howto6::field::FieldBase<>, howto6::field::ChecksumTypeCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<0, 2> > { @@ -35,6 +36,7 @@ class ChecksumType : public howto6::field::FieldBase<>, howto6::field::ChecksumTypeCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<0, 2> >; public: diff --git a/howtos/howto6/include/howto6/field/ChecksumTypeCommon.h b/howtos/howto6/include/howto6/field/ChecksumTypeCommon.h index 493f3a37..ccdbe660 100644 --- a/howtos/howto6/include/howto6/field/ChecksumTypeCommon.h +++ b/howtos/howto6/include/howto6/field/ChecksumTypeCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto6/include/howto6/field/FieldBase.h b/howtos/howto6/include/howto6/field/FieldBase.h index b5c91006..8961f741 100644 --- a/howtos/howto6/include/howto6/field/FieldBase.h +++ b/howtos/howto6/include/howto6/field/FieldBase.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of base class of all the fields. diff --git a/howtos/howto6/include/howto6/field/MsgId.h b/howtos/howto6/include/howto6/field/MsgId.h index 8f774b81..d2824384 100644 --- a/howtos/howto6/include/howto6/field/MsgId.h +++ b/howtos/howto6/include/howto6/field/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "MsgId" field. @@ -27,6 +27,7 @@ class MsgId : public howto6::field::FieldBase<>, howto6::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 3> > { @@ -35,6 +36,7 @@ class MsgId : public howto6::field::FieldBase<>, howto6::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 3> >; public: diff --git a/howtos/howto6/include/howto6/field/MsgIdCommon.h b/howtos/howto6/include/howto6/field/MsgIdCommon.h index 029a31e4..7fe1ba95 100644 --- a/howtos/howto6/include/howto6/field/MsgIdCommon.h +++ b/howtos/howto6/include/howto6/field/MsgIdCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto6/include/howto6/frame/Frame.h b/howtos/howto6/include/howto6/frame/Frame.h index a3789e1b..4403a325 100644 --- a/howtos/howto6/include/howto6/frame/Frame.h +++ b/howtos/howto6/include/howto6/frame/Frame.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Frame" frame class. @@ -34,10 +34,30 @@ namespace frame template struct FrameLayers { + /// @brief Scope for field(s) of @ref Data layer. + struct DataMembers + { + /// @brief Custom field for @ref howto6::frame::FrameLayers::Data layer + class Field : public + comms::field::ArrayList< + howto6::field::FieldBase<>, + std::uint8_t, + typename TOpt::frame::FrameLayers::DataMembers::Field, + comms::option::def::HasName + > + { + public: + static const char* name() + { + return "Data"; + } + }; + }; + /// @brief Definition of layer "Data". using Data = comms::protocol::MsgDataLayer< - typename TOpt::frame::FrameLayers::Data + comms::option::def::FieldType >; /// @brief Definition of layer "ChekcusmType". @@ -70,13 +90,15 @@ struct FrameLayers class SizeField : public comms::field::IntValue< howto6::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< howto6::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -112,6 +134,7 @@ struct FrameLayers comms::field::IntValue< howto6::field::FieldBase<>, std::uint16_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid, comms::option::def::DefaultNumValue<43981L> > @@ -120,6 +143,7 @@ struct FrameLayers comms::field::IntValue< howto6::field::FieldBase<>, std::uint16_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid, comms::option::def::DefaultNumValue<43981L> >; @@ -156,13 +180,15 @@ struct FrameLayers class ChecksumField : public comms::field::IntValue< howto6::field::FieldBase<>, - std::uint32_t + std::uint32_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< howto6::field::FieldBase<>, - std::uint32_t + std::uint32_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/howtos/howto6/include/howto6/frame/FrameCommon.h b/howtos/howto6/include/howto6/frame/FrameCommon.h index 7e23197e..74dc0279 100644 --- a/howtos/howto6/include/howto6/frame/FrameCommon.h +++ b/howtos/howto6/include/howto6/frame/FrameCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto6/include/howto6/input/AllMessages.h b/howtos/howto6/include/howto6/input/AllMessages.h index f61793d5..2eac0210 100644 --- a/howtos/howto6/include/howto6/input/AllMessages.h +++ b/howtos/howto6/include/howto6/input/AllMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the AllMessages messages bundle. diff --git a/howtos/howto6/include/howto6/input/ClientInputMessages.h b/howtos/howto6/include/howto6/input/ClientInputMessages.h index 3ef2bc54..5b3e380c 100644 --- a/howtos/howto6/include/howto6/input/ClientInputMessages.h +++ b/howtos/howto6/include/howto6/input/ClientInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ClientInputMessages messages bundle. diff --git a/howtos/howto6/include/howto6/input/ServerInputMessages.h b/howtos/howto6/include/howto6/input/ServerInputMessages.h index 3968c4f2..0406579c 100644 --- a/howtos/howto6/include/howto6/input/ServerInputMessages.h +++ b/howtos/howto6/include/howto6/input/ServerInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ServerInputMessages messages bundle. diff --git a/howtos/howto6/include/howto6/message/Msg1.h b/howtos/howto6/include/howto6/message/Msg1.h index 50ca8743..1531e13e 100644 --- a/howtos/howto6/include/howto6/message/Msg1.h +++ b/howtos/howto6/include/howto6/message/Msg1.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 1" message and its fields. @@ -32,13 +32,15 @@ struct Msg1Fields class F1 : public comms::field::IntValue< howto6::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< howto6::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/howtos/howto6/include/howto6/message/Msg1Common.h b/howtos/howto6/include/howto6/message/Msg1Common.h index 03d8a746..73c4bf13 100644 --- a/howtos/howto6/include/howto6/message/Msg1Common.h +++ b/howtos/howto6/include/howto6/message/Msg1Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto6/include/howto6/message/Msg2.h b/howtos/howto6/include/howto6/message/Msg2.h index 912c1854..419ab030 100644 --- a/howtos/howto6/include/howto6/message/Msg2.h +++ b/howtos/howto6/include/howto6/message/Msg2.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 2" message and its fields. @@ -32,13 +32,15 @@ struct Msg2Fields class F1 : public comms::field::IntValue< howto6::field::FieldBase<>, - std::uint32_t + std::uint32_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< howto6::field::FieldBase<>, - std::uint32_t + std::uint32_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/howtos/howto6/include/howto6/message/Msg2Common.h b/howtos/howto6/include/howto6/message/Msg2Common.h index 6d9559d8..8f9f75b6 100644 --- a/howtos/howto6/include/howto6/message/Msg2Common.h +++ b/howtos/howto6/include/howto6/message/Msg2Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto6/include/howto6/message/Msg3.h b/howtos/howto6/include/howto6/message/Msg3.h index 1737c012..1df5886b 100644 --- a/howtos/howto6/include/howto6/message/Msg3.h +++ b/howtos/howto6/include/howto6/message/Msg3.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 3" message and its fields. @@ -37,13 +37,15 @@ struct Msg3Fields class Length : public comms::field::IntValue< howto6::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< howto6::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -68,6 +70,7 @@ struct Msg3Fields comms::field::String< howto6::field::FieldBase<>, typename TOpt::message::Msg3Fields::F1, + comms::option::def::HasName, comms::option::def::SequenceSerLengthFieldPrefix > { @@ -75,6 +78,7 @@ struct Msg3Fields comms::field::String< howto6::field::FieldBase<>, typename TOpt::message::Msg3Fields::F1, + comms::option::def::HasName, comms::option::def::SequenceSerLengthFieldPrefix >; public: diff --git a/howtos/howto6/include/howto6/message/Msg3Common.h b/howtos/howto6/include/howto6/message/Msg3Common.h index 8bb26167..308aab7a 100644 --- a/howtos/howto6/include/howto6/message/Msg3Common.h +++ b/howtos/howto6/include/howto6/message/Msg3Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto6/include/howto6/options/AllMessagesDynMemMsgFactoryDefaultOptions.h b/howtos/howto6/include/howto6/options/AllMessagesDynMemMsgFactoryDefaultOptions.h index fa766aeb..a049651b 100644 --- a/howtos/howto6/include/howto6/options/AllMessagesDynMemMsgFactoryDefaultOptions.h +++ b/howtos/howto6/include/howto6/options/AllMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol all messages dynamic memory allocation message factory options. diff --git a/howtos/howto6/include/howto6/options/BareMetalDefaultOptions.h b/howtos/howto6/include/howto6/options/BareMetalDefaultOptions.h index 7c881431..67bff70f 100644 --- a/howtos/howto6/include/howto6/options/BareMetalDefaultOptions.h +++ b/howtos/howto6/include/howto6/options/BareMetalDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol bare metal default options. @@ -48,12 +48,15 @@ struct BareMetalDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// howto6::frame::FrameLayers::Data layer. - using Data = - std::tuple< - comms::option::app::FixedSizeStorage, - typename TBase::frame::FrameLayers::Data - >; + /// howto6::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::FixedSizeStorage, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers /// @brief Extra options for @ref /// howto6::frame::FrameLayers::Id layer. diff --git a/howtos/howto6/include/howto6/options/ClientDefaultOptions.h b/howtos/howto6/include/howto6/options/ClientDefaultOptions.h index e4c1da45..c9a06c7b 100644 --- a/howtos/howto6/include/howto6/options/ClientDefaultOptions.h +++ b/howtos/howto6/include/howto6/options/ClientDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client default options. diff --git a/howtos/howto6/include/howto6/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h b/howtos/howto6/include/howto6/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h index 51238567..bfeb5656 100644 --- a/howtos/howto6/include/howto6/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/howtos/howto6/include/howto6/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client input messages dynamic memory allocation message factory options. diff --git a/howtos/howto6/include/howto6/options/DataViewDefaultOptions.h b/howtos/howto6/include/howto6/options/DataViewDefaultOptions.h index 94b4ee6b..f83784e7 100644 --- a/howtos/howto6/include/howto6/options/DataViewDefaultOptions.h +++ b/howtos/howto6/include/howto6/options/DataViewDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol data view default options. @@ -42,12 +42,15 @@ struct DataViewDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// howto6::frame::FrameLayers::Data layer. - using Data = - std::tuple< - comms::option::app::OrigDataView, - typename TBase::frame::FrameLayers::Data - >; + /// howto6::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::OrigDataView, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers }; // struct FrameLayers }; // struct frame }; diff --git a/howtos/howto6/include/howto6/options/DefaultOptions.h b/howtos/howto6/include/howto6/options/DefaultOptions.h index 95d81017..c6606d12 100644 --- a/howtos/howto6/include/howto6/options/DefaultOptions.h +++ b/howtos/howto6/include/howto6/options/DefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol default options. @@ -29,7 +29,7 @@ struct DefaultOptionsT : public TBase { /// @brief Extra options for @ref /// howto6::message::Msg3Fields::F1 field. - using F1 = comms::option::EmptyOption; + using F1 = comms::option::app::EmptyOption; }; }; // struct message @@ -41,17 +41,20 @@ struct DefaultOptionsT : public TBase struct FrameLayers { /// @brief Extra options for @ref - /// howto6::frame::FrameLayers::Data layer. - using Data = comms::option::EmptyOption; + /// howto6::frame::FrameLayers::DataMembers::Field field. + struct DataMembers + { + using Field = comms::option::app::EmptyOption; + }; // struct DataMembers /// @brief Extra options for @ref /// howto6::frame::FrameLayers::Id layer. - using Id = comms::option::EmptyOption; + using Id = comms::option::app::EmptyOption; /// @brief Extra options for @ref /// howto6::frame::FrameLayers::Checksum /// layer. - using Checksum = comms::option::EmptyOption; + using Checksum = comms::option::app::EmptyOption; }; // struct FrameLayers }; // struct frame }; diff --git a/howtos/howto6/include/howto6/options/ServerDefaultOptions.h b/howtos/howto6/include/howto6/options/ServerDefaultOptions.h index a9d8d29c..080a1299 100644 --- a/howtos/howto6/include/howto6/options/ServerDefaultOptions.h +++ b/howtos/howto6/include/howto6/options/ServerDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server default options. diff --git a/howtos/howto6/include/howto6/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h b/howtos/howto6/include/howto6/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h index debfd85e..5b9efd86 100644 --- a/howtos/howto6/include/howto6/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/howtos/howto6/include/howto6/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server input messages dynamic memory allocation message factory options. diff --git a/howtos/howto7/include/howto7/Message.h b/howtos/howto7/include/howto7/Message.h index 41e97154..aa42ef0c 100644 --- a/howtos/howto7/include/howto7/Message.h +++ b/howtos/howto7/include/howto7/Message.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message" interface class. diff --git a/howtos/howto7/include/howto7/MsgId.h b/howtos/howto7/include/howto7/MsgId.h index 630e0f95..9aeee566 100644 --- a/howtos/howto7/include/howto7/MsgId.h +++ b/howtos/howto7/include/howto7/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of message ids enumeration. diff --git a/howtos/howto7/include/howto7/Version.h b/howtos/howto7/include/howto7/Version.h index 0ce6d974..2af8932a 100644 --- a/howtos/howto7/include/howto7/Version.h +++ b/howtos/howto7/include/howto7/Version.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains protocol version definition. @@ -22,5 +22,5 @@ inline constexpr unsigned specVersion() } // namespace howto7 // Generated compile time check for minimal supported version of the COMMS library -static_assert(COMMS_MAKE_VERSION(5, 2, 7) <= comms::version(), +static_assert(COMMS_MAKE_VERSION(5, 3, 0) <= comms::version(), "The version of COMMS library is too old"); diff --git a/howtos/howto7/include/howto7/dispatch/DispatchClientInputMessage.h b/howtos/howto7/include/howto7/dispatch/DispatchClientInputMessage.h index 22c57916..5f5af872 100644 --- a/howtos/howto7/include/howto7/dispatch/DispatchClientInputMessage.h +++ b/howtos/howto7/include/howto7/dispatch/DispatchClientInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/howtos/howto7/include/howto7/dispatch/DispatchMessage.h b/howtos/howto7/include/howto7/dispatch/DispatchMessage.h index 04bd2b67..ec185885 100644 --- a/howtos/howto7/include/howto7/dispatch/DispatchMessage.h +++ b/howtos/howto7/include/howto7/dispatch/DispatchMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for all input messages. diff --git a/howtos/howto7/include/howto7/dispatch/DispatchServerInputMessage.h b/howtos/howto7/include/howto7/dispatch/DispatchServerInputMessage.h index 4275a704..da7c390a 100644 --- a/howtos/howto7/include/howto7/dispatch/DispatchServerInputMessage.h +++ b/howtos/howto7/include/howto7/dispatch/DispatchServerInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/howtos/howto7/include/howto7/factory/AllMessagesDynMemMsgFactory.h b/howtos/howto7/include/howto7/factory/AllMessagesDynMemMsgFactory.h index e4722a27..8f6340a7 100644 --- a/howtos/howto7/include/howto7/factory/AllMessagesDynMemMsgFactory.h +++ b/howtos/howto7/include/howto7/factory/AllMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for all the messages. diff --git a/howtos/howto7/include/howto7/factory/ClientInputMessagesDynMemMsgFactory.h b/howtos/howto7/include/howto7/factory/ClientInputMessagesDynMemMsgFactory.h index 18e1401d..85359542 100644 --- a/howtos/howto7/include/howto7/factory/ClientInputMessagesDynMemMsgFactory.h +++ b/howtos/howto7/include/howto7/factory/ClientInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the client input messages. diff --git a/howtos/howto7/include/howto7/factory/ServerInputMessagesDynMemMsgFactory.h b/howtos/howto7/include/howto7/factory/ServerInputMessagesDynMemMsgFactory.h index 4b3cce29..85eca157 100644 --- a/howtos/howto7/include/howto7/factory/ServerInputMessagesDynMemMsgFactory.h +++ b/howtos/howto7/include/howto7/factory/ServerInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the server input messages. diff --git a/howtos/howto7/include/howto7/field/FieldBase.h b/howtos/howto7/include/howto7/field/FieldBase.h index 3dba5518..cb62d19c 100644 --- a/howtos/howto7/include/howto7/field/FieldBase.h +++ b/howtos/howto7/include/howto7/field/FieldBase.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of base class of all the fields. diff --git a/howtos/howto7/include/howto7/field/MsgId.h b/howtos/howto7/include/howto7/field/MsgId.h index 81519d3d..6a40a26d 100644 --- a/howtos/howto7/include/howto7/field/MsgId.h +++ b/howtos/howto7/include/howto7/field/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "MsgId" field. @@ -27,6 +27,7 @@ class MsgId : public howto7::field::FieldBase<>, howto7::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 3> > { @@ -35,6 +36,7 @@ class MsgId : public howto7::field::FieldBase<>, howto7::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 3> >; public: diff --git a/howtos/howto7/include/howto7/field/MsgIdCommon.h b/howtos/howto7/include/howto7/field/MsgIdCommon.h index 8281f57a..3d737b2e 100644 --- a/howtos/howto7/include/howto7/field/MsgIdCommon.h +++ b/howtos/howto7/include/howto7/field/MsgIdCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto7/include/howto7/frame/Frame.h b/howtos/howto7/include/howto7/frame/Frame.h index de491a28..99fe5732 100644 --- a/howtos/howto7/include/howto7/frame/Frame.h +++ b/howtos/howto7/include/howto7/frame/Frame.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Frame" frame class. @@ -31,10 +31,30 @@ namespace frame template struct FrameLayers { + /// @brief Scope for field(s) of @ref Data layer. + struct DataMembers + { + /// @brief Custom field for @ref howto7::frame::FrameLayers::Data layer + class Field : public + comms::field::ArrayList< + howto7::field::FieldBase<>, + std::uint8_t, + typename TOpt::frame::FrameLayers::DataMembers::Field, + comms::option::def::HasName + > + { + public: + static const char* name() + { + return "Data"; + } + }; + }; + /// @brief Definition of layer "Data". using Data = comms::protocol::MsgDataLayer< - typename TOpt::frame::FrameLayers::Data + comms::option::def::FieldType >; /// @brief Definition of layer "Id". @@ -57,13 +77,15 @@ struct FrameLayers class SizeField : public comms::field::IntValue< howto7::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< howto7::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -98,13 +120,15 @@ struct FrameLayers class SyncField : public comms::field::IntValue< howto7::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< howto7::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/howtos/howto7/include/howto7/frame/FrameCommon.h b/howtos/howto7/include/howto7/frame/FrameCommon.h index 2021aeb1..d83d6cd0 100644 --- a/howtos/howto7/include/howto7/frame/FrameCommon.h +++ b/howtos/howto7/include/howto7/frame/FrameCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto7/include/howto7/input/AllMessages.h b/howtos/howto7/include/howto7/input/AllMessages.h index 0cb23b19..2e134fae 100644 --- a/howtos/howto7/include/howto7/input/AllMessages.h +++ b/howtos/howto7/include/howto7/input/AllMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the AllMessages messages bundle. diff --git a/howtos/howto7/include/howto7/input/ClientInputMessages.h b/howtos/howto7/include/howto7/input/ClientInputMessages.h index 9f42cdaf..e7d140f4 100644 --- a/howtos/howto7/include/howto7/input/ClientInputMessages.h +++ b/howtos/howto7/include/howto7/input/ClientInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ClientInputMessages messages bundle. diff --git a/howtos/howto7/include/howto7/input/ServerInputMessages.h b/howtos/howto7/include/howto7/input/ServerInputMessages.h index e5ebf34d..2da5d022 100644 --- a/howtos/howto7/include/howto7/input/ServerInputMessages.h +++ b/howtos/howto7/include/howto7/input/ServerInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ServerInputMessages messages bundle. diff --git a/howtos/howto7/include/howto7/message/Msg1.h b/howtos/howto7/include/howto7/message/Msg1.h index 90fbaa93..28fb665f 100644 --- a/howtos/howto7/include/howto7/message/Msg1.h +++ b/howtos/howto7/include/howto7/message/Msg1.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 1" message and its fields. @@ -32,13 +32,15 @@ struct Msg1Fields class F1 : public comms::field::IntValue< howto7::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< howto7::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/howtos/howto7/include/howto7/message/Msg1Common.h b/howtos/howto7/include/howto7/message/Msg1Common.h index bb9c3e99..ad179023 100644 --- a/howtos/howto7/include/howto7/message/Msg1Common.h +++ b/howtos/howto7/include/howto7/message/Msg1Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto7/include/howto7/message/Msg2.h b/howtos/howto7/include/howto7/message/Msg2.h index ce3a0bfb..eee04083 100644 --- a/howtos/howto7/include/howto7/message/Msg2.h +++ b/howtos/howto7/include/howto7/message/Msg2.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 2" message and its fields. @@ -32,13 +32,15 @@ struct Msg2Fields class F1 : public comms::field::IntValue< howto7::field::FieldBase<>, - std::uint32_t + std::uint32_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< howto7::field::FieldBase<>, - std::uint32_t + std::uint32_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/howtos/howto7/include/howto7/message/Msg2Common.h b/howtos/howto7/include/howto7/message/Msg2Common.h index bff334f5..05a2bfba 100644 --- a/howtos/howto7/include/howto7/message/Msg2Common.h +++ b/howtos/howto7/include/howto7/message/Msg2Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto7/include/howto7/message/Msg3.h b/howtos/howto7/include/howto7/message/Msg3.h index 82e8c533..2ea17fd7 100644 --- a/howtos/howto7/include/howto7/message/Msg3.h +++ b/howtos/howto7/include/howto7/message/Msg3.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 3" message and its fields. @@ -37,13 +37,15 @@ struct Msg3Fields class Length : public comms::field::IntValue< howto7::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< howto7::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -68,6 +70,7 @@ struct Msg3Fields comms::field::String< howto7::field::FieldBase<>, typename TOpt::message::Msg3Fields::F1, + comms::option::def::HasName, comms::option::def::SequenceSerLengthFieldPrefix > { @@ -75,6 +78,7 @@ struct Msg3Fields comms::field::String< howto7::field::FieldBase<>, typename TOpt::message::Msg3Fields::F1, + comms::option::def::HasName, comms::option::def::SequenceSerLengthFieldPrefix >; public: diff --git a/howtos/howto7/include/howto7/message/Msg3Common.h b/howtos/howto7/include/howto7/message/Msg3Common.h index ef6a4921..771cca39 100644 --- a/howtos/howto7/include/howto7/message/Msg3Common.h +++ b/howtos/howto7/include/howto7/message/Msg3Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto7/include/howto7/options/AllMessagesDynMemMsgFactoryDefaultOptions.h b/howtos/howto7/include/howto7/options/AllMessagesDynMemMsgFactoryDefaultOptions.h index 897e47bd..4790ac67 100644 --- a/howtos/howto7/include/howto7/options/AllMessagesDynMemMsgFactoryDefaultOptions.h +++ b/howtos/howto7/include/howto7/options/AllMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol all messages dynamic memory allocation message factory options. diff --git a/howtos/howto7/include/howto7/options/BareMetalDefaultOptions.h b/howtos/howto7/include/howto7/options/BareMetalDefaultOptions.h index 93ee82e3..0c63cc05 100644 --- a/howtos/howto7/include/howto7/options/BareMetalDefaultOptions.h +++ b/howtos/howto7/include/howto7/options/BareMetalDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol bare metal default options. @@ -48,12 +48,15 @@ struct BareMetalDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// howto7::frame::FrameLayers::Data layer. - using Data = - std::tuple< - comms::option::app::FixedSizeStorage, - typename TBase::frame::FrameLayers::Data - >; + /// howto7::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::FixedSizeStorage, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers /// @brief Extra options for @ref /// howto7::frame::FrameLayers::Id layer. diff --git a/howtos/howto7/include/howto7/options/ClientDefaultOptions.h b/howtos/howto7/include/howto7/options/ClientDefaultOptions.h index b64e343a..01ca83ff 100644 --- a/howtos/howto7/include/howto7/options/ClientDefaultOptions.h +++ b/howtos/howto7/include/howto7/options/ClientDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client default options. diff --git a/howtos/howto7/include/howto7/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h b/howtos/howto7/include/howto7/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h index 170b1beb..a917a5d4 100644 --- a/howtos/howto7/include/howto7/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/howtos/howto7/include/howto7/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client input messages dynamic memory allocation message factory options. diff --git a/howtos/howto7/include/howto7/options/DataViewDefaultOptions.h b/howtos/howto7/include/howto7/options/DataViewDefaultOptions.h index c161ee75..e65abe24 100644 --- a/howtos/howto7/include/howto7/options/DataViewDefaultOptions.h +++ b/howtos/howto7/include/howto7/options/DataViewDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol data view default options. @@ -42,12 +42,15 @@ struct DataViewDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// howto7::frame::FrameLayers::Data layer. - using Data = - std::tuple< - comms::option::app::OrigDataView, - typename TBase::frame::FrameLayers::Data - >; + /// howto7::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::OrigDataView, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers }; // struct FrameLayers }; // struct frame }; diff --git a/howtos/howto7/include/howto7/options/DefaultOptions.h b/howtos/howto7/include/howto7/options/DefaultOptions.h index 05251a95..b3e9629c 100644 --- a/howtos/howto7/include/howto7/options/DefaultOptions.h +++ b/howtos/howto7/include/howto7/options/DefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol default options. @@ -29,7 +29,7 @@ struct DefaultOptionsT : public TBase { /// @brief Extra options for @ref /// howto7::message::Msg3Fields::F1 field. - using F1 = comms::option::EmptyOption; + using F1 = comms::option::app::EmptyOption; }; }; // struct message @@ -41,17 +41,20 @@ struct DefaultOptionsT : public TBase struct FrameLayers { /// @brief Extra options for @ref - /// howto7::frame::FrameLayers::Data layer. - using Data = comms::option::EmptyOption; + /// howto7::frame::FrameLayers::DataMembers::Field field. + struct DataMembers + { + using Field = comms::option::app::EmptyOption; + }; // struct DataMembers /// @brief Extra options for @ref /// howto7::frame::FrameLayers::Id layer. - using Id = comms::option::EmptyOption; + using Id = comms::option::app::EmptyOption; /// @brief Extra options for @ref /// howto7::frame::FrameLayers::AlternatingSync /// layer. - using AlternatingSync = comms::option::EmptyOption; + using AlternatingSync = comms::option::app::EmptyOption; }; // struct FrameLayers }; // struct frame }; diff --git a/howtos/howto7/include/howto7/options/ServerDefaultOptions.h b/howtos/howto7/include/howto7/options/ServerDefaultOptions.h index 13454db6..e4766786 100644 --- a/howtos/howto7/include/howto7/options/ServerDefaultOptions.h +++ b/howtos/howto7/include/howto7/options/ServerDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server default options. diff --git a/howtos/howto7/include/howto7/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h b/howtos/howto7/include/howto7/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h index 2e57a565..9f0022f6 100644 --- a/howtos/howto7/include/howto7/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/howtos/howto7/include/howto7/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server input messages dynamic memory allocation message factory options. diff --git a/howtos/howto8/include/howto8/Interface.h b/howtos/howto8/include/howto8/Interface.h index 3bad0a68..50d1d21a 100644 --- a/howtos/howto8/include/howto8/Interface.h +++ b/howtos/howto8/include/howto8/Interface.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Interface" interface class. @@ -24,7 +24,8 @@ struct InterfaceFields /// @brief Definition of "Flags" field. using Flags = howto8::field::Flags< - howto8::options::DefaultOptions + howto8::options::DefaultOptions, + comms::option::def::HasName >; /// @brief All the fields bundled in std::tuple. diff --git a/howtos/howto8/include/howto8/InterfaceCommon.h b/howtos/howto8/include/howto8/InterfaceCommon.h index ef696c08..0fd24eec 100644 --- a/howtos/howto8/include/howto8/InterfaceCommon.h +++ b/howtos/howto8/include/howto8/InterfaceCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto8/include/howto8/MsgId.h b/howtos/howto8/include/howto8/MsgId.h index efe318d0..659cc696 100644 --- a/howtos/howto8/include/howto8/MsgId.h +++ b/howtos/howto8/include/howto8/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of message ids enumeration. diff --git a/howtos/howto8/include/howto8/Version.h b/howtos/howto8/include/howto8/Version.h index f1e00a5e..1c52a66d 100644 --- a/howtos/howto8/include/howto8/Version.h +++ b/howtos/howto8/include/howto8/Version.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains protocol version definition. @@ -22,5 +22,5 @@ inline constexpr unsigned specVersion() } // namespace howto8 // Generated compile time check for minimal supported version of the COMMS library -static_assert(COMMS_MAKE_VERSION(5, 2, 7) <= comms::version(), +static_assert(COMMS_MAKE_VERSION(5, 3, 0) <= comms::version(), "The version of COMMS library is too old"); diff --git a/howtos/howto8/include/howto8/dispatch/DispatchClientInputMessage.h b/howtos/howto8/include/howto8/dispatch/DispatchClientInputMessage.h index e70d2608..b821cca3 100644 --- a/howtos/howto8/include/howto8/dispatch/DispatchClientInputMessage.h +++ b/howtos/howto8/include/howto8/dispatch/DispatchClientInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/howtos/howto8/include/howto8/dispatch/DispatchMessage.h b/howtos/howto8/include/howto8/dispatch/DispatchMessage.h index 17f67ea8..2894b839 100644 --- a/howtos/howto8/include/howto8/dispatch/DispatchMessage.h +++ b/howtos/howto8/include/howto8/dispatch/DispatchMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for all input messages. diff --git a/howtos/howto8/include/howto8/dispatch/DispatchServerInputMessage.h b/howtos/howto8/include/howto8/dispatch/DispatchServerInputMessage.h index dbf8039f..23db2351 100644 --- a/howtos/howto8/include/howto8/dispatch/DispatchServerInputMessage.h +++ b/howtos/howto8/include/howto8/dispatch/DispatchServerInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/howtos/howto8/include/howto8/factory/AllMessagesDynMemMsgFactory.h b/howtos/howto8/include/howto8/factory/AllMessagesDynMemMsgFactory.h index 2787d87f..a805110a 100644 --- a/howtos/howto8/include/howto8/factory/AllMessagesDynMemMsgFactory.h +++ b/howtos/howto8/include/howto8/factory/AllMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for all the messages. diff --git a/howtos/howto8/include/howto8/factory/ClientInputMessagesDynMemMsgFactory.h b/howtos/howto8/include/howto8/factory/ClientInputMessagesDynMemMsgFactory.h index a43ca5c9..b54fc218 100644 --- a/howtos/howto8/include/howto8/factory/ClientInputMessagesDynMemMsgFactory.h +++ b/howtos/howto8/include/howto8/factory/ClientInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the client input messages. diff --git a/howtos/howto8/include/howto8/factory/ServerInputMessagesDynMemMsgFactory.h b/howtos/howto8/include/howto8/factory/ServerInputMessagesDynMemMsgFactory.h index b2b43bf7..fdee6a57 100644 --- a/howtos/howto8/include/howto8/factory/ServerInputMessagesDynMemMsgFactory.h +++ b/howtos/howto8/include/howto8/factory/ServerInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the server input messages. diff --git a/howtos/howto8/include/howto8/field/FieldBase.h b/howtos/howto8/include/howto8/field/FieldBase.h index aef2723a..1b2d7788 100644 --- a/howtos/howto8/include/howto8/field/FieldBase.h +++ b/howtos/howto8/include/howto8/field/FieldBase.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of base class of all the fields. diff --git a/howtos/howto8/include/howto8/field/Flags.h b/howtos/howto8/include/howto8/field/Flags.h index 5095cce4..d6112222 100644 --- a/howtos/howto8/include/howto8/field/Flags.h +++ b/howtos/howto8/include/howto8/field/Flags.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Flags" field. @@ -25,6 +25,7 @@ class Flags : public comms::field::BitmaskValue< howto8::field::FieldBase<>, TExtraOpts..., + comms::option::def::HasName, comms::option::def::FixedLength<1U>, comms::option::def::BitmaskReservedBits<0xFCU, 0x0U> > @@ -33,6 +34,7 @@ class Flags : public comms::field::BitmaskValue< howto8::field::FieldBase<>, TExtraOpts..., + comms::option::def::HasName, comms::option::def::FixedLength<1U>, comms::option::def::BitmaskReservedBits<0xFCU, 0x0U> >; @@ -50,13 +52,18 @@ class Flags : public B1 ); + /// @brief Retrieve name of the bit. + /// @see @ref howto8::field::FlagsCommon::bitName(). + static const char* bitName(std::size_t idx) + { + return howto8::field::FlagsCommon::bitName(idx); + } + /// @brief Retrieve name of the bit. /// @see @ref howto8::field::FlagsCommon::bitName(). static const char* bitName(BitIdx idx) { - return - howto8::field::FlagsCommon::bitName( - static_cast(idx)); + return bitName(static_cast(idx)); } /// @brief Name of the field. diff --git a/howtos/howto8/include/howto8/field/FlagsCommon.h b/howtos/howto8/include/howto8/field/FlagsCommon.h index fb4eef49..2aa4675f 100644 --- a/howtos/howto8/include/howto8/field/FlagsCommon.h +++ b/howtos/howto8/include/howto8/field/FlagsCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto8/include/howto8/field/MsgId.h b/howtos/howto8/include/howto8/field/MsgId.h index b7ae4449..06692e40 100644 --- a/howtos/howto8/include/howto8/field/MsgId.h +++ b/howtos/howto8/include/howto8/field/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "MsgId" field. @@ -27,6 +27,7 @@ class MsgId : public howto8::field::FieldBase<>, howto8::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 2> > { @@ -35,6 +36,7 @@ class MsgId : public howto8::field::FieldBase<>, howto8::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 2> >; public: diff --git a/howtos/howto8/include/howto8/field/MsgIdCommon.h b/howtos/howto8/include/howto8/field/MsgIdCommon.h index bd3d24cf..4e5f43ce 100644 --- a/howtos/howto8/include/howto8/field/MsgIdCommon.h +++ b/howtos/howto8/include/howto8/field/MsgIdCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto8/include/howto8/frame/Frame.h b/howtos/howto8/include/howto8/frame/Frame.h index abec047a..1677224c 100644 --- a/howtos/howto8/include/howto8/frame/Frame.h +++ b/howtos/howto8/include/howto8/frame/Frame.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Frame" frame class. @@ -36,10 +36,30 @@ namespace frame template struct FrameLayers { + /// @brief Scope for field(s) of @ref Data layer. + struct DataMembers + { + /// @brief Custom field for @ref howto8::frame::FrameLayers::Data layer + class Field : public + comms::field::ArrayList< + howto8::field::FieldBase<>, + std::uint8_t, + typename TOpt::frame::FrameLayers::DataMembers::Field, + comms::option::def::HasName + > + { + public: + static const char* name() + { + return "Data"; + } + }; + }; + /// @brief Definition of layer "Data". using Data = comms::protocol::MsgDataLayer< - typename TOpt::frame::FrameLayers::Data + comms::option::def::FieldType >; /// @brief Scope for field(s) of @ref Flags layer. @@ -49,12 +69,14 @@ struct FrameLayers class OptFlags : public comms::field::Optional< howto8::field::Flags, + comms::option::def::HasName, comms::option::def::MissingByDefault > { using Base = comms::field::Optional< howto8::field::Flags, + comms::option::def::HasName, comms::option::def::MissingByDefault >; public: @@ -85,6 +107,7 @@ struct FrameLayers using MsgId = howto8::field::MsgId< TOpt, + comms::option::def::HasName, comms::option::def::FixedBitLength<7U> >; @@ -92,12 +115,14 @@ struct FrameLayers class Ctrl : public comms::field::BitmaskValue< howto8::field::FieldBase<>, + comms::option::def::HasName, comms::option::def::FixedBitLength<1U> > { using Base = comms::field::BitmaskValue< howto8::field::FieldBase<>, + comms::option::def::HasName, comms::option::def::FixedBitLength<1U> >; public: @@ -112,13 +137,18 @@ struct FrameLayers HasFlags ); + /// @brief Retrieve name of the bit. + /// @see @ref howto8::frame::FrameLayersCommon::IdMembersCommon::FieldMembersCommon::CtrlCommon::bitName(). + static const char* bitName(std::size_t idx) + { + return howto8::frame::FrameLayersCommon::IdMembersCommon::FieldMembersCommon::CtrlCommon::bitName(idx); + } + /// @brief Retrieve name of the bit. /// @see @ref howto8::frame::FrameLayersCommon::IdMembersCommon::FieldMembersCommon::CtrlCommon::bitName(). static const char* bitName(BitIdx idx) { - return - howto8::frame::FrameLayersCommon::IdMembersCommon::FieldMembersCommon::CtrlCommon::bitName( - static_cast(idx)); + return bitName(static_cast(idx)); } /// @brief Name of the field. @@ -141,6 +171,7 @@ struct FrameLayers comms::field::Bitfield< howto8::field::FieldBase<>, typename FieldMembers::All, + comms::option::def::HasName, comms::option::def::HasVersionDependentMembers > { @@ -148,6 +179,7 @@ struct FrameLayers comms::field::Bitfield< howto8::field::FieldBase<>, typename FieldMembers::All, + comms::option::def::HasName, comms::option::def::HasVersionDependentMembers >; public: @@ -192,13 +224,15 @@ struct FrameLayers class SizeField : public comms::field::IntValue< howto8::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< howto8::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/howtos/howto8/include/howto8/frame/FrameCommon.h b/howtos/howto8/include/howto8/frame/FrameCommon.h index ea2efce6..93777ac2 100644 --- a/howtos/howto8/include/howto8/frame/FrameCommon.h +++ b/howtos/howto8/include/howto8/frame/FrameCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto8/include/howto8/input/AllMessages.h b/howtos/howto8/include/howto8/input/AllMessages.h index 7c557b14..6d16080c 100644 --- a/howtos/howto8/include/howto8/input/AllMessages.h +++ b/howtos/howto8/include/howto8/input/AllMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the AllMessages messages bundle. diff --git a/howtos/howto8/include/howto8/input/ClientInputMessages.h b/howtos/howto8/include/howto8/input/ClientInputMessages.h index 61cb12c2..463198b9 100644 --- a/howtos/howto8/include/howto8/input/ClientInputMessages.h +++ b/howtos/howto8/include/howto8/input/ClientInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ClientInputMessages messages bundle. diff --git a/howtos/howto8/include/howto8/input/ServerInputMessages.h b/howtos/howto8/include/howto8/input/ServerInputMessages.h index 60e41b39..6be1677e 100644 --- a/howtos/howto8/include/howto8/input/ServerInputMessages.h +++ b/howtos/howto8/include/howto8/input/ServerInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ServerInputMessages messages bundle. diff --git a/howtos/howto8/include/howto8/message/Msg1.h b/howtos/howto8/include/howto8/message/Msg1.h index f7ab0ed6..51f1d350 100644 --- a/howtos/howto8/include/howto8/message/Msg1.h +++ b/howtos/howto8/include/howto8/message/Msg1.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 1" message and its fields. @@ -33,13 +33,15 @@ struct Msg1Fields class F1 : public comms::field::IntValue< howto8::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< howto8::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -66,13 +68,15 @@ struct Msg1Fields class F2Field : public comms::field::IntValue< howto8::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< howto8::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -98,12 +102,14 @@ struct Msg1Fields class F2 : public comms::field::Optional< typename F2Members::F2Field, + comms::option::def::HasName, comms::option::def::MissingByDefault > { using Base = comms::field::Optional< typename F2Members::F2Field, + comms::option::def::HasName, comms::option::def::MissingByDefault >; public: diff --git a/howtos/howto8/include/howto8/message/Msg1Common.h b/howtos/howto8/include/howto8/message/Msg1Common.h index c718fe1b..ae7cdb1d 100644 --- a/howtos/howto8/include/howto8/message/Msg1Common.h +++ b/howtos/howto8/include/howto8/message/Msg1Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto8/include/howto8/message/Msg2.h b/howtos/howto8/include/howto8/message/Msg2.h index d3ac110f..1687d794 100644 --- a/howtos/howto8/include/howto8/message/Msg2.h +++ b/howtos/howto8/include/howto8/message/Msg2.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 2" message and its fields. @@ -33,13 +33,15 @@ struct Msg2Fields class F1 : public comms::field::IntValue< howto8::field::FieldBase<>, - std::uint32_t + std::uint32_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< howto8::field::FieldBase<>, - std::uint32_t + std::uint32_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -66,13 +68,15 @@ struct Msg2Fields class F2Field : public comms::field::IntValue< howto8::field::FieldBase<>, - std::uint32_t + std::uint32_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< howto8::field::FieldBase<>, - std::uint32_t + std::uint32_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -98,12 +102,14 @@ struct Msg2Fields class F2 : public comms::field::Optional< typename F2Members::F2Field, + comms::option::def::HasName, comms::option::def::MissingByDefault > { using Base = comms::field::Optional< typename F2Members::F2Field, + comms::option::def::HasName, comms::option::def::MissingByDefault >; public: diff --git a/howtos/howto8/include/howto8/message/Msg2Common.h b/howtos/howto8/include/howto8/message/Msg2Common.h index 9486b0c0..8569c9aa 100644 --- a/howtos/howto8/include/howto8/message/Msg2Common.h +++ b/howtos/howto8/include/howto8/message/Msg2Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto8/include/howto8/options/AllMessagesDynMemMsgFactoryDefaultOptions.h b/howtos/howto8/include/howto8/options/AllMessagesDynMemMsgFactoryDefaultOptions.h index cb3e4583..f3e93d42 100644 --- a/howtos/howto8/include/howto8/options/AllMessagesDynMemMsgFactoryDefaultOptions.h +++ b/howtos/howto8/include/howto8/options/AllMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol all messages dynamic memory allocation message factory options. diff --git a/howtos/howto8/include/howto8/options/BareMetalDefaultOptions.h b/howtos/howto8/include/howto8/options/BareMetalDefaultOptions.h index 753b3b8c..8e549c1e 100644 --- a/howtos/howto8/include/howto8/options/BareMetalDefaultOptions.h +++ b/howtos/howto8/include/howto8/options/BareMetalDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol bare metal default options. @@ -31,12 +31,15 @@ struct BareMetalDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// howto8::frame::FrameLayers::Data layer. - using Data = - std::tuple< - comms::option::app::FixedSizeStorage, - typename TBase::frame::FrameLayers::Data - >; + /// howto8::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::FixedSizeStorage, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers /// @brief Extra options for @ref /// howto8::frame::FrameLayers::Id layer. diff --git a/howtos/howto8/include/howto8/options/ClientDefaultOptions.h b/howtos/howto8/include/howto8/options/ClientDefaultOptions.h index 7f99ce4d..281346ef 100644 --- a/howtos/howto8/include/howto8/options/ClientDefaultOptions.h +++ b/howtos/howto8/include/howto8/options/ClientDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client default options. diff --git a/howtos/howto8/include/howto8/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h b/howtos/howto8/include/howto8/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h index 41b738e6..cb429e80 100644 --- a/howtos/howto8/include/howto8/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/howtos/howto8/include/howto8/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client input messages dynamic memory allocation message factory options. diff --git a/howtos/howto8/include/howto8/options/DataViewDefaultOptions.h b/howtos/howto8/include/howto8/options/DataViewDefaultOptions.h index 9061ceda..29b963d7 100644 --- a/howtos/howto8/include/howto8/options/DataViewDefaultOptions.h +++ b/howtos/howto8/include/howto8/options/DataViewDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol data view default options. @@ -25,12 +25,15 @@ struct DataViewDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// howto8::frame::FrameLayers::Data layer. - using Data = - std::tuple< - comms::option::app::OrigDataView, - typename TBase::frame::FrameLayers::Data - >; + /// howto8::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::OrigDataView, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers }; // struct FrameLayers }; // struct frame }; diff --git a/howtos/howto8/include/howto8/options/DefaultOptions.h b/howtos/howto8/include/howto8/options/DefaultOptions.h index 2c377972..3f4a8711 100644 --- a/howtos/howto8/include/howto8/options/DefaultOptions.h +++ b/howtos/howto8/include/howto8/options/DefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol default options. @@ -28,16 +28,19 @@ struct DefaultOptionsT : public TBase struct FrameLayers { /// @brief Extra options for @ref - /// howto8::frame::FrameLayers::Data layer. - using Data = comms::option::EmptyOption; + /// howto8::frame::FrameLayers::DataMembers::Field field. + struct DataMembers + { + using Field = comms::option::app::EmptyOption; + }; // struct DataMembers /// @brief Extra options for @ref /// howto8::frame::FrameLayers::Flags layer. - using Flags = comms::option::EmptyOption; + using Flags = comms::option::app::EmptyOption; /// @brief Extra options for @ref /// howto8::frame::FrameLayers::Id layer. - using Id = comms::option::EmptyOption; + using Id = comms::option::app::EmptyOption; }; // struct FrameLayers }; // struct frame }; diff --git a/howtos/howto8/include/howto8/options/ServerDefaultOptions.h b/howtos/howto8/include/howto8/options/ServerDefaultOptions.h index e2b35d77..38ebda43 100644 --- a/howtos/howto8/include/howto8/options/ServerDefaultOptions.h +++ b/howtos/howto8/include/howto8/options/ServerDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server default options. diff --git a/howtos/howto8/include/howto8/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h b/howtos/howto8/include/howto8/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h index 9741e2f9..1db1d3f9 100644 --- a/howtos/howto8/include/howto8/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/howtos/howto8/include/howto8/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server input messages dynamic memory allocation message factory options. diff --git a/howtos/howto9/include/howto9/Message.h b/howtos/howto9/include/howto9/Message.h index 9260a279..ed989c7b 100644 --- a/howtos/howto9/include/howto9/Message.h +++ b/howtos/howto9/include/howto9/Message.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message" interface class. diff --git a/howtos/howto9/include/howto9/MsgId.h b/howtos/howto9/include/howto9/MsgId.h index 2177a115..e126cf88 100644 --- a/howtos/howto9/include/howto9/MsgId.h +++ b/howtos/howto9/include/howto9/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of message ids enumeration. diff --git a/howtos/howto9/include/howto9/Version.h b/howtos/howto9/include/howto9/Version.h index 5cd616ad..a425d38f 100644 --- a/howtos/howto9/include/howto9/Version.h +++ b/howtos/howto9/include/howto9/Version.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains protocol version definition. @@ -22,5 +22,5 @@ inline constexpr unsigned specVersion() } // namespace howto9 // Generated compile time check for minimal supported version of the COMMS library -static_assert(COMMS_MAKE_VERSION(5, 2, 7) <= comms::version(), +static_assert(COMMS_MAKE_VERSION(5, 3, 0) <= comms::version(), "The version of COMMS library is too old"); diff --git a/howtos/howto9/include/howto9/dispatch/DispatchClientInputMessage.h b/howtos/howto9/include/howto9/dispatch/DispatchClientInputMessage.h index 8ef23d64..ab1c3a99 100644 --- a/howtos/howto9/include/howto9/dispatch/DispatchClientInputMessage.h +++ b/howtos/howto9/include/howto9/dispatch/DispatchClientInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/howtos/howto9/include/howto9/dispatch/DispatchMessage.h b/howtos/howto9/include/howto9/dispatch/DispatchMessage.h index 9ad9b576..62422075 100644 --- a/howtos/howto9/include/howto9/dispatch/DispatchMessage.h +++ b/howtos/howto9/include/howto9/dispatch/DispatchMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for all input messages. diff --git a/howtos/howto9/include/howto9/dispatch/DispatchServerInputMessage.h b/howtos/howto9/include/howto9/dispatch/DispatchServerInputMessage.h index dc5909e6..a1cfdaf3 100644 --- a/howtos/howto9/include/howto9/dispatch/DispatchServerInputMessage.h +++ b/howtos/howto9/include/howto9/dispatch/DispatchServerInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/howtos/howto9/include/howto9/factory/AllMessagesDynMemMsgFactory.h b/howtos/howto9/include/howto9/factory/AllMessagesDynMemMsgFactory.h index 857c4b4a..45390fdc 100644 --- a/howtos/howto9/include/howto9/factory/AllMessagesDynMemMsgFactory.h +++ b/howtos/howto9/include/howto9/factory/AllMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for all the messages. diff --git a/howtos/howto9/include/howto9/factory/ClientInputMessagesDynMemMsgFactory.h b/howtos/howto9/include/howto9/factory/ClientInputMessagesDynMemMsgFactory.h index 6775b6da..377d5d8d 100644 --- a/howtos/howto9/include/howto9/factory/ClientInputMessagesDynMemMsgFactory.h +++ b/howtos/howto9/include/howto9/factory/ClientInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the client input messages. diff --git a/howtos/howto9/include/howto9/factory/ServerInputMessagesDynMemMsgFactory.h b/howtos/howto9/include/howto9/factory/ServerInputMessagesDynMemMsgFactory.h index a49fa3a1..44a3cee5 100644 --- a/howtos/howto9/include/howto9/factory/ServerInputMessagesDynMemMsgFactory.h +++ b/howtos/howto9/include/howto9/factory/ServerInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the server input messages. diff --git a/howtos/howto9/include/howto9/field/FieldBase.h b/howtos/howto9/include/howto9/field/FieldBase.h index 712b604e..80b05549 100644 --- a/howtos/howto9/include/howto9/field/FieldBase.h +++ b/howtos/howto9/include/howto9/field/FieldBase.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of base class of all the fields. diff --git a/howtos/howto9/include/howto9/field/MsgId.h b/howtos/howto9/include/howto9/field/MsgId.h index 75df807f..6f9d1c79 100644 --- a/howtos/howto9/include/howto9/field/MsgId.h +++ b/howtos/howto9/include/howto9/field/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "MsgId" field. @@ -27,6 +27,7 @@ class MsgId : public howto9::field::FieldBase<>, howto9::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 3> > { @@ -35,6 +36,7 @@ class MsgId : public howto9::field::FieldBase<>, howto9::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 3> >; public: diff --git a/howtos/howto9/include/howto9/field/MsgIdCommon.h b/howtos/howto9/include/howto9/field/MsgIdCommon.h index 3ae14936..76278179 100644 --- a/howtos/howto9/include/howto9/field/MsgIdCommon.h +++ b/howtos/howto9/include/howto9/field/MsgIdCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto9/include/howto9/field/SizeField.h b/howtos/howto9/include/howto9/field/SizeField.h index 73dcfad3..faae241d 100644 --- a/howtos/howto9/include/howto9/field/SizeField.h +++ b/howtos/howto9/include/howto9/field/SizeField.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "SizeField" field. @@ -26,14 +26,16 @@ class SizeField : public comms::field::IntValue< howto9::field::FieldBase<>, std::uint16_t, - TExtraOpts... + TExtraOpts..., + comms::option::def::HasName > { using Base = comms::field::IntValue< howto9::field::FieldBase<>, std::uint16_t, - TExtraOpts... + TExtraOpts..., + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/howtos/howto9/include/howto9/field/SizeFieldCommon.h b/howtos/howto9/include/howto9/field/SizeFieldCommon.h index 5dc86da1..d3ca5ba7 100644 --- a/howtos/howto9/include/howto9/field/SizeFieldCommon.h +++ b/howtos/howto9/include/howto9/field/SizeFieldCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto9/include/howto9/field/SyncField.h b/howtos/howto9/include/howto9/field/SyncField.h index 9fd32f63..61be1458 100644 --- a/howtos/howto9/include/howto9/field/SyncField.h +++ b/howtos/howto9/include/howto9/field/SyncField.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "SyncField" field. @@ -27,6 +27,7 @@ class SyncField : public howto9::field::FieldBase<>, std::uint16_t, TExtraOpts..., + comms::option::def::HasName, comms::option::def::DefaultNumValue<43981L> > { @@ -35,6 +36,7 @@ class SyncField : public howto9::field::FieldBase<>, std::uint16_t, TExtraOpts..., + comms::option::def::HasName, comms::option::def::DefaultNumValue<43981L> >; public: diff --git a/howtos/howto9/include/howto9/field/SyncFieldCommon.h b/howtos/howto9/include/howto9/field/SyncFieldCommon.h index 64ff063c..de5b7d5a 100644 --- a/howtos/howto9/include/howto9/field/SyncFieldCommon.h +++ b/howtos/howto9/include/howto9/field/SyncFieldCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto9/include/howto9/frame/Frame.h b/howtos/howto9/include/howto9/frame/Frame.h index 090b2446..16f050f7 100644 --- a/howtos/howto9/include/howto9/frame/Frame.h +++ b/howtos/howto9/include/howto9/frame/Frame.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Frame" frame class. @@ -34,10 +34,30 @@ namespace frame template struct FrameLayers { + /// @brief Scope for field(s) of @ref Data layer. + struct DataMembers + { + /// @brief Custom field for @ref howto9::frame::FrameLayers::Data layer + class Field : public + comms::field::ArrayList< + howto9::field::FieldBase<>, + std::uint8_t, + typename TOpt::frame::FrameLayers::DataMembers::Field, + comms::option::def::HasName + > + { + public: + static const char* name() + { + return "Data"; + } + }; + }; + /// @brief Definition of layer "Data". using Data = comms::protocol::MsgDataLayer< - typename TOpt::frame::FrameLayers::Data + comms::option::def::FieldType >; /// @brief Scope for field(s) of @ref Checksum layer. @@ -47,13 +67,15 @@ struct FrameLayers class ChecksumField : public comms::field::IntValue< howto9::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< howto9::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/howtos/howto9/include/howto9/frame/FrameCommon.h b/howtos/howto9/include/howto9/frame/FrameCommon.h index 33207618..9114ab24 100644 --- a/howtos/howto9/include/howto9/frame/FrameCommon.h +++ b/howtos/howto9/include/howto9/frame/FrameCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto9/include/howto9/input/AllMessages.h b/howtos/howto9/include/howto9/input/AllMessages.h index 5dafbb9d..e8e0da3a 100644 --- a/howtos/howto9/include/howto9/input/AllMessages.h +++ b/howtos/howto9/include/howto9/input/AllMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the AllMessages messages bundle. diff --git a/howtos/howto9/include/howto9/input/ClientInputMessages.h b/howtos/howto9/include/howto9/input/ClientInputMessages.h index b9df1dda..018f6179 100644 --- a/howtos/howto9/include/howto9/input/ClientInputMessages.h +++ b/howtos/howto9/include/howto9/input/ClientInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ClientInputMessages messages bundle. diff --git a/howtos/howto9/include/howto9/input/ServerInputMessages.h b/howtos/howto9/include/howto9/input/ServerInputMessages.h index 077f8e8d..ee3957e7 100644 --- a/howtos/howto9/include/howto9/input/ServerInputMessages.h +++ b/howtos/howto9/include/howto9/input/ServerInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ServerInputMessages messages bundle. diff --git a/howtos/howto9/include/howto9/message/Msg1.h b/howtos/howto9/include/howto9/message/Msg1.h index 6d579f4e..2173c37e 100644 --- a/howtos/howto9/include/howto9/message/Msg1.h +++ b/howtos/howto9/include/howto9/message/Msg1.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 1" message and its fields. @@ -32,13 +32,15 @@ struct Msg1Fields class F1 : public comms::field::IntValue< howto9::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< howto9::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/howtos/howto9/include/howto9/message/Msg1Common.h b/howtos/howto9/include/howto9/message/Msg1Common.h index 9c5c0365..2458b8e3 100644 --- a/howtos/howto9/include/howto9/message/Msg1Common.h +++ b/howtos/howto9/include/howto9/message/Msg1Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto9/include/howto9/message/Msg2.h b/howtos/howto9/include/howto9/message/Msg2.h index 90a59d58..a68f4391 100644 --- a/howtos/howto9/include/howto9/message/Msg2.h +++ b/howtos/howto9/include/howto9/message/Msg2.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 2" message and its fields. @@ -32,13 +32,15 @@ struct Msg2Fields class F1 : public comms::field::IntValue< howto9::field::FieldBase<>, - std::uint32_t + std::uint32_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< howto9::field::FieldBase<>, - std::uint32_t + std::uint32_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/howtos/howto9/include/howto9/message/Msg2Common.h b/howtos/howto9/include/howto9/message/Msg2Common.h index c62d1c24..aa6a6ad8 100644 --- a/howtos/howto9/include/howto9/message/Msg2Common.h +++ b/howtos/howto9/include/howto9/message/Msg2Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto9/include/howto9/message/Msg3.h b/howtos/howto9/include/howto9/message/Msg3.h index 81327159..3661619d 100644 --- a/howtos/howto9/include/howto9/message/Msg3.h +++ b/howtos/howto9/include/howto9/message/Msg3.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 3" message and its fields. @@ -37,13 +37,15 @@ struct Msg3Fields class Length : public comms::field::IntValue< howto9::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< howto9::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -68,6 +70,7 @@ struct Msg3Fields comms::field::String< howto9::field::FieldBase<>, typename TOpt::message::Msg3Fields::F1, + comms::option::def::HasName, comms::option::def::SequenceSerLengthFieldPrefix > { @@ -75,6 +78,7 @@ struct Msg3Fields comms::field::String< howto9::field::FieldBase<>, typename TOpt::message::Msg3Fields::F1, + comms::option::def::HasName, comms::option::def::SequenceSerLengthFieldPrefix >; public: diff --git a/howtos/howto9/include/howto9/message/Msg3Common.h b/howtos/howto9/include/howto9/message/Msg3Common.h index 85689abd..212200f6 100644 --- a/howtos/howto9/include/howto9/message/Msg3Common.h +++ b/howtos/howto9/include/howto9/message/Msg3Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/howtos/howto9/include/howto9/options/AllMessagesDynMemMsgFactoryDefaultOptions.h b/howtos/howto9/include/howto9/options/AllMessagesDynMemMsgFactoryDefaultOptions.h index 2f104296..8afe5c4f 100644 --- a/howtos/howto9/include/howto9/options/AllMessagesDynMemMsgFactoryDefaultOptions.h +++ b/howtos/howto9/include/howto9/options/AllMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol all messages dynamic memory allocation message factory options. diff --git a/howtos/howto9/include/howto9/options/BareMetalDefaultOptions.h b/howtos/howto9/include/howto9/options/BareMetalDefaultOptions.h index 01ef927e..e263923d 100644 --- a/howtos/howto9/include/howto9/options/BareMetalDefaultOptions.h +++ b/howtos/howto9/include/howto9/options/BareMetalDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol bare metal default options. @@ -48,12 +48,15 @@ struct BareMetalDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// howto9::frame::FrameLayers::Data layer. - using Data = - std::tuple< - comms::option::app::FixedSizeStorage, - typename TBase::frame::FrameLayers::Data - >; + /// howto9::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::FixedSizeStorage, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers /// @brief Extra options for @ref /// howto9::frame::FrameLayers::Id layer. diff --git a/howtos/howto9/include/howto9/options/ClientDefaultOptions.h b/howtos/howto9/include/howto9/options/ClientDefaultOptions.h index 05de037c..8e9da481 100644 --- a/howtos/howto9/include/howto9/options/ClientDefaultOptions.h +++ b/howtos/howto9/include/howto9/options/ClientDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client default options. diff --git a/howtos/howto9/include/howto9/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h b/howtos/howto9/include/howto9/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h index e87d3e89..5d2d9ce8 100644 --- a/howtos/howto9/include/howto9/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/howtos/howto9/include/howto9/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client input messages dynamic memory allocation message factory options. diff --git a/howtos/howto9/include/howto9/options/DataViewDefaultOptions.h b/howtos/howto9/include/howto9/options/DataViewDefaultOptions.h index ce68a85f..5641fa0e 100644 --- a/howtos/howto9/include/howto9/options/DataViewDefaultOptions.h +++ b/howtos/howto9/include/howto9/options/DataViewDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol data view default options. @@ -42,12 +42,15 @@ struct DataViewDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// howto9::frame::FrameLayers::Data layer. - using Data = - std::tuple< - comms::option::app::OrigDataView, - typename TBase::frame::FrameLayers::Data - >; + /// howto9::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::OrigDataView, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers }; // struct FrameLayers }; // struct frame }; diff --git a/howtos/howto9/include/howto9/options/DefaultOptions.h b/howtos/howto9/include/howto9/options/DefaultOptions.h index 96440781..5e072354 100644 --- a/howtos/howto9/include/howto9/options/DefaultOptions.h +++ b/howtos/howto9/include/howto9/options/DefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol default options. @@ -29,7 +29,7 @@ struct DefaultOptionsT : public TBase { /// @brief Extra options for @ref /// howto9::message::Msg3Fields::F1 field. - using F1 = comms::option::EmptyOption; + using F1 = comms::option::app::EmptyOption; }; }; // struct message @@ -41,17 +41,20 @@ struct DefaultOptionsT : public TBase struct FrameLayers { /// @brief Extra options for @ref - /// howto9::frame::FrameLayers::Data layer. - using Data = comms::option::EmptyOption; + /// howto9::frame::FrameLayers::DataMembers::Field field. + struct DataMembers + { + using Field = comms::option::app::EmptyOption; + }; // struct DataMembers /// @brief Extra options for @ref /// howto9::frame::FrameLayers::Checksum /// layer. - using Checksum = comms::option::EmptyOption; + using Checksum = comms::option::app::EmptyOption; /// @brief Extra options for @ref /// howto9::frame::FrameLayers::Id layer. - using Id = comms::option::EmptyOption; + using Id = comms::option::app::EmptyOption; }; // struct FrameLayers }; // struct frame }; diff --git a/howtos/howto9/include/howto9/options/ServerDefaultOptions.h b/howtos/howto9/include/howto9/options/ServerDefaultOptions.h index 5aeca9dc..01961876 100644 --- a/howtos/howto9/include/howto9/options/ServerDefaultOptions.h +++ b/howtos/howto9/include/howto9/options/ServerDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server default options. diff --git a/howtos/howto9/include/howto9/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h b/howtos/howto9/include/howto9/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h index db4ef0af..66b6a5aa 100644 --- a/howtos/howto9/include/howto9/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/howtos/howto9/include/howto9/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server input messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial1/include/tutorial1/Message.h b/tutorials/tutorial1/include/tutorial1/Message.h index c28170cb..69350844 100644 --- a/tutorials/tutorial1/include/tutorial1/Message.h +++ b/tutorials/tutorial1/include/tutorial1/Message.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message" interface class. diff --git a/tutorials/tutorial1/include/tutorial1/MsgId.h b/tutorials/tutorial1/include/tutorial1/MsgId.h index 60ad4f6b..5e5403a9 100644 --- a/tutorials/tutorial1/include/tutorial1/MsgId.h +++ b/tutorials/tutorial1/include/tutorial1/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of message ids enumeration. diff --git a/tutorials/tutorial1/include/tutorial1/Version.h b/tutorials/tutorial1/include/tutorial1/Version.h index d75788ad..7f40259b 100644 --- a/tutorials/tutorial1/include/tutorial1/Version.h +++ b/tutorials/tutorial1/include/tutorial1/Version.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains protocol version definition. @@ -22,5 +22,5 @@ inline constexpr unsigned specVersion() } // namespace tutorial1 // Generated compile time check for minimal supported version of the COMMS library -static_assert(COMMS_MAKE_VERSION(5, 2, 7) <= comms::version(), +static_assert(COMMS_MAKE_VERSION(5, 3, 0) <= comms::version(), "The version of COMMS library is too old"); diff --git a/tutorials/tutorial1/include/tutorial1/dispatch/DispatchClientInputMessage.h b/tutorials/tutorial1/include/tutorial1/dispatch/DispatchClientInputMessage.h index 1ec58550..bd7025fe 100644 --- a/tutorials/tutorial1/include/tutorial1/dispatch/DispatchClientInputMessage.h +++ b/tutorials/tutorial1/include/tutorial1/dispatch/DispatchClientInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/tutorials/tutorial1/include/tutorial1/dispatch/DispatchMessage.h b/tutorials/tutorial1/include/tutorial1/dispatch/DispatchMessage.h index a59b21ba..00a11d12 100644 --- a/tutorials/tutorial1/include/tutorial1/dispatch/DispatchMessage.h +++ b/tutorials/tutorial1/include/tutorial1/dispatch/DispatchMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for all input messages. diff --git a/tutorials/tutorial1/include/tutorial1/dispatch/DispatchServerInputMessage.h b/tutorials/tutorial1/include/tutorial1/dispatch/DispatchServerInputMessage.h index 9a65ed26..ffc4338c 100644 --- a/tutorials/tutorial1/include/tutorial1/dispatch/DispatchServerInputMessage.h +++ b/tutorials/tutorial1/include/tutorial1/dispatch/DispatchServerInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/tutorials/tutorial1/include/tutorial1/factory/AllMessagesDynMemMsgFactory.h b/tutorials/tutorial1/include/tutorial1/factory/AllMessagesDynMemMsgFactory.h index eca808af..a23c15e8 100644 --- a/tutorials/tutorial1/include/tutorial1/factory/AllMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial1/include/tutorial1/factory/AllMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for all the messages. diff --git a/tutorials/tutorial1/include/tutorial1/factory/ClientInputMessagesDynMemMsgFactory.h b/tutorials/tutorial1/include/tutorial1/factory/ClientInputMessagesDynMemMsgFactory.h index 2d04f546..16ae431c 100644 --- a/tutorials/tutorial1/include/tutorial1/factory/ClientInputMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial1/include/tutorial1/factory/ClientInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the client input messages. diff --git a/tutorials/tutorial1/include/tutorial1/factory/ServerInputMessagesDynMemMsgFactory.h b/tutorials/tutorial1/include/tutorial1/factory/ServerInputMessagesDynMemMsgFactory.h index 4dfb3375..2dfd57d8 100644 --- a/tutorials/tutorial1/include/tutorial1/factory/ServerInputMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial1/include/tutorial1/factory/ServerInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the server input messages. diff --git a/tutorials/tutorial1/include/tutorial1/field/FieldBase.h b/tutorials/tutorial1/include/tutorial1/field/FieldBase.h index 3db75eb8..6b9a2128 100644 --- a/tutorials/tutorial1/include/tutorial1/field/FieldBase.h +++ b/tutorials/tutorial1/include/tutorial1/field/FieldBase.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of base class of all the fields. diff --git a/tutorials/tutorial1/include/tutorial1/field/MsgId.h b/tutorials/tutorial1/include/tutorial1/field/MsgId.h index 6b647796..15bcfe6e 100644 --- a/tutorials/tutorial1/include/tutorial1/field/MsgId.h +++ b/tutorials/tutorial1/include/tutorial1/field/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "MsgId" field. @@ -27,6 +27,7 @@ class MsgId : public tutorial1::field::FieldBase<>, tutorial1::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 2> > { @@ -35,6 +36,7 @@ class MsgId : public tutorial1::field::FieldBase<>, tutorial1::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 2> >; public: diff --git a/tutorials/tutorial1/include/tutorial1/field/MsgIdCommon.h b/tutorials/tutorial1/include/tutorial1/field/MsgIdCommon.h index 3f33cdc9..a34ff362 100644 --- a/tutorials/tutorial1/include/tutorial1/field/MsgIdCommon.h +++ b/tutorials/tutorial1/include/tutorial1/field/MsgIdCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial1/include/tutorial1/frame/Frame.h b/tutorials/tutorial1/include/tutorial1/frame/Frame.h index 6c90a5bc..c2d7f9b2 100644 --- a/tutorials/tutorial1/include/tutorial1/frame/Frame.h +++ b/tutorials/tutorial1/include/tutorial1/frame/Frame.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Frame" frame class. @@ -24,10 +24,30 @@ namespace frame template struct FrameLayers { + /// @brief Scope for field(s) of @ref Data layer. + struct DataMembers + { + /// @brief Custom field for @ref tutorial1::frame::FrameLayers::Data layer + class Field : public + comms::field::ArrayList< + tutorial1::field::FieldBase<>, + std::uint8_t, + typename TOpt::frame::FrameLayers::DataMembers::Field, + comms::option::def::HasName + > + { + public: + static const char* name() + { + return "Data"; + } + }; + }; + /// @brief Definition of layer "Data". using Data = comms::protocol::MsgDataLayer< - typename TOpt::frame::FrameLayers::Data + comms::option::def::FieldType >; /// @brief Definition of layer "ID". diff --git a/tutorials/tutorial1/include/tutorial1/input/AllMessages.h b/tutorials/tutorial1/include/tutorial1/input/AllMessages.h index cdc14a53..0cb5b354 100644 --- a/tutorials/tutorial1/include/tutorial1/input/AllMessages.h +++ b/tutorials/tutorial1/include/tutorial1/input/AllMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the AllMessages messages bundle. diff --git a/tutorials/tutorial1/include/tutorial1/input/ClientInputMessages.h b/tutorials/tutorial1/include/tutorial1/input/ClientInputMessages.h index bd875137..dede60f0 100644 --- a/tutorials/tutorial1/include/tutorial1/input/ClientInputMessages.h +++ b/tutorials/tutorial1/include/tutorial1/input/ClientInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ClientInputMessages messages bundle. diff --git a/tutorials/tutorial1/include/tutorial1/input/ServerInputMessages.h b/tutorials/tutorial1/include/tutorial1/input/ServerInputMessages.h index 7e1a887e..3b9beda2 100644 --- a/tutorials/tutorial1/include/tutorial1/input/ServerInputMessages.h +++ b/tutorials/tutorial1/include/tutorial1/input/ServerInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ServerInputMessages messages bundle. diff --git a/tutorials/tutorial1/include/tutorial1/message/Msg1.h b/tutorials/tutorial1/include/tutorial1/message/Msg1.h index 545662b4..cb339f46 100644 --- a/tutorials/tutorial1/include/tutorial1/message/Msg1.h +++ b/tutorials/tutorial1/include/tutorial1/message/Msg1.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 1" message and its fields. diff --git a/tutorials/tutorial1/include/tutorial1/message/Msg1Common.h b/tutorials/tutorial1/include/tutorial1/message/Msg1Common.h index aa73d801..00d40971 100644 --- a/tutorials/tutorial1/include/tutorial1/message/Msg1Common.h +++ b/tutorials/tutorial1/include/tutorial1/message/Msg1Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial1/include/tutorial1/message/Msg2.h b/tutorials/tutorial1/include/tutorial1/message/Msg2.h index aa63f131..5f87c313 100644 --- a/tutorials/tutorial1/include/tutorial1/message/Msg2.h +++ b/tutorials/tutorial1/include/tutorial1/message/Msg2.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 2" message and its fields. diff --git a/tutorials/tutorial1/include/tutorial1/message/Msg2Common.h b/tutorials/tutorial1/include/tutorial1/message/Msg2Common.h index 90627a36..92753838 100644 --- a/tutorials/tutorial1/include/tutorial1/message/Msg2Common.h +++ b/tutorials/tutorial1/include/tutorial1/message/Msg2Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial1/include/tutorial1/options/AllMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial1/include/tutorial1/options/AllMessagesDynMemMsgFactoryDefaultOptions.h index 0e1f8b93..5b71f0ba 100644 --- a/tutorials/tutorial1/include/tutorial1/options/AllMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial1/include/tutorial1/options/AllMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol all messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial1/include/tutorial1/options/BareMetalDefaultOptions.h b/tutorials/tutorial1/include/tutorial1/options/BareMetalDefaultOptions.h index e6dacaa5..2347b319 100644 --- a/tutorials/tutorial1/include/tutorial1/options/BareMetalDefaultOptions.h +++ b/tutorials/tutorial1/include/tutorial1/options/BareMetalDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol bare metal default options. @@ -31,13 +31,15 @@ struct BareMetalDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// tutorial1::frame::FrameLayers::Data - /// layer. - using Data = - std::tuple< - comms::option::app::FixedSizeStorage, - typename TBase::frame::FrameLayers::Data - >; + /// tutorial1::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::FixedSizeStorage, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers /// @brief Extra options for @ref /// tutorial1::frame::FrameLayers::ID layer. diff --git a/tutorials/tutorial1/include/tutorial1/options/ClientDefaultOptions.h b/tutorials/tutorial1/include/tutorial1/options/ClientDefaultOptions.h index 1f30d0b6..3cd4a6e9 100644 --- a/tutorials/tutorial1/include/tutorial1/options/ClientDefaultOptions.h +++ b/tutorials/tutorial1/include/tutorial1/options/ClientDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client default options. diff --git a/tutorials/tutorial1/include/tutorial1/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial1/include/tutorial1/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h index 5af26269..d83531dc 100644 --- a/tutorials/tutorial1/include/tutorial1/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial1/include/tutorial1/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client input messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial1/include/tutorial1/options/DataViewDefaultOptions.h b/tutorials/tutorial1/include/tutorial1/options/DataViewDefaultOptions.h index c34d9409..6219b384 100644 --- a/tutorials/tutorial1/include/tutorial1/options/DataViewDefaultOptions.h +++ b/tutorials/tutorial1/include/tutorial1/options/DataViewDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol data view default options. @@ -25,13 +25,15 @@ struct DataViewDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// tutorial1::frame::FrameLayers::Data - /// layer. - using Data = - std::tuple< - comms::option::app::OrigDataView, - typename TBase::frame::FrameLayers::Data - >; + /// tutorial1::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::OrigDataView, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers }; // struct FrameLayers }; // struct frame }; diff --git a/tutorials/tutorial1/include/tutorial1/options/DefaultOptions.h b/tutorials/tutorial1/include/tutorial1/options/DefaultOptions.h index 5b4f3327..8adddab8 100644 --- a/tutorials/tutorial1/include/tutorial1/options/DefaultOptions.h +++ b/tutorials/tutorial1/include/tutorial1/options/DefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol default options. @@ -28,13 +28,15 @@ struct DefaultOptionsT : public TBase struct FrameLayers { /// @brief Extra options for @ref - /// tutorial1::frame::FrameLayers::Data - /// layer. - using Data = comms::option::EmptyOption; + /// tutorial1::frame::FrameLayers::DataMembers::Field field. + struct DataMembers + { + using Field = comms::option::app::EmptyOption; + }; // struct DataMembers /// @brief Extra options for @ref /// tutorial1::frame::FrameLayers::ID layer. - using ID = comms::option::EmptyOption; + using ID = comms::option::app::EmptyOption; }; // struct FrameLayers }; // struct frame }; diff --git a/tutorials/tutorial1/include/tutorial1/options/ServerDefaultOptions.h b/tutorials/tutorial1/include/tutorial1/options/ServerDefaultOptions.h index ddad125f..67757ba6 100644 --- a/tutorials/tutorial1/include/tutorial1/options/ServerDefaultOptions.h +++ b/tutorials/tutorial1/include/tutorial1/options/ServerDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server default options. diff --git a/tutorials/tutorial1/include/tutorial1/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial1/include/tutorial1/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h index 3a9b3cf8..728f6f6f 100644 --- a/tutorials/tutorial1/include/tutorial1/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial1/include/tutorial1/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server input messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial10/include/tutorial10/Message.h b/tutorials/tutorial10/include/tutorial10/Message.h index 3270dec0..67674786 100644 --- a/tutorials/tutorial10/include/tutorial10/Message.h +++ b/tutorials/tutorial10/include/tutorial10/Message.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message" interface class. diff --git a/tutorials/tutorial10/include/tutorial10/MsgId.h b/tutorials/tutorial10/include/tutorial10/MsgId.h index a3705c62..2ca289e0 100644 --- a/tutorials/tutorial10/include/tutorial10/MsgId.h +++ b/tutorials/tutorial10/include/tutorial10/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of message ids enumeration. diff --git a/tutorials/tutorial10/include/tutorial10/Version.h b/tutorials/tutorial10/include/tutorial10/Version.h index 90b1126e..134f7ba1 100644 --- a/tutorials/tutorial10/include/tutorial10/Version.h +++ b/tutorials/tutorial10/include/tutorial10/Version.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains protocol version definition. @@ -22,5 +22,5 @@ inline constexpr unsigned specVersion() } // namespace tutorial10 // Generated compile time check for minimal supported version of the COMMS library -static_assert(COMMS_MAKE_VERSION(5, 2, 7) <= comms::version(), +static_assert(COMMS_MAKE_VERSION(5, 3, 0) <= comms::version(), "The version of COMMS library is too old"); diff --git a/tutorials/tutorial10/include/tutorial10/dispatch/DispatchClientInputMessage.h b/tutorials/tutorial10/include/tutorial10/dispatch/DispatchClientInputMessage.h index ca1c9fa9..fe4b4daf 100644 --- a/tutorials/tutorial10/include/tutorial10/dispatch/DispatchClientInputMessage.h +++ b/tutorials/tutorial10/include/tutorial10/dispatch/DispatchClientInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/tutorials/tutorial10/include/tutorial10/dispatch/DispatchMessage.h b/tutorials/tutorial10/include/tutorial10/dispatch/DispatchMessage.h index 490c0c08..221b12b8 100644 --- a/tutorials/tutorial10/include/tutorial10/dispatch/DispatchMessage.h +++ b/tutorials/tutorial10/include/tutorial10/dispatch/DispatchMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for all input messages. diff --git a/tutorials/tutorial10/include/tutorial10/dispatch/DispatchServerInputMessage.h b/tutorials/tutorial10/include/tutorial10/dispatch/DispatchServerInputMessage.h index 3b7a5b28..c70dd00d 100644 --- a/tutorials/tutorial10/include/tutorial10/dispatch/DispatchServerInputMessage.h +++ b/tutorials/tutorial10/include/tutorial10/dispatch/DispatchServerInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/tutorials/tutorial10/include/tutorial10/factory/AllMessagesDynMemMsgFactory.h b/tutorials/tutorial10/include/tutorial10/factory/AllMessagesDynMemMsgFactory.h index d6b0b5cc..ed13c0b4 100644 --- a/tutorials/tutorial10/include/tutorial10/factory/AllMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial10/include/tutorial10/factory/AllMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for all the messages. diff --git a/tutorials/tutorial10/include/tutorial10/factory/ClientInputMessagesDynMemMsgFactory.h b/tutorials/tutorial10/include/tutorial10/factory/ClientInputMessagesDynMemMsgFactory.h index 5ca05e80..3a088244 100644 --- a/tutorials/tutorial10/include/tutorial10/factory/ClientInputMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial10/include/tutorial10/factory/ClientInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the client input messages. diff --git a/tutorials/tutorial10/include/tutorial10/factory/ServerInputMessagesDynMemMsgFactory.h b/tutorials/tutorial10/include/tutorial10/factory/ServerInputMessagesDynMemMsgFactory.h index ee41e677..ca288c47 100644 --- a/tutorials/tutorial10/include/tutorial10/factory/ServerInputMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial10/include/tutorial10/factory/ServerInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the server input messages. diff --git a/tutorials/tutorial10/include/tutorial10/field/FieldBase.h b/tutorials/tutorial10/include/tutorial10/field/FieldBase.h index 4418ac53..4b6e8448 100644 --- a/tutorials/tutorial10/include/tutorial10/field/FieldBase.h +++ b/tutorials/tutorial10/include/tutorial10/field/FieldBase.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of base class of all the fields. diff --git a/tutorials/tutorial10/include/tutorial10/field/MsgId.h b/tutorials/tutorial10/include/tutorial10/field/MsgId.h index c2e1cede..dfd25302 100644 --- a/tutorials/tutorial10/include/tutorial10/field/MsgId.h +++ b/tutorials/tutorial10/include/tutorial10/field/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "MsgId" field. @@ -27,6 +27,7 @@ class MsgId : public tutorial10::field::FieldBase<>, tutorial10::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 5> > { @@ -35,6 +36,7 @@ class MsgId : public tutorial10::field::FieldBase<>, tutorial10::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 5> >; public: diff --git a/tutorials/tutorial10/include/tutorial10/field/MsgIdCommon.h b/tutorials/tutorial10/include/tutorial10/field/MsgIdCommon.h index 64940222..f14437ed 100644 --- a/tutorials/tutorial10/include/tutorial10/field/MsgIdCommon.h +++ b/tutorials/tutorial10/include/tutorial10/field/MsgIdCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial10/include/tutorial10/frame/Frame.h b/tutorials/tutorial10/include/tutorial10/frame/Frame.h index fc520e1f..eb67b012 100644 --- a/tutorials/tutorial10/include/tutorial10/frame/Frame.h +++ b/tutorials/tutorial10/include/tutorial10/frame/Frame.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Frame" frame class. @@ -30,10 +30,30 @@ namespace frame template struct FrameLayers { + /// @brief Scope for field(s) of @ref Data layer. + struct DataMembers + { + /// @brief Custom field for @ref tutorial10::frame::FrameLayers::Data layer + class Field : public + comms::field::ArrayList< + tutorial10::field::FieldBase<>, + std::uint8_t, + typename TOpt::frame::FrameLayers::DataMembers::Field, + comms::option::def::HasName + > + { + public: + static const char* name() + { + return "Data"; + } + }; + }; + /// @brief Definition of layer "Data". using Data = comms::protocol::MsgDataLayer< - typename TOpt::frame::FrameLayers::Data + comms::option::def::FieldType >; /// @brief Definition of layer "Id". @@ -56,13 +76,15 @@ struct FrameLayers class SizeField : public comms::field::IntValue< tutorial10::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial10::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/tutorials/tutorial10/include/tutorial10/frame/FrameCommon.h b/tutorials/tutorial10/include/tutorial10/frame/FrameCommon.h index dba62194..ef3ec85d 100644 --- a/tutorials/tutorial10/include/tutorial10/frame/FrameCommon.h +++ b/tutorials/tutorial10/include/tutorial10/frame/FrameCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial10/include/tutorial10/input/AllMessages.h b/tutorials/tutorial10/include/tutorial10/input/AllMessages.h index bb7d21cf..e94e3296 100644 --- a/tutorials/tutorial10/include/tutorial10/input/AllMessages.h +++ b/tutorials/tutorial10/include/tutorial10/input/AllMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the AllMessages messages bundle. diff --git a/tutorials/tutorial10/include/tutorial10/input/ClientInputMessages.h b/tutorials/tutorial10/include/tutorial10/input/ClientInputMessages.h index 877ce867..912dad03 100644 --- a/tutorials/tutorial10/include/tutorial10/input/ClientInputMessages.h +++ b/tutorials/tutorial10/include/tutorial10/input/ClientInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ClientInputMessages messages bundle. diff --git a/tutorials/tutorial10/include/tutorial10/input/ServerInputMessages.h b/tutorials/tutorial10/include/tutorial10/input/ServerInputMessages.h index 51e7ab65..c624e99b 100644 --- a/tutorials/tutorial10/include/tutorial10/input/ServerInputMessages.h +++ b/tutorials/tutorial10/include/tutorial10/input/ServerInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ServerInputMessages messages bundle. diff --git a/tutorials/tutorial10/include/tutorial10/message/Msg1.h b/tutorials/tutorial10/include/tutorial10/message/Msg1.h index fae5dda7..c7babfdb 100644 --- a/tutorials/tutorial10/include/tutorial10/message/Msg1.h +++ b/tutorials/tutorial10/include/tutorial10/message/Msg1.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 1" message and its fields. diff --git a/tutorials/tutorial10/include/tutorial10/message/Msg1Common.h b/tutorials/tutorial10/include/tutorial10/message/Msg1Common.h index 4aa082d0..3b665506 100644 --- a/tutorials/tutorial10/include/tutorial10/message/Msg1Common.h +++ b/tutorials/tutorial10/include/tutorial10/message/Msg1Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial10/include/tutorial10/message/Msg2.h b/tutorials/tutorial10/include/tutorial10/message/Msg2.h index 882edaf9..dc1230e2 100644 --- a/tutorials/tutorial10/include/tutorial10/message/Msg2.h +++ b/tutorials/tutorial10/include/tutorial10/message/Msg2.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 2" message and its fields. diff --git a/tutorials/tutorial10/include/tutorial10/message/Msg2Common.h b/tutorials/tutorial10/include/tutorial10/message/Msg2Common.h index c73cf391..4a476b78 100644 --- a/tutorials/tutorial10/include/tutorial10/message/Msg2Common.h +++ b/tutorials/tutorial10/include/tutorial10/message/Msg2Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial10/include/tutorial10/message/Msg3.h b/tutorials/tutorial10/include/tutorial10/message/Msg3.h index 3d160728..0a34d2f7 100644 --- a/tutorials/tutorial10/include/tutorial10/message/Msg3.h +++ b/tutorials/tutorial10/include/tutorial10/message/Msg3.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 3" message and its fields. diff --git a/tutorials/tutorial10/include/tutorial10/message/Msg3Common.h b/tutorials/tutorial10/include/tutorial10/message/Msg3Common.h index a23a6b7c..763f2f49 100644 --- a/tutorials/tutorial10/include/tutorial10/message/Msg3Common.h +++ b/tutorials/tutorial10/include/tutorial10/message/Msg3Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial10/include/tutorial10/message/Msg4.h b/tutorials/tutorial10/include/tutorial10/message/Msg4.h index 53829108..5000e7fa 100644 --- a/tutorials/tutorial10/include/tutorial10/message/Msg4.h +++ b/tutorials/tutorial10/include/tutorial10/message/Msg4.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 4" message and its fields. diff --git a/tutorials/tutorial10/include/tutorial10/message/Msg4Common.h b/tutorials/tutorial10/include/tutorial10/message/Msg4Common.h index fc9c068f..2ad40e4b 100644 --- a/tutorials/tutorial10/include/tutorial10/message/Msg4Common.h +++ b/tutorials/tutorial10/include/tutorial10/message/Msg4Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial10/include/tutorial10/message/Msg5.h b/tutorials/tutorial10/include/tutorial10/message/Msg5.h index f37b4b16..f78eaf96 100644 --- a/tutorials/tutorial10/include/tutorial10/message/Msg5.h +++ b/tutorials/tutorial10/include/tutorial10/message/Msg5.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 5" message and its fields. diff --git a/tutorials/tutorial10/include/tutorial10/message/Msg5Common.h b/tutorials/tutorial10/include/tutorial10/message/Msg5Common.h index 704ee52b..4c64e2d5 100644 --- a/tutorials/tutorial10/include/tutorial10/message/Msg5Common.h +++ b/tutorials/tutorial10/include/tutorial10/message/Msg5Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial10/include/tutorial10/options/AllMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial10/include/tutorial10/options/AllMessagesDynMemMsgFactoryDefaultOptions.h index 593b6e2d..1059eba5 100644 --- a/tutorials/tutorial10/include/tutorial10/options/AllMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial10/include/tutorial10/options/AllMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol all messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial10/include/tutorial10/options/BareMetalDefaultOptions.h b/tutorials/tutorial10/include/tutorial10/options/BareMetalDefaultOptions.h index ada02ef0..3731033d 100644 --- a/tutorials/tutorial10/include/tutorial10/options/BareMetalDefaultOptions.h +++ b/tutorials/tutorial10/include/tutorial10/options/BareMetalDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol bare metal default options. @@ -31,13 +31,15 @@ struct BareMetalDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// tutorial10::frame::FrameLayers::Data - /// layer. - using Data = - std::tuple< - comms::option::app::FixedSizeStorage, - typename TBase::frame::FrameLayers::Data - >; + /// tutorial10::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::FixedSizeStorage, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers /// @brief Extra options for @ref /// tutorial10::frame::FrameLayers::Id diff --git a/tutorials/tutorial10/include/tutorial10/options/ClientDefaultOptions.h b/tutorials/tutorial10/include/tutorial10/options/ClientDefaultOptions.h index a4fc3c4c..8643190f 100644 --- a/tutorials/tutorial10/include/tutorial10/options/ClientDefaultOptions.h +++ b/tutorials/tutorial10/include/tutorial10/options/ClientDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client default options. diff --git a/tutorials/tutorial10/include/tutorial10/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial10/include/tutorial10/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h index 0d209dd2..bae29147 100644 --- a/tutorials/tutorial10/include/tutorial10/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial10/include/tutorial10/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client input messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial10/include/tutorial10/options/DataViewDefaultOptions.h b/tutorials/tutorial10/include/tutorial10/options/DataViewDefaultOptions.h index 1d1a2c4b..31b05892 100644 --- a/tutorials/tutorial10/include/tutorial10/options/DataViewDefaultOptions.h +++ b/tutorials/tutorial10/include/tutorial10/options/DataViewDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol data view default options. @@ -25,13 +25,15 @@ struct DataViewDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// tutorial10::frame::FrameLayers::Data - /// layer. - using Data = - std::tuple< - comms::option::app::OrigDataView, - typename TBase::frame::FrameLayers::Data - >; + /// tutorial10::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::OrigDataView, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers }; // struct FrameLayers }; // struct frame }; diff --git a/tutorials/tutorial10/include/tutorial10/options/DefaultOptions.h b/tutorials/tutorial10/include/tutorial10/options/DefaultOptions.h index f71693a8..e4b977a7 100644 --- a/tutorials/tutorial10/include/tutorial10/options/DefaultOptions.h +++ b/tutorials/tutorial10/include/tutorial10/options/DefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol default options. @@ -25,11 +25,11 @@ struct DefaultOptionsT : public TBase { /// @brief Extra options for @ref /// tutorial10::message::Msg1 message. - using Msg1 = comms::option::EmptyOption; + using Msg1 = comms::option::app::EmptyOption; /// @brief Extra options for @ref /// tutorial10::message::Msg2 message. - using Msg2 = comms::option::EmptyOption; + using Msg2 = comms::option::app::EmptyOption; }; // struct message /// @brief Extra options for frames. @@ -40,14 +40,16 @@ struct DefaultOptionsT : public TBase struct FrameLayers { /// @brief Extra options for @ref - /// tutorial10::frame::FrameLayers::Data - /// layer. - using Data = comms::option::EmptyOption; + /// tutorial10::frame::FrameLayers::DataMembers::Field field. + struct DataMembers + { + using Field = comms::option::app::EmptyOption; + }; // struct DataMembers /// @brief Extra options for @ref /// tutorial10::frame::FrameLayers::Id /// layer. - using Id = comms::option::EmptyOption; + using Id = comms::option::app::EmptyOption; }; // struct FrameLayers }; // struct frame }; diff --git a/tutorials/tutorial10/include/tutorial10/options/ServerDefaultOptions.h b/tutorials/tutorial10/include/tutorial10/options/ServerDefaultOptions.h index d639423a..cbb95924 100644 --- a/tutorials/tutorial10/include/tutorial10/options/ServerDefaultOptions.h +++ b/tutorials/tutorial10/include/tutorial10/options/ServerDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server default options. diff --git a/tutorials/tutorial10/include/tutorial10/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial10/include/tutorial10/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h index 4b17818d..7a5abeaa 100644 --- a/tutorials/tutorial10/include/tutorial10/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial10/include/tutorial10/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server input messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial11/include/tutorial11/Message.h b/tutorials/tutorial11/include/tutorial11/Message.h index 06c6118a..d98c3267 100644 --- a/tutorials/tutorial11/include/tutorial11/Message.h +++ b/tutorials/tutorial11/include/tutorial11/Message.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message" interface class. diff --git a/tutorials/tutorial11/include/tutorial11/MsgId.h b/tutorials/tutorial11/include/tutorial11/MsgId.h index 0858e87a..9843275c 100644 --- a/tutorials/tutorial11/include/tutorial11/MsgId.h +++ b/tutorials/tutorial11/include/tutorial11/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of message ids enumeration. diff --git a/tutorials/tutorial11/include/tutorial11/Version.h b/tutorials/tutorial11/include/tutorial11/Version.h index d5a1b265..dc50ae9e 100644 --- a/tutorials/tutorial11/include/tutorial11/Version.h +++ b/tutorials/tutorial11/include/tutorial11/Version.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains protocol version definition. @@ -22,5 +22,5 @@ inline constexpr unsigned specVersion() } // namespace tutorial11 // Generated compile time check for minimal supported version of the COMMS library -static_assert(COMMS_MAKE_VERSION(5, 2, 7) <= comms::version(), +static_assert(COMMS_MAKE_VERSION(5, 3, 0) <= comms::version(), "The version of COMMS library is too old"); diff --git a/tutorials/tutorial11/include/tutorial11/dispatch/DispatchClientInputMessage.h b/tutorials/tutorial11/include/tutorial11/dispatch/DispatchClientInputMessage.h index a9ea0d98..cc719a57 100644 --- a/tutorials/tutorial11/include/tutorial11/dispatch/DispatchClientInputMessage.h +++ b/tutorials/tutorial11/include/tutorial11/dispatch/DispatchClientInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/tutorials/tutorial11/include/tutorial11/dispatch/DispatchMessage.h b/tutorials/tutorial11/include/tutorial11/dispatch/DispatchMessage.h index 3f566bb5..ef315571 100644 --- a/tutorials/tutorial11/include/tutorial11/dispatch/DispatchMessage.h +++ b/tutorials/tutorial11/include/tutorial11/dispatch/DispatchMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for all input messages. diff --git a/tutorials/tutorial11/include/tutorial11/dispatch/DispatchServerInputMessage.h b/tutorials/tutorial11/include/tutorial11/dispatch/DispatchServerInputMessage.h index 3241932f..57fc1fcd 100644 --- a/tutorials/tutorial11/include/tutorial11/dispatch/DispatchServerInputMessage.h +++ b/tutorials/tutorial11/include/tutorial11/dispatch/DispatchServerInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/tutorials/tutorial11/include/tutorial11/factory/AllMessagesDynMemMsgFactory.h b/tutorials/tutorial11/include/tutorial11/factory/AllMessagesDynMemMsgFactory.h index dc35b723..3945e4b7 100644 --- a/tutorials/tutorial11/include/tutorial11/factory/AllMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial11/include/tutorial11/factory/AllMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for all the messages. diff --git a/tutorials/tutorial11/include/tutorial11/factory/ClientInputMessagesDynMemMsgFactory.h b/tutorials/tutorial11/include/tutorial11/factory/ClientInputMessagesDynMemMsgFactory.h index 29391a58..690fe483 100644 --- a/tutorials/tutorial11/include/tutorial11/factory/ClientInputMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial11/include/tutorial11/factory/ClientInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the client input messages. diff --git a/tutorials/tutorial11/include/tutorial11/factory/ServerInputMessagesDynMemMsgFactory.h b/tutorials/tutorial11/include/tutorial11/factory/ServerInputMessagesDynMemMsgFactory.h index 549e9bd8..4a5ff3f4 100644 --- a/tutorials/tutorial11/include/tutorial11/factory/ServerInputMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial11/include/tutorial11/factory/ServerInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the server input messages. diff --git a/tutorials/tutorial11/include/tutorial11/field/FieldBase.h b/tutorials/tutorial11/include/tutorial11/field/FieldBase.h index 96a3b954..67d3462d 100644 --- a/tutorials/tutorial11/include/tutorial11/field/FieldBase.h +++ b/tutorials/tutorial11/include/tutorial11/field/FieldBase.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of base class of all the fields. diff --git a/tutorials/tutorial11/include/tutorial11/field/MsgId.h b/tutorials/tutorial11/include/tutorial11/field/MsgId.h index a8bb2cd4..c9a07d2c 100644 --- a/tutorials/tutorial11/include/tutorial11/field/MsgId.h +++ b/tutorials/tutorial11/include/tutorial11/field/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "MsgId" field. @@ -27,6 +27,7 @@ class MsgId : public tutorial11::field::FieldBase<>, tutorial11::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 3> > { @@ -35,6 +36,7 @@ class MsgId : public tutorial11::field::FieldBase<>, tutorial11::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 3> >; public: diff --git a/tutorials/tutorial11/include/tutorial11/field/MsgIdCommon.h b/tutorials/tutorial11/include/tutorial11/field/MsgIdCommon.h index 5f61170a..fc5897a7 100644 --- a/tutorials/tutorial11/include/tutorial11/field/MsgIdCommon.h +++ b/tutorials/tutorial11/include/tutorial11/field/MsgIdCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial11/include/tutorial11/frame/Frame.h b/tutorials/tutorial11/include/tutorial11/frame/Frame.h index f88dadf7..92f90fc5 100644 --- a/tutorials/tutorial11/include/tutorial11/frame/Frame.h +++ b/tutorials/tutorial11/include/tutorial11/frame/Frame.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Frame" frame class. @@ -30,10 +30,30 @@ namespace frame template struct FrameLayers { + /// @brief Scope for field(s) of @ref Data layer. + struct DataMembers + { + /// @brief Custom field for @ref tutorial11::frame::FrameLayers::Data layer + class Field : public + comms::field::ArrayList< + tutorial11::field::FieldBase<>, + std::uint8_t, + typename TOpt::frame::FrameLayers::DataMembers::Field, + comms::option::def::HasName + > + { + public: + static const char* name() + { + return "Data"; + } + }; + }; + /// @brief Definition of layer "Data". using Data = comms::protocol::MsgDataLayer< - typename TOpt::frame::FrameLayers::Data + comms::option::def::FieldType >; /// @brief Definition of layer "Id". @@ -56,13 +76,15 @@ struct FrameLayers class SizeField : public comms::field::IntValue< tutorial11::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial11::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/tutorials/tutorial11/include/tutorial11/frame/FrameCommon.h b/tutorials/tutorial11/include/tutorial11/frame/FrameCommon.h index 9ffeed67..4bb1e66f 100644 --- a/tutorials/tutorial11/include/tutorial11/frame/FrameCommon.h +++ b/tutorials/tutorial11/include/tutorial11/frame/FrameCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial11/include/tutorial11/input/AllMessages.h b/tutorials/tutorial11/include/tutorial11/input/AllMessages.h index 7ebd9b5f..43e8c71b 100644 --- a/tutorials/tutorial11/include/tutorial11/input/AllMessages.h +++ b/tutorials/tutorial11/include/tutorial11/input/AllMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the AllMessages messages bundle. diff --git a/tutorials/tutorial11/include/tutorial11/input/ClientInputMessages.h b/tutorials/tutorial11/include/tutorial11/input/ClientInputMessages.h index 2e9d3435..f4d3eefd 100644 --- a/tutorials/tutorial11/include/tutorial11/input/ClientInputMessages.h +++ b/tutorials/tutorial11/include/tutorial11/input/ClientInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ClientInputMessages messages bundle. diff --git a/tutorials/tutorial11/include/tutorial11/input/ServerInputMessages.h b/tutorials/tutorial11/include/tutorial11/input/ServerInputMessages.h index c7212228..54aa943f 100644 --- a/tutorials/tutorial11/include/tutorial11/input/ServerInputMessages.h +++ b/tutorials/tutorial11/include/tutorial11/input/ServerInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ServerInputMessages messages bundle. diff --git a/tutorials/tutorial11/include/tutorial11/message/Msg1.h b/tutorials/tutorial11/include/tutorial11/message/Msg1.h index d689c73a..f3d34d4e 100644 --- a/tutorials/tutorial11/include/tutorial11/message/Msg1.h +++ b/tutorials/tutorial11/include/tutorial11/message/Msg1.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 1" message and its fields. diff --git a/tutorials/tutorial11/include/tutorial11/message/Msg1Common.h b/tutorials/tutorial11/include/tutorial11/message/Msg1Common.h index cff6fae7..51d5bde1 100644 --- a/tutorials/tutorial11/include/tutorial11/message/Msg1Common.h +++ b/tutorials/tutorial11/include/tutorial11/message/Msg1Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial11/include/tutorial11/message/Msg2.h b/tutorials/tutorial11/include/tutorial11/message/Msg2.h index ae370059..8403f93f 100644 --- a/tutorials/tutorial11/include/tutorial11/message/Msg2.h +++ b/tutorials/tutorial11/include/tutorial11/message/Msg2.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 2" message and its fields. diff --git a/tutorials/tutorial11/include/tutorial11/message/Msg2Common.h b/tutorials/tutorial11/include/tutorial11/message/Msg2Common.h index 0f24add8..a387344e 100644 --- a/tutorials/tutorial11/include/tutorial11/message/Msg2Common.h +++ b/tutorials/tutorial11/include/tutorial11/message/Msg2Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial11/include/tutorial11/message/Msg3.h b/tutorials/tutorial11/include/tutorial11/message/Msg3.h index b26b6dcd..01dedd13 100644 --- a/tutorials/tutorial11/include/tutorial11/message/Msg3.h +++ b/tutorials/tutorial11/include/tutorial11/message/Msg3.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 3" message and its fields. diff --git a/tutorials/tutorial11/include/tutorial11/message/Msg3Common.h b/tutorials/tutorial11/include/tutorial11/message/Msg3Common.h index fa163c91..db5dcc72 100644 --- a/tutorials/tutorial11/include/tutorial11/message/Msg3Common.h +++ b/tutorials/tutorial11/include/tutorial11/message/Msg3Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial11/include/tutorial11/options/AllMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial11/include/tutorial11/options/AllMessagesDynMemMsgFactoryDefaultOptions.h index 78122aa6..855635d3 100644 --- a/tutorials/tutorial11/include/tutorial11/options/AllMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial11/include/tutorial11/options/AllMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol all messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial11/include/tutorial11/options/BareMetalDefaultOptions.h b/tutorials/tutorial11/include/tutorial11/options/BareMetalDefaultOptions.h index 34d17cf1..96edb490 100644 --- a/tutorials/tutorial11/include/tutorial11/options/BareMetalDefaultOptions.h +++ b/tutorials/tutorial11/include/tutorial11/options/BareMetalDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol bare metal default options. @@ -31,13 +31,15 @@ struct BareMetalDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// tutorial11::frame::FrameLayers::Data - /// layer. - using Data = - std::tuple< - comms::option::app::FixedSizeStorage, - typename TBase::frame::FrameLayers::Data - >; + /// tutorial11::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::FixedSizeStorage, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers /// @brief Extra options for @ref /// tutorial11::frame::FrameLayers::Id diff --git a/tutorials/tutorial11/include/tutorial11/options/ClientDefaultOptions.h b/tutorials/tutorial11/include/tutorial11/options/ClientDefaultOptions.h index ed14b8c4..fbb66c4e 100644 --- a/tutorials/tutorial11/include/tutorial11/options/ClientDefaultOptions.h +++ b/tutorials/tutorial11/include/tutorial11/options/ClientDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client default options. diff --git a/tutorials/tutorial11/include/tutorial11/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial11/include/tutorial11/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h index 26d6261c..41442ed0 100644 --- a/tutorials/tutorial11/include/tutorial11/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial11/include/tutorial11/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client input messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial11/include/tutorial11/options/DataViewDefaultOptions.h b/tutorials/tutorial11/include/tutorial11/options/DataViewDefaultOptions.h index 8b79214b..72a145cf 100644 --- a/tutorials/tutorial11/include/tutorial11/options/DataViewDefaultOptions.h +++ b/tutorials/tutorial11/include/tutorial11/options/DataViewDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol data view default options. @@ -25,13 +25,15 @@ struct DataViewDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// tutorial11::frame::FrameLayers::Data - /// layer. - using Data = - std::tuple< - comms::option::app::OrigDataView, - typename TBase::frame::FrameLayers::Data - >; + /// tutorial11::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::OrigDataView, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers }; // struct FrameLayers }; // struct frame }; diff --git a/tutorials/tutorial11/include/tutorial11/options/DefaultOptions.h b/tutorials/tutorial11/include/tutorial11/options/DefaultOptions.h index fc535f78..aea7aa25 100644 --- a/tutorials/tutorial11/include/tutorial11/options/DefaultOptions.h +++ b/tutorials/tutorial11/include/tutorial11/options/DefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol default options. @@ -28,14 +28,16 @@ struct DefaultOptionsT : public TBase struct FrameLayers { /// @brief Extra options for @ref - /// tutorial11::frame::FrameLayers::Data - /// layer. - using Data = comms::option::EmptyOption; + /// tutorial11::frame::FrameLayers::DataMembers::Field field. + struct DataMembers + { + using Field = comms::option::app::EmptyOption; + }; // struct DataMembers /// @brief Extra options for @ref /// tutorial11::frame::FrameLayers::Id /// layer. - using Id = comms::option::EmptyOption; + using Id = comms::option::app::EmptyOption; }; // struct FrameLayers }; // struct frame }; diff --git a/tutorials/tutorial11/include/tutorial11/options/ServerDefaultOptions.h b/tutorials/tutorial11/include/tutorial11/options/ServerDefaultOptions.h index b5e526e2..b9828432 100644 --- a/tutorials/tutorial11/include/tutorial11/options/ServerDefaultOptions.h +++ b/tutorials/tutorial11/include/tutorial11/options/ServerDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server default options. diff --git a/tutorials/tutorial11/include/tutorial11/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial11/include/tutorial11/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h index db2bc0b1..bed1d120 100644 --- a/tutorials/tutorial11/include/tutorial11/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial11/include/tutorial11/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server input messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial12/include/tutorial12/Message.h b/tutorials/tutorial12/include/tutorial12/Message.h index 1002308a..3700e5b4 100644 --- a/tutorials/tutorial12/include/tutorial12/Message.h +++ b/tutorials/tutorial12/include/tutorial12/Message.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message" interface class. diff --git a/tutorials/tutorial12/include/tutorial12/MsgId.h b/tutorials/tutorial12/include/tutorial12/MsgId.h index e40c4285..60efb988 100644 --- a/tutorials/tutorial12/include/tutorial12/MsgId.h +++ b/tutorials/tutorial12/include/tutorial12/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of message ids enumeration. diff --git a/tutorials/tutorial12/include/tutorial12/Version.h b/tutorials/tutorial12/include/tutorial12/Version.h index 951df5e9..f6ce1f9f 100644 --- a/tutorials/tutorial12/include/tutorial12/Version.h +++ b/tutorials/tutorial12/include/tutorial12/Version.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains protocol version definition. @@ -22,5 +22,5 @@ inline constexpr unsigned specVersion() } // namespace tutorial12 // Generated compile time check for minimal supported version of the COMMS library -static_assert(COMMS_MAKE_VERSION(5, 2, 7) <= comms::version(), +static_assert(COMMS_MAKE_VERSION(5, 3, 0) <= comms::version(), "The version of COMMS library is too old"); diff --git a/tutorials/tutorial12/include/tutorial12/dispatch/DispatchClientInputMessage.h b/tutorials/tutorial12/include/tutorial12/dispatch/DispatchClientInputMessage.h index 27597246..0638bb51 100644 --- a/tutorials/tutorial12/include/tutorial12/dispatch/DispatchClientInputMessage.h +++ b/tutorials/tutorial12/include/tutorial12/dispatch/DispatchClientInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/tutorials/tutorial12/include/tutorial12/dispatch/DispatchMessage.h b/tutorials/tutorial12/include/tutorial12/dispatch/DispatchMessage.h index 982bdd49..4c9d3bd2 100644 --- a/tutorials/tutorial12/include/tutorial12/dispatch/DispatchMessage.h +++ b/tutorials/tutorial12/include/tutorial12/dispatch/DispatchMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for all input messages. diff --git a/tutorials/tutorial12/include/tutorial12/dispatch/DispatchServerInputMessage.h b/tutorials/tutorial12/include/tutorial12/dispatch/DispatchServerInputMessage.h index 72cc24d9..43ad93df 100644 --- a/tutorials/tutorial12/include/tutorial12/dispatch/DispatchServerInputMessage.h +++ b/tutorials/tutorial12/include/tutorial12/dispatch/DispatchServerInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/tutorials/tutorial12/include/tutorial12/factory/AllMessagesDynMemMsgFactory.h b/tutorials/tutorial12/include/tutorial12/factory/AllMessagesDynMemMsgFactory.h index b2b021e5..462300ae 100644 --- a/tutorials/tutorial12/include/tutorial12/factory/AllMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial12/include/tutorial12/factory/AllMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for all the messages. diff --git a/tutorials/tutorial12/include/tutorial12/factory/ClientInputMessagesDynMemMsgFactory.h b/tutorials/tutorial12/include/tutorial12/factory/ClientInputMessagesDynMemMsgFactory.h index 44b466c5..40123252 100644 --- a/tutorials/tutorial12/include/tutorial12/factory/ClientInputMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial12/include/tutorial12/factory/ClientInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the client input messages. diff --git a/tutorials/tutorial12/include/tutorial12/factory/ServerInputMessagesDynMemMsgFactory.h b/tutorials/tutorial12/include/tutorial12/factory/ServerInputMessagesDynMemMsgFactory.h index 5d8894d0..b1efe3e5 100644 --- a/tutorials/tutorial12/include/tutorial12/factory/ServerInputMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial12/include/tutorial12/factory/ServerInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the server input messages. diff --git a/tutorials/tutorial12/include/tutorial12/field/FieldBase.h b/tutorials/tutorial12/include/tutorial12/field/FieldBase.h index 243751d7..cba01e31 100644 --- a/tutorials/tutorial12/include/tutorial12/field/FieldBase.h +++ b/tutorials/tutorial12/include/tutorial12/field/FieldBase.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of base class of all the fields. diff --git a/tutorials/tutorial12/include/tutorial12/field/Length.h b/tutorials/tutorial12/include/tutorial12/field/Length.h index 1552e05d..e1994ca7 100644 --- a/tutorials/tutorial12/include/tutorial12/field/Length.h +++ b/tutorials/tutorial12/include/tutorial12/field/Length.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Length" field. @@ -26,14 +26,16 @@ class Length : public comms::field::IntValue< tutorial12::field::FieldBase<>, std::uint8_t, - TExtraOpts... + TExtraOpts..., + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial12::field::FieldBase<>, std::uint8_t, - TExtraOpts... + TExtraOpts..., + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/tutorials/tutorial12/include/tutorial12/field/LengthCommon.h b/tutorials/tutorial12/include/tutorial12/field/LengthCommon.h index 678f965f..b137521b 100644 --- a/tutorials/tutorial12/include/tutorial12/field/LengthCommon.h +++ b/tutorials/tutorial12/include/tutorial12/field/LengthCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial12/include/tutorial12/field/MsgId.h b/tutorials/tutorial12/include/tutorial12/field/MsgId.h index 0dea59b0..0f2d1b31 100644 --- a/tutorials/tutorial12/include/tutorial12/field/MsgId.h +++ b/tutorials/tutorial12/include/tutorial12/field/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "MsgId" field. @@ -27,6 +27,7 @@ class MsgId : public tutorial12::field::FieldBase<>, tutorial12::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 3> > { @@ -35,6 +36,7 @@ class MsgId : public tutorial12::field::FieldBase<>, tutorial12::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 3> >; public: diff --git a/tutorials/tutorial12/include/tutorial12/field/MsgIdCommon.h b/tutorials/tutorial12/include/tutorial12/field/MsgIdCommon.h index 48cbf8c0..7df67b02 100644 --- a/tutorials/tutorial12/include/tutorial12/field/MsgIdCommon.h +++ b/tutorials/tutorial12/include/tutorial12/field/MsgIdCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial12/include/tutorial12/frame/Frame.h b/tutorials/tutorial12/include/tutorial12/frame/Frame.h index 9742edfd..4254e750 100644 --- a/tutorials/tutorial12/include/tutorial12/frame/Frame.h +++ b/tutorials/tutorial12/include/tutorial12/frame/Frame.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Frame" frame class. @@ -30,10 +30,30 @@ namespace frame template struct FrameLayers { + /// @brief Scope for field(s) of @ref Data layer. + struct DataMembers + { + /// @brief Custom field for @ref tutorial12::frame::FrameLayers::Data layer + class Field : public + comms::field::ArrayList< + tutorial12::field::FieldBase<>, + std::uint8_t, + typename TOpt::frame::FrameLayers::DataMembers::Field, + comms::option::def::HasName + > + { + public: + static const char* name() + { + return "Data"; + } + }; + }; + /// @brief Definition of layer "Data". using Data = comms::protocol::MsgDataLayer< - typename TOpt::frame::FrameLayers::Data + comms::option::def::FieldType >; /// @brief Definition of layer "Id". @@ -56,13 +76,15 @@ struct FrameLayers class SizeField : public comms::field::IntValue< tutorial12::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial12::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/tutorials/tutorial12/include/tutorial12/frame/FrameCommon.h b/tutorials/tutorial12/include/tutorial12/frame/FrameCommon.h index 15440486..6311e330 100644 --- a/tutorials/tutorial12/include/tutorial12/frame/FrameCommon.h +++ b/tutorials/tutorial12/include/tutorial12/frame/FrameCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial12/include/tutorial12/input/AllMessages.h b/tutorials/tutorial12/include/tutorial12/input/AllMessages.h index 6b7819cd..40d842e0 100644 --- a/tutorials/tutorial12/include/tutorial12/input/AllMessages.h +++ b/tutorials/tutorial12/include/tutorial12/input/AllMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the AllMessages messages bundle. diff --git a/tutorials/tutorial12/include/tutorial12/input/ClientInputMessages.h b/tutorials/tutorial12/include/tutorial12/input/ClientInputMessages.h index 9e6e1c56..c3de78fe 100644 --- a/tutorials/tutorial12/include/tutorial12/input/ClientInputMessages.h +++ b/tutorials/tutorial12/include/tutorial12/input/ClientInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ClientInputMessages messages bundle. diff --git a/tutorials/tutorial12/include/tutorial12/input/ServerInputMessages.h b/tutorials/tutorial12/include/tutorial12/input/ServerInputMessages.h index decf5ae6..2361a8ce 100644 --- a/tutorials/tutorial12/include/tutorial12/input/ServerInputMessages.h +++ b/tutorials/tutorial12/include/tutorial12/input/ServerInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ServerInputMessages messages bundle. diff --git a/tutorials/tutorial12/include/tutorial12/message/Msg1.h b/tutorials/tutorial12/include/tutorial12/message/Msg1.h index e30a3c38..b0cc59f2 100644 --- a/tutorials/tutorial12/include/tutorial12/message/Msg1.h +++ b/tutorials/tutorial12/include/tutorial12/message/Msg1.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 1" message and its fields. @@ -33,6 +33,7 @@ struct Msg1Fields comms::field::String< tutorial12::field::FieldBase<>, typename TOpt::message::Msg1Fields::F1, + comms::option::def::HasName, comms::option::def::SequenceSerLengthFieldPrefix > > { @@ -40,6 +41,7 @@ struct Msg1Fields comms::field::String< tutorial12::field::FieldBase<>, typename TOpt::message::Msg1Fields::F1, + comms::option::def::HasName, comms::option::def::SequenceSerLengthFieldPrefix > >; public: @@ -55,6 +57,7 @@ struct Msg1Fields comms::field::String< tutorial12::field::FieldBase<>, typename TOpt::message::Msg1Fields::F2, + comms::option::def::HasName, comms::option::def::SequenceFixedSize<8U> > { @@ -62,6 +65,7 @@ struct Msg1Fields comms::field::String< tutorial12::field::FieldBase<>, typename TOpt::message::Msg1Fields::F2, + comms::option::def::HasName, comms::option::def::SequenceFixedSize<8U> >; public: diff --git a/tutorials/tutorial12/include/tutorial12/message/Msg1Common.h b/tutorials/tutorial12/include/tutorial12/message/Msg1Common.h index 2c2d2087..c197613f 100644 --- a/tutorials/tutorial12/include/tutorial12/message/Msg1Common.h +++ b/tutorials/tutorial12/include/tutorial12/message/Msg1Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial12/include/tutorial12/message/Msg2.h b/tutorials/tutorial12/include/tutorial12/message/Msg2.h index ce1e4836..1b05f087 100644 --- a/tutorials/tutorial12/include/tutorial12/message/Msg2.h +++ b/tutorials/tutorial12/include/tutorial12/message/Msg2.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 2" message and its fields. @@ -35,6 +35,7 @@ struct Msg2Fields tutorial12::field::FieldBase<>, std::uint8_t, typename TOpt::message::Msg2Fields::F1, + comms::option::def::HasName, comms::option::def::SequenceSerLengthFieldPrefix > > { @@ -43,6 +44,7 @@ struct Msg2Fields tutorial12::field::FieldBase<>, std::uint8_t, typename TOpt::message::Msg2Fields::F1, + comms::option::def::HasName, comms::option::def::SequenceSerLengthFieldPrefix > >; public: @@ -59,6 +61,7 @@ struct Msg2Fields tutorial12::field::FieldBase<>, std::uint8_t, typename TOpt::message::Msg2Fields::F2, + comms::option::def::HasName, comms::option::def::SequenceFixedSize<6U> > { @@ -67,6 +70,7 @@ struct Msg2Fields tutorial12::field::FieldBase<>, std::uint8_t, typename TOpt::message::Msg2Fields::F2, + comms::option::def::HasName, comms::option::def::SequenceFixedSize<6U> >; public: diff --git a/tutorials/tutorial12/include/tutorial12/message/Msg2Common.h b/tutorials/tutorial12/include/tutorial12/message/Msg2Common.h index 47a03b67..c5e57ed5 100644 --- a/tutorials/tutorial12/include/tutorial12/message/Msg2Common.h +++ b/tutorials/tutorial12/include/tutorial12/message/Msg2Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial12/include/tutorial12/message/Msg3.h b/tutorials/tutorial12/include/tutorial12/message/Msg3.h index d14b5310..7e1090d3 100644 --- a/tutorials/tutorial12/include/tutorial12/message/Msg3.h +++ b/tutorials/tutorial12/include/tutorial12/message/Msg3.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 3" message and its fields. @@ -38,13 +38,15 @@ struct Msg3Fields class Element : public comms::field::IntValue< tutorial12::field::FieldBase<>, - std::uint32_t + std::uint32_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial12::field::FieldBase<>, - std::uint32_t + std::uint32_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -70,6 +72,7 @@ struct Msg3Fields tutorial12::field::FieldBase<>, typename F1Members::Element, typename TOpt::message::Msg3Fields::F1, + comms::option::def::HasName, comms::option::def::SequenceSizeFieldPrefix > > { @@ -78,6 +81,7 @@ struct Msg3Fields tutorial12::field::FieldBase<>, typename F1Members::Element, typename TOpt::message::Msg3Fields::F1, + comms::option::def::HasName, comms::option::def::SequenceSizeFieldPrefix > >; public: @@ -96,13 +100,15 @@ struct Msg3Fields class Element : public comms::field::IntValue< tutorial12::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial12::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -128,6 +134,7 @@ struct Msg3Fields tutorial12::field::FieldBase<>, typename F2Members::Element, typename TOpt::message::Msg3Fields::F2, + comms::option::def::HasName, comms::option::def::SequenceFixedSize<6U> > { @@ -136,6 +143,7 @@ struct Msg3Fields tutorial12::field::FieldBase<>, typename F2Members::Element, typename TOpt::message::Msg3Fields::F2, + comms::option::def::HasName, comms::option::def::SequenceFixedSize<6U> >; public: diff --git a/tutorials/tutorial12/include/tutorial12/message/Msg3Common.h b/tutorials/tutorial12/include/tutorial12/message/Msg3Common.h index 1175148a..baaf1805 100644 --- a/tutorials/tutorial12/include/tutorial12/message/Msg3Common.h +++ b/tutorials/tutorial12/include/tutorial12/message/Msg3Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial12/include/tutorial12/options/AllMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial12/include/tutorial12/options/AllMessagesDynMemMsgFactoryDefaultOptions.h index 1da31949..72804082 100644 --- a/tutorials/tutorial12/include/tutorial12/options/AllMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial12/include/tutorial12/options/AllMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol all messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial12/include/tutorial12/options/BareMetalDefaultOptions.h b/tutorials/tutorial12/include/tutorial12/options/BareMetalDefaultOptions.h index 88baa0c8..eb29e55a 100644 --- a/tutorials/tutorial12/include/tutorial12/options/BareMetalDefaultOptions.h +++ b/tutorials/tutorial12/include/tutorial12/options/BareMetalDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol bare metal default options. @@ -104,13 +104,15 @@ struct BareMetalDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// tutorial12::frame::FrameLayers::Data - /// layer. - using Data = - std::tuple< - comms::option::app::FixedSizeStorage, - typename TBase::frame::FrameLayers::Data - >; + /// tutorial12::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::FixedSizeStorage, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers /// @brief Extra options for @ref /// tutorial12::frame::FrameLayers::Id diff --git a/tutorials/tutorial12/include/tutorial12/options/ClientDefaultOptions.h b/tutorials/tutorial12/include/tutorial12/options/ClientDefaultOptions.h index da066538..2408c863 100644 --- a/tutorials/tutorial12/include/tutorial12/options/ClientDefaultOptions.h +++ b/tutorials/tutorial12/include/tutorial12/options/ClientDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client default options. diff --git a/tutorials/tutorial12/include/tutorial12/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial12/include/tutorial12/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h index 038613d3..e2ddeef6 100644 --- a/tutorials/tutorial12/include/tutorial12/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial12/include/tutorial12/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client input messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial12/include/tutorial12/options/DataViewDefaultOptions.h b/tutorials/tutorial12/include/tutorial12/options/DataViewDefaultOptions.h index 6e0bde33..4b4a4276 100644 --- a/tutorials/tutorial12/include/tutorial12/options/DataViewDefaultOptions.h +++ b/tutorials/tutorial12/include/tutorial12/options/DataViewDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol data view default options. @@ -75,13 +75,15 @@ struct DataViewDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// tutorial12::frame::FrameLayers::Data - /// layer. - using Data = - std::tuple< - comms::option::app::OrigDataView, - typename TBase::frame::FrameLayers::Data - >; + /// tutorial12::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::OrigDataView, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers }; // struct FrameLayers }; // struct frame }; diff --git a/tutorials/tutorial12/include/tutorial12/options/DefaultOptions.h b/tutorials/tutorial12/include/tutorial12/options/DefaultOptions.h index 6b99f00a..9ff86b97 100644 --- a/tutorials/tutorial12/include/tutorial12/options/DefaultOptions.h +++ b/tutorials/tutorial12/include/tutorial12/options/DefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol default options. @@ -30,12 +30,12 @@ struct DefaultOptionsT : public TBase /// @brief Extra options for @ref /// tutorial12::message::Msg1Fields::F1 /// field. - using F1 = comms::option::EmptyOption; + using F1 = comms::option::app::EmptyOption; /// @brief Extra options for @ref /// tutorial12::message::Msg1Fields::F2 /// field. - using F2 = comms::option::EmptyOption; + using F2 = comms::option::app::EmptyOption; }; /// @brief Extra options for fields of @@ -45,12 +45,12 @@ struct DefaultOptionsT : public TBase /// @brief Extra options for @ref /// tutorial12::message::Msg2Fields::F1 /// field. - using F1 = comms::option::EmptyOption; + using F1 = comms::option::app::EmptyOption; /// @brief Extra options for @ref /// tutorial12::message::Msg2Fields::F2 /// field. - using F2 = comms::option::EmptyOption; + using F2 = comms::option::app::EmptyOption; }; /// @brief Extra options for fields of @@ -60,12 +60,12 @@ struct DefaultOptionsT : public TBase /// @brief Extra options for @ref /// tutorial12::message::Msg3Fields::F1 /// field. - using F1 = comms::option::EmptyOption; + using F1 = comms::option::app::EmptyOption; /// @brief Extra options for @ref /// tutorial12::message::Msg3Fields::F2 /// field. - using F2 = comms::option::EmptyOption; + using F2 = comms::option::app::EmptyOption; }; }; // struct message @@ -77,14 +77,16 @@ struct DefaultOptionsT : public TBase struct FrameLayers { /// @brief Extra options for @ref - /// tutorial12::frame::FrameLayers::Data - /// layer. - using Data = comms::option::EmptyOption; + /// tutorial12::frame::FrameLayers::DataMembers::Field field. + struct DataMembers + { + using Field = comms::option::app::EmptyOption; + }; // struct DataMembers /// @brief Extra options for @ref /// tutorial12::frame::FrameLayers::Id /// layer. - using Id = comms::option::EmptyOption; + using Id = comms::option::app::EmptyOption; }; // struct FrameLayers }; // struct frame }; diff --git a/tutorials/tutorial12/include/tutorial12/options/ServerDefaultOptions.h b/tutorials/tutorial12/include/tutorial12/options/ServerDefaultOptions.h index 4327ad53..d8ba753a 100644 --- a/tutorials/tutorial12/include/tutorial12/options/ServerDefaultOptions.h +++ b/tutorials/tutorial12/include/tutorial12/options/ServerDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server default options. diff --git a/tutorials/tutorial12/include/tutorial12/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial12/include/tutorial12/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h index 5264bb43..804194ed 100644 --- a/tutorials/tutorial12/include/tutorial12/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial12/include/tutorial12/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server input messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial13/include/tutorial13/Message.h b/tutorials/tutorial13/include/tutorial13/Message.h index f307cdf5..81d4e446 100644 --- a/tutorials/tutorial13/include/tutorial13/Message.h +++ b/tutorials/tutorial13/include/tutorial13/Message.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message" interface class. diff --git a/tutorials/tutorial13/include/tutorial13/MsgId.h b/tutorials/tutorial13/include/tutorial13/MsgId.h index b47dc840..b392f270 100644 --- a/tutorials/tutorial13/include/tutorial13/MsgId.h +++ b/tutorials/tutorial13/include/tutorial13/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of message ids enumeration. diff --git a/tutorials/tutorial13/include/tutorial13/Version.h b/tutorials/tutorial13/include/tutorial13/Version.h index 08895e9c..7099e95c 100644 --- a/tutorials/tutorial13/include/tutorial13/Version.h +++ b/tutorials/tutorial13/include/tutorial13/Version.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains protocol version definition. @@ -22,5 +22,5 @@ inline constexpr unsigned specVersion() } // namespace tutorial13 // Generated compile time check for minimal supported version of the COMMS library -static_assert(COMMS_MAKE_VERSION(5, 2, 7) <= comms::version(), +static_assert(COMMS_MAKE_VERSION(5, 3, 0) <= comms::version(), "The version of COMMS library is too old"); diff --git a/tutorials/tutorial13/include/tutorial13/dispatch/DispatchClientInputMessage.h b/tutorials/tutorial13/include/tutorial13/dispatch/DispatchClientInputMessage.h index 9ccfef4d..f20e480b 100644 --- a/tutorials/tutorial13/include/tutorial13/dispatch/DispatchClientInputMessage.h +++ b/tutorials/tutorial13/include/tutorial13/dispatch/DispatchClientInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/tutorials/tutorial13/include/tutorial13/dispatch/DispatchMessage.h b/tutorials/tutorial13/include/tutorial13/dispatch/DispatchMessage.h index cfa17e00..8d7e77c7 100644 --- a/tutorials/tutorial13/include/tutorial13/dispatch/DispatchMessage.h +++ b/tutorials/tutorial13/include/tutorial13/dispatch/DispatchMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for all input messages. diff --git a/tutorials/tutorial13/include/tutorial13/dispatch/DispatchServerInputMessage.h b/tutorials/tutorial13/include/tutorial13/dispatch/DispatchServerInputMessage.h index d122fe59..83457070 100644 --- a/tutorials/tutorial13/include/tutorial13/dispatch/DispatchServerInputMessage.h +++ b/tutorials/tutorial13/include/tutorial13/dispatch/DispatchServerInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/tutorials/tutorial13/include/tutorial13/factory/AllMessagesDynMemMsgFactory.h b/tutorials/tutorial13/include/tutorial13/factory/AllMessagesDynMemMsgFactory.h index 528f45ab..eaadaaae 100644 --- a/tutorials/tutorial13/include/tutorial13/factory/AllMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial13/include/tutorial13/factory/AllMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for all the messages. diff --git a/tutorials/tutorial13/include/tutorial13/factory/ClientInputMessagesDynMemMsgFactory.h b/tutorials/tutorial13/include/tutorial13/factory/ClientInputMessagesDynMemMsgFactory.h index 722393c3..272099a2 100644 --- a/tutorials/tutorial13/include/tutorial13/factory/ClientInputMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial13/include/tutorial13/factory/ClientInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the client input messages. diff --git a/tutorials/tutorial13/include/tutorial13/factory/ServerInputMessagesDynMemMsgFactory.h b/tutorials/tutorial13/include/tutorial13/factory/ServerInputMessagesDynMemMsgFactory.h index 636dee85..aba2d810 100644 --- a/tutorials/tutorial13/include/tutorial13/factory/ServerInputMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial13/include/tutorial13/factory/ServerInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the server input messages. diff --git a/tutorials/tutorial13/include/tutorial13/field/FieldBase.h b/tutorials/tutorial13/include/tutorial13/field/FieldBase.h index fa526f52..fa7addd4 100644 --- a/tutorials/tutorial13/include/tutorial13/field/FieldBase.h +++ b/tutorials/tutorial13/include/tutorial13/field/FieldBase.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of base class of all the fields. diff --git a/tutorials/tutorial13/include/tutorial13/field/MsgId.h b/tutorials/tutorial13/include/tutorial13/field/MsgId.h index 444d3b27..569247d7 100644 --- a/tutorials/tutorial13/include/tutorial13/field/MsgId.h +++ b/tutorials/tutorial13/include/tutorial13/field/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "MsgId" field. @@ -27,6 +27,7 @@ class MsgId : public tutorial13::field::FieldBase<>, tutorial13::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 2> > { @@ -35,6 +36,7 @@ class MsgId : public tutorial13::field::FieldBase<>, tutorial13::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 2> >; public: diff --git a/tutorials/tutorial13/include/tutorial13/field/MsgIdCommon.h b/tutorials/tutorial13/include/tutorial13/field/MsgIdCommon.h index 74d8adf8..e6755d46 100644 --- a/tutorials/tutorial13/include/tutorial13/field/MsgIdCommon.h +++ b/tutorials/tutorial13/include/tutorial13/field/MsgIdCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial13/include/tutorial13/frame/Frame.h b/tutorials/tutorial13/include/tutorial13/frame/Frame.h index 8610bd68..4f6f31e5 100644 --- a/tutorials/tutorial13/include/tutorial13/frame/Frame.h +++ b/tutorials/tutorial13/include/tutorial13/frame/Frame.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Frame" frame class. @@ -30,10 +30,30 @@ namespace frame template struct FrameLayers { + /// @brief Scope for field(s) of @ref Data layer. + struct DataMembers + { + /// @brief Custom field for @ref tutorial13::frame::FrameLayers::Data layer + class Field : public + comms::field::ArrayList< + tutorial13::field::FieldBase<>, + std::uint8_t, + typename TOpt::frame::FrameLayers::DataMembers::Field, + comms::option::def::HasName + > + { + public: + static const char* name() + { + return "Data"; + } + }; + }; + /// @brief Definition of layer "Data". using Data = comms::protocol::MsgDataLayer< - typename TOpt::frame::FrameLayers::Data + comms::option::def::FieldType >; /// @brief Definition of layer "Id". @@ -56,13 +76,15 @@ struct FrameLayers class SizeField : public comms::field::IntValue< tutorial13::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial13::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/tutorials/tutorial13/include/tutorial13/frame/FrameCommon.h b/tutorials/tutorial13/include/tutorial13/frame/FrameCommon.h index b127d587..003824f0 100644 --- a/tutorials/tutorial13/include/tutorial13/frame/FrameCommon.h +++ b/tutorials/tutorial13/include/tutorial13/frame/FrameCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial13/include/tutorial13/input/AllMessages.h b/tutorials/tutorial13/include/tutorial13/input/AllMessages.h index c1ddba9c..27eafb2f 100644 --- a/tutorials/tutorial13/include/tutorial13/input/AllMessages.h +++ b/tutorials/tutorial13/include/tutorial13/input/AllMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the AllMessages messages bundle. diff --git a/tutorials/tutorial13/include/tutorial13/input/ClientInputMessages.h b/tutorials/tutorial13/include/tutorial13/input/ClientInputMessages.h index 0e5759ad..79af5226 100644 --- a/tutorials/tutorial13/include/tutorial13/input/ClientInputMessages.h +++ b/tutorials/tutorial13/include/tutorial13/input/ClientInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ClientInputMessages messages bundle. diff --git a/tutorials/tutorial13/include/tutorial13/input/ServerInputMessages.h b/tutorials/tutorial13/include/tutorial13/input/ServerInputMessages.h index 90521ea3..7448fa2b 100644 --- a/tutorials/tutorial13/include/tutorial13/input/ServerInputMessages.h +++ b/tutorials/tutorial13/include/tutorial13/input/ServerInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ServerInputMessages messages bundle. diff --git a/tutorials/tutorial13/include/tutorial13/message/Msg1_1.h b/tutorials/tutorial13/include/tutorial13/message/Msg1_1.h index 1427f0d0..709031ca 100644 --- a/tutorials/tutorial13/include/tutorial13/message/Msg1_1.h +++ b/tutorials/tutorial13/include/tutorial13/message/Msg1_1.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 1 (1)" message and its fields. @@ -32,13 +32,15 @@ struct Msg1_1Fields class F1 : public comms::field::IntValue< tutorial13::field::FieldBase<>, - std::uint64_t + std::uint64_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial13::field::FieldBase<>, - std::uint64_t + std::uint64_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/tutorials/tutorial13/include/tutorial13/message/Msg1_1Common.h b/tutorials/tutorial13/include/tutorial13/message/Msg1_1Common.h index dfe3648f..a52d5cde 100644 --- a/tutorials/tutorial13/include/tutorial13/message/Msg1_1Common.h +++ b/tutorials/tutorial13/include/tutorial13/message/Msg1_1Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial13/include/tutorial13/message/Msg1_2.h b/tutorials/tutorial13/include/tutorial13/message/Msg1_2.h index 2a03b745..097c2550 100644 --- a/tutorials/tutorial13/include/tutorial13/message/Msg1_2.h +++ b/tutorials/tutorial13/include/tutorial13/message/Msg1_2.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 1 (2)" message and its fields. @@ -32,13 +32,15 @@ struct Msg1_2Fields class F1 : public comms::field::IntValue< tutorial13::field::FieldBase<>, - std::uint32_t + std::uint32_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial13::field::FieldBase<>, - std::uint32_t + std::uint32_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/tutorials/tutorial13/include/tutorial13/message/Msg1_2Common.h b/tutorials/tutorial13/include/tutorial13/message/Msg1_2Common.h index d9ae00fe..abab96ed 100644 --- a/tutorials/tutorial13/include/tutorial13/message/Msg1_2Common.h +++ b/tutorials/tutorial13/include/tutorial13/message/Msg1_2Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial13/include/tutorial13/message/Msg1_3.h b/tutorials/tutorial13/include/tutorial13/message/Msg1_3.h index 6253dedd..050f865e 100644 --- a/tutorials/tutorial13/include/tutorial13/message/Msg1_3.h +++ b/tutorials/tutorial13/include/tutorial13/message/Msg1_3.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 1 (3)" message and its fields. @@ -32,13 +32,15 @@ struct Msg1_3Fields class F1 : public comms::field::IntValue< tutorial13::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial13::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/tutorials/tutorial13/include/tutorial13/message/Msg1_3Common.h b/tutorials/tutorial13/include/tutorial13/message/Msg1_3Common.h index c26ddb06..fd77cca2 100644 --- a/tutorials/tutorial13/include/tutorial13/message/Msg1_3Common.h +++ b/tutorials/tutorial13/include/tutorial13/message/Msg1_3Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial13/include/tutorial13/message/Msg2_1.h b/tutorials/tutorial13/include/tutorial13/message/Msg2_1.h index 9a6ba7ad..dbec8011 100644 --- a/tutorials/tutorial13/include/tutorial13/message/Msg2_1.h +++ b/tutorials/tutorial13/include/tutorial13/message/Msg2_1.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 2 (1)" message and its fields. @@ -33,6 +33,7 @@ struct Msg2_1Fields comms::field::IntValue< tutorial13::field::FieldBase<>, std::uint8_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid<>, comms::option::def::DefaultNumValue<1>, comms::option::def::ValidNumValue<1>, @@ -43,6 +44,7 @@ struct Msg2_1Fields comms::field::IntValue< tutorial13::field::FieldBase<>, std::uint8_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid<>, comms::option::def::DefaultNumValue<1>, comms::option::def::ValidNumValue<1>, @@ -80,13 +82,15 @@ struct Msg2_1Fields class F1 : public comms::field::IntValue< tutorial13::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial13::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/tutorials/tutorial13/include/tutorial13/message/Msg2_1Common.h b/tutorials/tutorial13/include/tutorial13/message/Msg2_1Common.h index 5f4ff561..eb613dc4 100644 --- a/tutorials/tutorial13/include/tutorial13/message/Msg2_1Common.h +++ b/tutorials/tutorial13/include/tutorial13/message/Msg2_1Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial13/include/tutorial13/message/Msg2_2.h b/tutorials/tutorial13/include/tutorial13/message/Msg2_2.h index e475aba3..0a575da3 100644 --- a/tutorials/tutorial13/include/tutorial13/message/Msg2_2.h +++ b/tutorials/tutorial13/include/tutorial13/message/Msg2_2.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 2 (2)" message and its fields. @@ -33,6 +33,7 @@ struct Msg2_2Fields comms::field::IntValue< tutorial13::field::FieldBase<>, std::uint8_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid<>, comms::option::def::DefaultNumValue<2>, comms::option::def::ValidNumValue<2>, @@ -43,6 +44,7 @@ struct Msg2_2Fields comms::field::IntValue< tutorial13::field::FieldBase<>, std::uint8_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid<>, comms::option::def::DefaultNumValue<2>, comms::option::def::ValidNumValue<2>, @@ -80,13 +82,15 @@ struct Msg2_2Fields class F1 : public comms::field::IntValue< tutorial13::field::FieldBase<>, - std::uint32_t + std::uint32_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial13::field::FieldBase<>, - std::uint32_t + std::uint32_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/tutorials/tutorial13/include/tutorial13/message/Msg2_2Common.h b/tutorials/tutorial13/include/tutorial13/message/Msg2_2Common.h index 2719d476..937c72a6 100644 --- a/tutorials/tutorial13/include/tutorial13/message/Msg2_2Common.h +++ b/tutorials/tutorial13/include/tutorial13/message/Msg2_2Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial13/include/tutorial13/message/Msg2_3.h b/tutorials/tutorial13/include/tutorial13/message/Msg2_3.h index 2aca0b4d..a1107cdb 100644 --- a/tutorials/tutorial13/include/tutorial13/message/Msg2_3.h +++ b/tutorials/tutorial13/include/tutorial13/message/Msg2_3.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 2 (3)" message and its fields. @@ -33,6 +33,7 @@ struct Msg2_3Fields comms::field::IntValue< tutorial13::field::FieldBase<>, std::uint8_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid<>, comms::option::def::DefaultNumValue<3>, comms::option::def::ValidNumValue<3>, @@ -43,6 +44,7 @@ struct Msg2_3Fields comms::field::IntValue< tutorial13::field::FieldBase<>, std::uint8_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid<>, comms::option::def::DefaultNumValue<3>, comms::option::def::ValidNumValue<3>, @@ -80,13 +82,15 @@ struct Msg2_3Fields class F1 : public comms::field::IntValue< tutorial13::field::FieldBase<>, - std::uint64_t + std::uint64_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial13::field::FieldBase<>, - std::uint64_t + std::uint64_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/tutorials/tutorial13/include/tutorial13/message/Msg2_3Common.h b/tutorials/tutorial13/include/tutorial13/message/Msg2_3Common.h index 00035d26..7e8f8d98 100644 --- a/tutorials/tutorial13/include/tutorial13/message/Msg2_3Common.h +++ b/tutorials/tutorial13/include/tutorial13/message/Msg2_3Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial13/include/tutorial13/options/AllMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial13/include/tutorial13/options/AllMessagesDynMemMsgFactoryDefaultOptions.h index 22ec75e0..8cc71c47 100644 --- a/tutorials/tutorial13/include/tutorial13/options/AllMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial13/include/tutorial13/options/AllMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol all messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial13/include/tutorial13/options/BareMetalDefaultOptions.h b/tutorials/tutorial13/include/tutorial13/options/BareMetalDefaultOptions.h index 68ebc94d..1fd93740 100644 --- a/tutorials/tutorial13/include/tutorial13/options/BareMetalDefaultOptions.h +++ b/tutorials/tutorial13/include/tutorial13/options/BareMetalDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol bare metal default options. @@ -31,13 +31,15 @@ struct BareMetalDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// tutorial13::frame::FrameLayers::Data - /// layer. - using Data = - std::tuple< - comms::option::app::FixedSizeStorage, - typename TBase::frame::FrameLayers::Data - >; + /// tutorial13::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::FixedSizeStorage, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers /// @brief Extra options for @ref /// tutorial13::frame::FrameLayers::Id diff --git a/tutorials/tutorial13/include/tutorial13/options/ClientDefaultOptions.h b/tutorials/tutorial13/include/tutorial13/options/ClientDefaultOptions.h index 50a9da86..e8ea8aae 100644 --- a/tutorials/tutorial13/include/tutorial13/options/ClientDefaultOptions.h +++ b/tutorials/tutorial13/include/tutorial13/options/ClientDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client default options. diff --git a/tutorials/tutorial13/include/tutorial13/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial13/include/tutorial13/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h index 8abb9d8d..7b4deb8b 100644 --- a/tutorials/tutorial13/include/tutorial13/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial13/include/tutorial13/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client input messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial13/include/tutorial13/options/DataViewDefaultOptions.h b/tutorials/tutorial13/include/tutorial13/options/DataViewDefaultOptions.h index d728b105..23f02697 100644 --- a/tutorials/tutorial13/include/tutorial13/options/DataViewDefaultOptions.h +++ b/tutorials/tutorial13/include/tutorial13/options/DataViewDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol data view default options. @@ -25,13 +25,15 @@ struct DataViewDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// tutorial13::frame::FrameLayers::Data - /// layer. - using Data = - std::tuple< - comms::option::app::OrigDataView, - typename TBase::frame::FrameLayers::Data - >; + /// tutorial13::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::OrigDataView, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers }; // struct FrameLayers }; // struct frame }; diff --git a/tutorials/tutorial13/include/tutorial13/options/DefaultOptions.h b/tutorials/tutorial13/include/tutorial13/options/DefaultOptions.h index 80db2392..958054a7 100644 --- a/tutorials/tutorial13/include/tutorial13/options/DefaultOptions.h +++ b/tutorials/tutorial13/include/tutorial13/options/DefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol default options. @@ -28,14 +28,16 @@ struct DefaultOptionsT : public TBase struct FrameLayers { /// @brief Extra options for @ref - /// tutorial13::frame::FrameLayers::Data - /// layer. - using Data = comms::option::EmptyOption; + /// tutorial13::frame::FrameLayers::DataMembers::Field field. + struct DataMembers + { + using Field = comms::option::app::EmptyOption; + }; // struct DataMembers /// @brief Extra options for @ref /// tutorial13::frame::FrameLayers::Id /// layer. - using Id = comms::option::EmptyOption; + using Id = comms::option::app::EmptyOption; }; // struct FrameLayers }; // struct frame }; diff --git a/tutorials/tutorial13/include/tutorial13/options/ServerDefaultOptions.h b/tutorials/tutorial13/include/tutorial13/options/ServerDefaultOptions.h index 7a7a3be2..3b2f83f9 100644 --- a/tutorials/tutorial13/include/tutorial13/options/ServerDefaultOptions.h +++ b/tutorials/tutorial13/include/tutorial13/options/ServerDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server default options. diff --git a/tutorials/tutorial13/include/tutorial13/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial13/include/tutorial13/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h index ecd265e8..98313bf3 100644 --- a/tutorials/tutorial13/include/tutorial13/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial13/include/tutorial13/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server input messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial14/include/tutorial14/Message.h b/tutorials/tutorial14/include/tutorial14/Message.h index 872b18db..6efe33cc 100644 --- a/tutorials/tutorial14/include/tutorial14/Message.h +++ b/tutorials/tutorial14/include/tutorial14/Message.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message" interface class. diff --git a/tutorials/tutorial14/include/tutorial14/MsgId.h b/tutorials/tutorial14/include/tutorial14/MsgId.h index 6757d8eb..57c4bf4c 100644 --- a/tutorials/tutorial14/include/tutorial14/MsgId.h +++ b/tutorials/tutorial14/include/tutorial14/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of message ids enumeration. diff --git a/tutorials/tutorial14/include/tutorial14/Version.h b/tutorials/tutorial14/include/tutorial14/Version.h index f4f8cd3a..1d50d9ad 100644 --- a/tutorials/tutorial14/include/tutorial14/Version.h +++ b/tutorials/tutorial14/include/tutorial14/Version.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains protocol version definition. @@ -22,5 +22,5 @@ inline constexpr unsigned specVersion() } // namespace tutorial14 // Generated compile time check for minimal supported version of the COMMS library -static_assert(COMMS_MAKE_VERSION(5, 2, 7) <= comms::version(), +static_assert(COMMS_MAKE_VERSION(5, 3, 0) <= comms::version(), "The version of COMMS library is too old"); diff --git a/tutorials/tutorial14/include/tutorial14/dispatch/DispatchClientInputMessage.h b/tutorials/tutorial14/include/tutorial14/dispatch/DispatchClientInputMessage.h index efdb0e89..8dfe6cdf 100644 --- a/tutorials/tutorial14/include/tutorial14/dispatch/DispatchClientInputMessage.h +++ b/tutorials/tutorial14/include/tutorial14/dispatch/DispatchClientInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/tutorials/tutorial14/include/tutorial14/dispatch/DispatchMessage.h b/tutorials/tutorial14/include/tutorial14/dispatch/DispatchMessage.h index 153ebdee..45c5c3ea 100644 --- a/tutorials/tutorial14/include/tutorial14/dispatch/DispatchMessage.h +++ b/tutorials/tutorial14/include/tutorial14/dispatch/DispatchMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for all input messages. diff --git a/tutorials/tutorial14/include/tutorial14/dispatch/DispatchServerInputMessage.h b/tutorials/tutorial14/include/tutorial14/dispatch/DispatchServerInputMessage.h index b00c91a1..23878d4e 100644 --- a/tutorials/tutorial14/include/tutorial14/dispatch/DispatchServerInputMessage.h +++ b/tutorials/tutorial14/include/tutorial14/dispatch/DispatchServerInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/tutorials/tutorial14/include/tutorial14/factory/AllMessagesDynMemMsgFactory.h b/tutorials/tutorial14/include/tutorial14/factory/AllMessagesDynMemMsgFactory.h index 82f875fc..2f2b8ab9 100644 --- a/tutorials/tutorial14/include/tutorial14/factory/AllMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial14/include/tutorial14/factory/AllMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for all the messages. diff --git a/tutorials/tutorial14/include/tutorial14/factory/ClientInputMessagesDynMemMsgFactory.h b/tutorials/tutorial14/include/tutorial14/factory/ClientInputMessagesDynMemMsgFactory.h index 4e93b02f..49b7c91a 100644 --- a/tutorials/tutorial14/include/tutorial14/factory/ClientInputMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial14/include/tutorial14/factory/ClientInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the client input messages. diff --git a/tutorials/tutorial14/include/tutorial14/factory/ServerInputMessagesDynMemMsgFactory.h b/tutorials/tutorial14/include/tutorial14/factory/ServerInputMessagesDynMemMsgFactory.h index 03258f17..1192f6ed 100644 --- a/tutorials/tutorial14/include/tutorial14/factory/ServerInputMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial14/include/tutorial14/factory/ServerInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the server input messages. diff --git a/tutorials/tutorial14/include/tutorial14/field/FieldBase.h b/tutorials/tutorial14/include/tutorial14/field/FieldBase.h index 494e32c5..20356e7e 100644 --- a/tutorials/tutorial14/include/tutorial14/field/FieldBase.h +++ b/tutorials/tutorial14/include/tutorial14/field/FieldBase.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of base class of all the fields. diff --git a/tutorials/tutorial14/include/tutorial14/field/MsgId.h b/tutorials/tutorial14/include/tutorial14/field/MsgId.h index 9c2f42d0..af48baca 100644 --- a/tutorials/tutorial14/include/tutorial14/field/MsgId.h +++ b/tutorials/tutorial14/include/tutorial14/field/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "MsgId" field. @@ -27,6 +27,7 @@ class MsgId : public tutorial14::field::FieldBase<>, tutorial14::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 2> > { @@ -35,6 +36,7 @@ class MsgId : public tutorial14::field::FieldBase<>, tutorial14::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 2> >; public: diff --git a/tutorials/tutorial14/include/tutorial14/field/MsgIdCommon.h b/tutorials/tutorial14/include/tutorial14/field/MsgIdCommon.h index 568f60a9..ce96e65b 100644 --- a/tutorials/tutorial14/include/tutorial14/field/MsgIdCommon.h +++ b/tutorials/tutorial14/include/tutorial14/field/MsgIdCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial14/include/tutorial14/frame/Frame.h b/tutorials/tutorial14/include/tutorial14/frame/Frame.h index 16cdc16a..e976761a 100644 --- a/tutorials/tutorial14/include/tutorial14/frame/Frame.h +++ b/tutorials/tutorial14/include/tutorial14/frame/Frame.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Frame" frame class. @@ -33,10 +33,30 @@ namespace frame template struct FrameLayers { + /// @brief Scope for field(s) of @ref Data layer. + struct DataMembers + { + /// @brief Custom field for @ref tutorial14::frame::FrameLayers::Data layer + class Field : public + comms::field::ArrayList< + tutorial14::field::FieldBase<>, + std::uint8_t, + typename TOpt::frame::FrameLayers::DataMembers::Field, + comms::option::def::HasName + > + { + public: + static const char* name() + { + return "Data"; + } + }; + }; + /// @brief Definition of layer "Data". using Data = comms::protocol::MsgDataLayer< - typename TOpt::frame::FrameLayers::Data + comms::option::def::FieldType >; /// @brief Definition of layer "Id". @@ -60,6 +80,7 @@ struct FrameLayers comms::field::IntValue< tutorial14::field::FieldBase<>, std::uint16_t, + comms::option::def::HasName, comms::option::def::NumValueSerOffset<2> > { @@ -67,6 +88,7 @@ struct FrameLayers comms::field::IntValue< tutorial14::field::FieldBase<>, std::uint16_t, + comms::option::def::HasName, comms::option::def::NumValueSerOffset<2> >; public: @@ -102,13 +124,15 @@ struct FrameLayers class ChecksumField : public comms::field::IntValue< tutorial14::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial14::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -145,6 +169,7 @@ struct FrameLayers comms::field::IntValue< tutorial14::field::FieldBase<>, std::uint16_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid, comms::option::def::DefaultNumValue<43981L> > @@ -153,6 +178,7 @@ struct FrameLayers comms::field::IntValue< tutorial14::field::FieldBase<>, std::uint16_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid, comms::option::def::DefaultNumValue<43981L> >; diff --git a/tutorials/tutorial14/include/tutorial14/frame/FrameCommon.h b/tutorials/tutorial14/include/tutorial14/frame/FrameCommon.h index b2cf9deb..42b229a5 100644 --- a/tutorials/tutorial14/include/tutorial14/frame/FrameCommon.h +++ b/tutorials/tutorial14/include/tutorial14/frame/FrameCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial14/include/tutorial14/input/AllMessages.h b/tutorials/tutorial14/include/tutorial14/input/AllMessages.h index 61d202ba..57cc0bb5 100644 --- a/tutorials/tutorial14/include/tutorial14/input/AllMessages.h +++ b/tutorials/tutorial14/include/tutorial14/input/AllMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the AllMessages messages bundle. diff --git a/tutorials/tutorial14/include/tutorial14/input/ClientInputMessages.h b/tutorials/tutorial14/include/tutorial14/input/ClientInputMessages.h index b8da63ba..79ed2fcb 100644 --- a/tutorials/tutorial14/include/tutorial14/input/ClientInputMessages.h +++ b/tutorials/tutorial14/include/tutorial14/input/ClientInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ClientInputMessages messages bundle. diff --git a/tutorials/tutorial14/include/tutorial14/input/ServerInputMessages.h b/tutorials/tutorial14/include/tutorial14/input/ServerInputMessages.h index 876ade48..2c978e81 100644 --- a/tutorials/tutorial14/include/tutorial14/input/ServerInputMessages.h +++ b/tutorials/tutorial14/include/tutorial14/input/ServerInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ServerInputMessages messages bundle. diff --git a/tutorials/tutorial14/include/tutorial14/message/Msg1.h b/tutorials/tutorial14/include/tutorial14/message/Msg1.h index dee148e4..81fb1229 100644 --- a/tutorials/tutorial14/include/tutorial14/message/Msg1.h +++ b/tutorials/tutorial14/include/tutorial14/message/Msg1.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 1" message and its fields. @@ -38,13 +38,15 @@ struct Msg1Fields class F1 : public comms::field::IntValue< tutorial14::field::FieldBase<>, - std::uint32_t + std::uint32_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial14::field::FieldBase<>, - std::uint32_t + std::uint32_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -68,12 +70,14 @@ struct Msg1Fields class F1 : public comms::field::Optional< typename F1Members::F1, + comms::option::def::HasName, comms::option::def::ExistsByDefault > { using Base = comms::field::Optional< typename F1Members::F1, + comms::option::def::HasName, comms::option::def::ExistsByDefault >; public: @@ -92,13 +96,15 @@ struct Msg1Fields class F2 : public comms::field::IntValue< tutorial14::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial14::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -122,12 +128,14 @@ struct Msg1Fields class F2 : public comms::field::Optional< typename F2Members::F2, + comms::option::def::HasName, comms::option::def::MissingByDefault > { using Base = comms::field::Optional< typename F2Members::F2, + comms::option::def::HasName, comms::option::def::MissingByDefault >; public: @@ -146,13 +154,15 @@ struct Msg1Fields class F3 : public comms::field::IntValue< tutorial14::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial14::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -176,12 +186,14 @@ struct Msg1Fields class F3 : public comms::field::Optional< typename F3Members::F3, + comms::option::def::HasName, comms::option::def::MissingByDefault > { using Base = comms::field::Optional< typename F3Members::F3, + comms::option::def::HasName, comms::option::def::MissingByDefault >; public: @@ -196,6 +208,7 @@ struct Msg1Fields class Flags : public comms::field::BitmaskValue< tutorial14::field::FieldBase<>, + comms::option::def::HasName, comms::option::def::FixedLength<1U>, comms::option::def::BitmaskReservedBits<0xFEU, 0x0U> > @@ -203,6 +216,7 @@ struct Msg1Fields using Base = comms::field::BitmaskValue< tutorial14::field::FieldBase<>, + comms::option::def::HasName, comms::option::def::FixedLength<1U>, comms::option::def::BitmaskReservedBits<0xFEU, 0x0U> >; @@ -218,13 +232,18 @@ struct Msg1Fields F2F3 ); + /// @brief Retrieve name of the bit. + /// @see @ref tutorial14::message::Msg1FieldsCommon::FlagsCommon::bitName(). + static const char* bitName(std::size_t idx) + { + return tutorial14::message::Msg1FieldsCommon::FlagsCommon::bitName(idx); + } + /// @brief Retrieve name of the bit. /// @see @ref tutorial14::message::Msg1FieldsCommon::FlagsCommon::bitName(). static const char* bitName(BitIdx idx) { - return - tutorial14::message::Msg1FieldsCommon::FlagsCommon::bitName( - static_cast(idx)); + return bitName(static_cast(idx)); } /// @brief Name of the field. diff --git a/tutorials/tutorial14/include/tutorial14/message/Msg1Common.h b/tutorials/tutorial14/include/tutorial14/message/Msg1Common.h index 5081a394..1e57efef 100644 --- a/tutorials/tutorial14/include/tutorial14/message/Msg1Common.h +++ b/tutorials/tutorial14/include/tutorial14/message/Msg1Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial14/include/tutorial14/message/Msg2.h b/tutorials/tutorial14/include/tutorial14/message/Msg2.h index 9f8ecc7a..e82c9caa 100644 --- a/tutorials/tutorial14/include/tutorial14/message/Msg2.h +++ b/tutorials/tutorial14/include/tutorial14/message/Msg2.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 2" message and its fields. @@ -34,13 +34,15 @@ struct Msg2Fields class F1 : public comms::field::IntValue< tutorial14::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial14::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/tutorials/tutorial14/include/tutorial14/message/Msg2Common.h b/tutorials/tutorial14/include/tutorial14/message/Msg2Common.h index a9792029..ad9bfcb2 100644 --- a/tutorials/tutorial14/include/tutorial14/message/Msg2Common.h +++ b/tutorials/tutorial14/include/tutorial14/message/Msg2Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial14/include/tutorial14/options/AllMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial14/include/tutorial14/options/AllMessagesDynMemMsgFactoryDefaultOptions.h index 2af537a4..16f8e064 100644 --- a/tutorials/tutorial14/include/tutorial14/options/AllMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial14/include/tutorial14/options/AllMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol all messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial14/include/tutorial14/options/BareMetalDefaultOptions.h b/tutorials/tutorial14/include/tutorial14/options/BareMetalDefaultOptions.h index 93173ce8..9a47e3a7 100644 --- a/tutorials/tutorial14/include/tutorial14/options/BareMetalDefaultOptions.h +++ b/tutorials/tutorial14/include/tutorial14/options/BareMetalDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol bare metal default options. @@ -31,13 +31,15 @@ struct BareMetalDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// tutorial14::frame::FrameLayers::Data - /// layer. - using Data = - std::tuple< - comms::option::app::FixedSizeStorage, - typename TBase::frame::FrameLayers::Data - >; + /// tutorial14::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::FixedSizeStorage, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers /// @brief Extra options for @ref /// tutorial14::frame::FrameLayers::Id diff --git a/tutorials/tutorial14/include/tutorial14/options/ClientDefaultOptions.h b/tutorials/tutorial14/include/tutorial14/options/ClientDefaultOptions.h index fe2895c8..ac554c91 100644 --- a/tutorials/tutorial14/include/tutorial14/options/ClientDefaultOptions.h +++ b/tutorials/tutorial14/include/tutorial14/options/ClientDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client default options. diff --git a/tutorials/tutorial14/include/tutorial14/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial14/include/tutorial14/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h index 38d8118a..cae604ce 100644 --- a/tutorials/tutorial14/include/tutorial14/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial14/include/tutorial14/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client input messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial14/include/tutorial14/options/DataViewDefaultOptions.h b/tutorials/tutorial14/include/tutorial14/options/DataViewDefaultOptions.h index 2e4873b6..fc9c47b6 100644 --- a/tutorials/tutorial14/include/tutorial14/options/DataViewDefaultOptions.h +++ b/tutorials/tutorial14/include/tutorial14/options/DataViewDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol data view default options. @@ -25,13 +25,15 @@ struct DataViewDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// tutorial14::frame::FrameLayers::Data - /// layer. - using Data = - std::tuple< - comms::option::app::OrigDataView, - typename TBase::frame::FrameLayers::Data - >; + /// tutorial14::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::OrigDataView, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers }; // struct FrameLayers }; // struct frame }; diff --git a/tutorials/tutorial14/include/tutorial14/options/DefaultOptions.h b/tutorials/tutorial14/include/tutorial14/options/DefaultOptions.h index d8431155..56565b30 100644 --- a/tutorials/tutorial14/include/tutorial14/options/DefaultOptions.h +++ b/tutorials/tutorial14/include/tutorial14/options/DefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol default options. @@ -28,14 +28,16 @@ struct DefaultOptionsT : public TBase struct FrameLayers { /// @brief Extra options for @ref - /// tutorial14::frame::FrameLayers::Data - /// layer. - using Data = comms::option::EmptyOption; + /// tutorial14::frame::FrameLayers::DataMembers::Field field. + struct DataMembers + { + using Field = comms::option::app::EmptyOption; + }; // struct DataMembers /// @brief Extra options for @ref /// tutorial14::frame::FrameLayers::Id /// layer. - using Id = comms::option::EmptyOption; + using Id = comms::option::app::EmptyOption; }; // struct FrameLayers }; // struct frame }; diff --git a/tutorials/tutorial14/include/tutorial14/options/ServerDefaultOptions.h b/tutorials/tutorial14/include/tutorial14/options/ServerDefaultOptions.h index 6d7ed498..dfe7093e 100644 --- a/tutorials/tutorial14/include/tutorial14/options/ServerDefaultOptions.h +++ b/tutorials/tutorial14/include/tutorial14/options/ServerDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server default options. diff --git a/tutorials/tutorial14/include/tutorial14/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial14/include/tutorial14/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h index 1d10fd02..fba0d6ee 100644 --- a/tutorials/tutorial14/include/tutorial14/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial14/include/tutorial14/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server input messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial15/include/tutorial15/Message.h b/tutorials/tutorial15/include/tutorial15/Message.h index 9c213e40..ebf0f8de 100644 --- a/tutorials/tutorial15/include/tutorial15/Message.h +++ b/tutorials/tutorial15/include/tutorial15/Message.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message" interface class. diff --git a/tutorials/tutorial15/include/tutorial15/MsgId.h b/tutorials/tutorial15/include/tutorial15/MsgId.h index 86e9b8ef..0a04a0e7 100644 --- a/tutorials/tutorial15/include/tutorial15/MsgId.h +++ b/tutorials/tutorial15/include/tutorial15/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of message ids enumeration. diff --git a/tutorials/tutorial15/include/tutorial15/Version.h b/tutorials/tutorial15/include/tutorial15/Version.h index 96daa20a..e609376d 100644 --- a/tutorials/tutorial15/include/tutorial15/Version.h +++ b/tutorials/tutorial15/include/tutorial15/Version.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains protocol version definition. @@ -22,5 +22,5 @@ inline constexpr unsigned specVersion() } // namespace tutorial15 // Generated compile time check for minimal supported version of the COMMS library -static_assert(COMMS_MAKE_VERSION(5, 2, 7) <= comms::version(), +static_assert(COMMS_MAKE_VERSION(5, 3, 0) <= comms::version(), "The version of COMMS library is too old"); diff --git a/tutorials/tutorial15/include/tutorial15/dispatch/DispatchClientInputMessage.h b/tutorials/tutorial15/include/tutorial15/dispatch/DispatchClientInputMessage.h index a1104a12..16fe3654 100644 --- a/tutorials/tutorial15/include/tutorial15/dispatch/DispatchClientInputMessage.h +++ b/tutorials/tutorial15/include/tutorial15/dispatch/DispatchClientInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/tutorials/tutorial15/include/tutorial15/dispatch/DispatchMessage.h b/tutorials/tutorial15/include/tutorial15/dispatch/DispatchMessage.h index c7fea0ff..0377f0a1 100644 --- a/tutorials/tutorial15/include/tutorial15/dispatch/DispatchMessage.h +++ b/tutorials/tutorial15/include/tutorial15/dispatch/DispatchMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for all input messages. diff --git a/tutorials/tutorial15/include/tutorial15/dispatch/DispatchServerInputMessage.h b/tutorials/tutorial15/include/tutorial15/dispatch/DispatchServerInputMessage.h index ed6642ec..fbf45a47 100644 --- a/tutorials/tutorial15/include/tutorial15/dispatch/DispatchServerInputMessage.h +++ b/tutorials/tutorial15/include/tutorial15/dispatch/DispatchServerInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/tutorials/tutorial15/include/tutorial15/factory/AllMessagesDynMemMsgFactory.h b/tutorials/tutorial15/include/tutorial15/factory/AllMessagesDynMemMsgFactory.h index 3e575892..eecd6c1c 100644 --- a/tutorials/tutorial15/include/tutorial15/factory/AllMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial15/include/tutorial15/factory/AllMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for all the messages. diff --git a/tutorials/tutorial15/include/tutorial15/factory/ClientInputMessagesDynMemMsgFactory.h b/tutorials/tutorial15/include/tutorial15/factory/ClientInputMessagesDynMemMsgFactory.h index f1ec5941..7ee5d114 100644 --- a/tutorials/tutorial15/include/tutorial15/factory/ClientInputMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial15/include/tutorial15/factory/ClientInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the client input messages. diff --git a/tutorials/tutorial15/include/tutorial15/factory/ServerInputMessagesDynMemMsgFactory.h b/tutorials/tutorial15/include/tutorial15/factory/ServerInputMessagesDynMemMsgFactory.h index 513fe7cc..cb6c667b 100644 --- a/tutorials/tutorial15/include/tutorial15/factory/ServerInputMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial15/include/tutorial15/factory/ServerInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the server input messages. diff --git a/tutorials/tutorial15/include/tutorial15/field/FieldBase.h b/tutorials/tutorial15/include/tutorial15/field/FieldBase.h index bfd98e67..31d5f298 100644 --- a/tutorials/tutorial15/include/tutorial15/field/FieldBase.h +++ b/tutorials/tutorial15/include/tutorial15/field/FieldBase.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of base class of all the fields. diff --git a/tutorials/tutorial15/include/tutorial15/field/MsgId.h b/tutorials/tutorial15/include/tutorial15/field/MsgId.h index d63c882b..c9a6ebdf 100644 --- a/tutorials/tutorial15/include/tutorial15/field/MsgId.h +++ b/tutorials/tutorial15/include/tutorial15/field/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "MsgId" field. @@ -27,6 +27,7 @@ class MsgId : public tutorial15::field::FieldBase<>, tutorial15::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 3> > { @@ -35,6 +36,7 @@ class MsgId : public tutorial15::field::FieldBase<>, tutorial15::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 3> >; public: diff --git a/tutorials/tutorial15/include/tutorial15/field/MsgIdCommon.h b/tutorials/tutorial15/include/tutorial15/field/MsgIdCommon.h index 2b22272a..e895226a 100644 --- a/tutorials/tutorial15/include/tutorial15/field/MsgIdCommon.h +++ b/tutorials/tutorial15/include/tutorial15/field/MsgIdCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial15/include/tutorial15/frame/Frame.h b/tutorials/tutorial15/include/tutorial15/frame/Frame.h index c28e0acf..a41b7593 100644 --- a/tutorials/tutorial15/include/tutorial15/frame/Frame.h +++ b/tutorials/tutorial15/include/tutorial15/frame/Frame.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Frame" frame class. @@ -30,10 +30,30 @@ namespace frame template struct FrameLayers { + /// @brief Scope for field(s) of @ref Data layer. + struct DataMembers + { + /// @brief Custom field for @ref tutorial15::frame::FrameLayers::Data layer + class Field : public + comms::field::ArrayList< + tutorial15::field::FieldBase<>, + std::uint8_t, + typename TOpt::frame::FrameLayers::DataMembers::Field, + comms::option::def::HasName + > + { + public: + static const char* name() + { + return "Data"; + } + }; + }; + /// @brief Definition of layer "Data". using Data = comms::protocol::MsgDataLayer< - typename TOpt::frame::FrameLayers::Data + comms::option::def::FieldType >; /// @brief Definition of layer "Id". @@ -56,13 +76,15 @@ struct FrameLayers class SizeField : public comms::field::IntValue< tutorial15::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial15::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/tutorials/tutorial15/include/tutorial15/frame/FrameCommon.h b/tutorials/tutorial15/include/tutorial15/frame/FrameCommon.h index fbd69435..b1a8fe23 100644 --- a/tutorials/tutorial15/include/tutorial15/frame/FrameCommon.h +++ b/tutorials/tutorial15/include/tutorial15/frame/FrameCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial15/include/tutorial15/input/AllMessages.h b/tutorials/tutorial15/include/tutorial15/input/AllMessages.h index b5f9605d..60a18dc0 100644 --- a/tutorials/tutorial15/include/tutorial15/input/AllMessages.h +++ b/tutorials/tutorial15/include/tutorial15/input/AllMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the AllMessages messages bundle. diff --git a/tutorials/tutorial15/include/tutorial15/input/ClientInputMessages.h b/tutorials/tutorial15/include/tutorial15/input/ClientInputMessages.h index c6446531..32f450c4 100644 --- a/tutorials/tutorial15/include/tutorial15/input/ClientInputMessages.h +++ b/tutorials/tutorial15/include/tutorial15/input/ClientInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ClientInputMessages messages bundle. diff --git a/tutorials/tutorial15/include/tutorial15/input/ServerInputMessages.h b/tutorials/tutorial15/include/tutorial15/input/ServerInputMessages.h index 2a91f1dc..9b69a2fb 100644 --- a/tutorials/tutorial15/include/tutorial15/input/ServerInputMessages.h +++ b/tutorials/tutorial15/include/tutorial15/input/ServerInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ServerInputMessages messages bundle. diff --git a/tutorials/tutorial15/include/tutorial15/message/Msg1.h b/tutorials/tutorial15/include/tutorial15/message/Msg1.h index 63218261..dcf88019 100644 --- a/tutorials/tutorial15/include/tutorial15/message/Msg1.h +++ b/tutorials/tutorial15/include/tutorial15/message/Msg1.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 1" message and its fields. @@ -33,6 +33,7 @@ struct Msg1Fields comms::field::IntValue< tutorial15::field::FieldBase<>, std::uint32_t, + comms::option::def::HasName, comms::option::def::DefaultNumValue<43707L> > { @@ -40,6 +41,7 @@ struct Msg1Fields comms::field::IntValue< tutorial15::field::FieldBase<>, std::uint32_t, + comms::option::def::HasName, comms::option::def::DefaultNumValue<43707L> >; public: diff --git a/tutorials/tutorial15/include/tutorial15/message/Msg1Common.h b/tutorials/tutorial15/include/tutorial15/message/Msg1Common.h index fa78becf..9cbdfeab 100644 --- a/tutorials/tutorial15/include/tutorial15/message/Msg1Common.h +++ b/tutorials/tutorial15/include/tutorial15/message/Msg1Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial15/include/tutorial15/message/Msg2.h b/tutorials/tutorial15/include/tutorial15/message/Msg2.h index a7a06979..05975168 100644 --- a/tutorials/tutorial15/include/tutorial15/message/Msg2.h +++ b/tutorials/tutorial15/include/tutorial15/message/Msg2.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 2" message and its fields. @@ -37,13 +37,15 @@ struct Msg2Fields class Length : public comms::field::IntValue< tutorial15::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial15::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -68,6 +70,7 @@ struct Msg2Fields comms::field::String< tutorial15::field::FieldBase<>, typename TOpt::message::Msg2Fields::F1, + comms::option::def::HasName, comms::option::def::SequenceSerLengthFieldPrefix > { @@ -75,6 +78,7 @@ struct Msg2Fields comms::field::String< tutorial15::field::FieldBase<>, typename TOpt::message::Msg2Fields::F1, + comms::option::def::HasName, comms::option::def::SequenceSerLengthFieldPrefix >; public: diff --git a/tutorials/tutorial15/include/tutorial15/message/Msg2Common.h b/tutorials/tutorial15/include/tutorial15/message/Msg2Common.h index 15756586..bd9b55ce 100644 --- a/tutorials/tutorial15/include/tutorial15/message/Msg2Common.h +++ b/tutorials/tutorial15/include/tutorial15/message/Msg2Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial15/include/tutorial15/message/Msg3.h b/tutorials/tutorial15/include/tutorial15/message/Msg3.h index 56da22c2..dbce2ba1 100644 --- a/tutorials/tutorial15/include/tutorial15/message/Msg3.h +++ b/tutorials/tutorial15/include/tutorial15/message/Msg3.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 3" message and its fields. @@ -39,13 +39,15 @@ struct Msg3Fields class Length : public comms::field::IntValue< tutorial15::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial15::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -71,6 +73,7 @@ struct Msg3Fields tutorial15::field::FieldBase<>, std::uint8_t, typename TOpt::message::Msg3Fields::F1, + comms::option::def::HasName, comms::option::def::SequenceSerLengthFieldPrefix > { @@ -79,6 +82,7 @@ struct Msg3Fields tutorial15::field::FieldBase<>, std::uint8_t, typename TOpt::message::Msg3Fields::F1, + comms::option::def::HasName, comms::option::def::SequenceSerLengthFieldPrefix >; public: diff --git a/tutorials/tutorial15/include/tutorial15/message/Msg3Common.h b/tutorials/tutorial15/include/tutorial15/message/Msg3Common.h index 7767fd2d..40af6fd0 100644 --- a/tutorials/tutorial15/include/tutorial15/message/Msg3Common.h +++ b/tutorials/tutorial15/include/tutorial15/message/Msg3Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial15/include/tutorial15/options/AllMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial15/include/tutorial15/options/AllMessagesDynMemMsgFactoryDefaultOptions.h index bb958459..17483dbe 100644 --- a/tutorials/tutorial15/include/tutorial15/options/AllMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial15/include/tutorial15/options/AllMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol all messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial15/include/tutorial15/options/BareMetalDefaultOptions.h b/tutorials/tutorial15/include/tutorial15/options/BareMetalDefaultOptions.h index 9e79278e..59c6b13c 100644 --- a/tutorials/tutorial15/include/tutorial15/options/BareMetalDefaultOptions.h +++ b/tutorials/tutorial15/include/tutorial15/options/BareMetalDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol bare metal default options. @@ -63,13 +63,15 @@ struct BareMetalDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// tutorial15::frame::FrameLayers::Data - /// layer. - using Data = - std::tuple< - comms::option::app::FixedSizeStorage, - typename TBase::frame::FrameLayers::Data - >; + /// tutorial15::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::FixedSizeStorage, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers /// @brief Extra options for @ref /// tutorial15::frame::FrameLayers::Id diff --git a/tutorials/tutorial15/include/tutorial15/options/ClientDefaultOptions.h b/tutorials/tutorial15/include/tutorial15/options/ClientDefaultOptions.h index 5f1cab5a..3f41ae29 100644 --- a/tutorials/tutorial15/include/tutorial15/options/ClientDefaultOptions.h +++ b/tutorials/tutorial15/include/tutorial15/options/ClientDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client default options. diff --git a/tutorials/tutorial15/include/tutorial15/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial15/include/tutorial15/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h index ff1bb3d9..8747cfb0 100644 --- a/tutorials/tutorial15/include/tutorial15/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial15/include/tutorial15/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client input messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial15/include/tutorial15/options/DataViewDefaultOptions.h b/tutorials/tutorial15/include/tutorial15/options/DataViewDefaultOptions.h index 6f5af171..f679a1a6 100644 --- a/tutorials/tutorial15/include/tutorial15/options/DataViewDefaultOptions.h +++ b/tutorials/tutorial15/include/tutorial15/options/DataViewDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol data view default options. @@ -57,13 +57,15 @@ struct DataViewDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// tutorial15::frame::FrameLayers::Data - /// layer. - using Data = - std::tuple< - comms::option::app::OrigDataView, - typename TBase::frame::FrameLayers::Data - >; + /// tutorial15::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::OrigDataView, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers }; // struct FrameLayers }; // struct frame }; diff --git a/tutorials/tutorial15/include/tutorial15/options/DefaultOptions.h b/tutorials/tutorial15/include/tutorial15/options/DefaultOptions.h index 020a942d..e5e7e4c1 100644 --- a/tutorials/tutorial15/include/tutorial15/options/DefaultOptions.h +++ b/tutorials/tutorial15/include/tutorial15/options/DefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol default options. @@ -25,7 +25,7 @@ struct DefaultOptionsT : public TBase { /// @brief Extra options for @ref /// tutorial15::message::Msg1 message. - using Msg1 = comms::option::EmptyOption; + using Msg1 = comms::option::app::EmptyOption; /// @brief Extra options for fields of /// @ref tutorial15::message::Msg2 message. @@ -34,7 +34,7 @@ struct DefaultOptionsT : public TBase /// @brief Extra options for @ref /// tutorial15::message::Msg2Fields::F1 /// field. - using F1 = comms::option::EmptyOption; + using F1 = comms::option::app::EmptyOption; }; /// @brief Extra options for fields of @@ -44,7 +44,7 @@ struct DefaultOptionsT : public TBase /// @brief Extra options for @ref /// tutorial15::message::Msg3Fields::F1 /// field. - using F1 = comms::option::EmptyOption; + using F1 = comms::option::app::EmptyOption; }; }; // struct message @@ -56,14 +56,16 @@ struct DefaultOptionsT : public TBase struct FrameLayers { /// @brief Extra options for @ref - /// tutorial15::frame::FrameLayers::Data - /// layer. - using Data = comms::option::EmptyOption; + /// tutorial15::frame::FrameLayers::DataMembers::Field field. + struct DataMembers + { + using Field = comms::option::app::EmptyOption; + }; // struct DataMembers /// @brief Extra options for @ref /// tutorial15::frame::FrameLayers::Id /// layer. - using Id = comms::option::EmptyOption; + using Id = comms::option::app::EmptyOption; }; // struct FrameLayers }; // struct frame }; diff --git a/tutorials/tutorial15/include/tutorial15/options/ServerDefaultOptions.h b/tutorials/tutorial15/include/tutorial15/options/ServerDefaultOptions.h index 9b058681..79923b8e 100644 --- a/tutorials/tutorial15/include/tutorial15/options/ServerDefaultOptions.h +++ b/tutorials/tutorial15/include/tutorial15/options/ServerDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server default options. diff --git a/tutorials/tutorial15/include/tutorial15/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial15/include/tutorial15/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h index 2c31cede..91ac0438 100644 --- a/tutorials/tutorial15/include/tutorial15/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial15/include/tutorial15/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server input messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial16/include/tutorial16/Interface.h b/tutorials/tutorial16/include/tutorial16/Interface.h index 92e67457..7ec40dd5 100644 --- a/tutorials/tutorial16/include/tutorial16/Interface.h +++ b/tutorials/tutorial16/include/tutorial16/Interface.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Interface" interface class. @@ -24,12 +24,14 @@ struct InterfaceFields /// @brief Definition of "Flags" field. class Flags : public tutorial16::field::InterfaceFlags< - tutorial16::options::DefaultOptions + tutorial16::options::DefaultOptions, + comms::option::def::HasName > { using Base = tutorial16::field::InterfaceFlags< - tutorial16::options::DefaultOptions + tutorial16::options::DefaultOptions, + comms::option::def::HasName >; public: /// @brief Name of the field. diff --git a/tutorials/tutorial16/include/tutorial16/InterfaceCommon.h b/tutorials/tutorial16/include/tutorial16/InterfaceCommon.h index b38a92ef..e628e34d 100644 --- a/tutorials/tutorial16/include/tutorial16/InterfaceCommon.h +++ b/tutorials/tutorial16/include/tutorial16/InterfaceCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial16/include/tutorial16/MsgId.h b/tutorials/tutorial16/include/tutorial16/MsgId.h index 66d1c87c..3863d7c9 100644 --- a/tutorials/tutorial16/include/tutorial16/MsgId.h +++ b/tutorials/tutorial16/include/tutorial16/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of message ids enumeration. diff --git a/tutorials/tutorial16/include/tutorial16/Version.h b/tutorials/tutorial16/include/tutorial16/Version.h index 6dc1dba0..1cc79eb8 100644 --- a/tutorials/tutorial16/include/tutorial16/Version.h +++ b/tutorials/tutorial16/include/tutorial16/Version.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains protocol version definition. @@ -22,5 +22,5 @@ inline constexpr unsigned specVersion() } // namespace tutorial16 // Generated compile time check for minimal supported version of the COMMS library -static_assert(COMMS_MAKE_VERSION(5, 2, 7) <= comms::version(), +static_assert(COMMS_MAKE_VERSION(5, 3, 0) <= comms::version(), "The version of COMMS library is too old"); diff --git a/tutorials/tutorial16/include/tutorial16/dispatch/DispatchClientInputMessage.h b/tutorials/tutorial16/include/tutorial16/dispatch/DispatchClientInputMessage.h index bb7a3761..917acb38 100644 --- a/tutorials/tutorial16/include/tutorial16/dispatch/DispatchClientInputMessage.h +++ b/tutorials/tutorial16/include/tutorial16/dispatch/DispatchClientInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/tutorials/tutorial16/include/tutorial16/dispatch/DispatchMessage.h b/tutorials/tutorial16/include/tutorial16/dispatch/DispatchMessage.h index a98d7a36..c672780a 100644 --- a/tutorials/tutorial16/include/tutorial16/dispatch/DispatchMessage.h +++ b/tutorials/tutorial16/include/tutorial16/dispatch/DispatchMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for all input messages. diff --git a/tutorials/tutorial16/include/tutorial16/dispatch/DispatchServerInputMessage.h b/tutorials/tutorial16/include/tutorial16/dispatch/DispatchServerInputMessage.h index 56b9c8ca..2f18a4f5 100644 --- a/tutorials/tutorial16/include/tutorial16/dispatch/DispatchServerInputMessage.h +++ b/tutorials/tutorial16/include/tutorial16/dispatch/DispatchServerInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/tutorials/tutorial16/include/tutorial16/factory/AllMessagesDynMemMsgFactory.h b/tutorials/tutorial16/include/tutorial16/factory/AllMessagesDynMemMsgFactory.h index ff349a1d..68165cb5 100644 --- a/tutorials/tutorial16/include/tutorial16/factory/AllMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial16/include/tutorial16/factory/AllMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for all the messages. diff --git a/tutorials/tutorial16/include/tutorial16/factory/ClientInputMessagesDynMemMsgFactory.h b/tutorials/tutorial16/include/tutorial16/factory/ClientInputMessagesDynMemMsgFactory.h index 2e2cf3ca..34b0f203 100644 --- a/tutorials/tutorial16/include/tutorial16/factory/ClientInputMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial16/include/tutorial16/factory/ClientInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the client input messages. diff --git a/tutorials/tutorial16/include/tutorial16/factory/ServerInputMessagesDynMemMsgFactory.h b/tutorials/tutorial16/include/tutorial16/factory/ServerInputMessagesDynMemMsgFactory.h index cdd65333..097d4f25 100644 --- a/tutorials/tutorial16/include/tutorial16/factory/ServerInputMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial16/include/tutorial16/factory/ServerInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the server input messages. diff --git a/tutorials/tutorial16/include/tutorial16/field/FieldBase.h b/tutorials/tutorial16/include/tutorial16/field/FieldBase.h index b1fa3953..374d9131 100644 --- a/tutorials/tutorial16/include/tutorial16/field/FieldBase.h +++ b/tutorials/tutorial16/include/tutorial16/field/FieldBase.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of base class of all the fields. diff --git a/tutorials/tutorial16/include/tutorial16/field/InterfaceFlags.h b/tutorials/tutorial16/include/tutorial16/field/InterfaceFlags.h index 405503f5..25159af4 100644 --- a/tutorials/tutorial16/include/tutorial16/field/InterfaceFlags.h +++ b/tutorials/tutorial16/include/tutorial16/field/InterfaceFlags.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "InterfaceFlags" field. @@ -25,6 +25,7 @@ class InterfaceFlags : public comms::field::BitmaskValue< tutorial16::field::FieldBase<>, TExtraOpts..., + comms::option::def::HasName, comms::option::def::FixedLength<1U>, comms::option::def::BitmaskReservedBits<0xF0U, 0x0U> > @@ -33,6 +34,7 @@ class InterfaceFlags : public comms::field::BitmaskValue< tutorial16::field::FieldBase<>, TExtraOpts..., + comms::option::def::HasName, comms::option::def::FixedLength<1U>, comms::option::def::BitmaskReservedBits<0xF0U, 0x0U> >; @@ -54,13 +56,18 @@ class InterfaceFlags : public B3 ); + /// @brief Retrieve name of the bit. + /// @see @ref tutorial16::field::InterfaceFlagsCommon::bitName(). + static const char* bitName(std::size_t idx) + { + return tutorial16::field::InterfaceFlagsCommon::bitName(idx); + } + /// @brief Retrieve name of the bit. /// @see @ref tutorial16::field::InterfaceFlagsCommon::bitName(). static const char* bitName(BitIdx idx) { - return - tutorial16::field::InterfaceFlagsCommon::bitName( - static_cast(idx)); + return bitName(static_cast(idx)); } /// @brief Name of the field. diff --git a/tutorials/tutorial16/include/tutorial16/field/InterfaceFlagsCommon.h b/tutorials/tutorial16/include/tutorial16/field/InterfaceFlagsCommon.h index 3b9cdc0f..9279eb5d 100644 --- a/tutorials/tutorial16/include/tutorial16/field/InterfaceFlagsCommon.h +++ b/tutorials/tutorial16/include/tutorial16/field/InterfaceFlagsCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial16/include/tutorial16/field/MsgId.h b/tutorials/tutorial16/include/tutorial16/field/MsgId.h index 1a288afd..285a25fe 100644 --- a/tutorials/tutorial16/include/tutorial16/field/MsgId.h +++ b/tutorials/tutorial16/include/tutorial16/field/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "MsgId" field. @@ -27,6 +27,7 @@ class MsgId : public tutorial16::field::FieldBase<>, tutorial16::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 4> > { @@ -35,6 +36,7 @@ class MsgId : public tutorial16::field::FieldBase<>, tutorial16::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 4> >; public: diff --git a/tutorials/tutorial16/include/tutorial16/field/MsgIdCommon.h b/tutorials/tutorial16/include/tutorial16/field/MsgIdCommon.h index cebaaf46..3783db3e 100644 --- a/tutorials/tutorial16/include/tutorial16/field/MsgIdCommon.h +++ b/tutorials/tutorial16/include/tutorial16/field/MsgIdCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial16/include/tutorial16/frame/Frame.h b/tutorials/tutorial16/include/tutorial16/frame/Frame.h index e59c73bf..617430fb 100644 --- a/tutorials/tutorial16/include/tutorial16/frame/Frame.h +++ b/tutorials/tutorial16/include/tutorial16/frame/Frame.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Frame" frame class. @@ -32,10 +32,30 @@ namespace frame template struct FrameLayers { + /// @brief Scope for field(s) of @ref Data layer. + struct DataMembers + { + /// @brief Custom field for @ref tutorial16::frame::FrameLayers::Data layer + class Field : public + comms::field::ArrayList< + tutorial16::field::FieldBase<>, + std::uint8_t, + typename TOpt::frame::FrameLayers::DataMembers::Field, + comms::option::def::HasName + > + { + public: + static const char* name() + { + return "Data"; + } + }; + }; + /// @brief Definition of layer "Data". using Data = comms::protocol::MsgDataLayer< - typename TOpt::frame::FrameLayers::Data + comms::option::def::FieldType >; /// @brief Definition of layer "Id". @@ -57,12 +77,14 @@ struct FrameLayers /// @brief Definition of "Field" field. class Field : public tutorial16::field::InterfaceFlags< - TOpt + TOpt, + comms::option::def::HasName > { using Base = tutorial16::field::InterfaceFlags< - TOpt + TOpt, + comms::option::def::HasName >; public: /// @brief Name of the field. @@ -89,13 +111,15 @@ struct FrameLayers class SizeField : public comms::field::IntValue< tutorial16::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial16::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/tutorials/tutorial16/include/tutorial16/frame/FrameCommon.h b/tutorials/tutorial16/include/tutorial16/frame/FrameCommon.h index 4f65fd2f..0d95c5e8 100644 --- a/tutorials/tutorial16/include/tutorial16/frame/FrameCommon.h +++ b/tutorials/tutorial16/include/tutorial16/frame/FrameCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial16/include/tutorial16/input/AllMessages.h b/tutorials/tutorial16/include/tutorial16/input/AllMessages.h index 8587ec0f..b22d27f8 100644 --- a/tutorials/tutorial16/include/tutorial16/input/AllMessages.h +++ b/tutorials/tutorial16/include/tutorial16/input/AllMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the AllMessages messages bundle. diff --git a/tutorials/tutorial16/include/tutorial16/input/ClientInputMessages.h b/tutorials/tutorial16/include/tutorial16/input/ClientInputMessages.h index 6335c48c..3367b449 100644 --- a/tutorials/tutorial16/include/tutorial16/input/ClientInputMessages.h +++ b/tutorials/tutorial16/include/tutorial16/input/ClientInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ClientInputMessages messages bundle. diff --git a/tutorials/tutorial16/include/tutorial16/input/ServerInputMessages.h b/tutorials/tutorial16/include/tutorial16/input/ServerInputMessages.h index bd17e621..a4688ea6 100644 --- a/tutorials/tutorial16/include/tutorial16/input/ServerInputMessages.h +++ b/tutorials/tutorial16/include/tutorial16/input/ServerInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ServerInputMessages messages bundle. diff --git a/tutorials/tutorial16/include/tutorial16/message/Msg1.h b/tutorials/tutorial16/include/tutorial16/message/Msg1.h index 3c817e46..047ea06a 100644 --- a/tutorials/tutorial16/include/tutorial16/message/Msg1.h +++ b/tutorials/tutorial16/include/tutorial16/message/Msg1.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 1" message and its fields. @@ -33,13 +33,15 @@ struct Msg1Fields class F1 : public comms::field::IntValue< tutorial16::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial16::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -62,13 +64,15 @@ struct Msg1Fields class F2 : public comms::field::IntValue< tutorial16::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial16::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -95,13 +99,15 @@ struct Msg1Fields class Field : public comms::field::IntValue< tutorial16::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial16::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -125,12 +131,14 @@ struct Msg1Fields class F3 : public comms::field::Optional< typename F3Members::Field, + comms::option::def::HasName, comms::option::def::MissingByDefault > { using Base = comms::field::Optional< typename F3Members::Field, + comms::option::def::HasName, comms::option::def::MissingByDefault >; public: diff --git a/tutorials/tutorial16/include/tutorial16/message/Msg1Common.h b/tutorials/tutorial16/include/tutorial16/message/Msg1Common.h index fa783df5..3b2dcd7b 100644 --- a/tutorials/tutorial16/include/tutorial16/message/Msg1Common.h +++ b/tutorials/tutorial16/include/tutorial16/message/Msg1Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial16/include/tutorial16/message/Msg2.h b/tutorials/tutorial16/include/tutorial16/message/Msg2.h index cace3202..c5962cf1 100644 --- a/tutorials/tutorial16/include/tutorial16/message/Msg2.h +++ b/tutorials/tutorial16/include/tutorial16/message/Msg2.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 2" message and its fields. @@ -38,13 +38,15 @@ struct Msg2Fields class Length : public comms::field::IntValue< tutorial16::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial16::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -69,6 +71,7 @@ struct Msg2Fields comms::field::String< tutorial16::field::FieldBase<>, typename TOpt::message::Msg2Fields::F1, + comms::option::def::HasName, comms::option::def::SequenceSerLengthFieldPrefix > { @@ -76,6 +79,7 @@ struct Msg2Fields comms::field::String< tutorial16::field::FieldBase<>, typename TOpt::message::Msg2Fields::F1, + comms::option::def::HasName, comms::option::def::SequenceSerLengthFieldPrefix >; public: @@ -102,13 +106,15 @@ struct Msg2Fields class Field : public comms::field::IntValue< tutorial16::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial16::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -132,12 +138,14 @@ struct Msg2Fields class F2 : public comms::field::Optional< typename F2Members::Field, + comms::option::def::HasName, comms::option::def::MissingByDefault > { using Base = comms::field::Optional< typename F2Members::Field, + comms::option::def::HasName, comms::option::def::MissingByDefault >; public: diff --git a/tutorials/tutorial16/include/tutorial16/message/Msg2Common.h b/tutorials/tutorial16/include/tutorial16/message/Msg2Common.h index 1875d82d..6d87acc2 100644 --- a/tutorials/tutorial16/include/tutorial16/message/Msg2Common.h +++ b/tutorials/tutorial16/include/tutorial16/message/Msg2Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial16/include/tutorial16/message/Msg3.h b/tutorials/tutorial16/include/tutorial16/message/Msg3.h index 0f4bd11f..92dc020e 100644 --- a/tutorials/tutorial16/include/tutorial16/message/Msg3.h +++ b/tutorials/tutorial16/include/tutorial16/message/Msg3.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 3" message and its fields. @@ -32,13 +32,15 @@ struct Msg3Fields class F1 : public comms::field::IntValue< tutorial16::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial16::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/tutorials/tutorial16/include/tutorial16/message/Msg3Common.h b/tutorials/tutorial16/include/tutorial16/message/Msg3Common.h index 8867c504..98dc6111 100644 --- a/tutorials/tutorial16/include/tutorial16/message/Msg3Common.h +++ b/tutorials/tutorial16/include/tutorial16/message/Msg3Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial16/include/tutorial16/message/Msg4.h b/tutorials/tutorial16/include/tutorial16/message/Msg4.h index 36164bb3..d6d5c0b2 100644 --- a/tutorials/tutorial16/include/tutorial16/message/Msg4.h +++ b/tutorials/tutorial16/include/tutorial16/message/Msg4.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 4" message and its fields. @@ -32,13 +32,15 @@ struct Msg4Fields class F1 : public comms::field::IntValue< tutorial16::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial16::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/tutorials/tutorial16/include/tutorial16/message/Msg4Common.h b/tutorials/tutorial16/include/tutorial16/message/Msg4Common.h index 3b0ce3f6..378c1df7 100644 --- a/tutorials/tutorial16/include/tutorial16/message/Msg4Common.h +++ b/tutorials/tutorial16/include/tutorial16/message/Msg4Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial16/include/tutorial16/options/AllMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial16/include/tutorial16/options/AllMessagesDynMemMsgFactoryDefaultOptions.h index b5f1e58d..39f426f0 100644 --- a/tutorials/tutorial16/include/tutorial16/options/AllMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial16/include/tutorial16/options/AllMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol all messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial16/include/tutorial16/options/BareMetalDefaultOptions.h b/tutorials/tutorial16/include/tutorial16/options/BareMetalDefaultOptions.h index 941bed73..df6a4cd7 100644 --- a/tutorials/tutorial16/include/tutorial16/options/BareMetalDefaultOptions.h +++ b/tutorials/tutorial16/include/tutorial16/options/BareMetalDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol bare metal default options. @@ -49,13 +49,15 @@ struct BareMetalDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// tutorial16::frame::FrameLayers::Data - /// layer. - using Data = - std::tuple< - comms::option::app::FixedSizeStorage, - typename TBase::frame::FrameLayers::Data - >; + /// tutorial16::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::FixedSizeStorage, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers /// @brief Extra options for @ref /// tutorial16::frame::FrameLayers::Id diff --git a/tutorials/tutorial16/include/tutorial16/options/ClientDefaultOptions.h b/tutorials/tutorial16/include/tutorial16/options/ClientDefaultOptions.h index a961b051..af8a4f2d 100644 --- a/tutorials/tutorial16/include/tutorial16/options/ClientDefaultOptions.h +++ b/tutorials/tutorial16/include/tutorial16/options/ClientDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client default options. diff --git a/tutorials/tutorial16/include/tutorial16/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial16/include/tutorial16/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h index 60f886a4..facc26e5 100644 --- a/tutorials/tutorial16/include/tutorial16/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial16/include/tutorial16/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client input messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial16/include/tutorial16/options/DataViewDefaultOptions.h b/tutorials/tutorial16/include/tutorial16/options/DataViewDefaultOptions.h index 73f8a9d4..f1888a66 100644 --- a/tutorials/tutorial16/include/tutorial16/options/DataViewDefaultOptions.h +++ b/tutorials/tutorial16/include/tutorial16/options/DataViewDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol data view default options. @@ -43,13 +43,15 @@ struct DataViewDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// tutorial16::frame::FrameLayers::Data - /// layer. - using Data = - std::tuple< - comms::option::app::OrigDataView, - typename TBase::frame::FrameLayers::Data - >; + /// tutorial16::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::OrigDataView, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers }; // struct FrameLayers }; // struct frame }; diff --git a/tutorials/tutorial16/include/tutorial16/options/DefaultOptions.h b/tutorials/tutorial16/include/tutorial16/options/DefaultOptions.h index 32211117..56d37d78 100644 --- a/tutorials/tutorial16/include/tutorial16/options/DefaultOptions.h +++ b/tutorials/tutorial16/include/tutorial16/options/DefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol default options. @@ -30,7 +30,7 @@ struct DefaultOptionsT : public TBase /// @brief Extra options for @ref /// tutorial16::message::Msg2Fields::F1 /// field. - using F1 = comms::option::EmptyOption; + using F1 = comms::option::app::EmptyOption; }; }; // struct message @@ -42,14 +42,16 @@ struct DefaultOptionsT : public TBase struct FrameLayers { /// @brief Extra options for @ref - /// tutorial16::frame::FrameLayers::Data - /// layer. - using Data = comms::option::EmptyOption; + /// tutorial16::frame::FrameLayers::DataMembers::Field field. + struct DataMembers + { + using Field = comms::option::app::EmptyOption; + }; // struct DataMembers /// @brief Extra options for @ref /// tutorial16::frame::FrameLayers::Id /// layer. - using Id = comms::option::EmptyOption; + using Id = comms::option::app::EmptyOption; }; // struct FrameLayers }; // struct frame }; diff --git a/tutorials/tutorial16/include/tutorial16/options/ServerDefaultOptions.h b/tutorials/tutorial16/include/tutorial16/options/ServerDefaultOptions.h index 8d82b7dc..e4bbeae2 100644 --- a/tutorials/tutorial16/include/tutorial16/options/ServerDefaultOptions.h +++ b/tutorials/tutorial16/include/tutorial16/options/ServerDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server default options. diff --git a/tutorials/tutorial16/include/tutorial16/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial16/include/tutorial16/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h index 92a760b0..542363b3 100644 --- a/tutorials/tutorial16/include/tutorial16/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial16/include/tutorial16/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server input messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial17/include/tutorial17/Interface.h b/tutorials/tutorial17/include/tutorial17/Interface.h index ee078085..2aad3fed 100644 --- a/tutorials/tutorial17/include/tutorial17/Interface.h +++ b/tutorials/tutorial17/include/tutorial17/Interface.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Interface" interface class. @@ -25,6 +25,7 @@ struct InterfaceFields class Flags : public comms::field::BitmaskValue< tutorial17::field::FieldBase<>, + comms::option::def::HasName, comms::option::def::FixedLength<1U>, comms::option::def::BitmaskReservedBits<0xFCU, 0x0U> > @@ -32,6 +33,7 @@ struct InterfaceFields using Base = comms::field::BitmaskValue< tutorial17::field::FieldBase<>, + comms::option::def::HasName, comms::option::def::FixedLength<1U>, comms::option::def::BitmaskReservedBits<0xFCU, 0x0U> >; @@ -49,13 +51,18 @@ struct InterfaceFields B1 ); + /// @brief Retrieve name of the bit. + /// @see @ref tutorial17::InterfaceFieldsCommon::FlagsCommon::bitName(). + static const char* bitName(std::size_t idx) + { + return tutorial17::InterfaceFieldsCommon::FlagsCommon::bitName(idx); + } + /// @brief Retrieve name of the bit. /// @see @ref tutorial17::InterfaceFieldsCommon::FlagsCommon::bitName(). static const char* bitName(BitIdx idx) { - return - tutorial17::InterfaceFieldsCommon::FlagsCommon::bitName( - static_cast(idx)); + return bitName(static_cast(idx)); } /// @brief Name of the field. diff --git a/tutorials/tutorial17/include/tutorial17/InterfaceCommon.h b/tutorials/tutorial17/include/tutorial17/InterfaceCommon.h index fa773fc5..a4bf47e7 100644 --- a/tutorials/tutorial17/include/tutorial17/InterfaceCommon.h +++ b/tutorials/tutorial17/include/tutorial17/InterfaceCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial17/include/tutorial17/MsgId.h b/tutorials/tutorial17/include/tutorial17/MsgId.h index 306911d0..b78f96c2 100644 --- a/tutorials/tutorial17/include/tutorial17/MsgId.h +++ b/tutorials/tutorial17/include/tutorial17/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of message ids enumeration. diff --git a/tutorials/tutorial17/include/tutorial17/Version.h b/tutorials/tutorial17/include/tutorial17/Version.h index 46fa8752..ff5d6e4f 100644 --- a/tutorials/tutorial17/include/tutorial17/Version.h +++ b/tutorials/tutorial17/include/tutorial17/Version.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains protocol version definition. @@ -22,5 +22,5 @@ inline constexpr unsigned specVersion() } // namespace tutorial17 // Generated compile time check for minimal supported version of the COMMS library -static_assert(COMMS_MAKE_VERSION(5, 2, 7) <= comms::version(), +static_assert(COMMS_MAKE_VERSION(5, 3, 0) <= comms::version(), "The version of COMMS library is too old"); diff --git a/tutorials/tutorial17/include/tutorial17/dispatch/DispatchClientInputMessage.h b/tutorials/tutorial17/include/tutorial17/dispatch/DispatchClientInputMessage.h index 3cca3e0a..c0e1ae99 100644 --- a/tutorials/tutorial17/include/tutorial17/dispatch/DispatchClientInputMessage.h +++ b/tutorials/tutorial17/include/tutorial17/dispatch/DispatchClientInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/tutorials/tutorial17/include/tutorial17/dispatch/DispatchMessage.h b/tutorials/tutorial17/include/tutorial17/dispatch/DispatchMessage.h index a8a1acde..b8d8e27c 100644 --- a/tutorials/tutorial17/include/tutorial17/dispatch/DispatchMessage.h +++ b/tutorials/tutorial17/include/tutorial17/dispatch/DispatchMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for all input messages. diff --git a/tutorials/tutorial17/include/tutorial17/dispatch/DispatchServerInputMessage.h b/tutorials/tutorial17/include/tutorial17/dispatch/DispatchServerInputMessage.h index 368fb282..87970001 100644 --- a/tutorials/tutorial17/include/tutorial17/dispatch/DispatchServerInputMessage.h +++ b/tutorials/tutorial17/include/tutorial17/dispatch/DispatchServerInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/tutorials/tutorial17/include/tutorial17/factory/AllMessagesDynMemMsgFactory.h b/tutorials/tutorial17/include/tutorial17/factory/AllMessagesDynMemMsgFactory.h index b8413565..3ee99bc9 100644 --- a/tutorials/tutorial17/include/tutorial17/factory/AllMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial17/include/tutorial17/factory/AllMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for all the messages. diff --git a/tutorials/tutorial17/include/tutorial17/factory/ClientInputMessagesDynMemMsgFactory.h b/tutorials/tutorial17/include/tutorial17/factory/ClientInputMessagesDynMemMsgFactory.h index f478467d..e8149e98 100644 --- a/tutorials/tutorial17/include/tutorial17/factory/ClientInputMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial17/include/tutorial17/factory/ClientInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the client input messages. diff --git a/tutorials/tutorial17/include/tutorial17/factory/ServerInputMessagesDynMemMsgFactory.h b/tutorials/tutorial17/include/tutorial17/factory/ServerInputMessagesDynMemMsgFactory.h index 84bfc2ed..bc89f144 100644 --- a/tutorials/tutorial17/include/tutorial17/factory/ServerInputMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial17/include/tutorial17/factory/ServerInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the server input messages. diff --git a/tutorials/tutorial17/include/tutorial17/field/FieldBase.h b/tutorials/tutorial17/include/tutorial17/field/FieldBase.h index 4ca0adc1..a18fd348 100644 --- a/tutorials/tutorial17/include/tutorial17/field/FieldBase.h +++ b/tutorials/tutorial17/include/tutorial17/field/FieldBase.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of base class of all the fields. diff --git a/tutorials/tutorial17/include/tutorial17/field/MsgId.h b/tutorials/tutorial17/include/tutorial17/field/MsgId.h index 99008ae5..85cbeb7c 100644 --- a/tutorials/tutorial17/include/tutorial17/field/MsgId.h +++ b/tutorials/tutorial17/include/tutorial17/field/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "MsgId" field. @@ -27,6 +27,7 @@ class MsgId : public tutorial17::field::FieldBase<>, tutorial17::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 2> > { @@ -35,6 +36,7 @@ class MsgId : public tutorial17::field::FieldBase<>, tutorial17::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 2> >; public: diff --git a/tutorials/tutorial17/include/tutorial17/field/MsgIdCommon.h b/tutorials/tutorial17/include/tutorial17/field/MsgIdCommon.h index ba2dc1ce..bae5c5c7 100644 --- a/tutorials/tutorial17/include/tutorial17/field/MsgIdCommon.h +++ b/tutorials/tutorial17/include/tutorial17/field/MsgIdCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial17/include/tutorial17/frame/Frame.h b/tutorials/tutorial17/include/tutorial17/frame/Frame.h index 80774f6a..7cd04159 100644 --- a/tutorials/tutorial17/include/tutorial17/frame/Frame.h +++ b/tutorials/tutorial17/include/tutorial17/frame/Frame.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Frame" frame class. @@ -33,10 +33,30 @@ namespace frame template struct FrameLayers { + /// @brief Scope for field(s) of @ref Data layer. + struct DataMembers + { + /// @brief Custom field for @ref tutorial17::frame::FrameLayers::Data layer + class Field : public + comms::field::ArrayList< + tutorial17::field::FieldBase<>, + std::uint8_t, + typename TOpt::frame::FrameLayers::DataMembers::Field, + comms::option::def::HasName + > + { + public: + static const char* name() + { + return "Data"; + } + }; + }; + /// @brief Definition of layer "Data". using Data = comms::protocol::MsgDataLayer< - typename TOpt::frame::FrameLayers::Data + comms::option::def::FieldType >; /// @brief Scope for field(s) of @ref SizeWithFlags layer. @@ -51,6 +71,7 @@ struct FrameLayers comms::field::IntValue< tutorial17::field::FieldBase<>, std::uint16_t, + comms::option::def::HasName, comms::option::def::FixedBitLength<12U> > { @@ -58,6 +79,7 @@ struct FrameLayers comms::field::IntValue< tutorial17::field::FieldBase<>, std::uint16_t, + comms::option::def::HasName, comms::option::def::FixedBitLength<12U> >; public: @@ -81,6 +103,7 @@ struct FrameLayers class Flags : public comms::field::BitmaskValue< tutorial17::field::FieldBase<>, + comms::option::def::HasName, comms::option::def::FixedBitLength<4U>, comms::option::def::BitmaskReservedBits<0xEU, 0x0U> > @@ -88,6 +111,7 @@ struct FrameLayers using Base = comms::field::BitmaskValue< tutorial17::field::FieldBase<>, + comms::option::def::HasName, comms::option::def::FixedBitLength<4U>, comms::option::def::BitmaskReservedBits<0xEU, 0x0U> >; @@ -103,13 +127,18 @@ struct FrameLayers F1 ); + /// @brief Retrieve name of the bit. + /// @see @ref tutorial17::frame::FrameLayersCommon::SizeWithFlagsMembersCommon::FieldMembersCommon::FlagsCommon::bitName(). + static const char* bitName(std::size_t idx) + { + return tutorial17::frame::FrameLayersCommon::SizeWithFlagsMembersCommon::FieldMembersCommon::FlagsCommon::bitName(idx); + } + /// @brief Retrieve name of the bit. /// @see @ref tutorial17::frame::FrameLayersCommon::SizeWithFlagsMembersCommon::FieldMembersCommon::FlagsCommon::bitName(). static const char* bitName(BitIdx idx) { - return - tutorial17::frame::FrameLayersCommon::SizeWithFlagsMembersCommon::FieldMembersCommon::FlagsCommon::bitName( - static_cast(idx)); + return bitName(static_cast(idx)); } /// @brief Name of the field. @@ -132,6 +161,7 @@ struct FrameLayers comms::field::Bitfield< tutorial17::field::FieldBase<>, typename FieldMembers::All, + comms::option::def::HasName, comms::option::def::HasVersionDependentMembers > { @@ -139,6 +169,7 @@ struct FrameLayers comms::field::Bitfield< tutorial17::field::FieldBase<>, typename FieldMembers::All, + comms::option::def::HasName, comms::option::def::HasVersionDependentMembers >; public: @@ -184,6 +215,7 @@ struct FrameLayers using MsgId = tutorial17::field::MsgId< TOpt, + comms::option::def::HasName, comms::option::def::FixedBitLength<6U> >; @@ -191,6 +223,7 @@ struct FrameLayers class Flags : public comms::field::BitmaskValue< tutorial17::field::FieldBase<>, + comms::option::def::HasName, comms::option::def::FixedBitLength<2U>, comms::option::def::BitmaskReservedBits<0x2U, 0x0U> > @@ -198,6 +231,7 @@ struct FrameLayers using Base = comms::field::BitmaskValue< tutorial17::field::FieldBase<>, + comms::option::def::HasName, comms::option::def::FixedBitLength<2U>, comms::option::def::BitmaskReservedBits<0x2U, 0x0U> >; @@ -213,13 +247,18 @@ struct FrameLayers F1 ); + /// @brief Retrieve name of the bit. + /// @see @ref tutorial17::frame::FrameLayersCommon::IdWithFlagsMembersCommon::FieldMembersCommon::FlagsCommon::bitName(). + static const char* bitName(std::size_t idx) + { + return tutorial17::frame::FrameLayersCommon::IdWithFlagsMembersCommon::FieldMembersCommon::FlagsCommon::bitName(idx); + } + /// @brief Retrieve name of the bit. /// @see @ref tutorial17::frame::FrameLayersCommon::IdWithFlagsMembersCommon::FieldMembersCommon::FlagsCommon::bitName(). static const char* bitName(BitIdx idx) { - return - tutorial17::frame::FrameLayersCommon::IdWithFlagsMembersCommon::FieldMembersCommon::FlagsCommon::bitName( - static_cast(idx)); + return bitName(static_cast(idx)); } /// @brief Name of the field. @@ -242,6 +281,7 @@ struct FrameLayers comms::field::Bitfield< tutorial17::field::FieldBase<>, typename FieldMembers::All, + comms::option::def::HasName, comms::option::def::HasVersionDependentMembers > { @@ -249,6 +289,7 @@ struct FrameLayers comms::field::Bitfield< tutorial17::field::FieldBase<>, typename FieldMembers::All, + comms::option::def::HasName, comms::option::def::HasVersionDependentMembers >; public: diff --git a/tutorials/tutorial17/include/tutorial17/frame/FrameCommon.h b/tutorials/tutorial17/include/tutorial17/frame/FrameCommon.h index 98fc575e..88cdacda 100644 --- a/tutorials/tutorial17/include/tutorial17/frame/FrameCommon.h +++ b/tutorials/tutorial17/include/tutorial17/frame/FrameCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial17/include/tutorial17/input/AllMessages.h b/tutorials/tutorial17/include/tutorial17/input/AllMessages.h index 987db581..829921e8 100644 --- a/tutorials/tutorial17/include/tutorial17/input/AllMessages.h +++ b/tutorials/tutorial17/include/tutorial17/input/AllMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the AllMessages messages bundle. diff --git a/tutorials/tutorial17/include/tutorial17/input/ClientInputMessages.h b/tutorials/tutorial17/include/tutorial17/input/ClientInputMessages.h index 08514e8d..ceafbed6 100644 --- a/tutorials/tutorial17/include/tutorial17/input/ClientInputMessages.h +++ b/tutorials/tutorial17/include/tutorial17/input/ClientInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ClientInputMessages messages bundle. diff --git a/tutorials/tutorial17/include/tutorial17/input/ServerInputMessages.h b/tutorials/tutorial17/include/tutorial17/input/ServerInputMessages.h index f5505a65..c53f0c41 100644 --- a/tutorials/tutorial17/include/tutorial17/input/ServerInputMessages.h +++ b/tutorials/tutorial17/include/tutorial17/input/ServerInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ServerInputMessages messages bundle. diff --git a/tutorials/tutorial17/include/tutorial17/message/Msg1.h b/tutorials/tutorial17/include/tutorial17/message/Msg1.h index 9a80ac9f..04ee3db2 100644 --- a/tutorials/tutorial17/include/tutorial17/message/Msg1.h +++ b/tutorials/tutorial17/include/tutorial17/message/Msg1.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 1" message and its fields. @@ -33,13 +33,15 @@ struct Msg1Fields class F1 : public comms::field::IntValue< tutorial17::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial17::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -62,13 +64,15 @@ struct Msg1Fields class F2 : public comms::field::IntValue< tutorial17::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial17::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -95,13 +99,15 @@ struct Msg1Fields class Field : public comms::field::IntValue< tutorial17::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial17::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -127,12 +133,14 @@ struct Msg1Fields class F3 : public comms::field::Optional< typename F3Members::Field, + comms::option::def::HasName, comms::option::def::MissingByDefault > { using Base = comms::field::Optional< typename F3Members::Field, + comms::option::def::HasName, comms::option::def::MissingByDefault >; public: diff --git a/tutorials/tutorial17/include/tutorial17/message/Msg1Common.h b/tutorials/tutorial17/include/tutorial17/message/Msg1Common.h index 4045fe56..1fa6f627 100644 --- a/tutorials/tutorial17/include/tutorial17/message/Msg1Common.h +++ b/tutorials/tutorial17/include/tutorial17/message/Msg1Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial17/include/tutorial17/message/Msg2.h b/tutorials/tutorial17/include/tutorial17/message/Msg2.h index 5c6319d2..9151993a 100644 --- a/tutorials/tutorial17/include/tutorial17/message/Msg2.h +++ b/tutorials/tutorial17/include/tutorial17/message/Msg2.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 2" message and its fields. @@ -38,13 +38,15 @@ struct Msg2Fields class Length : public comms::field::IntValue< tutorial17::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial17::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -69,6 +71,7 @@ struct Msg2Fields comms::field::String< tutorial17::field::FieldBase<>, typename TOpt::message::Msg2Fields::F1, + comms::option::def::HasName, comms::option::def::SequenceSerLengthFieldPrefix > { @@ -76,6 +79,7 @@ struct Msg2Fields comms::field::String< tutorial17::field::FieldBase<>, typename TOpt::message::Msg2Fields::F1, + comms::option::def::HasName, comms::option::def::SequenceSerLengthFieldPrefix >; public: @@ -102,13 +106,15 @@ struct Msg2Fields class Field : public comms::field::IntValue< tutorial17::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial17::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -134,12 +140,14 @@ struct Msg2Fields class F2 : public comms::field::Optional< typename F2Members::Field, + comms::option::def::HasName, comms::option::def::MissingByDefault > { using Base = comms::field::Optional< typename F2Members::Field, + comms::option::def::HasName, comms::option::def::MissingByDefault >; public: diff --git a/tutorials/tutorial17/include/tutorial17/message/Msg2Common.h b/tutorials/tutorial17/include/tutorial17/message/Msg2Common.h index f8ca6989..4dc26f4f 100644 --- a/tutorials/tutorial17/include/tutorial17/message/Msg2Common.h +++ b/tutorials/tutorial17/include/tutorial17/message/Msg2Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial17/include/tutorial17/options/AllMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial17/include/tutorial17/options/AllMessagesDynMemMsgFactoryDefaultOptions.h index df173259..43af729e 100644 --- a/tutorials/tutorial17/include/tutorial17/options/AllMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial17/include/tutorial17/options/AllMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol all messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial17/include/tutorial17/options/BareMetalDefaultOptions.h b/tutorials/tutorial17/include/tutorial17/options/BareMetalDefaultOptions.h index ee53d9d5..0e81d520 100644 --- a/tutorials/tutorial17/include/tutorial17/options/BareMetalDefaultOptions.h +++ b/tutorials/tutorial17/include/tutorial17/options/BareMetalDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol bare metal default options. @@ -49,13 +49,15 @@ struct BareMetalDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// tutorial17::frame::FrameLayers::Data - /// layer. - using Data = - std::tuple< - comms::option::app::FixedSizeStorage, - typename TBase::frame::FrameLayers::Data - >; + /// tutorial17::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::FixedSizeStorage, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers /// @brief Extra options for @ref /// tutorial17::frame::FrameLayers::IdWithFlags diff --git a/tutorials/tutorial17/include/tutorial17/options/ClientDefaultOptions.h b/tutorials/tutorial17/include/tutorial17/options/ClientDefaultOptions.h index 73ac5580..b2347164 100644 --- a/tutorials/tutorial17/include/tutorial17/options/ClientDefaultOptions.h +++ b/tutorials/tutorial17/include/tutorial17/options/ClientDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client default options. diff --git a/tutorials/tutorial17/include/tutorial17/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial17/include/tutorial17/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h index 24ab2ff5..5afd28ac 100644 --- a/tutorials/tutorial17/include/tutorial17/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial17/include/tutorial17/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client input messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial17/include/tutorial17/options/DataViewDefaultOptions.h b/tutorials/tutorial17/include/tutorial17/options/DataViewDefaultOptions.h index 852d1da9..c649d6f1 100644 --- a/tutorials/tutorial17/include/tutorial17/options/DataViewDefaultOptions.h +++ b/tutorials/tutorial17/include/tutorial17/options/DataViewDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol data view default options. @@ -43,13 +43,15 @@ struct DataViewDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// tutorial17::frame::FrameLayers::Data - /// layer. - using Data = - std::tuple< - comms::option::app::OrigDataView, - typename TBase::frame::FrameLayers::Data - >; + /// tutorial17::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::OrigDataView, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers }; // struct FrameLayers }; // struct frame }; diff --git a/tutorials/tutorial17/include/tutorial17/options/DefaultOptions.h b/tutorials/tutorial17/include/tutorial17/options/DefaultOptions.h index 999f1f71..04db7de1 100644 --- a/tutorials/tutorial17/include/tutorial17/options/DefaultOptions.h +++ b/tutorials/tutorial17/include/tutorial17/options/DefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol default options. @@ -30,7 +30,7 @@ struct DefaultOptionsT : public TBase /// @brief Extra options for @ref /// tutorial17::message::Msg2Fields::F1 /// field. - using F1 = comms::option::EmptyOption; + using F1 = comms::option::app::EmptyOption; }; }; // struct message @@ -42,19 +42,21 @@ struct DefaultOptionsT : public TBase struct FrameLayers { /// @brief Extra options for @ref - /// tutorial17::frame::FrameLayers::Data - /// layer. - using Data = comms::option::EmptyOption; + /// tutorial17::frame::FrameLayers::DataMembers::Field field. + struct DataMembers + { + using Field = comms::option::app::EmptyOption; + }; // struct DataMembers /// @brief Extra options for @ref /// tutorial17::frame::FrameLayers::SizeWithFlags /// layer. - using SizeWithFlags = comms::option::EmptyOption; + using SizeWithFlags = comms::option::app::EmptyOption; /// @brief Extra options for @ref /// tutorial17::frame::FrameLayers::IdWithFlags /// layer. - using IdWithFlags = comms::option::EmptyOption; + using IdWithFlags = comms::option::app::EmptyOption; }; // struct FrameLayers }; // struct frame }; diff --git a/tutorials/tutorial17/include/tutorial17/options/ServerDefaultOptions.h b/tutorials/tutorial17/include/tutorial17/options/ServerDefaultOptions.h index 0abeeb2b..56a3d407 100644 --- a/tutorials/tutorial17/include/tutorial17/options/ServerDefaultOptions.h +++ b/tutorials/tutorial17/include/tutorial17/options/ServerDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server default options. diff --git a/tutorials/tutorial17/include/tutorial17/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial17/include/tutorial17/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h index 8d3aced7..a7cfb305 100644 --- a/tutorials/tutorial17/include/tutorial17/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial17/include/tutorial17/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server input messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial18/include/tutorial18/Message.h b/tutorials/tutorial18/include/tutorial18/Message.h index 01e21a21..f0ca8738 100644 --- a/tutorials/tutorial18/include/tutorial18/Message.h +++ b/tutorials/tutorial18/include/tutorial18/Message.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message" interface class. diff --git a/tutorials/tutorial18/include/tutorial18/MsgId.h b/tutorials/tutorial18/include/tutorial18/MsgId.h index 396c6adc..97cfab55 100644 --- a/tutorials/tutorial18/include/tutorial18/MsgId.h +++ b/tutorials/tutorial18/include/tutorial18/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of message ids enumeration. diff --git a/tutorials/tutorial18/include/tutorial18/Version.h b/tutorials/tutorial18/include/tutorial18/Version.h index 92a869f7..ed856f59 100644 --- a/tutorials/tutorial18/include/tutorial18/Version.h +++ b/tutorials/tutorial18/include/tutorial18/Version.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains protocol version definition. @@ -22,5 +22,5 @@ inline constexpr unsigned specVersion() } // namespace tutorial18 // Generated compile time check for minimal supported version of the COMMS library -static_assert(COMMS_MAKE_VERSION(5, 2, 7) <= comms::version(), +static_assert(COMMS_MAKE_VERSION(5, 3, 0) <= comms::version(), "The version of COMMS library is too old"); diff --git a/tutorials/tutorial18/include/tutorial18/dispatch/DispatchClientInputMessage.h b/tutorials/tutorial18/include/tutorial18/dispatch/DispatchClientInputMessage.h index 1d6cd8b7..54598bdc 100644 --- a/tutorials/tutorial18/include/tutorial18/dispatch/DispatchClientInputMessage.h +++ b/tutorials/tutorial18/include/tutorial18/dispatch/DispatchClientInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/tutorials/tutorial18/include/tutorial18/dispatch/DispatchMessage.h b/tutorials/tutorial18/include/tutorial18/dispatch/DispatchMessage.h index 3841685a..f7673430 100644 --- a/tutorials/tutorial18/include/tutorial18/dispatch/DispatchMessage.h +++ b/tutorials/tutorial18/include/tutorial18/dispatch/DispatchMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for all input messages. diff --git a/tutorials/tutorial18/include/tutorial18/dispatch/DispatchServerInputMessage.h b/tutorials/tutorial18/include/tutorial18/dispatch/DispatchServerInputMessage.h index 5d032b4e..9677e796 100644 --- a/tutorials/tutorial18/include/tutorial18/dispatch/DispatchServerInputMessage.h +++ b/tutorials/tutorial18/include/tutorial18/dispatch/DispatchServerInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/tutorials/tutorial18/include/tutorial18/factory/AllMessagesDynMemMsgFactory.h b/tutorials/tutorial18/include/tutorial18/factory/AllMessagesDynMemMsgFactory.h index 1e94eb70..05d7f934 100644 --- a/tutorials/tutorial18/include/tutorial18/factory/AllMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial18/include/tutorial18/factory/AllMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for all the messages. diff --git a/tutorials/tutorial18/include/tutorial18/factory/ClientInputMessagesDynMemMsgFactory.h b/tutorials/tutorial18/include/tutorial18/factory/ClientInputMessagesDynMemMsgFactory.h index 962a9ba2..724688e2 100644 --- a/tutorials/tutorial18/include/tutorial18/factory/ClientInputMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial18/include/tutorial18/factory/ClientInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the client input messages. diff --git a/tutorials/tutorial18/include/tutorial18/factory/ServerInputMessagesDynMemMsgFactory.h b/tutorials/tutorial18/include/tutorial18/factory/ServerInputMessagesDynMemMsgFactory.h index af024df4..135ae3cc 100644 --- a/tutorials/tutorial18/include/tutorial18/factory/ServerInputMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial18/include/tutorial18/factory/ServerInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the server input messages. diff --git a/tutorials/tutorial18/include/tutorial18/field/FieldBase.h b/tutorials/tutorial18/include/tutorial18/field/FieldBase.h index 7d5d5a79..4de3e9d0 100644 --- a/tutorials/tutorial18/include/tutorial18/field/FieldBase.h +++ b/tutorials/tutorial18/include/tutorial18/field/FieldBase.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of base class of all the fields. diff --git a/tutorials/tutorial18/include/tutorial18/field/MsgId.h b/tutorials/tutorial18/include/tutorial18/field/MsgId.h index 1f3e8223..32a9aeb1 100644 --- a/tutorials/tutorial18/include/tutorial18/field/MsgId.h +++ b/tutorials/tutorial18/include/tutorial18/field/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "ID" field. @@ -27,6 +27,7 @@ class MsgId : public tutorial18::field::FieldBase<>, tutorial18::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 2> > { @@ -35,6 +36,7 @@ class MsgId : public tutorial18::field::FieldBase<>, tutorial18::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 2> >; public: diff --git a/tutorials/tutorial18/include/tutorial18/field/MsgIdCommon.h b/tutorials/tutorial18/include/tutorial18/field/MsgIdCommon.h index 229d624c..e8606671 100644 --- a/tutorials/tutorial18/include/tutorial18/field/MsgIdCommon.h +++ b/tutorials/tutorial18/include/tutorial18/field/MsgIdCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial18/include/tutorial18/frame/Frame.h b/tutorials/tutorial18/include/tutorial18/frame/Frame.h index d18d39a5..7eed2fb1 100644 --- a/tutorials/tutorial18/include/tutorial18/frame/Frame.h +++ b/tutorials/tutorial18/include/tutorial18/frame/Frame.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Frame" frame class. @@ -33,10 +33,30 @@ namespace frame template struct FrameLayers { + /// @brief Scope for field(s) of @ref Data layer. + struct DataMembers + { + /// @brief Custom field for @ref tutorial18::frame::FrameLayers::Data layer + class Field : public + comms::field::ArrayList< + tutorial18::field::FieldBase<>, + std::uint8_t, + typename TOpt::frame::FrameLayers::DataMembers::Field, + comms::option::def::HasName + > + { + public: + static const char* name() + { + return "Data"; + } + }; + }; + /// @brief Definition of layer "Data". using Data = comms::protocol::MsgDataLayer< - typename TOpt::frame::FrameLayers::Data + comms::option::def::FieldType >; /// @brief Definition of layer "Id". @@ -60,6 +80,7 @@ struct FrameLayers comms::field::IntValue< tutorial18::field::FieldBase<>, std::uint16_t, + comms::option::def::HasName, comms::option::def::NumValueSerOffset<2> > { @@ -67,6 +88,7 @@ struct FrameLayers comms::field::IntValue< tutorial18::field::FieldBase<>, std::uint16_t, + comms::option::def::HasName, comms::option::def::NumValueSerOffset<2> >; public: @@ -102,13 +124,15 @@ struct FrameLayers class Field : public comms::field::IntValue< tutorial18::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial18::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -145,6 +169,7 @@ struct FrameLayers comms::field::IntValue< tutorial18::field::FieldBase<>, std::uint16_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid, comms::option::def::DefaultNumValue<43981L> > @@ -153,6 +178,7 @@ struct FrameLayers comms::field::IntValue< tutorial18::field::FieldBase<>, std::uint16_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid, comms::option::def::DefaultNumValue<43981L> >; diff --git a/tutorials/tutorial18/include/tutorial18/frame/FrameCommon.h b/tutorials/tutorial18/include/tutorial18/frame/FrameCommon.h index a081c6f3..446c9d42 100644 --- a/tutorials/tutorial18/include/tutorial18/frame/FrameCommon.h +++ b/tutorials/tutorial18/include/tutorial18/frame/FrameCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial18/include/tutorial18/input/AllMessages.h b/tutorials/tutorial18/include/tutorial18/input/AllMessages.h index f3a26b75..957abaaa 100644 --- a/tutorials/tutorial18/include/tutorial18/input/AllMessages.h +++ b/tutorials/tutorial18/include/tutorial18/input/AllMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the AllMessages messages bundle. diff --git a/tutorials/tutorial18/include/tutorial18/input/ClientInputMessages.h b/tutorials/tutorial18/include/tutorial18/input/ClientInputMessages.h index 1f0c3a3d..1e5902e8 100644 --- a/tutorials/tutorial18/include/tutorial18/input/ClientInputMessages.h +++ b/tutorials/tutorial18/include/tutorial18/input/ClientInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ClientInputMessages messages bundle. diff --git a/tutorials/tutorial18/include/tutorial18/input/ServerInputMessages.h b/tutorials/tutorial18/include/tutorial18/input/ServerInputMessages.h index 17bb8bbc..58fbb7e7 100644 --- a/tutorials/tutorial18/include/tutorial18/input/ServerInputMessages.h +++ b/tutorials/tutorial18/include/tutorial18/input/ServerInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ServerInputMessages messages bundle. diff --git a/tutorials/tutorial18/include/tutorial18/message/Msg1_1.h b/tutorials/tutorial18/include/tutorial18/message/Msg1_1.h index 5472a93e..b96c63ab 100644 --- a/tutorials/tutorial18/include/tutorial18/message/Msg1_1.h +++ b/tutorials/tutorial18/include/tutorial18/message/Msg1_1.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 1 (1)" message and its fields. @@ -32,13 +32,15 @@ struct Msg1_1Fields class F1 : public comms::field::IntValue< tutorial18::field::FieldBase<>, - std::uint64_t + std::uint64_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial18::field::FieldBase<>, - std::uint64_t + std::uint64_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/tutorials/tutorial18/include/tutorial18/message/Msg1_1Common.h b/tutorials/tutorial18/include/tutorial18/message/Msg1_1Common.h index b33f5538..a2ab2bad 100644 --- a/tutorials/tutorial18/include/tutorial18/message/Msg1_1Common.h +++ b/tutorials/tutorial18/include/tutorial18/message/Msg1_1Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial18/include/tutorial18/message/Msg1_2.h b/tutorials/tutorial18/include/tutorial18/message/Msg1_2.h index ff8a2627..1c0acd2f 100644 --- a/tutorials/tutorial18/include/tutorial18/message/Msg1_2.h +++ b/tutorials/tutorial18/include/tutorial18/message/Msg1_2.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 1 (2)" message and its fields. @@ -32,13 +32,15 @@ struct Msg1_2Fields class F1 : public comms::field::IntValue< tutorial18::field::FieldBase<>, - std::uint32_t + std::uint32_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial18::field::FieldBase<>, - std::uint32_t + std::uint32_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/tutorials/tutorial18/include/tutorial18/message/Msg1_2Common.h b/tutorials/tutorial18/include/tutorial18/message/Msg1_2Common.h index 12cb692d..fd82fa00 100644 --- a/tutorials/tutorial18/include/tutorial18/message/Msg1_2Common.h +++ b/tutorials/tutorial18/include/tutorial18/message/Msg1_2Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial18/include/tutorial18/message/Msg1_3.h b/tutorials/tutorial18/include/tutorial18/message/Msg1_3.h index 69f896a3..fedf4ca2 100644 --- a/tutorials/tutorial18/include/tutorial18/message/Msg1_3.h +++ b/tutorials/tutorial18/include/tutorial18/message/Msg1_3.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 1 (3)" message and its fields. @@ -32,13 +32,15 @@ struct Msg1_3Fields class F1 : public comms::field::IntValue< tutorial18::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial18::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/tutorials/tutorial18/include/tutorial18/message/Msg1_3Common.h b/tutorials/tutorial18/include/tutorial18/message/Msg1_3Common.h index d664b120..f9fb7aa0 100644 --- a/tutorials/tutorial18/include/tutorial18/message/Msg1_3Common.h +++ b/tutorials/tutorial18/include/tutorial18/message/Msg1_3Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial18/include/tutorial18/message/Msg2_1.h b/tutorials/tutorial18/include/tutorial18/message/Msg2_1.h index 38ba1ac2..e8004e29 100644 --- a/tutorials/tutorial18/include/tutorial18/message/Msg2_1.h +++ b/tutorials/tutorial18/include/tutorial18/message/Msg2_1.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 2 (1)" message and its fields. @@ -33,6 +33,7 @@ struct Msg2_1Fields comms::field::IntValue< tutorial18::field::FieldBase<>, std::uint8_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid<>, comms::option::def::DefaultNumValue<1>, comms::option::def::ValidNumValue<1>, @@ -43,6 +44,7 @@ struct Msg2_1Fields comms::field::IntValue< tutorial18::field::FieldBase<>, std::uint8_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid<>, comms::option::def::DefaultNumValue<1>, comms::option::def::ValidNumValue<1>, @@ -80,13 +82,15 @@ struct Msg2_1Fields class F1 : public comms::field::IntValue< tutorial18::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial18::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/tutorials/tutorial18/include/tutorial18/message/Msg2_1Common.h b/tutorials/tutorial18/include/tutorial18/message/Msg2_1Common.h index cab253b5..5acae62b 100644 --- a/tutorials/tutorial18/include/tutorial18/message/Msg2_1Common.h +++ b/tutorials/tutorial18/include/tutorial18/message/Msg2_1Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial18/include/tutorial18/message/Msg2_2.h b/tutorials/tutorial18/include/tutorial18/message/Msg2_2.h index 0b86e8b4..75151281 100644 --- a/tutorials/tutorial18/include/tutorial18/message/Msg2_2.h +++ b/tutorials/tutorial18/include/tutorial18/message/Msg2_2.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 2 (2)" message and its fields. @@ -33,6 +33,7 @@ struct Msg2_2Fields comms::field::IntValue< tutorial18::field::FieldBase<>, std::uint8_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid<>, comms::option::def::DefaultNumValue<2>, comms::option::def::ValidNumValue<2>, @@ -43,6 +44,7 @@ struct Msg2_2Fields comms::field::IntValue< tutorial18::field::FieldBase<>, std::uint8_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid<>, comms::option::def::DefaultNumValue<2>, comms::option::def::ValidNumValue<2>, @@ -80,13 +82,15 @@ struct Msg2_2Fields class F1 : public comms::field::IntValue< tutorial18::field::FieldBase<>, - std::uint32_t + std::uint32_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial18::field::FieldBase<>, - std::uint32_t + std::uint32_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/tutorials/tutorial18/include/tutorial18/message/Msg2_2Common.h b/tutorials/tutorial18/include/tutorial18/message/Msg2_2Common.h index 8269473a..2a806579 100644 --- a/tutorials/tutorial18/include/tutorial18/message/Msg2_2Common.h +++ b/tutorials/tutorial18/include/tutorial18/message/Msg2_2Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial18/include/tutorial18/message/Msg2_3.h b/tutorials/tutorial18/include/tutorial18/message/Msg2_3.h index e1c24dbc..c6945907 100644 --- a/tutorials/tutorial18/include/tutorial18/message/Msg2_3.h +++ b/tutorials/tutorial18/include/tutorial18/message/Msg2_3.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 2 (3)" message and its fields. @@ -33,6 +33,7 @@ struct Msg2_3Fields comms::field::IntValue< tutorial18::field::FieldBase<>, std::uint8_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid<>, comms::option::def::DefaultNumValue<3>, comms::option::def::ValidNumValue<3>, @@ -43,6 +44,7 @@ struct Msg2_3Fields comms::field::IntValue< tutorial18::field::FieldBase<>, std::uint8_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid<>, comms::option::def::DefaultNumValue<3>, comms::option::def::ValidNumValue<3>, @@ -80,13 +82,15 @@ struct Msg2_3Fields class F1 : public comms::field::IntValue< tutorial18::field::FieldBase<>, - std::uint64_t + std::uint64_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial18::field::FieldBase<>, - std::uint64_t + std::uint64_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/tutorials/tutorial18/include/tutorial18/message/Msg2_3Common.h b/tutorials/tutorial18/include/tutorial18/message/Msg2_3Common.h index 428b5e79..6aa505f5 100644 --- a/tutorials/tutorial18/include/tutorial18/message/Msg2_3Common.h +++ b/tutorials/tutorial18/include/tutorial18/message/Msg2_3Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial18/include/tutorial18/options/AllMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial18/include/tutorial18/options/AllMessagesDynMemMsgFactoryDefaultOptions.h index 740f20b1..f7dbcd04 100644 --- a/tutorials/tutorial18/include/tutorial18/options/AllMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial18/include/tutorial18/options/AllMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol all messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial18/include/tutorial18/options/BareMetalDefaultOptions.h b/tutorials/tutorial18/include/tutorial18/options/BareMetalDefaultOptions.h index 8a58a15d..a9da1ba8 100644 --- a/tutorials/tutorial18/include/tutorial18/options/BareMetalDefaultOptions.h +++ b/tutorials/tutorial18/include/tutorial18/options/BareMetalDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol bare metal default options. @@ -31,13 +31,15 @@ struct BareMetalDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// tutorial18::frame::FrameLayers::Data - /// layer. - using Data = - std::tuple< - comms::option::app::FixedSizeStorage, - typename TBase::frame::FrameLayers::Data - >; + /// tutorial18::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::FixedSizeStorage, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers /// @brief Extra options for @ref /// tutorial18::frame::FrameLayers::Id diff --git a/tutorials/tutorial18/include/tutorial18/options/ClientDefaultOptions.h b/tutorials/tutorial18/include/tutorial18/options/ClientDefaultOptions.h index 658a4908..09adef11 100644 --- a/tutorials/tutorial18/include/tutorial18/options/ClientDefaultOptions.h +++ b/tutorials/tutorial18/include/tutorial18/options/ClientDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client default options. diff --git a/tutorials/tutorial18/include/tutorial18/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial18/include/tutorial18/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h index c10ff25b..d1a70c6b 100644 --- a/tutorials/tutorial18/include/tutorial18/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial18/include/tutorial18/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client input messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial18/include/tutorial18/options/DataViewDefaultOptions.h b/tutorials/tutorial18/include/tutorial18/options/DataViewDefaultOptions.h index 33939559..f7b2f8ab 100644 --- a/tutorials/tutorial18/include/tutorial18/options/DataViewDefaultOptions.h +++ b/tutorials/tutorial18/include/tutorial18/options/DataViewDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol data view default options. @@ -25,13 +25,15 @@ struct DataViewDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// tutorial18::frame::FrameLayers::Data - /// layer. - using Data = - std::tuple< - comms::option::app::OrigDataView, - typename TBase::frame::FrameLayers::Data - >; + /// tutorial18::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::OrigDataView, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers }; // struct FrameLayers }; // struct frame }; diff --git a/tutorials/tutorial18/include/tutorial18/options/DefaultOptions.h b/tutorials/tutorial18/include/tutorial18/options/DefaultOptions.h index 15d239f2..aec5cf40 100644 --- a/tutorials/tutorial18/include/tutorial18/options/DefaultOptions.h +++ b/tutorials/tutorial18/include/tutorial18/options/DefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol default options. @@ -28,14 +28,16 @@ struct DefaultOptionsT : public TBase struct FrameLayers { /// @brief Extra options for @ref - /// tutorial18::frame::FrameLayers::Data - /// layer. - using Data = comms::option::EmptyOption; + /// tutorial18::frame::FrameLayers::DataMembers::Field field. + struct DataMembers + { + using Field = comms::option::app::EmptyOption; + }; // struct DataMembers /// @brief Extra options for @ref /// tutorial18::frame::FrameLayers::Id /// layer. - using Id = comms::option::EmptyOption; + using Id = comms::option::app::EmptyOption; }; // struct FrameLayers }; // struct frame }; diff --git a/tutorials/tutorial18/include/tutorial18/options/ServerDefaultOptions.h b/tutorials/tutorial18/include/tutorial18/options/ServerDefaultOptions.h index ff2a5cd5..20d17fa9 100644 --- a/tutorials/tutorial18/include/tutorial18/options/ServerDefaultOptions.h +++ b/tutorials/tutorial18/include/tutorial18/options/ServerDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server default options. diff --git a/tutorials/tutorial18/include/tutorial18/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial18/include/tutorial18/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h index ae7c68ef..a2ff1fb2 100644 --- a/tutorials/tutorial18/include/tutorial18/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial18/include/tutorial18/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server input messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial19/include/tutorial19/Interface.h b/tutorials/tutorial19/include/tutorial19/Interface.h index 23560181..07d4e251 100644 --- a/tutorials/tutorial19/include/tutorial19/Interface.h +++ b/tutorials/tutorial19/include/tutorial19/Interface.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Interface" interface class. @@ -27,6 +27,7 @@ struct InterfaceFields comms::field::IntValue< tutorial19::field::FieldBase<>, std::uint16_t, + comms::option::def::HasName, comms::option::def::DefaultNumValue<5U> > { @@ -34,6 +35,7 @@ struct InterfaceFields comms::field::IntValue< tutorial19::field::FieldBase<>, std::uint16_t, + comms::option::def::HasName, comms::option::def::DefaultNumValue<5U> >; public: diff --git a/tutorials/tutorial19/include/tutorial19/InterfaceCommon.h b/tutorials/tutorial19/include/tutorial19/InterfaceCommon.h index 2e8e48c8..c106894a 100644 --- a/tutorials/tutorial19/include/tutorial19/InterfaceCommon.h +++ b/tutorials/tutorial19/include/tutorial19/InterfaceCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial19/include/tutorial19/MsgId.h b/tutorials/tutorial19/include/tutorial19/MsgId.h index 52a00a8c..af05be00 100644 --- a/tutorials/tutorial19/include/tutorial19/MsgId.h +++ b/tutorials/tutorial19/include/tutorial19/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of message ids enumeration. diff --git a/tutorials/tutorial19/include/tutorial19/Version.h b/tutorials/tutorial19/include/tutorial19/Version.h index f3f14764..ba7e8902 100644 --- a/tutorials/tutorial19/include/tutorial19/Version.h +++ b/tutorials/tutorial19/include/tutorial19/Version.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains protocol version definition. @@ -22,5 +22,5 @@ inline constexpr unsigned specVersion() } // namespace tutorial19 // Generated compile time check for minimal supported version of the COMMS library -static_assert(COMMS_MAKE_VERSION(5, 2, 7) <= comms::version(), +static_assert(COMMS_MAKE_VERSION(5, 3, 0) <= comms::version(), "The version of COMMS library is too old"); diff --git a/tutorials/tutorial19/include/tutorial19/dispatch/DispatchClientInputMessage.h b/tutorials/tutorial19/include/tutorial19/dispatch/DispatchClientInputMessage.h index 70fb4db7..c9a6cdc8 100644 --- a/tutorials/tutorial19/include/tutorial19/dispatch/DispatchClientInputMessage.h +++ b/tutorials/tutorial19/include/tutorial19/dispatch/DispatchClientInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/tutorials/tutorial19/include/tutorial19/dispatch/DispatchMessage.h b/tutorials/tutorial19/include/tutorial19/dispatch/DispatchMessage.h index 0f942171..fc30fe97 100644 --- a/tutorials/tutorial19/include/tutorial19/dispatch/DispatchMessage.h +++ b/tutorials/tutorial19/include/tutorial19/dispatch/DispatchMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for all input messages. diff --git a/tutorials/tutorial19/include/tutorial19/dispatch/DispatchServerInputMessage.h b/tutorials/tutorial19/include/tutorial19/dispatch/DispatchServerInputMessage.h index 57e19c16..4eb557fc 100644 --- a/tutorials/tutorial19/include/tutorial19/dispatch/DispatchServerInputMessage.h +++ b/tutorials/tutorial19/include/tutorial19/dispatch/DispatchServerInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/tutorials/tutorial19/include/tutorial19/factory/AllMessagesDynMemMsgFactory.h b/tutorials/tutorial19/include/tutorial19/factory/AllMessagesDynMemMsgFactory.h index aec10662..9b40f7e1 100644 --- a/tutorials/tutorial19/include/tutorial19/factory/AllMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial19/include/tutorial19/factory/AllMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for all the messages. diff --git a/tutorials/tutorial19/include/tutorial19/factory/ClientInputMessagesDynMemMsgFactory.h b/tutorials/tutorial19/include/tutorial19/factory/ClientInputMessagesDynMemMsgFactory.h index 65af569d..e77cff04 100644 --- a/tutorials/tutorial19/include/tutorial19/factory/ClientInputMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial19/include/tutorial19/factory/ClientInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the client input messages. diff --git a/tutorials/tutorial19/include/tutorial19/factory/ServerInputMessagesDynMemMsgFactory.h b/tutorials/tutorial19/include/tutorial19/factory/ServerInputMessagesDynMemMsgFactory.h index efe2ad2f..7b4067b4 100644 --- a/tutorials/tutorial19/include/tutorial19/factory/ServerInputMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial19/include/tutorial19/factory/ServerInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the server input messages. diff --git a/tutorials/tutorial19/include/tutorial19/field/FieldBase.h b/tutorials/tutorial19/include/tutorial19/field/FieldBase.h index ae8c5912..7a7d85b1 100644 --- a/tutorials/tutorial19/include/tutorial19/field/FieldBase.h +++ b/tutorials/tutorial19/include/tutorial19/field/FieldBase.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of base class of all the fields. diff --git a/tutorials/tutorial19/include/tutorial19/field/MsgId.h b/tutorials/tutorial19/include/tutorial19/field/MsgId.h index 0428c79b..de1ee1e0 100644 --- a/tutorials/tutorial19/include/tutorial19/field/MsgId.h +++ b/tutorials/tutorial19/include/tutorial19/field/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "MsgId" field. @@ -27,6 +27,7 @@ class MsgId : public tutorial19::field::FieldBase<>, tutorial19::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 3> > { @@ -35,6 +36,7 @@ class MsgId : public tutorial19::field::FieldBase<>, tutorial19::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 3> >; public: diff --git a/tutorials/tutorial19/include/tutorial19/field/MsgIdCommon.h b/tutorials/tutorial19/include/tutorial19/field/MsgIdCommon.h index 3e5110d3..74379f15 100644 --- a/tutorials/tutorial19/include/tutorial19/field/MsgIdCommon.h +++ b/tutorials/tutorial19/include/tutorial19/field/MsgIdCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial19/include/tutorial19/frame/Frame.h b/tutorials/tutorial19/include/tutorial19/frame/Frame.h index fb9e2a8c..f4d2b3e6 100644 --- a/tutorials/tutorial19/include/tutorial19/frame/Frame.h +++ b/tutorials/tutorial19/include/tutorial19/frame/Frame.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Frame" frame class. @@ -31,10 +31,30 @@ namespace frame template struct FrameLayers { + /// @brief Scope for field(s) of @ref Data layer. + struct DataMembers + { + /// @brief Custom field for @ref tutorial19::frame::FrameLayers::Data layer + class Field : public + comms::field::ArrayList< + tutorial19::field::FieldBase<>, + std::uint8_t, + typename TOpt::frame::FrameLayers::DataMembers::Field, + comms::option::def::HasName + > + { + public: + static const char* name() + { + return "Data"; + } + }; + }; + /// @brief Definition of layer "Data". using Data = comms::protocol::MsgDataLayer< - typename TOpt::frame::FrameLayers::Data + comms::option::def::FieldType >; /// @brief Definition of layer "Id". @@ -58,6 +78,7 @@ struct FrameLayers comms::field::IntValue< tutorial19::field::FieldBase<>, std::uint16_t, + comms::option::def::HasName, comms::option::def::DefaultNumValue<5U> > { @@ -65,6 +86,7 @@ struct FrameLayers comms::field::IntValue< tutorial19::field::FieldBase<>, std::uint16_t, + comms::option::def::HasName, comms::option::def::DefaultNumValue<5U> >; public: @@ -101,13 +123,15 @@ struct FrameLayers class Field : public comms::field::IntValue< tutorial19::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial19::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/tutorials/tutorial19/include/tutorial19/frame/FrameCommon.h b/tutorials/tutorial19/include/tutorial19/frame/FrameCommon.h index f389823e..6249ffd4 100644 --- a/tutorials/tutorial19/include/tutorial19/frame/FrameCommon.h +++ b/tutorials/tutorial19/include/tutorial19/frame/FrameCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial19/include/tutorial19/input/AllMessages.h b/tutorials/tutorial19/include/tutorial19/input/AllMessages.h index 37c5259e..c91dc4ce 100644 --- a/tutorials/tutorial19/include/tutorial19/input/AllMessages.h +++ b/tutorials/tutorial19/include/tutorial19/input/AllMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the AllMessages messages bundle. diff --git a/tutorials/tutorial19/include/tutorial19/input/ClientInputMessages.h b/tutorials/tutorial19/include/tutorial19/input/ClientInputMessages.h index 008edf3b..ed8b85cb 100644 --- a/tutorials/tutorial19/include/tutorial19/input/ClientInputMessages.h +++ b/tutorials/tutorial19/include/tutorial19/input/ClientInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ClientInputMessages messages bundle. diff --git a/tutorials/tutorial19/include/tutorial19/input/ServerInputMessages.h b/tutorials/tutorial19/include/tutorial19/input/ServerInputMessages.h index 48de6cc8..fd133a51 100644 --- a/tutorials/tutorial19/include/tutorial19/input/ServerInputMessages.h +++ b/tutorials/tutorial19/include/tutorial19/input/ServerInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ServerInputMessages messages bundle. diff --git a/tutorials/tutorial19/include/tutorial19/message/Msg1.h b/tutorials/tutorial19/include/tutorial19/message/Msg1.h index 476fdc28..bc71feae 100644 --- a/tutorials/tutorial19/include/tutorial19/message/Msg1.h +++ b/tutorials/tutorial19/include/tutorial19/message/Msg1.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 1" message and its fields. @@ -33,13 +33,15 @@ struct Msg1Fields class F1 : public comms::field::IntValue< tutorial19::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial19::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -64,13 +66,15 @@ struct Msg1Fields class F2Field : public comms::field::IntValue< tutorial19::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial19::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -95,8 +99,8 @@ struct Msg1Fields comms::field::Optional< F2Field, comms::option::def::ExistsByDefault, - comms::option::def::ExistsSinceVersion<2U> - > + comms::option::def::ExistsSinceVersion<2U>, + comms::option::def::HasName > { /// @brief Name of the field. static const char* name() @@ -109,13 +113,15 @@ struct Msg1Fields class F3Field : public comms::field::IntValue< tutorial19::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial19::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -140,8 +146,8 @@ struct Msg1Fields comms::field::Optional< F3Field, comms::option::def::ExistsByDefault, - comms::option::def::ExistsSinceVersion<5U> - > + comms::option::def::ExistsSinceVersion<5U>, + comms::option::def::HasName > { /// @brief Name of the field. static const char* name() diff --git a/tutorials/tutorial19/include/tutorial19/message/Msg1Common.h b/tutorials/tutorial19/include/tutorial19/message/Msg1Common.h index bc8f2d29..15e12734 100644 --- a/tutorials/tutorial19/include/tutorial19/message/Msg1Common.h +++ b/tutorials/tutorial19/include/tutorial19/message/Msg1Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial19/include/tutorial19/message/Msg2.h b/tutorials/tutorial19/include/tutorial19/message/Msg2.h index efc30418..6acdc42a 100644 --- a/tutorials/tutorial19/include/tutorial19/message/Msg2.h +++ b/tutorials/tutorial19/include/tutorial19/message/Msg2.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 2" message and its fields. @@ -34,6 +34,7 @@ struct Msg2Fields comms::field::EnumValue< tutorial19::field::FieldBase<>, tutorial19::message::Msg2FieldsCommon::F1Common::ValueType, + comms::option::def::HasName, comms::option::def::ValidNumValueRange<0, 2> > { @@ -41,6 +42,7 @@ struct Msg2Fields comms::field::EnumValue< tutorial19::field::FieldBase<>, tutorial19::message::Msg2FieldsCommon::F1Common::ValueType, + comms::option::def::HasName, comms::option::def::ValidNumValueRange<0, 2> >; public: @@ -94,8 +96,8 @@ struct Msg2Fields comms::field::Optional< F1Field, comms::option::def::ExistsByDefault, - comms::option::def::ExistsSinceVersion<1U> - > + comms::option::def::ExistsSinceVersion<1U>, + comms::option::def::HasName > { /// @brief Name of the field. static const char* name() @@ -110,6 +112,7 @@ struct Msg2Fields comms::field::EnumValue< tutorial19::field::FieldBase<>, tutorial19::message::Msg2FieldsCommon::F2Common::ValueType, + comms::option::def::HasName, comms::option::def::VersionStorage, comms::option::def::InvalidByDefault > @@ -118,6 +121,7 @@ struct Msg2Fields comms::field::EnumValue< tutorial19::field::FieldBase<>, tutorial19::message::Msg2FieldsCommon::F2Common::ValueType, + comms::option::def::HasName, comms::option::def::VersionStorage, comms::option::def::InvalidByDefault >; @@ -201,8 +205,8 @@ struct Msg2Fields comms::field::Optional< F2Field, comms::option::def::ExistsByDefault, - comms::option::def::ExistsSinceVersion<3U> - > + comms::option::def::ExistsSinceVersion<3U>, + comms::option::def::HasName > { /// @brief Name of the field. static const char* name() diff --git a/tutorials/tutorial19/include/tutorial19/message/Msg2Common.h b/tutorials/tutorial19/include/tutorial19/message/Msg2Common.h index 680f1c6d..16bada7c 100644 --- a/tutorials/tutorial19/include/tutorial19/message/Msg2Common.h +++ b/tutorials/tutorial19/include/tutorial19/message/Msg2Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial19/include/tutorial19/message/Msg3.h b/tutorials/tutorial19/include/tutorial19/message/Msg3.h index 98d03521..eb811b2b 100644 --- a/tutorials/tutorial19/include/tutorial19/message/Msg3.h +++ b/tutorials/tutorial19/include/tutorial19/message/Msg3.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 3" message and its fields. @@ -34,6 +34,7 @@ struct Msg3Fields class F1 : public comms::field::BitmaskValue< tutorial19::field::FieldBase<>, + comms::option::def::HasName, comms::option::def::FixedLength<1U>, comms::option::def::BitmaskReservedBits<0xFCU, 0x0U> > @@ -41,6 +42,7 @@ struct Msg3Fields using Base = comms::field::BitmaskValue< tutorial19::field::FieldBase<>, + comms::option::def::HasName, comms::option::def::FixedLength<1U>, comms::option::def::BitmaskReservedBits<0xFCU, 0x0U> >; @@ -58,13 +60,18 @@ struct Msg3Fields B1 ); + /// @brief Retrieve name of the bit. + /// @see @ref tutorial19::message::Msg3FieldsCommon::F1Common::bitName(). + static const char* bitName(std::size_t idx) + { + return tutorial19::message::Msg3FieldsCommon::F1Common::bitName(idx); + } + /// @brief Retrieve name of the bit. /// @see @ref tutorial19::message::Msg3FieldsCommon::F1Common::bitName(). static const char* bitName(BitIdx idx) { - return - tutorial19::message::Msg3FieldsCommon::F1Common::bitName( - static_cast(idx)); + return bitName(static_cast(idx)); } /// @brief Name of the field. @@ -82,13 +89,15 @@ struct Msg3Fields class Field : public comms::field::IntValue< tutorial19::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial19::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -112,12 +121,14 @@ struct Msg3Fields class F2 : public comms::field::Optional< typename F2Members::Field, + comms::option::def::HasName, comms::option::def::MissingByDefault > { using Base = comms::field::Optional< typename F2Members::Field, + comms::option::def::HasName, comms::option::def::MissingByDefault >; public: @@ -136,13 +147,15 @@ struct Msg3Fields class Field : public comms::field::IntValue< tutorial19::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial19::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -166,12 +179,14 @@ struct Msg3Fields class F3 : public comms::field::Optional< typename F3Members::Field, + comms::option::def::HasName, comms::option::def::MissingByDefault > { using Base = comms::field::Optional< typename F3Members::Field, + comms::option::def::HasName, comms::option::def::MissingByDefault >; public: @@ -186,13 +201,15 @@ struct Msg3Fields class F4Field : public comms::field::IntValue< tutorial19::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial19::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -217,8 +234,8 @@ struct Msg3Fields comms::field::Optional< F4Field, comms::option::def::ExistsByDefault, - comms::option::def::ExistsSinceVersion<3U> - > + comms::option::def::ExistsSinceVersion<3U>, + comms::option::def::HasName > { /// @brief Name of the field. static const char* name() diff --git a/tutorials/tutorial19/include/tutorial19/message/Msg3Common.h b/tutorials/tutorial19/include/tutorial19/message/Msg3Common.h index c5719521..7058233a 100644 --- a/tutorials/tutorial19/include/tutorial19/message/Msg3Common.h +++ b/tutorials/tutorial19/include/tutorial19/message/Msg3Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial19/include/tutorial19/options/AllMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial19/include/tutorial19/options/AllMessagesDynMemMsgFactoryDefaultOptions.h index 691893e3..c96dd1c1 100644 --- a/tutorials/tutorial19/include/tutorial19/options/AllMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial19/include/tutorial19/options/AllMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol all messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial19/include/tutorial19/options/BareMetalDefaultOptions.h b/tutorials/tutorial19/include/tutorial19/options/BareMetalDefaultOptions.h index 50929bb3..01aae19b 100644 --- a/tutorials/tutorial19/include/tutorial19/options/BareMetalDefaultOptions.h +++ b/tutorials/tutorial19/include/tutorial19/options/BareMetalDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol bare metal default options. @@ -31,13 +31,15 @@ struct BareMetalDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// tutorial19::frame::FrameLayers::Data - /// layer. - using Data = - std::tuple< - comms::option::app::FixedSizeStorage, - typename TBase::frame::FrameLayers::Data - >; + /// tutorial19::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::FixedSizeStorage, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers /// @brief Extra options for @ref /// tutorial19::frame::FrameLayers::Id diff --git a/tutorials/tutorial19/include/tutorial19/options/ClientDefaultOptions.h b/tutorials/tutorial19/include/tutorial19/options/ClientDefaultOptions.h index 779d8c78..d3c7a358 100644 --- a/tutorials/tutorial19/include/tutorial19/options/ClientDefaultOptions.h +++ b/tutorials/tutorial19/include/tutorial19/options/ClientDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client default options. diff --git a/tutorials/tutorial19/include/tutorial19/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial19/include/tutorial19/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h index 88baf9d0..a426c841 100644 --- a/tutorials/tutorial19/include/tutorial19/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial19/include/tutorial19/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client input messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial19/include/tutorial19/options/DataViewDefaultOptions.h b/tutorials/tutorial19/include/tutorial19/options/DataViewDefaultOptions.h index 8fdb4def..477a75d4 100644 --- a/tutorials/tutorial19/include/tutorial19/options/DataViewDefaultOptions.h +++ b/tutorials/tutorial19/include/tutorial19/options/DataViewDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol data view default options. @@ -25,13 +25,15 @@ struct DataViewDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// tutorial19::frame::FrameLayers::Data - /// layer. - using Data = - std::tuple< - comms::option::app::OrigDataView, - typename TBase::frame::FrameLayers::Data - >; + /// tutorial19::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::OrigDataView, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers }; // struct FrameLayers }; // struct frame }; diff --git a/tutorials/tutorial19/include/tutorial19/options/DefaultOptions.h b/tutorials/tutorial19/include/tutorial19/options/DefaultOptions.h index a067d731..f5ff29c2 100644 --- a/tutorials/tutorial19/include/tutorial19/options/DefaultOptions.h +++ b/tutorials/tutorial19/include/tutorial19/options/DefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol default options. @@ -28,14 +28,16 @@ struct DefaultOptionsT : public TBase struct FrameLayers { /// @brief Extra options for @ref - /// tutorial19::frame::FrameLayers::Data - /// layer. - using Data = comms::option::EmptyOption; + /// tutorial19::frame::FrameLayers::DataMembers::Field field. + struct DataMembers + { + using Field = comms::option::app::EmptyOption; + }; // struct DataMembers /// @brief Extra options for @ref /// tutorial19::frame::FrameLayers::Id /// layer. - using Id = comms::option::EmptyOption; + using Id = comms::option::app::EmptyOption; }; // struct FrameLayers }; // struct frame }; diff --git a/tutorials/tutorial19/include/tutorial19/options/ServerDefaultOptions.h b/tutorials/tutorial19/include/tutorial19/options/ServerDefaultOptions.h index c8d3382d..7955f513 100644 --- a/tutorials/tutorial19/include/tutorial19/options/ServerDefaultOptions.h +++ b/tutorials/tutorial19/include/tutorial19/options/ServerDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server default options. diff --git a/tutorials/tutorial19/include/tutorial19/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial19/include/tutorial19/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h index d756616c..68b56bc2 100644 --- a/tutorials/tutorial19/include/tutorial19/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial19/include/tutorial19/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server input messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial2/include/tutorial2/Message.h b/tutorials/tutorial2/include/tutorial2/Message.h index 79552325..6966fdb1 100644 --- a/tutorials/tutorial2/include/tutorial2/Message.h +++ b/tutorials/tutorial2/include/tutorial2/Message.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message" interface class. diff --git a/tutorials/tutorial2/include/tutorial2/MsgId.h b/tutorials/tutorial2/include/tutorial2/MsgId.h index faafded0..9d002ca5 100644 --- a/tutorials/tutorial2/include/tutorial2/MsgId.h +++ b/tutorials/tutorial2/include/tutorial2/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of message ids enumeration. diff --git a/tutorials/tutorial2/include/tutorial2/Version.h b/tutorials/tutorial2/include/tutorial2/Version.h index 79b92c3c..615f108d 100644 --- a/tutorials/tutorial2/include/tutorial2/Version.h +++ b/tutorials/tutorial2/include/tutorial2/Version.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains protocol version definition. @@ -22,5 +22,5 @@ inline constexpr unsigned specVersion() } // namespace tutorial2 // Generated compile time check for minimal supported version of the COMMS library -static_assert(COMMS_MAKE_VERSION(5, 2, 7) <= comms::version(), +static_assert(COMMS_MAKE_VERSION(5, 3, 0) <= comms::version(), "The version of COMMS library is too old"); diff --git a/tutorials/tutorial2/include/tutorial2/dispatch/DispatchClientInputMessage.h b/tutorials/tutorial2/include/tutorial2/dispatch/DispatchClientInputMessage.h index fc2b01b3..2a586f03 100644 --- a/tutorials/tutorial2/include/tutorial2/dispatch/DispatchClientInputMessage.h +++ b/tutorials/tutorial2/include/tutorial2/dispatch/DispatchClientInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/tutorials/tutorial2/include/tutorial2/dispatch/DispatchMessage.h b/tutorials/tutorial2/include/tutorial2/dispatch/DispatchMessage.h index c0f4d320..0d15ba89 100644 --- a/tutorials/tutorial2/include/tutorial2/dispatch/DispatchMessage.h +++ b/tutorials/tutorial2/include/tutorial2/dispatch/DispatchMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for all input messages. diff --git a/tutorials/tutorial2/include/tutorial2/dispatch/DispatchServerInputMessage.h b/tutorials/tutorial2/include/tutorial2/dispatch/DispatchServerInputMessage.h index 00e08df9..426ffc4c 100644 --- a/tutorials/tutorial2/include/tutorial2/dispatch/DispatchServerInputMessage.h +++ b/tutorials/tutorial2/include/tutorial2/dispatch/DispatchServerInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/tutorials/tutorial2/include/tutorial2/factory/AllMessagesDynMemMsgFactory.h b/tutorials/tutorial2/include/tutorial2/factory/AllMessagesDynMemMsgFactory.h index 3b564ca7..0931b57e 100644 --- a/tutorials/tutorial2/include/tutorial2/factory/AllMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial2/include/tutorial2/factory/AllMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for all the messages. diff --git a/tutorials/tutorial2/include/tutorial2/factory/ClientInputMessagesDynMemMsgFactory.h b/tutorials/tutorial2/include/tutorial2/factory/ClientInputMessagesDynMemMsgFactory.h index 6eb85dc3..5673df41 100644 --- a/tutorials/tutorial2/include/tutorial2/factory/ClientInputMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial2/include/tutorial2/factory/ClientInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the client input messages. diff --git a/tutorials/tutorial2/include/tutorial2/factory/ServerInputMessagesDynMemMsgFactory.h b/tutorials/tutorial2/include/tutorial2/factory/ServerInputMessagesDynMemMsgFactory.h index 05cd3728..a321a1cd 100644 --- a/tutorials/tutorial2/include/tutorial2/factory/ServerInputMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial2/include/tutorial2/factory/ServerInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the server input messages. diff --git a/tutorials/tutorial2/include/tutorial2/field/B8_1.h b/tutorials/tutorial2/include/tutorial2/field/B8_1.h index 7f05eb34..5c7831ff 100644 --- a/tutorials/tutorial2/include/tutorial2/field/B8_1.h +++ b/tutorials/tutorial2/include/tutorial2/field/B8_1.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "B8_1" field. @@ -32,13 +32,15 @@ struct B8_1Members class M1 : public comms::field::IntValue< tutorial2::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial2::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -63,6 +65,7 @@ struct B8_1Members comms::field::EnumValue< tutorial2::field::FieldBase<>, tutorial2::field::B8_1MembersCommon::M2Common::ValueType, + comms::option::def::HasName, comms::option::def::ValidNumValueRange<0, 1> > { @@ -70,6 +73,7 @@ struct B8_1Members comms::field::EnumValue< tutorial2::field::FieldBase<>, tutorial2::field::B8_1MembersCommon::M2Common::ValueType, + comms::option::def::HasName, comms::option::def::ValidNumValueRange<0, 1> >; public: @@ -122,6 +126,7 @@ struct B8_1Members comms::field::String< tutorial2::field::FieldBase<>, typename TOpt::field::B8_1Members::M3, + comms::option::def::HasName, comms::option::def::SequenceFixedSize<3U> > { @@ -129,6 +134,7 @@ struct B8_1Members comms::field::String< tutorial2::field::FieldBase<>, typename TOpt::field::B8_1Members::M3, + comms::option::def::HasName, comms::option::def::SequenceFixedSize<3U> >; public: @@ -157,6 +163,7 @@ class B8_1 : public tutorial2::field::FieldBase<>, typename B8_1Members::All, TExtraOpts..., + comms::option::def::HasName, comms::option::def::HasVersionDependentMembers > { @@ -165,6 +172,7 @@ class B8_1 : public tutorial2::field::FieldBase<>, typename B8_1Members::All, TExtraOpts..., + comms::option::def::HasName, comms::option::def::HasVersionDependentMembers >; public: diff --git a/tutorials/tutorial2/include/tutorial2/field/B8_1Common.h b/tutorials/tutorial2/include/tutorial2/field/B8_1Common.h index ea2229b0..1a426754 100644 --- a/tutorials/tutorial2/include/tutorial2/field/B8_1Common.h +++ b/tutorials/tutorial2/include/tutorial2/field/B8_1Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial2/include/tutorial2/field/B8_2.h b/tutorials/tutorial2/include/tutorial2/field/B8_2.h index 462a80ee..30007e38 100644 --- a/tutorials/tutorial2/include/tutorial2/field/B8_2.h +++ b/tutorials/tutorial2/include/tutorial2/field/B8_2.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "B8_2" field. @@ -35,13 +35,15 @@ struct B8_2Members class M1 : public comms::field::FloatValue< tutorial2::field::FieldBase<>, - float + float, + comms::option::def::HasName > { using Base = comms::field::FloatValue< tutorial2::field::FieldBase<>, - float + float, + comms::option::def::HasName >; public: /// @brief Default constructor. @@ -77,6 +79,7 @@ struct B8_2Members class M2 : public comms::field::BitmaskValue< tutorial2::field::FieldBase<>, + comms::option::def::HasName, comms::option::def::FixedLength<1U>, comms::option::def::BitmaskReservedBits<0xDEU, 0x0U> > @@ -84,6 +87,7 @@ struct B8_2Members using Base = comms::field::BitmaskValue< tutorial2::field::FieldBase<>, + comms::option::def::HasName, comms::option::def::FixedLength<1U>, comms::option::def::BitmaskReservedBits<0xDEU, 0x0U> >; @@ -114,13 +118,18 @@ struct B8_2Members SomeOtherbit ); + /// @brief Retrieve name of the bit. + /// @see @ref tutorial2::field::B8_2MembersCommon::M2Common::bitName(). + static const char* bitName(std::size_t idx) + { + return tutorial2::field::B8_2MembersCommon::M2Common::bitName(idx); + } + /// @brief Retrieve name of the bit. /// @see @ref tutorial2::field::B8_2MembersCommon::M2Common::bitName(). static const char* bitName(BitIdx idx) { - return - tutorial2::field::B8_2MembersCommon::M2Common::bitName( - static_cast(idx)); + return bitName(static_cast(idx)); } /// @brief Name of the field. @@ -138,13 +147,15 @@ struct B8_2Members class Length : public comms::field::IntValue< tutorial2::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial2::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -170,6 +181,7 @@ struct B8_2Members tutorial2::field::FieldBase<>, std::uint8_t, typename TOpt::field::B8_2Members::M3, + comms::option::def::HasName, comms::option::def::SequenceSerLengthFieldPrefix > { @@ -178,6 +190,7 @@ struct B8_2Members tutorial2::field::FieldBase<>, std::uint8_t, typename TOpt::field::B8_2Members::M3, + comms::option::def::HasName, comms::option::def::SequenceSerLengthFieldPrefix >; public: @@ -208,6 +221,7 @@ class B8_2 : public tutorial2::field::FieldBase<>, typename B8_2Members::All, TExtraOpts..., + comms::option::def::HasName, comms::option::def::HasVersionDependentMembers > { @@ -216,6 +230,7 @@ class B8_2 : public tutorial2::field::FieldBase<>, typename B8_2Members::All, TExtraOpts..., + comms::option::def::HasName, comms::option::def::HasVersionDependentMembers >; public: diff --git a/tutorials/tutorial2/include/tutorial2/field/B8_2Common.h b/tutorials/tutorial2/include/tutorial2/field/B8_2Common.h index 2892213d..8481b052 100644 --- a/tutorials/tutorial2/include/tutorial2/field/B8_2Common.h +++ b/tutorials/tutorial2/include/tutorial2/field/B8_2Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial2/include/tutorial2/field/B9_1.h b/tutorials/tutorial2/include/tutorial2/field/B9_1.h index 2d378c97..39d25820 100644 --- a/tutorials/tutorial2/include/tutorial2/field/B9_1.h +++ b/tutorials/tutorial2/include/tutorial2/field/B9_1.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "B9_1" field. @@ -33,6 +33,7 @@ struct B9_1Members comms::field::IntValue< tutorial2::field::FieldBase<>, std::uint8_t, + comms::option::def::HasName, comms::option::def::FixedBitLength<6U> > { @@ -40,6 +41,7 @@ struct B9_1Members comms::field::IntValue< tutorial2::field::FieldBase<>, std::uint8_t, + comms::option::def::HasName, comms::option::def::FixedBitLength<6U> >; public: @@ -65,6 +67,7 @@ struct B9_1Members comms::field::EnumValue< tutorial2::field::FieldBase<>, tutorial2::field::B9_1MembersCommon::M2Common::ValueType, + comms::option::def::HasName, comms::option::def::FixedBitLength<4U>, comms::option::def::ValidNumValueRange<0, 1> > @@ -73,6 +76,7 @@ struct B9_1Members comms::field::EnumValue< tutorial2::field::FieldBase<>, tutorial2::field::B9_1MembersCommon::M2Common::ValueType, + comms::option::def::HasName, comms::option::def::FixedBitLength<4U>, comms::option::def::ValidNumValueRange<0, 1> >; @@ -125,6 +129,7 @@ struct B9_1Members class M3 : public comms::field::BitmaskValue< tutorial2::field::FieldBase<>, + comms::option::def::HasName, comms::option::def::FixedBitLength<6U>, comms::option::def::BitmaskReservedBits<0x1EU, 0x0U> > @@ -132,6 +137,7 @@ struct B9_1Members using Base = comms::field::BitmaskValue< tutorial2::field::FieldBase<>, + comms::option::def::HasName, comms::option::def::FixedBitLength<6U>, comms::option::def::BitmaskReservedBits<0x1EU, 0x0U> >; @@ -162,13 +168,18 @@ struct B9_1Members B5 ); + /// @brief Retrieve name of the bit. + /// @see @ref tutorial2::field::B9_1MembersCommon::M3Common::bitName(). + static const char* bitName(std::size_t idx) + { + return tutorial2::field::B9_1MembersCommon::M3Common::bitName(idx); + } + /// @brief Retrieve name of the bit. /// @see @ref tutorial2::field::B9_1MembersCommon::M3Common::bitName(). static const char* bitName(BitIdx idx) { - return - tutorial2::field::B9_1MembersCommon::M3Common::bitName( - static_cast(idx)); + return bitName(static_cast(idx)); } /// @brief Name of the field. @@ -196,6 +207,7 @@ class B9_1 : public tutorial2::field::FieldBase<>, typename B9_1Members::All, TExtraOpts..., + comms::option::def::HasName, comms::option::def::HasVersionDependentMembers > { @@ -204,6 +216,7 @@ class B9_1 : public tutorial2::field::FieldBase<>, typename B9_1Members::All, TExtraOpts..., + comms::option::def::HasName, comms::option::def::HasVersionDependentMembers >; public: diff --git a/tutorials/tutorial2/include/tutorial2/field/B9_1Common.h b/tutorials/tutorial2/include/tutorial2/field/B9_1Common.h index d54b7c52..32543052 100644 --- a/tutorials/tutorial2/include/tutorial2/field/B9_1Common.h +++ b/tutorials/tutorial2/include/tutorial2/field/B9_1Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial2/include/tutorial2/field/B9_2.h b/tutorials/tutorial2/include/tutorial2/field/B9_2.h index d269717e..e119824e 100644 --- a/tutorials/tutorial2/include/tutorial2/field/B9_2.h +++ b/tutorials/tutorial2/include/tutorial2/field/B9_2.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "B9_2" field. @@ -33,6 +33,7 @@ struct B9_2Members comms::field::IntValue< tutorial2::field::FieldBase<>, std::uint16_t, + comms::option::def::HasName, comms::option::def::FixedBitLength<12U>, comms::option::def::DefaultNumValue<16> > @@ -41,6 +42,7 @@ struct B9_2Members comms::field::IntValue< tutorial2::field::FieldBase<>, std::uint16_t, + comms::option::def::HasName, comms::option::def::FixedBitLength<12U>, comms::option::def::DefaultNumValue<16> >; @@ -67,6 +69,7 @@ struct B9_2Members comms::field::EnumValue< tutorial2::field::FieldBase<>, tutorial2::field::B9_2MembersCommon::M2Common::ValueType, + comms::option::def::HasName, comms::option::def::DefaultNumValue<2>, comms::option::def::FixedBitLength<4U>, comms::option::def::ValidNumValue<2>, @@ -77,6 +80,7 @@ struct B9_2Members comms::field::EnumValue< tutorial2::field::FieldBase<>, tutorial2::field::B9_2MembersCommon::M2Common::ValueType, + comms::option::def::HasName, comms::option::def::DefaultNumValue<2>, comms::option::def::FixedBitLength<4U>, comms::option::def::ValidNumValue<2>, @@ -131,6 +135,7 @@ struct B9_2Members class M3 : public comms::field::BitmaskValue< tutorial2::field::FieldBase<>, + comms::option::def::HasName, comms::option::def::FixedBitLength<8U>, comms::option::def::DefaultNumValue<0x81U>, comms::option::def::BitmaskReservedBits<0x5EU, 0x0U> @@ -139,6 +144,7 @@ struct B9_2Members using Base = comms::field::BitmaskValue< tutorial2::field::FieldBase<>, + comms::option::def::HasName, comms::option::def::FixedBitLength<8U>, comms::option::def::DefaultNumValue<0x81U>, comms::option::def::BitmaskReservedBits<0x5EU, 0x0U> @@ -174,13 +180,18 @@ struct B9_2Members B7 ); + /// @brief Retrieve name of the bit. + /// @see @ref tutorial2::field::B9_2MembersCommon::M3Common::bitName(). + static const char* bitName(std::size_t idx) + { + return tutorial2::field::B9_2MembersCommon::M3Common::bitName(idx); + } + /// @brief Retrieve name of the bit. /// @see @ref tutorial2::field::B9_2MembersCommon::M3Common::bitName(). static const char* bitName(BitIdx idx) { - return - tutorial2::field::B9_2MembersCommon::M3Common::bitName( - static_cast(idx)); + return bitName(static_cast(idx)); } /// @brief Name of the field. @@ -210,6 +221,7 @@ class B9_2 : public tutorial2::field::FieldBase<>, typename B9_2Members::All, TExtraOpts..., + comms::option::def::HasName, comms::option::def::HasVersionDependentMembers > { @@ -218,6 +230,7 @@ class B9_2 : public tutorial2::field::FieldBase<>, typename B9_2Members::All, TExtraOpts..., + comms::option::def::HasName, comms::option::def::HasVersionDependentMembers >; public: diff --git a/tutorials/tutorial2/include/tutorial2/field/B9_2Common.h b/tutorials/tutorial2/include/tutorial2/field/B9_2Common.h index a089fb71..51d624de 100644 --- a/tutorials/tutorial2/include/tutorial2/field/B9_2Common.h +++ b/tutorials/tutorial2/include/tutorial2/field/B9_2Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial2/include/tutorial2/field/D7_1.h b/tutorials/tutorial2/include/tutorial2/field/D7_1.h index 14ed5df7..86da638d 100644 --- a/tutorials/tutorial2/include/tutorial2/field/D7_1.h +++ b/tutorials/tutorial2/include/tutorial2/field/D7_1.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "D7_1" field. @@ -28,6 +28,7 @@ class D7_1 : public std::uint8_t, TExtraOpts..., typename TOpt::field::D7_1, + comms::option::def::HasName, comms::option::def::SequenceFixedSize<5U> > { @@ -37,6 +38,7 @@ class D7_1 : public std::uint8_t, TExtraOpts..., typename TOpt::field::D7_1, + comms::option::def::HasName, comms::option::def::SequenceFixedSize<5U> >; public: diff --git a/tutorials/tutorial2/include/tutorial2/field/D7_1Common.h b/tutorials/tutorial2/include/tutorial2/field/D7_1Common.h index aed8d0d8..a82bf678 100644 --- a/tutorials/tutorial2/include/tutorial2/field/D7_1Common.h +++ b/tutorials/tutorial2/include/tutorial2/field/D7_1Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial2/include/tutorial2/field/D7_2.h b/tutorials/tutorial2/include/tutorial2/field/D7_2.h index 70f6be9e..d9488497 100644 --- a/tutorials/tutorial2/include/tutorial2/field/D7_2.h +++ b/tutorials/tutorial2/include/tutorial2/field/D7_2.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "D7_2" field. @@ -31,13 +31,15 @@ struct D7_2Members class Length : public comms::field::IntValue< tutorial2::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial2::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -67,6 +69,7 @@ class D7_2 : public std::uint8_t, TExtraOpts..., typename TOpt::field::D7_2, + comms::option::def::HasName, comms::option::def::SequenceSerLengthFieldPrefix::Length> > { @@ -76,6 +79,7 @@ class D7_2 : public std::uint8_t, TExtraOpts..., typename TOpt::field::D7_2, + comms::option::def::HasName, comms::option::def::SequenceSerLengthFieldPrefix::Length> >; public: diff --git a/tutorials/tutorial2/include/tutorial2/field/D7_2Common.h b/tutorials/tutorial2/include/tutorial2/field/D7_2Common.h index dbb22262..0e1762e7 100644 --- a/tutorials/tutorial2/include/tutorial2/field/D7_2Common.h +++ b/tutorials/tutorial2/include/tutorial2/field/D7_2Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial2/include/tutorial2/field/E2_1.h b/tutorials/tutorial2/include/tutorial2/field/E2_1.h index bea7e82c..146205e4 100644 --- a/tutorials/tutorial2/include/tutorial2/field/E2_1.h +++ b/tutorials/tutorial2/include/tutorial2/field/E2_1.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "E2_1" field. @@ -27,6 +27,7 @@ class E2_1 : public tutorial2::field::FieldBase<>, tutorial2::field::E2_1Common::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<0, 2> > { @@ -35,6 +36,7 @@ class E2_1 : public tutorial2::field::FieldBase<>, tutorial2::field::E2_1Common::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<0, 2> >; public: diff --git a/tutorials/tutorial2/include/tutorial2/field/E2_1Common.h b/tutorials/tutorial2/include/tutorial2/field/E2_1Common.h index 6667737e..26222033 100644 --- a/tutorials/tutorial2/include/tutorial2/field/E2_1Common.h +++ b/tutorials/tutorial2/include/tutorial2/field/E2_1Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial2/include/tutorial2/field/E2_2.h b/tutorials/tutorial2/include/tutorial2/field/E2_2.h index 9a0ac4d9..01252bd4 100644 --- a/tutorials/tutorial2/include/tutorial2/field/E2_2.h +++ b/tutorials/tutorial2/include/tutorial2/field/E2_2.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "E2_2" field. @@ -27,6 +27,7 @@ class E2_2 : public tutorial2::field::FieldBase<>, tutorial2::field::E2_2Common::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::DefaultNumValue<100>, comms::option::def::ValidNumValue<0>, comms::option::def::ValidNumValue<100>, @@ -38,6 +39,7 @@ class E2_2 : public tutorial2::field::FieldBase<>, tutorial2::field::E2_2Common::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::DefaultNumValue<100>, comms::option::def::ValidNumValue<0>, comms::option::def::ValidNumValue<100>, diff --git a/tutorials/tutorial2/include/tutorial2/field/E2_2Common.h b/tutorials/tutorial2/include/tutorial2/field/E2_2Common.h index 5dc6ca36..d02eded5 100644 --- a/tutorials/tutorial2/include/tutorial2/field/E2_2Common.h +++ b/tutorials/tutorial2/include/tutorial2/field/E2_2Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial2/include/tutorial2/field/F11_1.h b/tutorials/tutorial2/include/tutorial2/field/F11_1.h index 4c494916..d14c4637 100644 --- a/tutorials/tutorial2/include/tutorial2/field/F11_1.h +++ b/tutorials/tutorial2/include/tutorial2/field/F11_1.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Field 11_1" field. @@ -26,14 +26,16 @@ class F11_1 : public comms::field::IntValue< tutorial2::field::FieldBase<>, std::uint8_t, - TExtraOpts... + TExtraOpts..., + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial2::field::FieldBase<>, std::uint8_t, - TExtraOpts... + TExtraOpts..., + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/tutorials/tutorial2/include/tutorial2/field/F11_1Common.h b/tutorials/tutorial2/include/tutorial2/field/F11_1Common.h index 6f917236..eff1a6f2 100644 --- a/tutorials/tutorial2/include/tutorial2/field/F11_1Common.h +++ b/tutorials/tutorial2/include/tutorial2/field/F11_1Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial2/include/tutorial2/field/F11_2.h b/tutorials/tutorial2/include/tutorial2/field/F11_2.h index 5dc17ebd..cf714de9 100644 --- a/tutorials/tutorial2/include/tutorial2/field/F11_2.h +++ b/tutorials/tutorial2/include/tutorial2/field/F11_2.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Field 11_2" field. @@ -27,6 +27,7 @@ class F11_2 : public tutorial2::field::FieldBase<>, tutorial2::field::F11_2Common::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<0, 2> > { @@ -35,6 +36,7 @@ class F11_2 : public tutorial2::field::FieldBase<>, tutorial2::field::F11_2Common::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<0, 2> >; public: diff --git a/tutorials/tutorial2/include/tutorial2/field/F11_2Common.h b/tutorials/tutorial2/include/tutorial2/field/F11_2Common.h index 3cd294f9..6b57c1bc 100644 --- a/tutorials/tutorial2/include/tutorial2/field/F11_2Common.h +++ b/tutorials/tutorial2/include/tutorial2/field/F11_2Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial2/include/tutorial2/field/F11_3.h b/tutorials/tutorial2/include/tutorial2/field/F11_3.h index 94d395b4..ad39848c 100644 --- a/tutorials/tutorial2/include/tutorial2/field/F11_3.h +++ b/tutorials/tutorial2/include/tutorial2/field/F11_3.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "F11_3" field. @@ -30,6 +30,7 @@ struct F11_3Members using M1 = tutorial2::field::F11_1< TOpt, + comms::option::def::HasName, comms::option::def::FixedBitLength<5U> >; @@ -37,12 +38,14 @@ struct F11_3Members class M2 : public tutorial2::field::F11_2< TOpt, + comms::option::def::HasName, comms::option::def::FixedBitLength<3U> > { using Base = tutorial2::field::F11_2< TOpt, + comms::option::def::HasName, comms::option::def::FixedBitLength<3U> >; public: @@ -70,6 +73,7 @@ class F11_3 : public tutorial2::field::FieldBase<>, typename F11_3Members::All, TExtraOpts..., + comms::option::def::HasName, comms::option::def::HasVersionDependentMembers > { @@ -78,6 +82,7 @@ class F11_3 : public tutorial2::field::FieldBase<>, typename F11_3Members::All, TExtraOpts..., + comms::option::def::HasName, comms::option::def::HasVersionDependentMembers >; public: diff --git a/tutorials/tutorial2/include/tutorial2/field/F11_3Common.h b/tutorials/tutorial2/include/tutorial2/field/F11_3Common.h index dab8fd18..24557284 100644 --- a/tutorials/tutorial2/include/tutorial2/field/F11_3Common.h +++ b/tutorials/tutorial2/include/tutorial2/field/F11_3Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial2/include/tutorial2/field/F5_1.h b/tutorials/tutorial2/include/tutorial2/field/F5_1.h index 6323bca8..ae279a9c 100644 --- a/tutorials/tutorial2/include/tutorial2/field/F5_1.h +++ b/tutorials/tutorial2/include/tutorial2/field/F5_1.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "F5_1" field. @@ -25,14 +25,16 @@ class F5_1 : public comms::field::FloatValue< tutorial2::field::FieldBase<>, float, - TExtraOpts... + TExtraOpts..., + comms::option::def::HasName > { using Base = comms::field::FloatValue< tutorial2::field::FieldBase<>, float, - TExtraOpts... + TExtraOpts..., + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/tutorials/tutorial2/include/tutorial2/field/F5_1Common.h b/tutorials/tutorial2/include/tutorial2/field/F5_1Common.h index 019107b7..e91bf7c4 100644 --- a/tutorials/tutorial2/include/tutorial2/field/F5_1Common.h +++ b/tutorials/tutorial2/include/tutorial2/field/F5_1Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial2/include/tutorial2/field/F5_2.h b/tutorials/tutorial2/include/tutorial2/field/F5_2.h index f008bab9..4a572ed6 100644 --- a/tutorials/tutorial2/include/tutorial2/field/F5_2.h +++ b/tutorials/tutorial2/include/tutorial2/field/F5_2.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "F5_2" field. @@ -27,14 +27,16 @@ class F5_2 : public comms::field::FloatValue< tutorial2::field::FieldBase<>, double, - TExtraOpts... + TExtraOpts..., + comms::option::def::HasName > { using Base = comms::field::FloatValue< tutorial2::field::FieldBase<>, double, - TExtraOpts... + TExtraOpts..., + comms::option::def::HasName >; public: /// @brief Default constructor. diff --git a/tutorials/tutorial2/include/tutorial2/field/F5_2Common.h b/tutorials/tutorial2/include/tutorial2/field/F5_2Common.h index 42397a43..722aa052 100644 --- a/tutorials/tutorial2/include/tutorial2/field/F5_2Common.h +++ b/tutorials/tutorial2/include/tutorial2/field/F5_2Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial2/include/tutorial2/field/FieldBase.h b/tutorials/tutorial2/include/tutorial2/field/FieldBase.h index 10607196..481f24ad 100644 --- a/tutorials/tutorial2/include/tutorial2/field/FieldBase.h +++ b/tutorials/tutorial2/include/tutorial2/field/FieldBase.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of base class of all the fields. diff --git a/tutorials/tutorial2/include/tutorial2/field/I1.h b/tutorials/tutorial2/include/tutorial2/field/I1.h index b6930229..893db70a 100644 --- a/tutorials/tutorial2/include/tutorial2/field/I1.h +++ b/tutorials/tutorial2/include/tutorial2/field/I1.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "I1" field. @@ -26,14 +26,16 @@ class I1 : public comms::field::IntValue< tutorial2::field::FieldBase<>, std::uint8_t, - TExtraOpts... + TExtraOpts..., + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial2::field::FieldBase<>, std::uint8_t, - TExtraOpts... + TExtraOpts..., + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/tutorials/tutorial2/include/tutorial2/field/I1Common.h b/tutorials/tutorial2/include/tutorial2/field/I1Common.h index 20569983..ec0179fb 100644 --- a/tutorials/tutorial2/include/tutorial2/field/I1Common.h +++ b/tutorials/tutorial2/include/tutorial2/field/I1Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial2/include/tutorial2/field/I3_1.h b/tutorials/tutorial2/include/tutorial2/field/I3_1.h index 680eaa50..de610bc8 100644 --- a/tutorials/tutorial2/include/tutorial2/field/I3_1.h +++ b/tutorials/tutorial2/include/tutorial2/field/I3_1.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "I3_1" field. @@ -27,6 +27,7 @@ class I3_1 : public tutorial2::field::FieldBase<>, std::int32_t, TExtraOpts..., + comms::option::def::HasName, comms::option::def::DefaultNumValue<10> > { @@ -35,6 +36,7 @@ class I3_1 : public tutorial2::field::FieldBase<>, std::int32_t, TExtraOpts..., + comms::option::def::HasName, comms::option::def::DefaultNumValue<10> >; public: diff --git a/tutorials/tutorial2/include/tutorial2/field/I3_1Common.h b/tutorials/tutorial2/include/tutorial2/field/I3_1Common.h index 0353daa3..8e5a74a9 100644 --- a/tutorials/tutorial2/include/tutorial2/field/I3_1Common.h +++ b/tutorials/tutorial2/include/tutorial2/field/I3_1Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial2/include/tutorial2/field/I3_2.h b/tutorials/tutorial2/include/tutorial2/field/I3_2.h index 4e4836f6..d73cdf8b 100644 --- a/tutorials/tutorial2/include/tutorial2/field/I3_2.h +++ b/tutorials/tutorial2/include/tutorial2/field/I3_2.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "I3_2" field. @@ -27,6 +27,7 @@ class I3_2 : public tutorial2::field::FieldBase<>, std::uint32_t, TExtraOpts..., + comms::option::def::HasName, comms::option::def::FixedLength<3U> > { @@ -35,6 +36,7 @@ class I3_2 : public tutorial2::field::FieldBase<>, std::uint32_t, TExtraOpts..., + comms::option::def::HasName, comms::option::def::FixedLength<3U> >; public: diff --git a/tutorials/tutorial2/include/tutorial2/field/I3_2Common.h b/tutorials/tutorial2/include/tutorial2/field/I3_2Common.h index f7213054..a79a4a34 100644 --- a/tutorials/tutorial2/include/tutorial2/field/I3_2Common.h +++ b/tutorials/tutorial2/include/tutorial2/field/I3_2Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial2/include/tutorial2/field/I3_3.h b/tutorials/tutorial2/include/tutorial2/field/I3_3.h index 8ad3bc06..1362213a 100644 --- a/tutorials/tutorial2/include/tutorial2/field/I3_3.h +++ b/tutorials/tutorial2/include/tutorial2/field/I3_3.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "I3_3" field. @@ -27,6 +27,7 @@ class I3_3 : public tutorial2::field::FieldBase<>, std::uint32_t, TExtraOpts..., + comms::option::def::HasName, comms::option::def::VarLength<1U, 4U> > { @@ -35,6 +36,7 @@ class I3_3 : public tutorial2::field::FieldBase<>, std::uint32_t, TExtraOpts..., + comms::option::def::HasName, comms::option::def::VarLength<1U, 4U> >; public: diff --git a/tutorials/tutorial2/include/tutorial2/field/I3_3Common.h b/tutorials/tutorial2/include/tutorial2/field/I3_3Common.h index 44263531..32853a07 100644 --- a/tutorials/tutorial2/include/tutorial2/field/I3_3Common.h +++ b/tutorials/tutorial2/include/tutorial2/field/I3_3Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial2/include/tutorial2/field/I3_4.h b/tutorials/tutorial2/include/tutorial2/field/I3_4.h index dabd6460..53354a1d 100644 --- a/tutorials/tutorial2/include/tutorial2/field/I3_4.h +++ b/tutorials/tutorial2/include/tutorial2/field/I3_4.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "I3_4" field. @@ -27,6 +27,7 @@ class I3_4 : public tutorial2::field::FieldBase<>, std::uint8_t, TExtraOpts..., + comms::option::def::HasName, comms::option::def::DefaultNumValue<1> > { @@ -35,6 +36,7 @@ class I3_4 : public tutorial2::field::FieldBase<>, std::uint8_t, TExtraOpts..., + comms::option::def::HasName, comms::option::def::DefaultNumValue<1> >; public: diff --git a/tutorials/tutorial2/include/tutorial2/field/I3_4Common.h b/tutorials/tutorial2/include/tutorial2/field/I3_4Common.h index 032c24e3..6d7f6451 100644 --- a/tutorials/tutorial2/include/tutorial2/field/I3_4Common.h +++ b/tutorials/tutorial2/include/tutorial2/field/I3_4Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial2/include/tutorial2/field/I3_5.h b/tutorials/tutorial2/include/tutorial2/field/I3_5.h index 4beaebc0..8a5d1923 100644 --- a/tutorials/tutorial2/include/tutorial2/field/I3_5.h +++ b/tutorials/tutorial2/include/tutorial2/field/I3_5.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "I3_5" field. @@ -29,6 +29,7 @@ class I3_5 : public tutorial2::field::FieldBase<>, std::int16_t, TExtraOpts..., + comms::option::def::HasName, comms::option::def::FixedLength<1U>, comms::option::def::NumValueSerOffset<-2000>, comms::option::def::DefaultNumValue<2020> @@ -39,6 +40,7 @@ class I3_5 : public tutorial2::field::FieldBase<>, std::int16_t, TExtraOpts..., + comms::option::def::HasName, comms::option::def::FixedLength<1U>, comms::option::def::NumValueSerOffset<-2000>, comms::option::def::DefaultNumValue<2020> diff --git a/tutorials/tutorial2/include/tutorial2/field/I3_5Common.h b/tutorials/tutorial2/include/tutorial2/field/I3_5Common.h index 68e3a6b7..82a89c1b 100644 --- a/tutorials/tutorial2/include/tutorial2/field/I3_5Common.h +++ b/tutorials/tutorial2/include/tutorial2/field/I3_5Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial2/include/tutorial2/field/L10_1.h b/tutorials/tutorial2/include/tutorial2/field/L10_1.h index 9abeebd6..b8616c20 100644 --- a/tutorials/tutorial2/include/tutorial2/field/L10_1.h +++ b/tutorials/tutorial2/include/tutorial2/field/L10_1.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "L10_1" field. @@ -29,13 +29,15 @@ struct L10_1Members class Element : public comms::field::IntValue< tutorial2::field::FieldBase<>, - std::uint32_t + std::uint32_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial2::field::FieldBase<>, - std::uint32_t + std::uint32_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -65,6 +67,7 @@ class L10_1 : public typename L10_1Members::Element, TExtraOpts..., typename TOpt::field::L10_1, + comms::option::def::HasName, comms::option::def::SequenceFixedSize<5U> > { @@ -74,6 +77,7 @@ class L10_1 : public typename L10_1Members::Element, TExtraOpts..., typename TOpt::field::L10_1, + comms::option::def::HasName, comms::option::def::SequenceFixedSize<5U> >; public: diff --git a/tutorials/tutorial2/include/tutorial2/field/L10_1Common.h b/tutorials/tutorial2/include/tutorial2/field/L10_1Common.h index 38429795..79efe0cb 100644 --- a/tutorials/tutorial2/include/tutorial2/field/L10_1Common.h +++ b/tutorials/tutorial2/include/tutorial2/field/L10_1Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial2/include/tutorial2/field/L10_2.h b/tutorials/tutorial2/include/tutorial2/field/L10_2.h index a058f970..a3d7e2c2 100644 --- a/tutorials/tutorial2/include/tutorial2/field/L10_2.h +++ b/tutorials/tutorial2/include/tutorial2/field/L10_2.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "L10_2" field. @@ -29,13 +29,15 @@ struct L10_2Members class Element : public comms::field::IntValue< tutorial2::field::FieldBase<>, - std::int16_t + std::int16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial2::field::FieldBase<>, - std::int16_t + std::int16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -59,6 +61,7 @@ struct L10_2Members comms::field::IntValue< tutorial2::field::FieldBase<>, std::uint32_t, + comms::option::def::HasName, comms::option::def::VarLength<1U, 4U> > { @@ -66,6 +69,7 @@ struct L10_2Members comms::field::IntValue< tutorial2::field::FieldBase<>, std::uint32_t, + comms::option::def::HasName, comms::option::def::VarLength<1U, 4U> >; public: @@ -96,6 +100,7 @@ class L10_2 : public typename L10_2Members::Element, TExtraOpts..., typename TOpt::field::L10_2, + comms::option::def::HasName, comms::option::def::SequenceSizeFieldPrefix::Size> > { @@ -105,6 +110,7 @@ class L10_2 : public typename L10_2Members::Element, TExtraOpts..., typename TOpt::field::L10_2, + comms::option::def::HasName, comms::option::def::SequenceSizeFieldPrefix::Size> >; public: diff --git a/tutorials/tutorial2/include/tutorial2/field/L10_2Common.h b/tutorials/tutorial2/include/tutorial2/field/L10_2Common.h index 82fcc811..25268787 100644 --- a/tutorials/tutorial2/include/tutorial2/field/L10_2Common.h +++ b/tutorials/tutorial2/include/tutorial2/field/L10_2Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial2/include/tutorial2/field/L10_3.h b/tutorials/tutorial2/include/tutorial2/field/L10_3.h index 1c5b595d..8ea1e063 100644 --- a/tutorials/tutorial2/include/tutorial2/field/L10_3.h +++ b/tutorials/tutorial2/include/tutorial2/field/L10_3.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "L10_3" field. @@ -36,13 +36,15 @@ struct L10_3Members class M1 : public comms::field::IntValue< tutorial2::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial2::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -66,6 +68,7 @@ struct L10_3Members comms::field::String< tutorial2::field::FieldBase<>, typename TOpt::field::L10_3Members::ElementMembers::M2, + comms::option::def::HasName, comms::option::def::SequenceFixedSize<3U> > { @@ -73,6 +76,7 @@ struct L10_3Members comms::field::String< tutorial2::field::FieldBase<>, typename TOpt::field::L10_3Members::ElementMembers::M2, + comms::option::def::HasName, comms::option::def::SequenceFixedSize<3U> >; public: @@ -96,6 +100,7 @@ struct L10_3Members comms::field::Bundle< tutorial2::field::FieldBase<>, typename ElementMembers::All, + comms::option::def::HasName, comms::option::def::HasVersionDependentMembers > { @@ -103,6 +108,7 @@ struct L10_3Members comms::field::Bundle< tutorial2::field::FieldBase<>, typename ElementMembers::All, + comms::option::def::HasName, comms::option::def::HasVersionDependentMembers >; public: @@ -132,13 +138,15 @@ struct L10_3Members class Length : public comms::field::IntValue< tutorial2::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial2::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -168,6 +176,7 @@ class L10_3 : public typename L10_3Members::Element, TExtraOpts..., typename TOpt::field::L10_3, + comms::option::def::HasName, comms::option::def::SequenceSerLengthFieldPrefix::Length> > { @@ -177,6 +186,7 @@ class L10_3 : public typename L10_3Members::Element, TExtraOpts..., typename TOpt::field::L10_3, + comms::option::def::HasName, comms::option::def::SequenceSerLengthFieldPrefix::Length> >; public: diff --git a/tutorials/tutorial2/include/tutorial2/field/L10_3Common.h b/tutorials/tutorial2/include/tutorial2/field/L10_3Common.h index cc3dfd14..19c39d99 100644 --- a/tutorials/tutorial2/include/tutorial2/field/L10_3Common.h +++ b/tutorials/tutorial2/include/tutorial2/field/L10_3Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial2/include/tutorial2/field/L10_4.h b/tutorials/tutorial2/include/tutorial2/field/L10_4.h index edcb02d2..5f57267f 100644 --- a/tutorials/tutorial2/include/tutorial2/field/L10_4.h +++ b/tutorials/tutorial2/include/tutorial2/field/L10_4.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "L10_4" field. @@ -37,13 +37,15 @@ struct L10_4Members class M1 : public comms::field::IntValue< tutorial2::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial2::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -68,6 +70,7 @@ struct L10_4Members comms::field::EnumValue< tutorial2::field::FieldBase<>, tutorial2::field::L10_4MembersCommon::ElementMembersCommon::M2Common::ValueType, + comms::option::def::HasName, comms::option::def::ValidNumValue<5>, comms::option::def::ValidNumValue<15> > @@ -76,6 +79,7 @@ struct L10_4Members comms::field::EnumValue< tutorial2::field::FieldBase<>, tutorial2::field::L10_4MembersCommon::ElementMembersCommon::M2Common::ValueType, + comms::option::def::HasName, comms::option::def::ValidNumValue<5>, comms::option::def::ValidNumValue<15> >; @@ -128,13 +132,15 @@ struct L10_4Members class M3 : public comms::field::String< tutorial2::field::FieldBase<>, - typename TOpt::field::L10_4Members::ElementMembers::M3 + typename TOpt::field::L10_4Members::ElementMembers::M3, + comms::option::def::HasName > { using Base = comms::field::String< tutorial2::field::FieldBase<>, - typename TOpt::field::L10_4Members::ElementMembers::M3 + typename TOpt::field::L10_4Members::ElementMembers::M3, + comms::option::def::HasName >; public: /// @brief Name of the field. @@ -158,6 +164,7 @@ struct L10_4Members comms::field::Bundle< tutorial2::field::FieldBase<>, typename ElementMembers::All, + comms::option::def::HasName, comms::option::def::HasVersionDependentMembers > { @@ -165,6 +172,7 @@ struct L10_4Members comms::field::Bundle< tutorial2::field::FieldBase<>, typename ElementMembers::All, + comms::option::def::HasName, comms::option::def::HasVersionDependentMembers >; public: @@ -197,13 +205,15 @@ struct L10_4Members class Size : public comms::field::IntValue< tutorial2::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial2::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -226,13 +236,15 @@ struct L10_4Members class Length : public comms::field::IntValue< tutorial2::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial2::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -262,6 +274,7 @@ class L10_4 : public typename L10_4Members::Element, TExtraOpts..., typename TOpt::field::L10_4, + comms::option::def::HasName, comms::option::def::SequenceSizeFieldPrefix::Size>, comms::option::def::SequenceElemSerLengthFieldPrefix::Length> > @@ -272,6 +285,7 @@ class L10_4 : public typename L10_4Members::Element, TExtraOpts..., typename TOpt::field::L10_4, + comms::option::def::HasName, comms::option::def::SequenceSizeFieldPrefix::Size>, comms::option::def::SequenceElemSerLengthFieldPrefix::Length> >; diff --git a/tutorials/tutorial2/include/tutorial2/field/L10_4Common.h b/tutorials/tutorial2/include/tutorial2/field/L10_4Common.h index b5f41bd0..53311db6 100644 --- a/tutorials/tutorial2/include/tutorial2/field/L10_4Common.h +++ b/tutorials/tutorial2/include/tutorial2/field/L10_4Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial2/include/tutorial2/field/L6_3.h b/tutorials/tutorial2/include/tutorial2/field/L6_3.h index c8d1f6a8..a100057c 100644 --- a/tutorials/tutorial2/include/tutorial2/field/L6_3.h +++ b/tutorials/tutorial2/include/tutorial2/field/L6_3.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "L6_3" field. @@ -27,6 +27,7 @@ class L6_3 : public tutorial2::field::FieldBase<>, std::uint16_t, TExtraOpts..., + comms::option::def::HasName, comms::option::def::VarLength<1U, 2U> > { @@ -35,6 +36,7 @@ class L6_3 : public tutorial2::field::FieldBase<>, std::uint16_t, TExtraOpts..., + comms::option::def::HasName, comms::option::def::VarLength<1U, 2U> >; public: diff --git a/tutorials/tutorial2/include/tutorial2/field/L6_3Common.h b/tutorials/tutorial2/include/tutorial2/field/L6_3Common.h index c92dbef8..4ac2353a 100644 --- a/tutorials/tutorial2/include/tutorial2/field/L6_3Common.h +++ b/tutorials/tutorial2/include/tutorial2/field/L6_3Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial2/include/tutorial2/field/MsgId.h b/tutorials/tutorial2/include/tutorial2/field/MsgId.h index 9084516a..3d891534 100644 --- a/tutorials/tutorial2/include/tutorial2/field/MsgId.h +++ b/tutorials/tutorial2/include/tutorial2/field/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "MsgId" field. @@ -27,6 +27,7 @@ class MsgId : public tutorial2::field::FieldBase<>, tutorial2::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 18> > { @@ -35,6 +36,7 @@ class MsgId : public tutorial2::field::FieldBase<>, tutorial2::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 18> >; public: diff --git a/tutorials/tutorial2/include/tutorial2/field/MsgIdCommon.h b/tutorials/tutorial2/include/tutorial2/field/MsgIdCommon.h index 3103a3ad..6e9c3bf3 100644 --- a/tutorials/tutorial2/include/tutorial2/field/MsgIdCommon.h +++ b/tutorials/tutorial2/include/tutorial2/field/MsgIdCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial2/include/tutorial2/field/S4_1.h b/tutorials/tutorial2/include/tutorial2/field/S4_1.h index 5b45cc30..59fc5d95 100644 --- a/tutorials/tutorial2/include/tutorial2/field/S4_1.h +++ b/tutorials/tutorial2/include/tutorial2/field/S4_1.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "S4_1" field. @@ -25,6 +25,7 @@ class S4_1 : public comms::field::BitmaskValue< tutorial2::field::FieldBase<>, TExtraOpts..., + comms::option::def::HasName, comms::option::def::FixedLength<1U>, comms::option::def::BitmaskReservedBits<0xF8U, 0x0U> > @@ -33,6 +34,7 @@ class S4_1 : public comms::field::BitmaskValue< tutorial2::field::FieldBase<>, TExtraOpts..., + comms::option::def::HasName, comms::option::def::FixedLength<1U>, comms::option::def::BitmaskReservedBits<0xF8U, 0x0U> >; @@ -52,13 +54,18 @@ class S4_1 : public B2 ); + /// @brief Retrieve name of the bit. + /// @see @ref tutorial2::field::S4_1Common::bitName(). + static const char* bitName(std::size_t idx) + { + return tutorial2::field::S4_1Common::bitName(idx); + } + /// @brief Retrieve name of the bit. /// @see @ref tutorial2::field::S4_1Common::bitName(). static const char* bitName(BitIdx idx) { - return - tutorial2::field::S4_1Common::bitName( - static_cast(idx)); + return bitName(static_cast(idx)); } /// @brief Name of the field. diff --git a/tutorials/tutorial2/include/tutorial2/field/S4_1Common.h b/tutorials/tutorial2/include/tutorial2/field/S4_1Common.h index 7df941e1..011eb3cd 100644 --- a/tutorials/tutorial2/include/tutorial2/field/S4_1Common.h +++ b/tutorials/tutorial2/include/tutorial2/field/S4_1Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial2/include/tutorial2/field/S4_2.h b/tutorials/tutorial2/include/tutorial2/field/S4_2.h index 060a6e35..b5a6ff60 100644 --- a/tutorials/tutorial2/include/tutorial2/field/S4_2.h +++ b/tutorials/tutorial2/include/tutorial2/field/S4_2.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "S4_2" field. @@ -25,6 +25,7 @@ class S4_2 : public comms::field::BitmaskValue< tutorial2::field::FieldBase<>, TExtraOpts..., + comms::option::def::HasName, comms::option::def::FixedLength<2U>, comms::option::def::DefaultNumValue<0xFFFEU>, comms::option::def::BitmaskReservedBits<0x7FDEU, 0x0U> @@ -34,6 +35,7 @@ class S4_2 : public comms::field::BitmaskValue< tutorial2::field::FieldBase<>, TExtraOpts..., + comms::option::def::HasName, comms::option::def::FixedLength<2U>, comms::option::def::DefaultNumValue<0xFFFEU>, comms::option::def::BitmaskReservedBits<0x7FDEU, 0x0U> @@ -69,13 +71,18 @@ class S4_2 : public B15 ); + /// @brief Retrieve name of the bit. + /// @see @ref tutorial2::field::S4_2Common::bitName(). + static const char* bitName(std::size_t idx) + { + return tutorial2::field::S4_2Common::bitName(idx); + } + /// @brief Retrieve name of the bit. /// @see @ref tutorial2::field::S4_2Common::bitName(). static const char* bitName(BitIdx idx) { - return - tutorial2::field::S4_2Common::bitName( - static_cast(idx)); + return bitName(static_cast(idx)); } /// @brief Name of the field. diff --git a/tutorials/tutorial2/include/tutorial2/field/S4_2Common.h b/tutorials/tutorial2/include/tutorial2/field/S4_2Common.h index e2b8a5a9..798c0f81 100644 --- a/tutorials/tutorial2/include/tutorial2/field/S4_2Common.h +++ b/tutorials/tutorial2/include/tutorial2/field/S4_2Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial2/include/tutorial2/field/S4_3.h b/tutorials/tutorial2/include/tutorial2/field/S4_3.h index 92f1c3c4..3035c2d6 100644 --- a/tutorials/tutorial2/include/tutorial2/field/S4_3.h +++ b/tutorials/tutorial2/include/tutorial2/field/S4_3.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "S4_3" field. @@ -25,6 +25,7 @@ class S4_3 : public comms::field::BitmaskValue< tutorial2::field::FieldBase<>, TExtraOpts..., + comms::option::def::HasName, comms::option::def::FixedLength<3U>, comms::option::def::DefaultNumValue<0x1U>, comms::option::def::BitmaskReservedBits<0xEFFFDEUL, 0xEFFFDCUL> @@ -34,6 +35,7 @@ class S4_3 : public comms::field::BitmaskValue< tutorial2::field::FieldBase<>, TExtraOpts..., + comms::option::def::HasName, comms::option::def::FixedLength<3U>, comms::option::def::DefaultNumValue<0x1U>, comms::option::def::BitmaskReservedBits<0xEFFFDEUL, 0xEFFFDCUL> @@ -73,13 +75,18 @@ class S4_3 : public B20 ); + /// @brief Retrieve name of the bit. + /// @see @ref tutorial2::field::S4_3Common::bitName(). + static const char* bitName(std::size_t idx) + { + return tutorial2::field::S4_3Common::bitName(idx); + } + /// @brief Retrieve name of the bit. /// @see @ref tutorial2::field::S4_3Common::bitName(). static const char* bitName(BitIdx idx) { - return - tutorial2::field::S4_3Common::bitName( - static_cast(idx)); + return bitName(static_cast(idx)); } /// @brief Name of the field. diff --git a/tutorials/tutorial2/include/tutorial2/field/S4_3Common.h b/tutorials/tutorial2/include/tutorial2/field/S4_3Common.h index dd413ceb..5935d511 100644 --- a/tutorials/tutorial2/include/tutorial2/field/S4_3Common.h +++ b/tutorials/tutorial2/include/tutorial2/field/S4_3Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial2/include/tutorial2/field/S6_1.h b/tutorials/tutorial2/include/tutorial2/field/S6_1.h index 44fee985..183509f8 100644 --- a/tutorials/tutorial2/include/tutorial2/field/S6_1.h +++ b/tutorials/tutorial2/include/tutorial2/field/S6_1.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "S6_1" field. @@ -26,6 +26,7 @@ class S6_1 : public tutorial2::field::FieldBase<>, TExtraOpts..., typename TOpt::field::S6_1, + comms::option::def::HasName, comms::option::def::SequenceFixedSize<5U> > { @@ -34,6 +35,7 @@ class S6_1 : public tutorial2::field::FieldBase<>, TExtraOpts..., typename TOpt::field::S6_1, + comms::option::def::HasName, comms::option::def::SequenceFixedSize<5U> >; public: diff --git a/tutorials/tutorial2/include/tutorial2/field/S6_1Common.h b/tutorials/tutorial2/include/tutorial2/field/S6_1Common.h index 7bfbcd36..2f8c55dd 100644 --- a/tutorials/tutorial2/include/tutorial2/field/S6_1Common.h +++ b/tutorials/tutorial2/include/tutorial2/field/S6_1Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial2/include/tutorial2/field/S6_2.h b/tutorials/tutorial2/include/tutorial2/field/S6_2.h index 707f56ec..935ecf0e 100644 --- a/tutorials/tutorial2/include/tutorial2/field/S6_2.h +++ b/tutorials/tutorial2/include/tutorial2/field/S6_2.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "S6_2" field. @@ -29,13 +29,15 @@ struct S6_2Members class Length : public comms::field::IntValue< tutorial2::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial2::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -64,6 +66,7 @@ class S6_2 : public tutorial2::field::FieldBase<>, TExtraOpts..., typename TOpt::field::S6_2, + comms::option::def::HasName, comms::option::def::SequenceSerLengthFieldPrefix::Length> > { @@ -72,6 +75,7 @@ class S6_2 : public tutorial2::field::FieldBase<>, TExtraOpts..., typename TOpt::field::S6_2, + comms::option::def::HasName, comms::option::def::SequenceSerLengthFieldPrefix::Length> >; public: diff --git a/tutorials/tutorial2/include/tutorial2/field/S6_2Common.h b/tutorials/tutorial2/include/tutorial2/field/S6_2Common.h index 7293ac52..44a4477b 100644 --- a/tutorials/tutorial2/include/tutorial2/field/S6_2Common.h +++ b/tutorials/tutorial2/include/tutorial2/field/S6_2Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial2/include/tutorial2/field/S6_3.h b/tutorials/tutorial2/include/tutorial2/field/S6_3.h index 956702be..aa86c5e7 100644 --- a/tutorials/tutorial2/include/tutorial2/field/S6_3.h +++ b/tutorials/tutorial2/include/tutorial2/field/S6_3.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "S6_3" field. @@ -27,6 +27,7 @@ class S6_3 : public tutorial2::field::FieldBase<>, TExtraOpts..., typename TOpt::field::S6_3, + comms::option::def::HasName, comms::option::def::SequenceSerLengthFieldPrefix > > { @@ -35,6 +36,7 @@ class S6_3 : public tutorial2::field::FieldBase<>, TExtraOpts..., typename TOpt::field::S6_3, + comms::option::def::HasName, comms::option::def::SequenceSerLengthFieldPrefix > >; public: diff --git a/tutorials/tutorial2/include/tutorial2/field/S6_3Common.h b/tutorials/tutorial2/include/tutorial2/field/S6_3Common.h index cdbf1796..deb23bb9 100644 --- a/tutorials/tutorial2/include/tutorial2/field/S6_3Common.h +++ b/tutorials/tutorial2/include/tutorial2/field/S6_3Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial2/include/tutorial2/field/S6_4.h b/tutorials/tutorial2/include/tutorial2/field/S6_4.h index 5ca79187..0d197d46 100644 --- a/tutorials/tutorial2/include/tutorial2/field/S6_4.h +++ b/tutorials/tutorial2/include/tutorial2/field/S6_4.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "S6_4" field. @@ -28,6 +28,7 @@ class S6_4 : public tutorial2::field::FieldBase<>, TExtraOpts..., typename TOpt::field::S6_4, + comms::option::def::HasName, comms::option::def::SequenceTerminationFieldSuffix< comms::field::IntValue< tutorial2::field::FieldBase<>, @@ -43,6 +44,7 @@ class S6_4 : public tutorial2::field::FieldBase<>, TExtraOpts..., typename TOpt::field::S6_4, + comms::option::def::HasName, comms::option::def::SequenceTerminationFieldSuffix< comms::field::IntValue< tutorial2::field::FieldBase<>, diff --git a/tutorials/tutorial2/include/tutorial2/field/S6_4Common.h b/tutorials/tutorial2/include/tutorial2/field/S6_4Common.h index 850f3944..6c2fa8cc 100644 --- a/tutorials/tutorial2/include/tutorial2/field/S6_4Common.h +++ b/tutorials/tutorial2/include/tutorial2/field/S6_4Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial2/include/tutorial2/frame/Frame.h b/tutorials/tutorial2/include/tutorial2/frame/Frame.h index 957a2bc4..b66d7059 100644 --- a/tutorials/tutorial2/include/tutorial2/frame/Frame.h +++ b/tutorials/tutorial2/include/tutorial2/frame/Frame.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Frame" frame class. @@ -30,10 +30,30 @@ namespace frame template struct FrameLayers { + /// @brief Scope for field(s) of @ref Data layer. + struct DataMembers + { + /// @brief Custom field for @ref tutorial2::frame::FrameLayers::Data layer + class Field : public + comms::field::ArrayList< + tutorial2::field::FieldBase<>, + std::uint8_t, + typename TOpt::frame::FrameLayers::DataMembers::Field, + comms::option::def::HasName + > + { + public: + static const char* name() + { + return "Data"; + } + }; + }; + /// @brief Definition of layer "Data". using Data = comms::protocol::MsgDataLayer< - typename TOpt::frame::FrameLayers::Data + comms::option::def::FieldType >; /// @brief Definition of layer "ID". @@ -56,13 +76,15 @@ struct FrameLayers class SizeField : public comms::field::IntValue< tutorial2::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial2::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/tutorials/tutorial2/include/tutorial2/frame/FrameCommon.h b/tutorials/tutorial2/include/tutorial2/frame/FrameCommon.h index ed9da6bd..1f4e0987 100644 --- a/tutorials/tutorial2/include/tutorial2/frame/FrameCommon.h +++ b/tutorials/tutorial2/include/tutorial2/frame/FrameCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial2/include/tutorial2/input/AllMessages.h b/tutorials/tutorial2/include/tutorial2/input/AllMessages.h index 7b603c28..546d24dd 100644 --- a/tutorials/tutorial2/include/tutorial2/input/AllMessages.h +++ b/tutorials/tutorial2/include/tutorial2/input/AllMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the AllMessages messages bundle. diff --git a/tutorials/tutorial2/include/tutorial2/input/ClientInputMessages.h b/tutorials/tutorial2/include/tutorial2/input/ClientInputMessages.h index e6845b8d..e98043b6 100644 --- a/tutorials/tutorial2/include/tutorial2/input/ClientInputMessages.h +++ b/tutorials/tutorial2/include/tutorial2/input/ClientInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ClientInputMessages messages bundle. diff --git a/tutorials/tutorial2/include/tutorial2/input/ServerInputMessages.h b/tutorials/tutorial2/include/tutorial2/input/ServerInputMessages.h index b06c151e..c5f40cc4 100644 --- a/tutorials/tutorial2/include/tutorial2/input/ServerInputMessages.h +++ b/tutorials/tutorial2/include/tutorial2/input/ServerInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ServerInputMessages messages bundle. diff --git a/tutorials/tutorial2/include/tutorial2/message/Msg1.h b/tutorials/tutorial2/include/tutorial2/message/Msg1.h index 8070ebc9..288beb00 100644 --- a/tutorials/tutorial2/include/tutorial2/message/Msg1.h +++ b/tutorials/tutorial2/include/tutorial2/message/Msg1.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 1" message and its fields. @@ -32,12 +32,14 @@ struct Msg1Fields /// @brief Definition of "F1" field. class F1 : public tutorial2::field::I1< - TOpt + TOpt, + comms::option::def::HasName > { using Base = tutorial2::field::I1< - TOpt + TOpt, + comms::option::def::HasName >; public: /// @brief Name of the field. @@ -51,13 +53,15 @@ struct Msg1Fields class F2 : public comms::field::IntValue< tutorial2::field::FieldBase<>, - std::int16_t + std::int16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial2::field::FieldBase<>, - std::int16_t + std::int16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/tutorials/tutorial2/include/tutorial2/message/Msg10.h b/tutorials/tutorial2/include/tutorial2/message/Msg10.h index 6afd9a3a..11d7acef 100644 --- a/tutorials/tutorial2/include/tutorial2/message/Msg10.h +++ b/tutorials/tutorial2/include/tutorial2/message/Msg10.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 10" message and its fields. @@ -34,13 +34,15 @@ struct Msg10Fields class F1 : public tutorial2::field::L10_1< TOpt, - typename TOpt::message::Msg10Fields::F1 + typename TOpt::message::Msg10Fields::F1, + comms::option::def::HasName > { using Base = tutorial2::field::L10_1< TOpt, - typename TOpt::message::Msg10Fields::F1 + typename TOpt::message::Msg10Fields::F1, + comms::option::def::HasName >; public: /// @brief Name of the field. @@ -54,13 +56,15 @@ struct Msg10Fields class F2 : public tutorial2::field::L10_2< TOpt, - typename TOpt::message::Msg10Fields::F2 + typename TOpt::message::Msg10Fields::F2, + comms::option::def::HasName > { using Base = tutorial2::field::L10_2< TOpt, - typename TOpt::message::Msg10Fields::F2 + typename TOpt::message::Msg10Fields::F2, + comms::option::def::HasName >; public: /// @brief Name of the field. @@ -74,13 +78,15 @@ struct Msg10Fields class F3 : public tutorial2::field::L10_3< TOpt, - typename TOpt::message::Msg10Fields::F3 + typename TOpt::message::Msg10Fields::F3, + comms::option::def::HasName > { using Base = tutorial2::field::L10_3< TOpt, - typename TOpt::message::Msg10Fields::F3 + typename TOpt::message::Msg10Fields::F3, + comms::option::def::HasName >; public: /// @brief Name of the field. @@ -94,13 +100,15 @@ struct Msg10Fields class F4 : public tutorial2::field::L10_4< TOpt, - typename TOpt::message::Msg10Fields::F4 + typename TOpt::message::Msg10Fields::F4, + comms::option::def::HasName > { using Base = tutorial2::field::L10_4< TOpt, - typename TOpt::message::Msg10Fields::F4 + typename TOpt::message::Msg10Fields::F4, + comms::option::def::HasName >; public: /// @brief Name of the field. diff --git a/tutorials/tutorial2/include/tutorial2/message/Msg10Common.h b/tutorials/tutorial2/include/tutorial2/message/Msg10Common.h index cdbe6c54..05c19656 100644 --- a/tutorials/tutorial2/include/tutorial2/message/Msg10Common.h +++ b/tutorials/tutorial2/include/tutorial2/message/Msg10Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial2/include/tutorial2/message/Msg11.h b/tutorials/tutorial2/include/tutorial2/message/Msg11.h index f231ab16..25807442 100644 --- a/tutorials/tutorial2/include/tutorial2/message/Msg11.h +++ b/tutorials/tutorial2/include/tutorial2/message/Msg11.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 11" message and its fields. @@ -32,24 +32,28 @@ struct Msg11Fields /// @brief Definition of "Field 11_1" field. using F11_1 = tutorial2::field::F11_1< - TOpt + TOpt, + comms::option::def::HasName >; /// @brief Definition of "Field 11_2" field. using F2 = tutorial2::field::F11_2< - TOpt + TOpt, + comms::option::def::HasName >; /// @brief Definition of "F3" field. class F3 : public tutorial2::field::F11_3< - TOpt + TOpt, + comms::option::def::HasName > { using Base = tutorial2::field::F11_3< - TOpt + TOpt, + comms::option::def::HasName >; public: /// @brief Name of the field. diff --git a/tutorials/tutorial2/include/tutorial2/message/Msg11Common.h b/tutorials/tutorial2/include/tutorial2/message/Msg11Common.h index 013af8f7..f99a5e2a 100644 --- a/tutorials/tutorial2/include/tutorial2/message/Msg11Common.h +++ b/tutorials/tutorial2/include/tutorial2/message/Msg11Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial2/include/tutorial2/message/Msg12.h b/tutorials/tutorial2/include/tutorial2/message/Msg12.h index 4ff4ff16..f7e1e4b2 100644 --- a/tutorials/tutorial2/include/tutorial2/message/Msg12.h +++ b/tutorials/tutorial2/include/tutorial2/message/Msg12.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 12" message and its fields. @@ -37,13 +37,15 @@ struct Msg12Fields class ActF1 : public comms::field::IntValue< tutorial2::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial2::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -66,12 +68,14 @@ struct Msg12Fields /// @brief Definition of "F1" field. class F1 : public comms::field::Optional< - typename F1Members::ActF1 + typename F1Members::ActF1, + comms::option::def::HasName > { using Base = comms::field::Optional< - typename F1Members::ActF1 + typename F1Members::ActF1, + comms::option::def::HasName >; public: /// @brief Name of the field. diff --git a/tutorials/tutorial2/include/tutorial2/message/Msg12Common.h b/tutorials/tutorial2/include/tutorial2/message/Msg12Common.h index c2be9263..e6f3813d 100644 --- a/tutorials/tutorial2/include/tutorial2/message/Msg12Common.h +++ b/tutorials/tutorial2/include/tutorial2/message/Msg12Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial2/include/tutorial2/message/Msg13.h b/tutorials/tutorial2/include/tutorial2/message/Msg13.h index 034e848e..70544ff4 100644 --- a/tutorials/tutorial2/include/tutorial2/message/Msg13.h +++ b/tutorials/tutorial2/include/tutorial2/message/Msg13.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 13" message and its fields. @@ -34,6 +34,7 @@ struct Msg13Fields class Flags : public comms::field::BitmaskValue< tutorial2::field::FieldBase<>, + comms::option::def::HasName, comms::option::def::FixedLength<1U>, comms::option::def::BitmaskReservedBits<0xFCU, 0x0U> > @@ -41,6 +42,7 @@ struct Msg13Fields using Base = comms::field::BitmaskValue< tutorial2::field::FieldBase<>, + comms::option::def::HasName, comms::option::def::FixedLength<1U>, comms::option::def::BitmaskReservedBits<0xFCU, 0x0U> >; @@ -58,13 +60,18 @@ struct Msg13Fields F3Missing ); + /// @brief Retrieve name of the bit. + /// @see @ref tutorial2::message::Msg13FieldsCommon::FlagsCommon::bitName(). + static const char* bitName(std::size_t idx) + { + return tutorial2::message::Msg13FieldsCommon::FlagsCommon::bitName(idx); + } + /// @brief Retrieve name of the bit. /// @see @ref tutorial2::message::Msg13FieldsCommon::FlagsCommon::bitName(). static const char* bitName(BitIdx idx) { - return - tutorial2::message::Msg13FieldsCommon::FlagsCommon::bitName( - static_cast(idx)); + return bitName(static_cast(idx)); } /// @brief Name of the field. @@ -82,13 +89,15 @@ struct Msg13Fields class ActF2 : public comms::field::IntValue< tutorial2::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial2::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -112,12 +121,14 @@ struct Msg13Fields class F2 : public comms::field::Optional< typename F2Members::ActF2, + comms::option::def::HasName, comms::option::def::MissingByDefault > { using Base = comms::field::Optional< typename F2Members::ActF2, + comms::option::def::HasName, comms::option::def::MissingByDefault >; public: @@ -136,13 +147,15 @@ struct Msg13Fields class ActF3 : public comms::field::IntValue< tutorial2::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial2::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -166,12 +179,14 @@ struct Msg13Fields class F3 : public comms::field::Optional< typename F3Members::ActF3, + comms::option::def::HasName, comms::option::def::ExistsByDefault > { using Base = comms::field::Optional< typename F3Members::ActF3, + comms::option::def::HasName, comms::option::def::ExistsByDefault >; public: diff --git a/tutorials/tutorial2/include/tutorial2/message/Msg13Common.h b/tutorials/tutorial2/include/tutorial2/message/Msg13Common.h index 3c629094..5c06ce5f 100644 --- a/tutorials/tutorial2/include/tutorial2/message/Msg13Common.h +++ b/tutorials/tutorial2/include/tutorial2/message/Msg13Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial2/include/tutorial2/message/Msg14.h b/tutorials/tutorial2/include/tutorial2/message/Msg14.h index 5ab3602d..da37ca4d 100644 --- a/tutorials/tutorial2/include/tutorial2/message/Msg14.h +++ b/tutorials/tutorial2/include/tutorial2/message/Msg14.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 14" message and its fields. @@ -33,13 +33,15 @@ struct Msg14Fields class F1 : public comms::field::IntValue< tutorial2::field::FieldBase<>, - std::int8_t + std::int8_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial2::field::FieldBase<>, - std::int8_t + std::int8_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -62,13 +64,15 @@ struct Msg14Fields class F2 : public comms::field::IntValue< tutorial2::field::FieldBase<>, - std::int8_t + std::int8_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial2::field::FieldBase<>, - std::int8_t + std::int8_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -95,13 +99,15 @@ struct Msg14Fields class ActF3 : public comms::field::IntValue< tutorial2::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial2::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -125,12 +131,14 @@ struct Msg14Fields class F3 : public comms::field::Optional< typename F3Members::ActF3, + comms::option::def::HasName, comms::option::def::MissingByDefault > { using Base = comms::field::Optional< typename F3Members::ActF3, + comms::option::def::HasName, comms::option::def::MissingByDefault >; public: diff --git a/tutorials/tutorial2/include/tutorial2/message/Msg14Common.h b/tutorials/tutorial2/include/tutorial2/message/Msg14Common.h index 30fcc68f..f8faf257 100644 --- a/tutorials/tutorial2/include/tutorial2/message/Msg14Common.h +++ b/tutorials/tutorial2/include/tutorial2/message/Msg14Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial2/include/tutorial2/message/Msg15.h b/tutorials/tutorial2/include/tutorial2/message/Msg15.h index e0a43d5e..bb174be0 100644 --- a/tutorials/tutorial2/include/tutorial2/message/Msg15.h +++ b/tutorials/tutorial2/include/tutorial2/message/Msg15.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 15" message and its fields. @@ -32,12 +32,14 @@ struct Msg15Fields /// @brief Definition of "F1" field. class F1 : public tutorial2::field::I1< - TOpt + TOpt, + comms::option::def::HasName > { using Base = tutorial2::field::I1< - TOpt + TOpt, + comms::option::def::HasName >; public: /// @brief Name of the field. @@ -51,13 +53,15 @@ struct Msg15Fields class F2 : public comms::field::IntValue< tutorial2::field::FieldBase<>, - std::int16_t + std::int16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial2::field::FieldBase<>, - std::int16_t + std::int16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -80,13 +84,15 @@ struct Msg15Fields class F3 : public comms::field::IntValue< tutorial2::field::FieldBase<>, - std::int8_t + std::int8_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial2::field::FieldBase<>, - std::int8_t + std::int8_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/tutorials/tutorial2/include/tutorial2/message/Msg15Common.h b/tutorials/tutorial2/include/tutorial2/message/Msg15Common.h index afec26a3..c22125c4 100644 --- a/tutorials/tutorial2/include/tutorial2/message/Msg15Common.h +++ b/tutorials/tutorial2/include/tutorial2/message/Msg15Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial2/include/tutorial2/message/Msg16.h b/tutorials/tutorial2/include/tutorial2/message/Msg16.h index 7c27867b..0bfe2670 100644 --- a/tutorials/tutorial2/include/tutorial2/message/Msg16.h +++ b/tutorials/tutorial2/include/tutorial2/message/Msg16.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 16" message and its fields. @@ -32,13 +32,15 @@ struct Msg16Fields class F1 : public comms::field::IntValue< tutorial2::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial2::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -61,13 +63,15 @@ struct Msg16Fields class F2 : public comms::field::IntValue< tutorial2::field::FieldBase<>, - std::int8_t + std::int8_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial2::field::FieldBase<>, - std::int8_t + std::int8_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -90,13 +94,15 @@ struct Msg16Fields class F3 : public comms::field::IntValue< tutorial2::field::FieldBase<>, - std::int8_t + std::int8_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial2::field::FieldBase<>, - std::int8_t + std::int8_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/tutorials/tutorial2/include/tutorial2/message/Msg16Common.h b/tutorials/tutorial2/include/tutorial2/message/Msg16Common.h index 57befa40..26436c08 100644 --- a/tutorials/tutorial2/include/tutorial2/message/Msg16Common.h +++ b/tutorials/tutorial2/include/tutorial2/message/Msg16Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial2/include/tutorial2/message/Msg17.h b/tutorials/tutorial2/include/tutorial2/message/Msg17.h index 38736105..e9540499 100644 --- a/tutorials/tutorial2/include/tutorial2/message/Msg17.h +++ b/tutorials/tutorial2/include/tutorial2/message/Msg17.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 17" message and its fields. @@ -34,6 +34,7 @@ struct Msg17Fields comms::field::IntValue< tutorial2::field::FieldBase<>, std::uint32_t, + comms::option::def::HasName, comms::option::def::DefaultNumValue<10> > { @@ -41,6 +42,7 @@ struct Msg17Fields comms::field::IntValue< tutorial2::field::FieldBase<>, std::uint32_t, + comms::option::def::HasName, comms::option::def::DefaultNumValue<10> >; public: @@ -101,13 +103,15 @@ struct Msg17Fields class M1 : public comms::field::IntValue< tutorial2::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial2::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -130,13 +134,15 @@ struct Msg17Fields class M2 : public comms::field::IntValue< tutorial2::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial2::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -159,13 +165,15 @@ struct Msg17Fields class M3 : public comms::field::IntValue< tutorial2::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial2::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -198,6 +206,7 @@ struct Msg17Fields comms::field::Bundle< tutorial2::field::FieldBase<>, typename F2Members::All, + comms::option::def::HasName, comms::option::def::HasVersionDependentMembers > { @@ -205,6 +214,7 @@ struct Msg17Fields comms::field::Bundle< tutorial2::field::FieldBase<>, typename F2Members::All, + comms::option::def::HasName, comms::option::def::HasVersionDependentMembers >; public: diff --git a/tutorials/tutorial2/include/tutorial2/message/Msg17Common.h b/tutorials/tutorial2/include/tutorial2/message/Msg17Common.h index 99392c9d..ffa82a80 100644 --- a/tutorials/tutorial2/include/tutorial2/message/Msg17Common.h +++ b/tutorials/tutorial2/include/tutorial2/message/Msg17Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial2/include/tutorial2/message/Msg18.h b/tutorials/tutorial2/include/tutorial2/message/Msg18.h index b678ec25..90b9792c 100644 --- a/tutorials/tutorial2/include/tutorial2/message/Msg18.h +++ b/tutorials/tutorial2/include/tutorial2/message/Msg18.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 18" message and its fields. @@ -38,13 +38,15 @@ struct Msg18Fields class Length : public comms::field::IntValue< tutorial2::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial2::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -69,6 +71,7 @@ struct Msg18Fields comms::field::String< tutorial2::field::FieldBase<>, typename TOpt::message::Msg18Fields::F1, + comms::option::def::HasName, comms::option::def::SequenceSerLengthFieldPrefix > { @@ -76,6 +79,7 @@ struct Msg18Fields comms::field::String< tutorial2::field::FieldBase<>, typename TOpt::message::Msg18Fields::F1, + comms::option::def::HasName, comms::option::def::SequenceSerLengthFieldPrefix >; public: @@ -94,13 +98,15 @@ struct Msg18Fields class ActF2 : public comms::field::IntValue< tutorial2::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial2::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -124,12 +130,14 @@ struct Msg18Fields class F2 : public comms::field::Optional< typename F2Members::ActF2, + comms::option::def::HasName, comms::option::def::MissingByDefault > { using Base = comms::field::Optional< typename F2Members::ActF2, + comms::option::def::HasName, comms::option::def::MissingByDefault >; public: @@ -148,13 +156,15 @@ struct Msg18Fields class ActF3 : public comms::field::IntValue< tutorial2::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial2::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -178,12 +188,14 @@ struct Msg18Fields class F3 : public comms::field::Optional< typename F3Members::ActF3, + comms::option::def::HasName, comms::option::def::ExistsByDefault > { using Base = comms::field::Optional< typename F3Members::ActF3, + comms::option::def::HasName, comms::option::def::ExistsByDefault >; public: diff --git a/tutorials/tutorial2/include/tutorial2/message/Msg18Common.h b/tutorials/tutorial2/include/tutorial2/message/Msg18Common.h index 02f6a586..dc619837 100644 --- a/tutorials/tutorial2/include/tutorial2/message/Msg18Common.h +++ b/tutorials/tutorial2/include/tutorial2/message/Msg18Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial2/include/tutorial2/message/Msg1Common.h b/tutorials/tutorial2/include/tutorial2/message/Msg1Common.h index 2bd70170..fb6f59fd 100644 --- a/tutorials/tutorial2/include/tutorial2/message/Msg1Common.h +++ b/tutorials/tutorial2/include/tutorial2/message/Msg1Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial2/include/tutorial2/message/Msg2.h b/tutorials/tutorial2/include/tutorial2/message/Msg2.h index c41b6256..caa6bdab 100644 --- a/tutorials/tutorial2/include/tutorial2/message/Msg2.h +++ b/tutorials/tutorial2/include/tutorial2/message/Msg2.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 2" message and its fields. @@ -32,12 +32,14 @@ struct Msg2Fields /// @brief Definition of "F1" field. class F1 : public tutorial2::field::E2_1< - TOpt + TOpt, + comms::option::def::HasName > { using Base = tutorial2::field::E2_1< - TOpt + TOpt, + comms::option::def::HasName >; public: /// @brief Name of the field. @@ -50,12 +52,14 @@ struct Msg2Fields /// @brief Definition of "F2" field. class F2 : public tutorial2::field::E2_2< - TOpt + TOpt, + comms::option::def::HasName > { using Base = tutorial2::field::E2_2< - TOpt + TOpt, + comms::option::def::HasName >; public: /// @brief Name of the field. @@ -73,6 +77,7 @@ struct Msg2Fields comms::field::EnumValue< tutorial2::field::FieldBase<>, tutorial2::message::Msg2FieldsCommon::F3Common::ValueType, + comms::option::def::HasName, comms::option::def::DefaultNumValue<10>, comms::option::def::ValidNumValue<-100>, comms::option::def::ValidNumValue<0>, @@ -83,6 +88,7 @@ struct Msg2Fields comms::field::EnumValue< tutorial2::field::FieldBase<>, tutorial2::message::Msg2FieldsCommon::F3Common::ValueType, + comms::option::def::HasName, comms::option::def::DefaultNumValue<10>, comms::option::def::ValidNumValue<-100>, comms::option::def::ValidNumValue<0>, @@ -139,6 +145,7 @@ struct Msg2Fields comms::field::EnumValue< tutorial2::field::FieldBase<>, tutorial2::message::Msg2FieldsCommon::F4Common::ValueType, + comms::option::def::HasName, comms::option::def::ValidNumValue<0>, comms::option::def::ValidNumValue<255>, comms::option::def::ValidNumValue<767>, @@ -149,6 +156,7 @@ struct Msg2Fields comms::field::EnumValue< tutorial2::field::FieldBase<>, tutorial2::message::Msg2FieldsCommon::F4Common::ValueType, + comms::option::def::HasName, comms::option::def::ValidNumValue<0>, comms::option::def::ValidNumValue<255>, comms::option::def::ValidNumValue<767>, diff --git a/tutorials/tutorial2/include/tutorial2/message/Msg2Common.h b/tutorials/tutorial2/include/tutorial2/message/Msg2Common.h index a03c33bd..85f211a0 100644 --- a/tutorials/tutorial2/include/tutorial2/message/Msg2Common.h +++ b/tutorials/tutorial2/include/tutorial2/message/Msg2Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial2/include/tutorial2/message/Msg3.h b/tutorials/tutorial2/include/tutorial2/message/Msg3.h index 7f8d4354..2827320a 100644 --- a/tutorials/tutorial2/include/tutorial2/message/Msg3.h +++ b/tutorials/tutorial2/include/tutorial2/message/Msg3.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 3" message and its fields. @@ -34,12 +34,14 @@ struct Msg3Fields /// @brief Definition of "F1" field. class F1 : public tutorial2::field::I3_1< - TOpt + TOpt, + comms::option::def::HasName > { using Base = tutorial2::field::I3_1< - TOpt + TOpt, + comms::option::def::HasName >; public: /// @brief Name of the field. @@ -52,12 +54,14 @@ struct Msg3Fields /// @brief Definition of "F2" field. class F2 : public tutorial2::field::I3_2< - TOpt + TOpt, + comms::option::def::HasName > { using Base = tutorial2::field::I3_2< - TOpt + TOpt, + comms::option::def::HasName >; public: /// @brief Name of the field. @@ -70,12 +74,14 @@ struct Msg3Fields /// @brief Definition of "F3" field. class F3 : public tutorial2::field::I3_3< - TOpt + TOpt, + comms::option::def::HasName > { using Base = tutorial2::field::I3_3< - TOpt + TOpt, + comms::option::def::HasName >; public: /// @brief Name of the field. @@ -88,12 +94,14 @@ struct Msg3Fields /// @brief Definition of "F4" field. class F4 : public tutorial2::field::I3_4< - TOpt + TOpt, + comms::option::def::HasName > { using Base = tutorial2::field::I3_4< - TOpt + TOpt, + comms::option::def::HasName >; public: /// @brief Name of the field. @@ -106,12 +114,14 @@ struct Msg3Fields /// @brief Definition of "F5" field. class F5 : public tutorial2::field::I3_5< - TOpt + TOpt, + comms::option::def::HasName > { using Base = tutorial2::field::I3_5< - TOpt + TOpt, + comms::option::def::HasName >; public: /// @brief Name of the field. diff --git a/tutorials/tutorial2/include/tutorial2/message/Msg3Common.h b/tutorials/tutorial2/include/tutorial2/message/Msg3Common.h index 449653ba..27c13bc5 100644 --- a/tutorials/tutorial2/include/tutorial2/message/Msg3Common.h +++ b/tutorials/tutorial2/include/tutorial2/message/Msg3Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial2/include/tutorial2/message/Msg4.h b/tutorials/tutorial2/include/tutorial2/message/Msg4.h index 077ecda2..2c93a2c3 100644 --- a/tutorials/tutorial2/include/tutorial2/message/Msg4.h +++ b/tutorials/tutorial2/include/tutorial2/message/Msg4.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 4" message and its fields. @@ -32,12 +32,14 @@ struct Msg4Fields /// @brief Definition of "F1" field. class F1 : public tutorial2::field::S4_1< - TOpt + TOpt, + comms::option::def::HasName > { using Base = tutorial2::field::S4_1< - TOpt + TOpt, + comms::option::def::HasName >; public: /// @brief Name of the field. @@ -50,12 +52,14 @@ struct Msg4Fields /// @brief Definition of "F2" field. class F2 : public tutorial2::field::S4_2< - TOpt + TOpt, + comms::option::def::HasName > { using Base = tutorial2::field::S4_2< - TOpt + TOpt, + comms::option::def::HasName >; public: /// @brief Name of the field. @@ -68,12 +72,14 @@ struct Msg4Fields /// @brief Definition of "F3" field. class F3 : public tutorial2::field::S4_3< - TOpt + TOpt, + comms::option::def::HasName > { using Base = tutorial2::field::S4_3< - TOpt + TOpt, + comms::option::def::HasName >; public: /// @brief Name of the field. diff --git a/tutorials/tutorial2/include/tutorial2/message/Msg4Common.h b/tutorials/tutorial2/include/tutorial2/message/Msg4Common.h index 74fbef0b..5572b821 100644 --- a/tutorials/tutorial2/include/tutorial2/message/Msg4Common.h +++ b/tutorials/tutorial2/include/tutorial2/message/Msg4Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial2/include/tutorial2/message/Msg5.h b/tutorials/tutorial2/include/tutorial2/message/Msg5.h index d667a212..e7405948 100644 --- a/tutorials/tutorial2/include/tutorial2/message/Msg5.h +++ b/tutorials/tutorial2/include/tutorial2/message/Msg5.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 5" message and its fields. @@ -31,12 +31,14 @@ struct Msg5Fields /// @brief Definition of "F1" field. class F1 : public tutorial2::field::F5_1< - TOpt + TOpt, + comms::option::def::HasName > { using Base = tutorial2::field::F5_1< - TOpt + TOpt, + comms::option::def::HasName >; public: /// @brief Name of the field. @@ -49,12 +51,14 @@ struct Msg5Fields /// @brief Definition of "F2" field. class F2 : public tutorial2::field::F5_2< - TOpt + TOpt, + comms::option::def::HasName > { using Base = tutorial2::field::F5_2< - TOpt + TOpt, + comms::option::def::HasName >; public: /// @brief Name of the field. diff --git a/tutorials/tutorial2/include/tutorial2/message/Msg5Common.h b/tutorials/tutorial2/include/tutorial2/message/Msg5Common.h index 7a3a2bb6..77c3b1d2 100644 --- a/tutorials/tutorial2/include/tutorial2/message/Msg5Common.h +++ b/tutorials/tutorial2/include/tutorial2/message/Msg5Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial2/include/tutorial2/message/Msg6.h b/tutorials/tutorial2/include/tutorial2/message/Msg6.h index 66ecddb4..352772ed 100644 --- a/tutorials/tutorial2/include/tutorial2/message/Msg6.h +++ b/tutorials/tutorial2/include/tutorial2/message/Msg6.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 6" message and its fields. @@ -35,13 +35,15 @@ struct Msg6Fields class F1 : public tutorial2::field::S6_1< TOpt, - typename TOpt::message::Msg6Fields::F1 + typename TOpt::message::Msg6Fields::F1, + comms::option::def::HasName > { using Base = tutorial2::field::S6_1< TOpt, - typename TOpt::message::Msg6Fields::F1 + typename TOpt::message::Msg6Fields::F1, + comms::option::def::HasName >; public: /// @brief Name of the field. @@ -55,13 +57,15 @@ struct Msg6Fields class F2 : public tutorial2::field::S6_2< TOpt, - typename TOpt::message::Msg6Fields::F2 + typename TOpt::message::Msg6Fields::F2, + comms::option::def::HasName > { using Base = tutorial2::field::S6_2< TOpt, - typename TOpt::message::Msg6Fields::F2 + typename TOpt::message::Msg6Fields::F2, + comms::option::def::HasName >; public: /// @brief Name of the field. @@ -75,13 +79,15 @@ struct Msg6Fields class F3 : public tutorial2::field::S6_3< TOpt, - typename TOpt::message::Msg6Fields::F3 + typename TOpt::message::Msg6Fields::F3, + comms::option::def::HasName > { using Base = tutorial2::field::S6_3< TOpt, - typename TOpt::message::Msg6Fields::F3 + typename TOpt::message::Msg6Fields::F3, + comms::option::def::HasName >; public: /// @brief Name of the field. @@ -95,13 +101,15 @@ struct Msg6Fields class F4 : public tutorial2::field::S6_4< TOpt, - typename TOpt::message::Msg6Fields::F4 + typename TOpt::message::Msg6Fields::F4, + comms::option::def::HasName > { using Base = tutorial2::field::S6_4< TOpt, - typename TOpt::message::Msg6Fields::F4 + typename TOpt::message::Msg6Fields::F4, + comms::option::def::HasName >; public: /// @brief Name of the field. @@ -115,13 +123,15 @@ struct Msg6Fields class F5 : public comms::field::String< tutorial2::field::FieldBase<>, - typename TOpt::message::Msg6Fields::F5 + typename TOpt::message::Msg6Fields::F5, + comms::option::def::HasName > { using Base = comms::field::String< tutorial2::field::FieldBase<>, - typename TOpt::message::Msg6Fields::F5 + typename TOpt::message::Msg6Fields::F5, + comms::option::def::HasName >; public: /// @brief Name of the field. diff --git a/tutorials/tutorial2/include/tutorial2/message/Msg6Common.h b/tutorials/tutorial2/include/tutorial2/message/Msg6Common.h index fc0dc12e..524206c2 100644 --- a/tutorials/tutorial2/include/tutorial2/message/Msg6Common.h +++ b/tutorials/tutorial2/include/tutorial2/message/Msg6Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial2/include/tutorial2/message/Msg7.h b/tutorials/tutorial2/include/tutorial2/message/Msg7.h index 7ee44795..2c9cab95 100644 --- a/tutorials/tutorial2/include/tutorial2/message/Msg7.h +++ b/tutorials/tutorial2/include/tutorial2/message/Msg7.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 7" message and its fields. @@ -34,13 +34,15 @@ struct Msg7Fields class F1 : public tutorial2::field::D7_1< TOpt, - typename TOpt::message::Msg7Fields::F1 + typename TOpt::message::Msg7Fields::F1, + comms::option::def::HasName > { using Base = tutorial2::field::D7_1< TOpt, - typename TOpt::message::Msg7Fields::F1 + typename TOpt::message::Msg7Fields::F1, + comms::option::def::HasName >; public: /// @brief Name of the field. @@ -54,13 +56,15 @@ struct Msg7Fields class F2 : public tutorial2::field::D7_2< TOpt, - typename TOpt::message::Msg7Fields::F2 + typename TOpt::message::Msg7Fields::F2, + comms::option::def::HasName > { using Base = tutorial2::field::D7_2< TOpt, - typename TOpt::message::Msg7Fields::F2 + typename TOpt::message::Msg7Fields::F2, + comms::option::def::HasName >; public: /// @brief Name of the field. @@ -75,14 +79,16 @@ struct Msg7Fields comms::field::ArrayList< tutorial2::field::FieldBase<>, std::uint8_t, - typename TOpt::message::Msg7Fields::F3 + typename TOpt::message::Msg7Fields::F3, + comms::option::def::HasName > { using Base = comms::field::ArrayList< tutorial2::field::FieldBase<>, std::uint8_t, - typename TOpt::message::Msg7Fields::F3 + typename TOpt::message::Msg7Fields::F3, + comms::option::def::HasName >; public: /// @brief Name of the field. diff --git a/tutorials/tutorial2/include/tutorial2/message/Msg7Common.h b/tutorials/tutorial2/include/tutorial2/message/Msg7Common.h index a9a69674..c50b23d5 100644 --- a/tutorials/tutorial2/include/tutorial2/message/Msg7Common.h +++ b/tutorials/tutorial2/include/tutorial2/message/Msg7Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial2/include/tutorial2/message/Msg8.h b/tutorials/tutorial2/include/tutorial2/message/Msg8.h index 53146532..291822ee 100644 --- a/tutorials/tutorial2/include/tutorial2/message/Msg8.h +++ b/tutorials/tutorial2/include/tutorial2/message/Msg8.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 8" message and its fields. @@ -31,12 +31,14 @@ struct Msg8Fields /// @brief Definition of "F1" field. class F1 : public tutorial2::field::B8_1< - TOpt + TOpt, + comms::option::def::HasName > { using Base = tutorial2::field::B8_1< - TOpt + TOpt, + comms::option::def::HasName >; public: /// @brief Name of the field. @@ -49,12 +51,14 @@ struct Msg8Fields /// @brief Definition of "F2" field. class F2 : public tutorial2::field::B8_2< - TOpt + TOpt, + comms::option::def::HasName > { using Base = tutorial2::field::B8_2< - TOpt + TOpt, + comms::option::def::HasName >; public: /// @brief Name of the field. diff --git a/tutorials/tutorial2/include/tutorial2/message/Msg8Common.h b/tutorials/tutorial2/include/tutorial2/message/Msg8Common.h index 32405b9d..cde8f90e 100644 --- a/tutorials/tutorial2/include/tutorial2/message/Msg8Common.h +++ b/tutorials/tutorial2/include/tutorial2/message/Msg8Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial2/include/tutorial2/message/Msg9.h b/tutorials/tutorial2/include/tutorial2/message/Msg9.h index 912eb284..19348d2d 100644 --- a/tutorials/tutorial2/include/tutorial2/message/Msg9.h +++ b/tutorials/tutorial2/include/tutorial2/message/Msg9.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 9" message and its fields. @@ -31,12 +31,14 @@ struct Msg9Fields /// @brief Definition of "F1" field. class F1 : public tutorial2::field::B9_1< - TOpt + TOpt, + comms::option::def::HasName > { using Base = tutorial2::field::B9_1< - TOpt + TOpt, + comms::option::def::HasName >; public: /// @brief Name of the field. @@ -49,12 +51,14 @@ struct Msg9Fields /// @brief Definition of "F2" field. class F2 : public tutorial2::field::B9_2< - TOpt + TOpt, + comms::option::def::HasName > { using Base = tutorial2::field::B9_2< - TOpt + TOpt, + comms::option::def::HasName >; public: /// @brief Name of the field. diff --git a/tutorials/tutorial2/include/tutorial2/message/Msg9Common.h b/tutorials/tutorial2/include/tutorial2/message/Msg9Common.h index 6e063514..3a1da2fa 100644 --- a/tutorials/tutorial2/include/tutorial2/message/Msg9Common.h +++ b/tutorials/tutorial2/include/tutorial2/message/Msg9Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial2/include/tutorial2/options/AllMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial2/include/tutorial2/options/AllMessagesDynMemMsgFactoryDefaultOptions.h index 7176056f..736f57d1 100644 --- a/tutorials/tutorial2/include/tutorial2/options/AllMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial2/include/tutorial2/options/AllMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol all messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial2/include/tutorial2/options/BareMetalDefaultOptions.h b/tutorials/tutorial2/include/tutorial2/options/BareMetalDefaultOptions.h index daec6ff3..290694f3 100644 --- a/tutorials/tutorial2/include/tutorial2/options/BareMetalDefaultOptions.h +++ b/tutorials/tutorial2/include/tutorial2/options/BareMetalDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol bare metal default options. @@ -213,13 +213,15 @@ struct BareMetalDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// tutorial2::frame::FrameLayers::Data - /// layer. - using Data = - std::tuple< - comms::option::app::FixedSizeStorage, - typename TBase::frame::FrameLayers::Data - >; + /// tutorial2::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::FixedSizeStorage, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers /// @brief Extra options for @ref /// tutorial2::frame::FrameLayers::ID layer. diff --git a/tutorials/tutorial2/include/tutorial2/options/ClientDefaultOptions.h b/tutorials/tutorial2/include/tutorial2/options/ClientDefaultOptions.h index 529e13b1..a6d97eac 100644 --- a/tutorials/tutorial2/include/tutorial2/options/ClientDefaultOptions.h +++ b/tutorials/tutorial2/include/tutorial2/options/ClientDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client default options. diff --git a/tutorials/tutorial2/include/tutorial2/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial2/include/tutorial2/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h index 94f5ca4f..df9c1561 100644 --- a/tutorials/tutorial2/include/tutorial2/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial2/include/tutorial2/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client input messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial2/include/tutorial2/options/DataViewDefaultOptions.h b/tutorials/tutorial2/include/tutorial2/options/DataViewDefaultOptions.h index e4cc65b4..18c41616 100644 --- a/tutorials/tutorial2/include/tutorial2/options/DataViewDefaultOptions.h +++ b/tutorials/tutorial2/include/tutorial2/options/DataViewDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol data view default options. @@ -175,13 +175,15 @@ struct DataViewDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// tutorial2::frame::FrameLayers::Data - /// layer. - using Data = - std::tuple< - comms::option::app::OrigDataView, - typename TBase::frame::FrameLayers::Data - >; + /// tutorial2::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::OrigDataView, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers }; // struct FrameLayers }; // struct frame }; diff --git a/tutorials/tutorial2/include/tutorial2/options/DefaultOptions.h b/tutorials/tutorial2/include/tutorial2/options/DefaultOptions.h index 66e43309..30158ad9 100644 --- a/tutorials/tutorial2/include/tutorial2/options/DefaultOptions.h +++ b/tutorials/tutorial2/include/tutorial2/options/DefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol default options. @@ -27,31 +27,31 @@ struct DefaultOptionsT : public TBase { /// @brief Extra options for @ref /// tutorial2::field::B8_1Members::M3 field. - using M3 = comms::option::EmptyOption; + using M3 = comms::option::app::EmptyOption; }; // struct B8_1Members struct B8_2Members { /// @brief Extra options for @ref /// tutorial2::field::B8_2Members::M3 field. - using M3 = comms::option::EmptyOption; + using M3 = comms::option::app::EmptyOption; }; // struct B8_2Members /// @brief Extra options for @ref /// tutorial2::field::D7_1 field. - using D7_1 = comms::option::EmptyOption; + using D7_1 = comms::option::app::EmptyOption; /// @brief Extra options for @ref /// tutorial2::field::D7_2 field. - using D7_2 = comms::option::EmptyOption; + using D7_2 = comms::option::app::EmptyOption; /// @brief Extra options for @ref /// tutorial2::field::L10_1 field. - using L10_1 = comms::option::EmptyOption; + using L10_1 = comms::option::app::EmptyOption; /// @brief Extra options for @ref /// tutorial2::field::L10_2 field. - using L10_2 = comms::option::EmptyOption; + using L10_2 = comms::option::app::EmptyOption; struct L10_3Members { @@ -60,13 +60,13 @@ struct DefaultOptionsT : public TBase /// @brief Extra options for @ref /// tutorial2::field::L10_3Members::ElementMembers::M2 /// field. - using M2 = comms::option::EmptyOption; + using M2 = comms::option::app::EmptyOption; }; // struct ElementMembers }; // struct L10_3Members /// @brief Extra options for @ref /// tutorial2::field::L10_3 field. - using L10_3 = comms::option::EmptyOption; + using L10_3 = comms::option::app::EmptyOption; struct L10_4Members { @@ -75,29 +75,29 @@ struct DefaultOptionsT : public TBase /// @brief Extra options for @ref /// tutorial2::field::L10_4Members::ElementMembers::M3 /// field. - using M3 = comms::option::EmptyOption; + using M3 = comms::option::app::EmptyOption; }; // struct ElementMembers }; // struct L10_4Members /// @brief Extra options for @ref /// tutorial2::field::L10_4 field. - using L10_4 = comms::option::EmptyOption; + using L10_4 = comms::option::app::EmptyOption; /// @brief Extra options for @ref /// tutorial2::field::S6_1 field. - using S6_1 = comms::option::EmptyOption; + using S6_1 = comms::option::app::EmptyOption; /// @brief Extra options for @ref /// tutorial2::field::S6_2 field. - using S6_2 = comms::option::EmptyOption; + using S6_2 = comms::option::app::EmptyOption; /// @brief Extra options for @ref /// tutorial2::field::S6_3 field. - using S6_3 = comms::option::EmptyOption; + using S6_3 = comms::option::app::EmptyOption; /// @brief Extra options for @ref /// tutorial2::field::S6_4 field. - using S6_4 = comms::option::EmptyOption; + using S6_4 = comms::option::app::EmptyOption; }; // struct field /// @brief Extra options for messages. @@ -110,22 +110,22 @@ struct DefaultOptionsT : public TBase /// @brief Extra options for @ref /// tutorial2::message::Msg10Fields::F1 /// field. - using F1 = comms::option::EmptyOption; + using F1 = comms::option::app::EmptyOption; /// @brief Extra options for @ref /// tutorial2::message::Msg10Fields::F2 /// field. - using F2 = comms::option::EmptyOption; + using F2 = comms::option::app::EmptyOption; /// @brief Extra options for @ref /// tutorial2::message::Msg10Fields::F3 /// field. - using F3 = comms::option::EmptyOption; + using F3 = comms::option::app::EmptyOption; /// @brief Extra options for @ref /// tutorial2::message::Msg10Fields::F4 /// field. - using F4 = comms::option::EmptyOption; + using F4 = comms::option::app::EmptyOption; }; /// @brief Extra options for fields of @@ -135,7 +135,7 @@ struct DefaultOptionsT : public TBase /// @brief Extra options for @ref /// tutorial2::message::Msg18Fields::F1 /// field. - using F1 = comms::option::EmptyOption; + using F1 = comms::option::app::EmptyOption; }; /// @brief Extra options for fields of @@ -145,27 +145,27 @@ struct DefaultOptionsT : public TBase /// @brief Extra options for @ref /// tutorial2::message::Msg6Fields::F1 /// field. - using F1 = comms::option::EmptyOption; + using F1 = comms::option::app::EmptyOption; /// @brief Extra options for @ref /// tutorial2::message::Msg6Fields::F2 /// field. - using F2 = comms::option::EmptyOption; + using F2 = comms::option::app::EmptyOption; /// @brief Extra options for @ref /// tutorial2::message::Msg6Fields::F3 /// field. - using F3 = comms::option::EmptyOption; + using F3 = comms::option::app::EmptyOption; /// @brief Extra options for @ref /// tutorial2::message::Msg6Fields::F4 /// field. - using F4 = comms::option::EmptyOption; + using F4 = comms::option::app::EmptyOption; /// @brief Extra options for @ref /// tutorial2::message::Msg6Fields::F5 /// field. - using F5 = comms::option::EmptyOption; + using F5 = comms::option::app::EmptyOption; }; /// @brief Extra options for fields of @@ -175,17 +175,17 @@ struct DefaultOptionsT : public TBase /// @brief Extra options for @ref /// tutorial2::message::Msg7Fields::F1 /// field. - using F1 = comms::option::EmptyOption; + using F1 = comms::option::app::EmptyOption; /// @brief Extra options for @ref /// tutorial2::message::Msg7Fields::F2 /// field. - using F2 = comms::option::EmptyOption; + using F2 = comms::option::app::EmptyOption; /// @brief Extra options for @ref /// tutorial2::message::Msg7Fields::F3 /// field. - using F3 = comms::option::EmptyOption; + using F3 = comms::option::app::EmptyOption; }; }; // struct message @@ -197,13 +197,15 @@ struct DefaultOptionsT : public TBase struct FrameLayers { /// @brief Extra options for @ref - /// tutorial2::frame::FrameLayers::Data - /// layer. - using Data = comms::option::EmptyOption; + /// tutorial2::frame::FrameLayers::DataMembers::Field field. + struct DataMembers + { + using Field = comms::option::app::EmptyOption; + }; // struct DataMembers /// @brief Extra options for @ref /// tutorial2::frame::FrameLayers::ID layer. - using ID = comms::option::EmptyOption; + using ID = comms::option::app::EmptyOption; }; // struct FrameLayers }; // struct frame }; diff --git a/tutorials/tutorial2/include/tutorial2/options/ServerDefaultOptions.h b/tutorials/tutorial2/include/tutorial2/options/ServerDefaultOptions.h index df1d2d3e..8f9d9e21 100644 --- a/tutorials/tutorial2/include/tutorial2/options/ServerDefaultOptions.h +++ b/tutorials/tutorial2/include/tutorial2/options/ServerDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server default options. diff --git a/tutorials/tutorial2/include/tutorial2/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial2/include/tutorial2/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h index 56accb63..a66b7dce 100644 --- a/tutorials/tutorial2/include/tutorial2/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial2/include/tutorial2/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server input messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial20/include/tutorial20/Interface.h b/tutorials/tutorial20/include/tutorial20/Interface.h index da95c8f3..97d1317f 100644 --- a/tutorials/tutorial20/include/tutorial20/Interface.h +++ b/tutorials/tutorial20/include/tutorial20/Interface.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Interface" interface class. @@ -24,7 +24,8 @@ struct InterfaceFields /// @brief Definition of "Version" field. using Version = tutorial20::field::Version< - tutorial20::options::DefaultOptions + tutorial20::options::DefaultOptions, + comms::option::def::HasName >; /// @brief All the fields bundled in std::tuple. diff --git a/tutorials/tutorial20/include/tutorial20/InterfaceCommon.h b/tutorials/tutorial20/include/tutorial20/InterfaceCommon.h index b67c2202..69008bcc 100644 --- a/tutorials/tutorial20/include/tutorial20/InterfaceCommon.h +++ b/tutorials/tutorial20/include/tutorial20/InterfaceCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial20/include/tutorial20/MsgId.h b/tutorials/tutorial20/include/tutorial20/MsgId.h index a944edc1..7b64e9fc 100644 --- a/tutorials/tutorial20/include/tutorial20/MsgId.h +++ b/tutorials/tutorial20/include/tutorial20/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of message ids enumeration. diff --git a/tutorials/tutorial20/include/tutorial20/Version.h b/tutorials/tutorial20/include/tutorial20/Version.h index 6e0c4957..ccd159d0 100644 --- a/tutorials/tutorial20/include/tutorial20/Version.h +++ b/tutorials/tutorial20/include/tutorial20/Version.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains protocol version definition. @@ -22,5 +22,5 @@ inline constexpr unsigned specVersion() } // namespace tutorial20 // Generated compile time check for minimal supported version of the COMMS library -static_assert(COMMS_MAKE_VERSION(5, 2, 7) <= comms::version(), +static_assert(COMMS_MAKE_VERSION(5, 3, 0) <= comms::version(), "The version of COMMS library is too old"); diff --git a/tutorials/tutorial20/include/tutorial20/dispatch/DispatchClientInputMessage.h b/tutorials/tutorial20/include/tutorial20/dispatch/DispatchClientInputMessage.h index 0fda3839..0990408b 100644 --- a/tutorials/tutorial20/include/tutorial20/dispatch/DispatchClientInputMessage.h +++ b/tutorials/tutorial20/include/tutorial20/dispatch/DispatchClientInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/tutorials/tutorial20/include/tutorial20/dispatch/DispatchMessage.h b/tutorials/tutorial20/include/tutorial20/dispatch/DispatchMessage.h index d0eb1a31..82cba9a1 100644 --- a/tutorials/tutorial20/include/tutorial20/dispatch/DispatchMessage.h +++ b/tutorials/tutorial20/include/tutorial20/dispatch/DispatchMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for all input messages. diff --git a/tutorials/tutorial20/include/tutorial20/dispatch/DispatchServerInputMessage.h b/tutorials/tutorial20/include/tutorial20/dispatch/DispatchServerInputMessage.h index e0cc5ecc..f14c64ff 100644 --- a/tutorials/tutorial20/include/tutorial20/dispatch/DispatchServerInputMessage.h +++ b/tutorials/tutorial20/include/tutorial20/dispatch/DispatchServerInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/tutorials/tutorial20/include/tutorial20/factory/AllMessagesDynMemMsgFactory.h b/tutorials/tutorial20/include/tutorial20/factory/AllMessagesDynMemMsgFactory.h index c3e6266f..e2512c12 100644 --- a/tutorials/tutorial20/include/tutorial20/factory/AllMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial20/include/tutorial20/factory/AllMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for all the messages. diff --git a/tutorials/tutorial20/include/tutorial20/factory/ClientInputMessagesDynMemMsgFactory.h b/tutorials/tutorial20/include/tutorial20/factory/ClientInputMessagesDynMemMsgFactory.h index 00404af5..282223f0 100644 --- a/tutorials/tutorial20/include/tutorial20/factory/ClientInputMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial20/include/tutorial20/factory/ClientInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the client input messages. diff --git a/tutorials/tutorial20/include/tutorial20/factory/ServerInputMessagesDynMemMsgFactory.h b/tutorials/tutorial20/include/tutorial20/factory/ServerInputMessagesDynMemMsgFactory.h index e5a74c4a..6d34f4a0 100644 --- a/tutorials/tutorial20/include/tutorial20/factory/ServerInputMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial20/include/tutorial20/factory/ServerInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the server input messages. diff --git a/tutorials/tutorial20/include/tutorial20/field/FieldBase.h b/tutorials/tutorial20/include/tutorial20/field/FieldBase.h index 6256e241..d6592c74 100644 --- a/tutorials/tutorial20/include/tutorial20/field/FieldBase.h +++ b/tutorials/tutorial20/include/tutorial20/field/FieldBase.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of base class of all the fields. diff --git a/tutorials/tutorial20/include/tutorial20/field/MsgId.h b/tutorials/tutorial20/include/tutorial20/field/MsgId.h index d17bf5b6..481cb225 100644 --- a/tutorials/tutorial20/include/tutorial20/field/MsgId.h +++ b/tutorials/tutorial20/include/tutorial20/field/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "MsgId" field. @@ -27,6 +27,7 @@ class MsgId : public tutorial20::field::FieldBase<>, tutorial20::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<0, 3> > { @@ -35,6 +36,7 @@ class MsgId : public tutorial20::field::FieldBase<>, tutorial20::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<0, 3> >; public: diff --git a/tutorials/tutorial20/include/tutorial20/field/MsgIdCommon.h b/tutorials/tutorial20/include/tutorial20/field/MsgIdCommon.h index 23aa02f1..81822bd2 100644 --- a/tutorials/tutorial20/include/tutorial20/field/MsgIdCommon.h +++ b/tutorials/tutorial20/include/tutorial20/field/MsgIdCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial20/include/tutorial20/field/Version.h b/tutorials/tutorial20/include/tutorial20/field/Version.h index f8f254a5..ab59c357 100644 --- a/tutorials/tutorial20/include/tutorial20/field/Version.h +++ b/tutorials/tutorial20/include/tutorial20/field/Version.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Version" field. @@ -27,6 +27,7 @@ class Version : public tutorial20::field::FieldBase<>, std::uint16_t, TExtraOpts..., + comms::option::def::HasName, comms::option::def::DefaultNumValue<5U> > { @@ -35,6 +36,7 @@ class Version : public tutorial20::field::FieldBase<>, std::uint16_t, TExtraOpts..., + comms::option::def::HasName, comms::option::def::DefaultNumValue<5U> >; public: diff --git a/tutorials/tutorial20/include/tutorial20/field/VersionCommon.h b/tutorials/tutorial20/include/tutorial20/field/VersionCommon.h index b0bc0998..fa73bd6a 100644 --- a/tutorials/tutorial20/include/tutorial20/field/VersionCommon.h +++ b/tutorials/tutorial20/include/tutorial20/field/VersionCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial20/include/tutorial20/frame/Frame.h b/tutorials/tutorial20/include/tutorial20/frame/Frame.h index 756789b0..b5401d46 100644 --- a/tutorials/tutorial20/include/tutorial20/frame/Frame.h +++ b/tutorials/tutorial20/include/tutorial20/frame/Frame.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Frame" frame class. @@ -32,10 +32,30 @@ namespace frame template struct FrameLayers { + /// @brief Scope for field(s) of @ref Data layer. + struct DataMembers + { + /// @brief Custom field for @ref tutorial20::frame::FrameLayers::Data layer + class Field : public + comms::field::ArrayList< + tutorial20::field::FieldBase<>, + std::uint8_t, + typename TOpt::frame::FrameLayers::DataMembers::Field, + comms::option::def::HasName + > + { + public: + static const char* name() + { + return "Data"; + } + }; + }; + /// @brief Definition of layer "Data". using Data = comms::protocol::MsgDataLayer< - typename TOpt::frame::FrameLayers::Data + comms::option::def::FieldType >; /// @brief Definition of layer "Version". @@ -70,13 +90,15 @@ struct FrameLayers class Field : public comms::field::IntValue< tutorial20::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial20::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/tutorials/tutorial20/include/tutorial20/frame/FrameCommon.h b/tutorials/tutorial20/include/tutorial20/frame/FrameCommon.h index aeb25b71..17e44cd1 100644 --- a/tutorials/tutorial20/include/tutorial20/frame/FrameCommon.h +++ b/tutorials/tutorial20/include/tutorial20/frame/FrameCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial20/include/tutorial20/input/AllMessages.h b/tutorials/tutorial20/include/tutorial20/input/AllMessages.h index 69c83b45..07b0e09e 100644 --- a/tutorials/tutorial20/include/tutorial20/input/AllMessages.h +++ b/tutorials/tutorial20/include/tutorial20/input/AllMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the AllMessages messages bundle. diff --git a/tutorials/tutorial20/include/tutorial20/input/ClientInputMessages.h b/tutorials/tutorial20/include/tutorial20/input/ClientInputMessages.h index 1700e5a1..04489d03 100644 --- a/tutorials/tutorial20/include/tutorial20/input/ClientInputMessages.h +++ b/tutorials/tutorial20/include/tutorial20/input/ClientInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ClientInputMessages messages bundle. diff --git a/tutorials/tutorial20/include/tutorial20/input/ServerInputMessages.h b/tutorials/tutorial20/include/tutorial20/input/ServerInputMessages.h index be1e9e9a..d48b89ad 100644 --- a/tutorials/tutorial20/include/tutorial20/input/ServerInputMessages.h +++ b/tutorials/tutorial20/include/tutorial20/input/ServerInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ServerInputMessages messages bundle. diff --git a/tutorials/tutorial20/include/tutorial20/message/Connect.h b/tutorials/tutorial20/include/tutorial20/message/Connect.h index 7ed68dba..2d26f437 100644 --- a/tutorials/tutorial20/include/tutorial20/message/Connect.h +++ b/tutorials/tutorial20/include/tutorial20/message/Connect.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Connect" message and its fields. @@ -30,7 +30,8 @@ struct ConnectFields /// @brief Definition of "Version" field. using Version = tutorial20::field::Version< - TOpt + TOpt, + comms::option::def::HasName >; /// @brief All the fields bundled in std::tuple. diff --git a/tutorials/tutorial20/include/tutorial20/message/ConnectCommon.h b/tutorials/tutorial20/include/tutorial20/message/ConnectCommon.h index 7115cb2b..d0540d5e 100644 --- a/tutorials/tutorial20/include/tutorial20/message/ConnectCommon.h +++ b/tutorials/tutorial20/include/tutorial20/message/ConnectCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial20/include/tutorial20/message/Msg1.h b/tutorials/tutorial20/include/tutorial20/message/Msg1.h index ffe282d9..e2b90b18 100644 --- a/tutorials/tutorial20/include/tutorial20/message/Msg1.h +++ b/tutorials/tutorial20/include/tutorial20/message/Msg1.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 1" message and its fields. @@ -33,13 +33,15 @@ struct Msg1Fields class F1 : public comms::field::IntValue< tutorial20::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial20::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -64,13 +66,15 @@ struct Msg1Fields class F2Field : public comms::field::IntValue< tutorial20::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial20::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -95,8 +99,8 @@ struct Msg1Fields comms::field::Optional< F2Field, comms::option::def::ExistsByDefault, - comms::option::def::ExistsSinceVersion<2U> - > + comms::option::def::ExistsSinceVersion<2U>, + comms::option::def::HasName > { /// @brief Name of the field. static const char* name() @@ -109,13 +113,15 @@ struct Msg1Fields class F3Field : public comms::field::IntValue< tutorial20::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial20::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -140,8 +146,8 @@ struct Msg1Fields comms::field::Optional< F3Field, comms::option::def::ExistsByDefault, - comms::option::def::ExistsSinceVersion<5U> - > + comms::option::def::ExistsSinceVersion<5U>, + comms::option::def::HasName > { /// @brief Name of the field. static const char* name() diff --git a/tutorials/tutorial20/include/tutorial20/message/Msg1Common.h b/tutorials/tutorial20/include/tutorial20/message/Msg1Common.h index 6910d97e..a99be3ab 100644 --- a/tutorials/tutorial20/include/tutorial20/message/Msg1Common.h +++ b/tutorials/tutorial20/include/tutorial20/message/Msg1Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial20/include/tutorial20/message/Msg2.h b/tutorials/tutorial20/include/tutorial20/message/Msg2.h index 002b91aa..b94fd7d0 100644 --- a/tutorials/tutorial20/include/tutorial20/message/Msg2.h +++ b/tutorials/tutorial20/include/tutorial20/message/Msg2.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 2" message and its fields. @@ -34,6 +34,7 @@ struct Msg2Fields comms::field::EnumValue< tutorial20::field::FieldBase<>, tutorial20::message::Msg2FieldsCommon::F1Common::ValueType, + comms::option::def::HasName, comms::option::def::ValidNumValueRange<0, 2> > { @@ -41,6 +42,7 @@ struct Msg2Fields comms::field::EnumValue< tutorial20::field::FieldBase<>, tutorial20::message::Msg2FieldsCommon::F1Common::ValueType, + comms::option::def::HasName, comms::option::def::ValidNumValueRange<0, 2> >; public: @@ -94,8 +96,8 @@ struct Msg2Fields comms::field::Optional< F1Field, comms::option::def::ExistsByDefault, - comms::option::def::ExistsSinceVersion<1U> - > + comms::option::def::ExistsSinceVersion<1U>, + comms::option::def::HasName > { /// @brief Name of the field. static const char* name() @@ -110,6 +112,7 @@ struct Msg2Fields comms::field::EnumValue< tutorial20::field::FieldBase<>, tutorial20::message::Msg2FieldsCommon::F2Common::ValueType, + comms::option::def::HasName, comms::option::def::VersionStorage, comms::option::def::InvalidByDefault > @@ -118,6 +121,7 @@ struct Msg2Fields comms::field::EnumValue< tutorial20::field::FieldBase<>, tutorial20::message::Msg2FieldsCommon::F2Common::ValueType, + comms::option::def::HasName, comms::option::def::VersionStorage, comms::option::def::InvalidByDefault >; @@ -201,8 +205,8 @@ struct Msg2Fields comms::field::Optional< F2Field, comms::option::def::ExistsByDefault, - comms::option::def::ExistsSinceVersion<3U> - > + comms::option::def::ExistsSinceVersion<3U>, + comms::option::def::HasName > { /// @brief Name of the field. static const char* name() diff --git a/tutorials/tutorial20/include/tutorial20/message/Msg2Common.h b/tutorials/tutorial20/include/tutorial20/message/Msg2Common.h index 839b56d3..365f462c 100644 --- a/tutorials/tutorial20/include/tutorial20/message/Msg2Common.h +++ b/tutorials/tutorial20/include/tutorial20/message/Msg2Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial20/include/tutorial20/message/Msg3.h b/tutorials/tutorial20/include/tutorial20/message/Msg3.h index 376b252f..adc8b00e 100644 --- a/tutorials/tutorial20/include/tutorial20/message/Msg3.h +++ b/tutorials/tutorial20/include/tutorial20/message/Msg3.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 3" message and its fields. @@ -34,6 +34,7 @@ struct Msg3Fields class F1 : public comms::field::BitmaskValue< tutorial20::field::FieldBase<>, + comms::option::def::HasName, comms::option::def::FixedLength<1U>, comms::option::def::BitmaskReservedBits<0xFCU, 0x0U> > @@ -41,6 +42,7 @@ struct Msg3Fields using Base = comms::field::BitmaskValue< tutorial20::field::FieldBase<>, + comms::option::def::HasName, comms::option::def::FixedLength<1U>, comms::option::def::BitmaskReservedBits<0xFCU, 0x0U> >; @@ -58,13 +60,18 @@ struct Msg3Fields B1 ); + /// @brief Retrieve name of the bit. + /// @see @ref tutorial20::message::Msg3FieldsCommon::F1Common::bitName(). + static const char* bitName(std::size_t idx) + { + return tutorial20::message::Msg3FieldsCommon::F1Common::bitName(idx); + } + /// @brief Retrieve name of the bit. /// @see @ref tutorial20::message::Msg3FieldsCommon::F1Common::bitName(). static const char* bitName(BitIdx idx) { - return - tutorial20::message::Msg3FieldsCommon::F1Common::bitName( - static_cast(idx)); + return bitName(static_cast(idx)); } /// @brief Name of the field. @@ -82,13 +89,15 @@ struct Msg3Fields class Field : public comms::field::IntValue< tutorial20::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial20::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -112,12 +121,14 @@ struct Msg3Fields class F2 : public comms::field::Optional< typename F2Members::Field, + comms::option::def::HasName, comms::option::def::MissingByDefault > { using Base = comms::field::Optional< typename F2Members::Field, + comms::option::def::HasName, comms::option::def::MissingByDefault >; public: @@ -136,13 +147,15 @@ struct Msg3Fields class Field : public comms::field::IntValue< tutorial20::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial20::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -166,12 +179,14 @@ struct Msg3Fields class F3 : public comms::field::Optional< typename F3Members::Field, + comms::option::def::HasName, comms::option::def::MissingByDefault > { using Base = comms::field::Optional< typename F3Members::Field, + comms::option::def::HasName, comms::option::def::MissingByDefault >; public: @@ -186,13 +201,15 @@ struct Msg3Fields class F4Field : public comms::field::IntValue< tutorial20::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial20::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -217,8 +234,8 @@ struct Msg3Fields comms::field::Optional< F4Field, comms::option::def::ExistsByDefault, - comms::option::def::ExistsSinceVersion<3U> - > + comms::option::def::ExistsSinceVersion<3U>, + comms::option::def::HasName > { /// @brief Name of the field. static const char* name() diff --git a/tutorials/tutorial20/include/tutorial20/message/Msg3Common.h b/tutorials/tutorial20/include/tutorial20/message/Msg3Common.h index d465e644..a6d99cba 100644 --- a/tutorials/tutorial20/include/tutorial20/message/Msg3Common.h +++ b/tutorials/tutorial20/include/tutorial20/message/Msg3Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial20/include/tutorial20/options/AllMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial20/include/tutorial20/options/AllMessagesDynMemMsgFactoryDefaultOptions.h index b59f4ecd..37c6fccb 100644 --- a/tutorials/tutorial20/include/tutorial20/options/AllMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial20/include/tutorial20/options/AllMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol all messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial20/include/tutorial20/options/BareMetalDefaultOptions.h b/tutorials/tutorial20/include/tutorial20/options/BareMetalDefaultOptions.h index 5fe8b568..99d0be33 100644 --- a/tutorials/tutorial20/include/tutorial20/options/BareMetalDefaultOptions.h +++ b/tutorials/tutorial20/include/tutorial20/options/BareMetalDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol bare metal default options. @@ -31,13 +31,15 @@ struct BareMetalDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// tutorial20::frame::FrameLayers::Data - /// layer. - using Data = - std::tuple< - comms::option::app::FixedSizeStorage, - typename TBase::frame::FrameLayers::Data - >; + /// tutorial20::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::FixedSizeStorage, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers /// @brief Extra options for @ref /// tutorial20::frame::FrameLayers::Id diff --git a/tutorials/tutorial20/include/tutorial20/options/ClientDefaultOptions.h b/tutorials/tutorial20/include/tutorial20/options/ClientDefaultOptions.h index 72edf20b..fb93481c 100644 --- a/tutorials/tutorial20/include/tutorial20/options/ClientDefaultOptions.h +++ b/tutorials/tutorial20/include/tutorial20/options/ClientDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client default options. diff --git a/tutorials/tutorial20/include/tutorial20/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial20/include/tutorial20/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h index 4241a431..009f7d6a 100644 --- a/tutorials/tutorial20/include/tutorial20/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial20/include/tutorial20/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client input messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial20/include/tutorial20/options/DataViewDefaultOptions.h b/tutorials/tutorial20/include/tutorial20/options/DataViewDefaultOptions.h index bfe2d4a0..dd76a69a 100644 --- a/tutorials/tutorial20/include/tutorial20/options/DataViewDefaultOptions.h +++ b/tutorials/tutorial20/include/tutorial20/options/DataViewDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol data view default options. @@ -25,13 +25,15 @@ struct DataViewDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// tutorial20::frame::FrameLayers::Data - /// layer. - using Data = - std::tuple< - comms::option::app::OrigDataView, - typename TBase::frame::FrameLayers::Data - >; + /// tutorial20::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::OrigDataView, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers }; // struct FrameLayers }; // struct frame }; diff --git a/tutorials/tutorial20/include/tutorial20/options/DefaultOptions.h b/tutorials/tutorial20/include/tutorial20/options/DefaultOptions.h index f9c4d9ad..ede683ac 100644 --- a/tutorials/tutorial20/include/tutorial20/options/DefaultOptions.h +++ b/tutorials/tutorial20/include/tutorial20/options/DefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol default options. @@ -25,7 +25,7 @@ struct DefaultOptionsT : public TBase { /// @brief Extra options for @ref /// tutorial20::message::Connect message. - using Connect = comms::option::EmptyOption; + using Connect = comms::option::app::EmptyOption; }; // struct message /// @brief Extra options for frames. @@ -36,14 +36,16 @@ struct DefaultOptionsT : public TBase struct FrameLayers { /// @brief Extra options for @ref - /// tutorial20::frame::FrameLayers::Data - /// layer. - using Data = comms::option::EmptyOption; + /// tutorial20::frame::FrameLayers::DataMembers::Field field. + struct DataMembers + { + using Field = comms::option::app::EmptyOption; + }; // struct DataMembers /// @brief Extra options for @ref /// tutorial20::frame::FrameLayers::Id /// layer. - using Id = comms::option::EmptyOption; + using Id = comms::option::app::EmptyOption; }; // struct FrameLayers }; // struct frame }; diff --git a/tutorials/tutorial20/include/tutorial20/options/ServerDefaultOptions.h b/tutorials/tutorial20/include/tutorial20/options/ServerDefaultOptions.h index 523a2999..e6b58bd2 100644 --- a/tutorials/tutorial20/include/tutorial20/options/ServerDefaultOptions.h +++ b/tutorials/tutorial20/include/tutorial20/options/ServerDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server default options. diff --git a/tutorials/tutorial20/include/tutorial20/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial20/include/tutorial20/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h index 7bacde29..44512709 100644 --- a/tutorials/tutorial20/include/tutorial20/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial20/include/tutorial20/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server input messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial21/include/tutorial21/Interface.h b/tutorials/tutorial21/include/tutorial21/Interface.h index 10b30397..7df991da 100644 --- a/tutorials/tutorial21/include/tutorial21/Interface.h +++ b/tutorials/tutorial21/include/tutorial21/Interface.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Interface" interface class. @@ -24,7 +24,8 @@ struct InterfaceFields /// @brief Definition of "Flags" field. using Flags = tutorial21::field::BasicFlags< - tutorial21::options::DefaultOptions + tutorial21::options::DefaultOptions, + comms::option::def::HasName >; /// @brief All the fields bundled in std::tuple. diff --git a/tutorials/tutorial21/include/tutorial21/InterfaceCommon.h b/tutorials/tutorial21/include/tutorial21/InterfaceCommon.h index 5b2585fb..895ab868 100644 --- a/tutorials/tutorial21/include/tutorial21/InterfaceCommon.h +++ b/tutorials/tutorial21/include/tutorial21/InterfaceCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial21/include/tutorial21/MsgId.h b/tutorials/tutorial21/include/tutorial21/MsgId.h index ca1f1250..70a6602e 100644 --- a/tutorials/tutorial21/include/tutorial21/MsgId.h +++ b/tutorials/tutorial21/include/tutorial21/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of message ids enumeration. diff --git a/tutorials/tutorial21/include/tutorial21/Version.h b/tutorials/tutorial21/include/tutorial21/Version.h index 79dda9e5..912b2afa 100644 --- a/tutorials/tutorial21/include/tutorial21/Version.h +++ b/tutorials/tutorial21/include/tutorial21/Version.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains protocol version definition. @@ -22,5 +22,5 @@ inline constexpr unsigned specVersion() } // namespace tutorial21 // Generated compile time check for minimal supported version of the COMMS library -static_assert(COMMS_MAKE_VERSION(5, 2, 7) <= comms::version(), +static_assert(COMMS_MAKE_VERSION(5, 3, 0) <= comms::version(), "The version of COMMS library is too old"); diff --git a/tutorials/tutorial21/include/tutorial21/dispatch/DispatchClientInputMessage.h b/tutorials/tutorial21/include/tutorial21/dispatch/DispatchClientInputMessage.h index 76fe35d9..bad8799c 100644 --- a/tutorials/tutorial21/include/tutorial21/dispatch/DispatchClientInputMessage.h +++ b/tutorials/tutorial21/include/tutorial21/dispatch/DispatchClientInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/tutorials/tutorial21/include/tutorial21/dispatch/DispatchMessage.h b/tutorials/tutorial21/include/tutorial21/dispatch/DispatchMessage.h index f91997c3..52757778 100644 --- a/tutorials/tutorial21/include/tutorial21/dispatch/DispatchMessage.h +++ b/tutorials/tutorial21/include/tutorial21/dispatch/DispatchMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for all input messages. diff --git a/tutorials/tutorial21/include/tutorial21/dispatch/DispatchServerInputMessage.h b/tutorials/tutorial21/include/tutorial21/dispatch/DispatchServerInputMessage.h index cfd93987..c6ba9138 100644 --- a/tutorials/tutorial21/include/tutorial21/dispatch/DispatchServerInputMessage.h +++ b/tutorials/tutorial21/include/tutorial21/dispatch/DispatchServerInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/tutorials/tutorial21/include/tutorial21/factory/AllMessagesDynMemMsgFactory.h b/tutorials/tutorial21/include/tutorial21/factory/AllMessagesDynMemMsgFactory.h index ca79c27d..8b60d9ac 100644 --- a/tutorials/tutorial21/include/tutorial21/factory/AllMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial21/include/tutorial21/factory/AllMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for all the messages. diff --git a/tutorials/tutorial21/include/tutorial21/factory/ClientInputMessagesDynMemMsgFactory.h b/tutorials/tutorial21/include/tutorial21/factory/ClientInputMessagesDynMemMsgFactory.h index 9cb1c760..ef159f14 100644 --- a/tutorials/tutorial21/include/tutorial21/factory/ClientInputMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial21/include/tutorial21/factory/ClientInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the client input messages. diff --git a/tutorials/tutorial21/include/tutorial21/factory/ServerInputMessagesDynMemMsgFactory.h b/tutorials/tutorial21/include/tutorial21/factory/ServerInputMessagesDynMemMsgFactory.h index 7c907917..34233975 100644 --- a/tutorials/tutorial21/include/tutorial21/factory/ServerInputMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial21/include/tutorial21/factory/ServerInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the server input messages. diff --git a/tutorials/tutorial21/include/tutorial21/field/BasicFlags.h b/tutorials/tutorial21/include/tutorial21/field/BasicFlags.h index 7e8cd6f3..a86df9c1 100644 --- a/tutorials/tutorial21/include/tutorial21/field/BasicFlags.h +++ b/tutorials/tutorial21/include/tutorial21/field/BasicFlags.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Flags" field. @@ -26,14 +26,16 @@ class BasicFlags : public comms::field::IntValue< tutorial21::field::FieldBase<>, std::uint8_t, - TExtraOpts... + TExtraOpts..., + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial21::field::FieldBase<>, std::uint8_t, - TExtraOpts... + TExtraOpts..., + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/tutorials/tutorial21/include/tutorial21/field/BasicFlagsCommon.h b/tutorials/tutorial21/include/tutorial21/field/BasicFlagsCommon.h index 14ddc039..6a3257fc 100644 --- a/tutorials/tutorial21/include/tutorial21/field/BasicFlagsCommon.h +++ b/tutorials/tutorial21/include/tutorial21/field/BasicFlagsCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial21/include/tutorial21/field/FieldBase.h b/tutorials/tutorial21/include/tutorial21/field/FieldBase.h index a0bc2839..faf2eac9 100644 --- a/tutorials/tutorial21/include/tutorial21/field/FieldBase.h +++ b/tutorials/tutorial21/include/tutorial21/field/FieldBase.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of base class of all the fields. diff --git a/tutorials/tutorial21/include/tutorial21/field/Msg1Flags.h b/tutorials/tutorial21/include/tutorial21/field/Msg1Flags.h index f41a39c8..e9052766 100644 --- a/tutorials/tutorial21/include/tutorial21/field/Msg1Flags.h +++ b/tutorials/tutorial21/include/tutorial21/field/Msg1Flags.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Msg1Flags" field. @@ -25,6 +25,7 @@ class Msg1Flags : public comms::field::BitmaskValue< tutorial21::field::FieldBase<>, TExtraOpts..., + comms::option::def::HasName, comms::option::def::FixedLength<1U>, comms::option::def::BitmaskReservedBits<0xF8U, 0x0U> > @@ -33,6 +34,7 @@ class Msg1Flags : public comms::field::BitmaskValue< tutorial21::field::FieldBase<>, TExtraOpts..., + comms::option::def::HasName, comms::option::def::FixedLength<1U>, comms::option::def::BitmaskReservedBits<0xF8U, 0x0U> >; @@ -52,13 +54,18 @@ class Msg1Flags : public B2 ); + /// @brief Retrieve name of the bit. + /// @see @ref tutorial21::field::Msg1FlagsCommon::bitName(). + static const char* bitName(std::size_t idx) + { + return tutorial21::field::Msg1FlagsCommon::bitName(idx); + } + /// @brief Retrieve name of the bit. /// @see @ref tutorial21::field::Msg1FlagsCommon::bitName(). static const char* bitName(BitIdx idx) { - return - tutorial21::field::Msg1FlagsCommon::bitName( - static_cast(idx)); + return bitName(static_cast(idx)); } /// @brief Name of the field. diff --git a/tutorials/tutorial21/include/tutorial21/field/Msg1FlagsCommon.h b/tutorials/tutorial21/include/tutorial21/field/Msg1FlagsCommon.h index 02343fdd..02359f0a 100644 --- a/tutorials/tutorial21/include/tutorial21/field/Msg1FlagsCommon.h +++ b/tutorials/tutorial21/include/tutorial21/field/Msg1FlagsCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial21/include/tutorial21/field/Msg2Flags.h b/tutorials/tutorial21/include/tutorial21/field/Msg2Flags.h index 247a36fa..43986ea7 100644 --- a/tutorials/tutorial21/include/tutorial21/field/Msg2Flags.h +++ b/tutorials/tutorial21/include/tutorial21/field/Msg2Flags.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Msg2Flags" field. @@ -33,6 +33,7 @@ struct Msg2FlagsMembers comms::field::EnumValue< tutorial21::field::FieldBase<>, tutorial21::field::Msg2FlagsMembersCommon::EnumMemCommon::ValueType, + comms::option::def::HasName, comms::option::def::FixedBitLength<2U>, comms::option::def::ValidNumValueRange<0, 3> > @@ -41,6 +42,7 @@ struct Msg2FlagsMembers comms::field::EnumValue< tutorial21::field::FieldBase<>, tutorial21::field::Msg2FlagsMembersCommon::EnumMemCommon::ValueType, + comms::option::def::HasName, comms::option::def::FixedBitLength<2U>, comms::option::def::ValidNumValueRange<0, 3> >; @@ -94,6 +96,7 @@ struct Msg2FlagsMembers comms::field::IntValue< tutorial21::field::FieldBase<>, std::uint8_t, + comms::option::def::HasName, comms::option::def::FixedBitLength<6U> > { @@ -101,6 +104,7 @@ struct Msg2FlagsMembers comms::field::IntValue< tutorial21::field::FieldBase<>, std::uint8_t, + comms::option::def::HasName, comms::option::def::FixedBitLength<6U> >; public: @@ -137,6 +141,7 @@ class Msg2Flags : public tutorial21::field::FieldBase<>, typename Msg2FlagsMembers::All, TExtraOpts..., + comms::option::def::HasName, comms::option::def::HasVersionDependentMembers > { @@ -145,6 +150,7 @@ class Msg2Flags : public tutorial21::field::FieldBase<>, typename Msg2FlagsMembers::All, TExtraOpts..., + comms::option::def::HasName, comms::option::def::HasVersionDependentMembers >; public: diff --git a/tutorials/tutorial21/include/tutorial21/field/Msg2FlagsCommon.h b/tutorials/tutorial21/include/tutorial21/field/Msg2FlagsCommon.h index df2078f0..689c3063 100644 --- a/tutorials/tutorial21/include/tutorial21/field/Msg2FlagsCommon.h +++ b/tutorials/tutorial21/include/tutorial21/field/Msg2FlagsCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial21/include/tutorial21/field/MsgId.h b/tutorials/tutorial21/include/tutorial21/field/MsgId.h index daf01d0e..01c3398d 100644 --- a/tutorials/tutorial21/include/tutorial21/field/MsgId.h +++ b/tutorials/tutorial21/include/tutorial21/field/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "MsgId" field. @@ -27,6 +27,7 @@ class MsgId : public tutorial21::field::FieldBase<>, tutorial21::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 3> > { @@ -35,6 +36,7 @@ class MsgId : public tutorial21::field::FieldBase<>, tutorial21::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 3> >; public: diff --git a/tutorials/tutorial21/include/tutorial21/field/MsgIdCommon.h b/tutorials/tutorial21/include/tutorial21/field/MsgIdCommon.h index 1f7fb072..ec1a45d3 100644 --- a/tutorials/tutorial21/include/tutorial21/field/MsgIdCommon.h +++ b/tutorials/tutorial21/include/tutorial21/field/MsgIdCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial21/include/tutorial21/frame/Frame.h b/tutorials/tutorial21/include/tutorial21/frame/Frame.h index e85e57ad..2d886083 100644 --- a/tutorials/tutorial21/include/tutorial21/frame/Frame.h +++ b/tutorials/tutorial21/include/tutorial21/frame/Frame.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Frame" frame class. @@ -32,10 +32,30 @@ namespace frame template struct FrameLayers { + /// @brief Scope for field(s) of @ref Data layer. + struct DataMembers + { + /// @brief Custom field for @ref tutorial21::frame::FrameLayers::Data layer + class Field : public + comms::field::ArrayList< + tutorial21::field::FieldBase<>, + std::uint8_t, + typename TOpt::frame::FrameLayers::DataMembers::Field, + comms::option::def::HasName + > + { + public: + static const char* name() + { + return "Data"; + } + }; + }; + /// @brief Definition of layer "Data". using Data = comms::protocol::MsgDataLayer< - typename TOpt::frame::FrameLayers::Data + comms::option::def::FieldType >; /// @brief Definition of layer "Flags". @@ -68,13 +88,15 @@ struct FrameLayers class Field : public comms::field::IntValue< tutorial21::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial21::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/tutorials/tutorial21/include/tutorial21/frame/FrameCommon.h b/tutorials/tutorial21/include/tutorial21/frame/FrameCommon.h index c878eab2..e1b3b30c 100644 --- a/tutorials/tutorial21/include/tutorial21/frame/FrameCommon.h +++ b/tutorials/tutorial21/include/tutorial21/frame/FrameCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial21/include/tutorial21/input/AllMessages.h b/tutorials/tutorial21/include/tutorial21/input/AllMessages.h index 9a3dbb69..5a3c2814 100644 --- a/tutorials/tutorial21/include/tutorial21/input/AllMessages.h +++ b/tutorials/tutorial21/include/tutorial21/input/AllMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the AllMessages messages bundle. diff --git a/tutorials/tutorial21/include/tutorial21/input/ClientInputMessages.h b/tutorials/tutorial21/include/tutorial21/input/ClientInputMessages.h index ffc08cf4..834f1297 100644 --- a/tutorials/tutorial21/include/tutorial21/input/ClientInputMessages.h +++ b/tutorials/tutorial21/include/tutorial21/input/ClientInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ClientInputMessages messages bundle. diff --git a/tutorials/tutorial21/include/tutorial21/input/ServerInputMessages.h b/tutorials/tutorial21/include/tutorial21/input/ServerInputMessages.h index 75ac5485..0cefa9e0 100644 --- a/tutorials/tutorial21/include/tutorial21/input/ServerInputMessages.h +++ b/tutorials/tutorial21/include/tutorial21/input/ServerInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ServerInputMessages messages bundle. diff --git a/tutorials/tutorial21/include/tutorial21/message/Msg1.h b/tutorials/tutorial21/include/tutorial21/message/Msg1.h index fb9c8615..89e0efb9 100644 --- a/tutorials/tutorial21/include/tutorial21/message/Msg1.h +++ b/tutorials/tutorial21/include/tutorial21/message/Msg1.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 1" message and its fields. diff --git a/tutorials/tutorial21/include/tutorial21/message/Msg1Common.h b/tutorials/tutorial21/include/tutorial21/message/Msg1Common.h index b123ba6d..cdd6f43e 100644 --- a/tutorials/tutorial21/include/tutorial21/message/Msg1Common.h +++ b/tutorials/tutorial21/include/tutorial21/message/Msg1Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial21/include/tutorial21/message/Msg2.h b/tutorials/tutorial21/include/tutorial21/message/Msg2.h index cc152f3d..3c04ff85 100644 --- a/tutorials/tutorial21/include/tutorial21/message/Msg2.h +++ b/tutorials/tutorial21/include/tutorial21/message/Msg2.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 2" message and its fields. diff --git a/tutorials/tutorial21/include/tutorial21/message/Msg2Common.h b/tutorials/tutorial21/include/tutorial21/message/Msg2Common.h index 65df04e3..038ff0c6 100644 --- a/tutorials/tutorial21/include/tutorial21/message/Msg2Common.h +++ b/tutorials/tutorial21/include/tutorial21/message/Msg2Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial21/include/tutorial21/options/AllMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial21/include/tutorial21/options/AllMessagesDynMemMsgFactoryDefaultOptions.h index 973d0552..a1ff93f4 100644 --- a/tutorials/tutorial21/include/tutorial21/options/AllMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial21/include/tutorial21/options/AllMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol all messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial21/include/tutorial21/options/BareMetalDefaultOptions.h b/tutorials/tutorial21/include/tutorial21/options/BareMetalDefaultOptions.h index 14363c1b..cd5d5ef6 100644 --- a/tutorials/tutorial21/include/tutorial21/options/BareMetalDefaultOptions.h +++ b/tutorials/tutorial21/include/tutorial21/options/BareMetalDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol bare metal default options. @@ -31,13 +31,15 @@ struct BareMetalDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// tutorial21::frame::FrameLayers::Data - /// layer. - using Data = - std::tuple< - comms::option::app::FixedSizeStorage, - typename TBase::frame::FrameLayers::Data - >; + /// tutorial21::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::FixedSizeStorage, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers /// @brief Extra options for @ref /// tutorial21::frame::FrameLayers::Id diff --git a/tutorials/tutorial21/include/tutorial21/options/ClientDefaultOptions.h b/tutorials/tutorial21/include/tutorial21/options/ClientDefaultOptions.h index e3363ab0..215ccb80 100644 --- a/tutorials/tutorial21/include/tutorial21/options/ClientDefaultOptions.h +++ b/tutorials/tutorial21/include/tutorial21/options/ClientDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client default options. diff --git a/tutorials/tutorial21/include/tutorial21/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial21/include/tutorial21/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h index 97e4300c..7fccd746 100644 --- a/tutorials/tutorial21/include/tutorial21/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial21/include/tutorial21/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client input messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial21/include/tutorial21/options/DataViewDefaultOptions.h b/tutorials/tutorial21/include/tutorial21/options/DataViewDefaultOptions.h index a4ed0d55..02b34534 100644 --- a/tutorials/tutorial21/include/tutorial21/options/DataViewDefaultOptions.h +++ b/tutorials/tutorial21/include/tutorial21/options/DataViewDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol data view default options. @@ -25,13 +25,15 @@ struct DataViewDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// tutorial21::frame::FrameLayers::Data - /// layer. - using Data = - std::tuple< - comms::option::app::OrigDataView, - typename TBase::frame::FrameLayers::Data - >; + /// tutorial21::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::OrigDataView, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers }; // struct FrameLayers }; // struct frame }; diff --git a/tutorials/tutorial21/include/tutorial21/options/DefaultOptions.h b/tutorials/tutorial21/include/tutorial21/options/DefaultOptions.h index 4f09803e..fd7b5b2b 100644 --- a/tutorials/tutorial21/include/tutorial21/options/DefaultOptions.h +++ b/tutorials/tutorial21/include/tutorial21/options/DefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol default options. @@ -28,14 +28,16 @@ struct DefaultOptionsT : public TBase struct FrameLayers { /// @brief Extra options for @ref - /// tutorial21::frame::FrameLayers::Data - /// layer. - using Data = comms::option::EmptyOption; + /// tutorial21::frame::FrameLayers::DataMembers::Field field. + struct DataMembers + { + using Field = comms::option::app::EmptyOption; + }; // struct DataMembers /// @brief Extra options for @ref /// tutorial21::frame::FrameLayers::Id /// layer. - using Id = comms::option::EmptyOption; + using Id = comms::option::app::EmptyOption; }; // struct FrameLayers }; // struct frame }; diff --git a/tutorials/tutorial21/include/tutorial21/options/ServerDefaultOptions.h b/tutorials/tutorial21/include/tutorial21/options/ServerDefaultOptions.h index d28c0f4e..9e36f840 100644 --- a/tutorials/tutorial21/include/tutorial21/options/ServerDefaultOptions.h +++ b/tutorials/tutorial21/include/tutorial21/options/ServerDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server default options. diff --git a/tutorials/tutorial21/include/tutorial21/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial21/include/tutorial21/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h index 0ab97f6d..d1fe8977 100644 --- a/tutorials/tutorial21/include/tutorial21/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial21/include/tutorial21/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server input messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial22/include/tutorial22/Message.h b/tutorials/tutorial22/include/tutorial22/Message.h index e8f82e25..684bba38 100644 --- a/tutorials/tutorial22/include/tutorial22/Message.h +++ b/tutorials/tutorial22/include/tutorial22/Message.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message" interface class. diff --git a/tutorials/tutorial22/include/tutorial22/MsgId.h b/tutorials/tutorial22/include/tutorial22/MsgId.h index 16a91de1..7a183fe5 100644 --- a/tutorials/tutorial22/include/tutorial22/MsgId.h +++ b/tutorials/tutorial22/include/tutorial22/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of message ids enumeration. diff --git a/tutorials/tutorial22/include/tutorial22/Version.h b/tutorials/tutorial22/include/tutorial22/Version.h index 5273426e..32de072b 100644 --- a/tutorials/tutorial22/include/tutorial22/Version.h +++ b/tutorials/tutorial22/include/tutorial22/Version.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains protocol version definition. @@ -22,5 +22,5 @@ inline constexpr unsigned specVersion() } // namespace tutorial22 // Generated compile time check for minimal supported version of the COMMS library -static_assert(COMMS_MAKE_VERSION(5, 2, 7) <= comms::version(), +static_assert(COMMS_MAKE_VERSION(5, 3, 0) <= comms::version(), "The version of COMMS library is too old"); diff --git a/tutorials/tutorial22/include/tutorial22/dispatch/DispatchClientInputMessage.h b/tutorials/tutorial22/include/tutorial22/dispatch/DispatchClientInputMessage.h index fead58be..360ada15 100644 --- a/tutorials/tutorial22/include/tutorial22/dispatch/DispatchClientInputMessage.h +++ b/tutorials/tutorial22/include/tutorial22/dispatch/DispatchClientInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/tutorials/tutorial22/include/tutorial22/dispatch/DispatchMessage.h b/tutorials/tutorial22/include/tutorial22/dispatch/DispatchMessage.h index 1954f689..c3bf74cd 100644 --- a/tutorials/tutorial22/include/tutorial22/dispatch/DispatchMessage.h +++ b/tutorials/tutorial22/include/tutorial22/dispatch/DispatchMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for all input messages. diff --git a/tutorials/tutorial22/include/tutorial22/dispatch/DispatchServerInputMessage.h b/tutorials/tutorial22/include/tutorial22/dispatch/DispatchServerInputMessage.h index 4c00f618..9824f473 100644 --- a/tutorials/tutorial22/include/tutorial22/dispatch/DispatchServerInputMessage.h +++ b/tutorials/tutorial22/include/tutorial22/dispatch/DispatchServerInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/tutorials/tutorial22/include/tutorial22/factory/AllMessagesDynMemMsgFactory.h b/tutorials/tutorial22/include/tutorial22/factory/AllMessagesDynMemMsgFactory.h index 23e04eeb..3a96d6ff 100644 --- a/tutorials/tutorial22/include/tutorial22/factory/AllMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial22/include/tutorial22/factory/AllMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for all the messages. diff --git a/tutorials/tutorial22/include/tutorial22/factory/ClientInputMessagesDynMemMsgFactory.h b/tutorials/tutorial22/include/tutorial22/factory/ClientInputMessagesDynMemMsgFactory.h index 6298fec7..7d1eef26 100644 --- a/tutorials/tutorial22/include/tutorial22/factory/ClientInputMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial22/include/tutorial22/factory/ClientInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the client input messages. diff --git a/tutorials/tutorial22/include/tutorial22/factory/ServerInputMessagesDynMemMsgFactory.h b/tutorials/tutorial22/include/tutorial22/factory/ServerInputMessagesDynMemMsgFactory.h index 74211fbf..6495d54c 100644 --- a/tutorials/tutorial22/include/tutorial22/factory/ServerInputMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial22/include/tutorial22/factory/ServerInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the server input messages. diff --git a/tutorials/tutorial22/include/tutorial22/field/FieldBase.h b/tutorials/tutorial22/include/tutorial22/field/FieldBase.h index 651fb93f..1914b6cc 100644 --- a/tutorials/tutorial22/include/tutorial22/field/FieldBase.h +++ b/tutorials/tutorial22/include/tutorial22/field/FieldBase.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of base class of all the fields. diff --git a/tutorials/tutorial22/include/tutorial22/field/Length.h b/tutorials/tutorial22/include/tutorial22/field/Length.h index e284973e..d83aac72 100644 --- a/tutorials/tutorial22/include/tutorial22/field/Length.h +++ b/tutorials/tutorial22/include/tutorial22/field/Length.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Length" field. @@ -31,13 +31,15 @@ struct LengthMembers class Short : public comms::field::IntValue< tutorial22::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial22::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -97,13 +99,15 @@ struct LengthMembers class ActLong : public comms::field::IntValue< tutorial22::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial22::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -127,12 +131,14 @@ struct LengthMembers class Long : public comms::field::Optional< typename LongMembers::ActLong, + comms::option::def::HasName, comms::option::def::MissingByDefault > { using Base = comms::field::Optional< typename LongMembers::ActLong, + comms::option::def::HasName, comms::option::def::MissingByDefault >; public: @@ -160,6 +166,7 @@ class Length : public tutorial22::field::FieldBase<>, typename LengthMembers::All, TExtraOpts..., + comms::option::def::HasName, comms::option::def::HasCustomRead, comms::option::def::HasCustomRefresh, comms::option::def::HasVersionDependentMembers @@ -170,6 +177,7 @@ class Length : public tutorial22::field::FieldBase<>, typename LengthMembers::All, TExtraOpts..., + comms::option::def::HasName, comms::option::def::HasCustomRead, comms::option::def::HasCustomRefresh, comms::option::def::HasVersionDependentMembers diff --git a/tutorials/tutorial22/include/tutorial22/field/LengthCommon.h b/tutorials/tutorial22/include/tutorial22/field/LengthCommon.h index f3883a72..d80184d2 100644 --- a/tutorials/tutorial22/include/tutorial22/field/LengthCommon.h +++ b/tutorials/tutorial22/include/tutorial22/field/LengthCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial22/include/tutorial22/field/MsgId.h b/tutorials/tutorial22/include/tutorial22/field/MsgId.h index 3f26b012..0a2df04f 100644 --- a/tutorials/tutorial22/include/tutorial22/field/MsgId.h +++ b/tutorials/tutorial22/include/tutorial22/field/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "MsgId" field. @@ -27,6 +27,7 @@ class MsgId : public tutorial22::field::FieldBase<>, tutorial22::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 3> > { @@ -35,6 +36,7 @@ class MsgId : public tutorial22::field::FieldBase<>, tutorial22::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 3> >; public: diff --git a/tutorials/tutorial22/include/tutorial22/field/MsgIdCommon.h b/tutorials/tutorial22/include/tutorial22/field/MsgIdCommon.h index e2024d3f..21ec55f8 100644 --- a/tutorials/tutorial22/include/tutorial22/field/MsgIdCommon.h +++ b/tutorials/tutorial22/include/tutorial22/field/MsgIdCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial22/include/tutorial22/field/TlvProp.h b/tutorials/tutorial22/include/tutorial22/field/TlvProp.h index eb9cd3d0..97d72638 100644 --- a/tutorials/tutorial22/include/tutorial22/field/TlvProp.h +++ b/tutorials/tutorial22/include/tutorial22/field/TlvProp.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "TlvProp" field. @@ -41,6 +41,7 @@ struct TlvPropMembers comms::field::IntValue< tutorial22::field::FieldBase<>, std::uint8_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid<>, comms::option::def::ValidNumValue<0>, comms::option::def::HasCustomRefresh @@ -50,6 +51,7 @@ struct TlvPropMembers comms::field::IntValue< tutorial22::field::FieldBase<>, std::uint8_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid<>, comms::option::def::ValidNumValue<0>, comms::option::def::HasCustomRefresh @@ -85,7 +87,8 @@ struct TlvPropMembers /// @brief Definition of "Length" field. using Length = tutorial22::field::Length< - TOpt + TOpt, + comms::option::def::HasName >; /// @brief Definition of "Val" field. @@ -93,6 +96,7 @@ struct TlvPropMembers comms::field::IntValue< tutorial22::field::FieldBase<>, std::uint32_t, + comms::option::def::HasName, comms::option::def::AvailableLengthLimit > { @@ -100,6 +104,7 @@ struct TlvPropMembers comms::field::IntValue< tutorial22::field::FieldBase<>, std::uint32_t, + comms::option::def::HasName, comms::option::def::AvailableLengthLimit >; public: @@ -133,6 +138,7 @@ struct TlvPropMembers comms::field::Bundle< tutorial22::field::FieldBase<>, typename Prop1Members::All, + comms::option::def::HasName, comms::option::def::RemLengthMemberField<1U>, comms::option::def::HasVersionDependentMembers > @@ -141,6 +147,7 @@ struct TlvPropMembers comms::field::Bundle< tutorial22::field::FieldBase<>, typename Prop1Members::All, + comms::option::def::HasName, comms::option::def::RemLengthMemberField<1U>, comms::option::def::HasVersionDependentMembers >; @@ -179,6 +186,7 @@ struct TlvPropMembers comms::field::IntValue< tutorial22::field::FieldBase<>, std::uint8_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid<>, comms::option::def::DefaultNumValue<2>, comms::option::def::ValidNumValue<2>, @@ -189,6 +197,7 @@ struct TlvPropMembers comms::field::IntValue< tutorial22::field::FieldBase<>, std::uint8_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid<>, comms::option::def::DefaultNumValue<2>, comms::option::def::ValidNumValue<2>, @@ -225,20 +234,23 @@ struct TlvPropMembers /// @brief Definition of "Length" field. using Length = tutorial22::field::Length< - TOpt + TOpt, + comms::option::def::HasName >; /// @brief Definition of "Val" field. class Val : public comms::field::String< tutorial22::field::FieldBase<>, - typename TOpt::field::TlvPropMembers::Prop2Members::Val + typename TOpt::field::TlvPropMembers::Prop2Members::Val, + comms::option::def::HasName > { using Base = comms::field::String< tutorial22::field::FieldBase<>, - typename TOpt::field::TlvPropMembers::Prop2Members::Val + typename TOpt::field::TlvPropMembers::Prop2Members::Val, + comms::option::def::HasName >; public: /// @brief Name of the field. @@ -262,6 +274,7 @@ struct TlvPropMembers comms::field::Bundle< tutorial22::field::FieldBase<>, typename Prop2Members::All, + comms::option::def::HasName, comms::option::def::RemLengthMemberField<1U>, comms::option::def::HasVersionDependentMembers > @@ -270,6 +283,7 @@ struct TlvPropMembers comms::field::Bundle< tutorial22::field::FieldBase<>, typename Prop2Members::All, + comms::option::def::HasName, comms::option::def::RemLengthMemberField<1U>, comms::option::def::HasVersionDependentMembers >; @@ -307,13 +321,15 @@ struct TlvPropMembers class Key : public comms::field::IntValue< tutorial22::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial22::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -336,13 +352,15 @@ struct TlvPropMembers class Length : public comms::field::IntValue< tutorial22::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial22::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -366,14 +384,16 @@ struct TlvPropMembers comms::field::ArrayList< tutorial22::field::FieldBase<>, std::uint8_t, - typename TOpt::field::TlvPropMembers::AnyMembers::Val + typename TOpt::field::TlvPropMembers::AnyMembers::Val, + comms::option::def::HasName > { using Base = comms::field::ArrayList< tutorial22::field::FieldBase<>, std::uint8_t, - typename TOpt::field::TlvPropMembers::AnyMembers::Val + typename TOpt::field::TlvPropMembers::AnyMembers::Val, + comms::option::def::HasName >; public: /// @brief Name of the field. @@ -397,6 +417,7 @@ struct TlvPropMembers comms::field::Bundle< tutorial22::field::FieldBase<>, typename AnyMembers::All, + comms::option::def::HasName, comms::option::def::RemLengthMemberField<1U>, comms::option::def::HasVersionDependentMembers > @@ -405,6 +426,7 @@ struct TlvPropMembers comms::field::Bundle< tutorial22::field::FieldBase<>, typename AnyMembers::All, + comms::option::def::HasName, comms::option::def::RemLengthMemberField<1U>, comms::option::def::HasVersionDependentMembers >; @@ -454,6 +476,7 @@ class TlvProp : public tutorial22::field::FieldBase<>, typename TlvPropMembers::All, TExtraOpts..., + comms::option::def::HasName, comms::option::def::HasCustomRead, comms::option::def::HasCustomWrite, comms::option::def::HasCustomRefresh, @@ -466,6 +489,7 @@ class TlvProp : public tutorial22::field::FieldBase<>, typename TlvPropMembers::All, TExtraOpts..., + comms::option::def::HasName, comms::option::def::HasCustomRead, comms::option::def::HasCustomWrite, comms::option::def::HasCustomRefresh, @@ -482,6 +506,13 @@ class TlvProp : public reset(); } + /// @brief Single member name info entry + using MemberNameInfo = tutorial22::field::TlvPropCommon::MemberNameInfo; + + /// @brief Type returned from @ref memberNamesMap() member function. + /// @see @ref tutorial22::field::TlvPropCommon::MemberNamesMapInfo. + using MemberNamesMapInfo = tutorial22::field::TlvPropCommon::MemberNamesMapInfo; + /// @brief Allow access to internal fields. /// @details See definition of @b COMMS_VARIANT_MEMBERS_NAMES macro /// related to @b comms::field::Variant class from COMMS library @@ -581,7 +612,6 @@ class TlvProp : public } if (Base::currentField() != other.currentField()) { - return false; } @@ -755,6 +785,27 @@ class TlvProp : public return false; } + /// @brief Retrieve name of the member + /// @see @ref tutorial22::field::TlvPropCommon::memberName(). + static const char* memberName(std::size_t idx) + { + return tutorial22::field::TlvPropCommon::memberName(idx); + } + + /// @brief Retrieve name of the member + /// @see @ref tutorial22::field::TlvPropCommon::memberName(). + static const char* memberName(FieldIdx idx) + { + return memberName(static_cast(idx)); + } + + /// @brief Retrieve map of members names + /// @see @ref tutorial22::field::TlvPropCommon::memberNamesMap(). + static MemberNamesMapInfo memberNamesMap() + { + return tutorial22::field::TlvPropCommon::memberNamesMap(); + } + /// @brief Name of the field. static const char* name() { diff --git a/tutorials/tutorial22/include/tutorial22/field/TlvPropCommon.h b/tutorials/tutorial22/include/tutorial22/field/TlvPropCommon.h index 8ffd744d..05c9c269 100644 --- a/tutorials/tutorial22/include/tutorial22/field/TlvPropCommon.h +++ b/tutorials/tutorial22/include/tutorial22/field/TlvPropCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of @@ -7,6 +7,8 @@ #pragma once #include +#include +#include #include "tutorial22/field/LengthCommon.h" namespace tutorial22 @@ -215,11 +217,43 @@ struct TlvPropMembersCommon /// @ref tutorial22::field::TlvProp field. struct TlvPropCommon { + /// @brief Single member name info entry + using MemberNameInfo = const char*; + + /// @brief Type returned from @ref memberNamesMap() member function. + /// @details The @b first value of the pair is pointer to the map array, + /// The @b second value of the pair is the size of the array. + using MemberNamesMapInfo = std::pair; + /// @brief Name of the @ref tutorial22::field::TlvProp field. static const char* name() { return "TlvProp"; } + + /// @brief Retrieve name of the member + static const char* memberName(std::size_t idx) + { + auto namesMapInfo = memberNamesMap(); + if (namesMapInfo.second <= idx) { + return nullptr; + } + + return namesMapInfo.first[idx]; + } + + /// @brief Retrieve map of members names + static MemberNamesMapInfo memberNamesMap() + { + static const MemberNameInfo Map[] = { + TlvPropMembersCommon::Prop1Common::name(), + TlvPropMembersCommon::Prop2Common::name(), + TlvPropMembersCommon::AnyCommon::name() + }; + static const std::size_t MapSize = std::extent::value; + + return std::make_pair(&Map[0], MapSize); + } }; } // namespace field diff --git a/tutorials/tutorial22/include/tutorial22/frame/Frame.h b/tutorials/tutorial22/include/tutorial22/frame/Frame.h index 8a3113d8..29500ea7 100644 --- a/tutorials/tutorial22/include/tutorial22/frame/Frame.h +++ b/tutorials/tutorial22/include/tutorial22/frame/Frame.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Frame" frame class. @@ -32,10 +32,30 @@ namespace frame template struct FrameLayers { + /// @brief Scope for field(s) of @ref Data layer. + struct DataMembers + { + /// @brief Custom field for @ref tutorial22::frame::FrameLayers::Data layer + class Field : public + comms::field::ArrayList< + tutorial22::field::FieldBase<>, + std::uint8_t, + typename TOpt::frame::FrameLayers::DataMembers::Field, + comms::option::def::HasName + > + { + public: + static const char* name() + { + return "Data"; + } + }; + }; + /// @brief Definition of layer "Data". using Data = comms::protocol::MsgDataLayer< - typename TOpt::frame::FrameLayers::Data + comms::option::def::FieldType >; /// @brief Definition of layer "Id". @@ -69,6 +89,7 @@ struct FrameLayers comms::field::IntValue< tutorial22::field::FieldBase<>, std::uint16_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid, comms::option::def::DefaultNumValue<43996L> > @@ -77,6 +98,7 @@ struct FrameLayers comms::field::IntValue< tutorial22::field::FieldBase<>, std::uint16_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid, comms::option::def::DefaultNumValue<43996L> >; diff --git a/tutorials/tutorial22/include/tutorial22/frame/FrameCommon.h b/tutorials/tutorial22/include/tutorial22/frame/FrameCommon.h index d85e47ac..940580a0 100644 --- a/tutorials/tutorial22/include/tutorial22/frame/FrameCommon.h +++ b/tutorials/tutorial22/include/tutorial22/frame/FrameCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial22/include/tutorial22/input/AllMessages.h b/tutorials/tutorial22/include/tutorial22/input/AllMessages.h index 9281b954..94cd5ea4 100644 --- a/tutorials/tutorial22/include/tutorial22/input/AllMessages.h +++ b/tutorials/tutorial22/include/tutorial22/input/AllMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the AllMessages messages bundle. diff --git a/tutorials/tutorial22/include/tutorial22/input/ClientInputMessages.h b/tutorials/tutorial22/include/tutorial22/input/ClientInputMessages.h index 4a43c5b9..bf1c2b28 100644 --- a/tutorials/tutorial22/include/tutorial22/input/ClientInputMessages.h +++ b/tutorials/tutorial22/include/tutorial22/input/ClientInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ClientInputMessages messages bundle. diff --git a/tutorials/tutorial22/include/tutorial22/input/ServerInputMessages.h b/tutorials/tutorial22/include/tutorial22/input/ServerInputMessages.h index e6a544c9..7a7bcd9a 100644 --- a/tutorials/tutorial22/include/tutorial22/input/ServerInputMessages.h +++ b/tutorials/tutorial22/include/tutorial22/input/ServerInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ServerInputMessages messages bundle. diff --git a/tutorials/tutorial22/include/tutorial22/message/Msg1.h b/tutorials/tutorial22/include/tutorial22/message/Msg1.h index 0cd8274e..c94ddf16 100644 --- a/tutorials/tutorial22/include/tutorial22/message/Msg1.h +++ b/tutorials/tutorial22/include/tutorial22/message/Msg1.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 1" message and its fields. @@ -33,14 +33,16 @@ struct Msg1Fields comms::field::ArrayList< tutorial22::field::FieldBase<>, tutorial22::field::TlvProp, - typename TOpt::message::Msg1Fields::F1 + typename TOpt::message::Msg1Fields::F1, + comms::option::def::HasName > { using Base = comms::field::ArrayList< tutorial22::field::FieldBase<>, tutorial22::field::TlvProp, - typename TOpt::message::Msg1Fields::F1 + typename TOpt::message::Msg1Fields::F1, + comms::option::def::HasName >; public: /// @brief Name of the field. diff --git a/tutorials/tutorial22/include/tutorial22/message/Msg1Common.h b/tutorials/tutorial22/include/tutorial22/message/Msg1Common.h index e12336d3..2c395914 100644 --- a/tutorials/tutorial22/include/tutorial22/message/Msg1Common.h +++ b/tutorials/tutorial22/include/tutorial22/message/Msg1Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial22/include/tutorial22/options/AllMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial22/include/tutorial22/options/AllMessagesDynMemMsgFactoryDefaultOptions.h index 024fe0c3..29c5ed07 100644 --- a/tutorials/tutorial22/include/tutorial22/options/AllMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial22/include/tutorial22/options/AllMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol all messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial22/include/tutorial22/options/BareMetalDefaultOptions.h b/tutorials/tutorial22/include/tutorial22/options/BareMetalDefaultOptions.h index 2f545e3e..ea064877 100644 --- a/tutorials/tutorial22/include/tutorial22/options/BareMetalDefaultOptions.h +++ b/tutorials/tutorial22/include/tutorial22/options/BareMetalDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol bare metal default options. @@ -80,13 +80,15 @@ struct BareMetalDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// tutorial22::frame::FrameLayers::Data - /// layer. - using Data = - std::tuple< - comms::option::app::FixedSizeStorage, - typename TBase::frame::FrameLayers::Data - >; + /// tutorial22::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::FixedSizeStorage, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers /// @brief Extra options for @ref /// tutorial22::frame::FrameLayers::Id diff --git a/tutorials/tutorial22/include/tutorial22/options/ClientDefaultOptions.h b/tutorials/tutorial22/include/tutorial22/options/ClientDefaultOptions.h index baedb38a..fc15501c 100644 --- a/tutorials/tutorial22/include/tutorial22/options/ClientDefaultOptions.h +++ b/tutorials/tutorial22/include/tutorial22/options/ClientDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client default options. diff --git a/tutorials/tutorial22/include/tutorial22/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial22/include/tutorial22/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h index 5642f220..d7a3f517 100644 --- a/tutorials/tutorial22/include/tutorial22/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial22/include/tutorial22/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client input messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial22/include/tutorial22/options/DataViewDefaultOptions.h b/tutorials/tutorial22/include/tutorial22/options/DataViewDefaultOptions.h index b0fbc24a..24207bd5 100644 --- a/tutorials/tutorial22/include/tutorial22/options/DataViewDefaultOptions.h +++ b/tutorials/tutorial22/include/tutorial22/options/DataViewDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol data view default options. @@ -56,13 +56,15 @@ struct DataViewDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// tutorial22::frame::FrameLayers::Data - /// layer. - using Data = - std::tuple< - comms::option::app::OrigDataView, - typename TBase::frame::FrameLayers::Data - >; + /// tutorial22::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::OrigDataView, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers }; // struct FrameLayers }; // struct frame }; diff --git a/tutorials/tutorial22/include/tutorial22/options/DefaultOptions.h b/tutorials/tutorial22/include/tutorial22/options/DefaultOptions.h index c8ee5ac5..159dfcaf 100644 --- a/tutorials/tutorial22/include/tutorial22/options/DefaultOptions.h +++ b/tutorials/tutorial22/include/tutorial22/options/DefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol default options. @@ -30,7 +30,7 @@ struct DefaultOptionsT : public TBase /// @brief Extra options for @ref /// tutorial22::field::TlvPropMembers::Prop2Members::Val /// field. - using Val = comms::option::EmptyOption; + using Val = comms::option::app::EmptyOption; }; // struct Prop2Members struct AnyMembers @@ -38,7 +38,7 @@ struct DefaultOptionsT : public TBase /// @brief Extra options for @ref /// tutorial22::field::TlvPropMembers::AnyMembers::Val /// field. - using Val = comms::option::EmptyOption; + using Val = comms::option::app::EmptyOption; }; // struct AnyMembers }; // struct TlvPropMembers }; // struct field @@ -53,7 +53,7 @@ struct DefaultOptionsT : public TBase /// @brief Extra options for @ref /// tutorial22::message::Msg1Fields::F1 /// field. - using F1 = comms::option::EmptyOption; + using F1 = comms::option::app::EmptyOption; }; }; // struct message @@ -65,14 +65,16 @@ struct DefaultOptionsT : public TBase struct FrameLayers { /// @brief Extra options for @ref - /// tutorial22::frame::FrameLayers::Data - /// layer. - using Data = comms::option::EmptyOption; + /// tutorial22::frame::FrameLayers::DataMembers::Field field. + struct DataMembers + { + using Field = comms::option::app::EmptyOption; + }; // struct DataMembers /// @brief Extra options for @ref /// tutorial22::frame::FrameLayers::Id /// layer. - using Id = comms::option::EmptyOption; + using Id = comms::option::app::EmptyOption; }; // struct FrameLayers }; // struct frame }; diff --git a/tutorials/tutorial22/include/tutorial22/options/ServerDefaultOptions.h b/tutorials/tutorial22/include/tutorial22/options/ServerDefaultOptions.h index 1a0d9e08..e3923c42 100644 --- a/tutorials/tutorial22/include/tutorial22/options/ServerDefaultOptions.h +++ b/tutorials/tutorial22/include/tutorial22/options/ServerDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server default options. diff --git a/tutorials/tutorial22/include/tutorial22/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial22/include/tutorial22/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h index dc574e0b..e5292922 100644 --- a/tutorials/tutorial22/include/tutorial22/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial22/include/tutorial22/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server input messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial23/include/t23_ext/Version.h b/tutorials/tutorial23/include/t23_ext/Version.h index 2b8ddfaa..0881b436 100644 --- a/tutorials/tutorial23/include/t23_ext/Version.h +++ b/tutorials/tutorial23/include/t23_ext/Version.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains protocol version definition. @@ -22,5 +22,5 @@ inline constexpr unsigned specVersion() } // namespace t23_ext // Generated compile time check for minimal supported version of the COMMS library -static_assert(COMMS_MAKE_VERSION(5, 2, 7) <= comms::version(), +static_assert(COMMS_MAKE_VERSION(5, 3, 0) <= comms::version(), "The version of COMMS library is too old"); diff --git a/tutorials/tutorial23/include/t23_ext/field/FieldBase.h b/tutorials/tutorial23/include/t23_ext/field/FieldBase.h index bb0fbd81..f61f7b2d 100644 --- a/tutorials/tutorial23/include/t23_ext/field/FieldBase.h +++ b/tutorials/tutorial23/include/t23_ext/field/FieldBase.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of base class of all the fields. diff --git a/tutorials/tutorial23/include/t23_ext/ns1/field/I1.h b/tutorials/tutorial23/include/t23_ext/ns1/field/I1.h index b2ab4bfc..16d43793 100644 --- a/tutorials/tutorial23/include/t23_ext/ns1/field/I1.h +++ b/tutorials/tutorial23/include/t23_ext/ns1/field/I1.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "I1" field. @@ -29,14 +29,16 @@ class I1 : public comms::field::IntValue< t23_ext::field::FieldBase<>, std::uint16_t, - TExtraOpts... + TExtraOpts..., + comms::option::def::HasName > { using Base = comms::field::IntValue< t23_ext::field::FieldBase<>, std::uint16_t, - TExtraOpts... + TExtraOpts..., + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/tutorials/tutorial23/include/t23_ext/ns1/field/I1Common.h b/tutorials/tutorial23/include/t23_ext/ns1/field/I1Common.h index 64e9569e..97fea9ae 100644 --- a/tutorials/tutorial23/include/t23_ext/ns1/field/I1Common.h +++ b/tutorials/tutorial23/include/t23_ext/ns1/field/I1Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial23/include/t23_ext/ns1/field/S1.h b/tutorials/tutorial23/include/t23_ext/ns1/field/S1.h index 0d8eb485..a4d9950c 100644 --- a/tutorials/tutorial23/include/t23_ext/ns1/field/S1.h +++ b/tutorials/tutorial23/include/t23_ext/ns1/field/S1.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "S1" field. @@ -32,13 +32,15 @@ struct S1Members class LengthPrefix : public comms::field::IntValue< t23_ext::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< t23_ext::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -67,6 +69,7 @@ class S1 : public t23_ext::field::FieldBase<>, TExtraOpts..., typename TOpt::t23_ext::ns1::field::S1, + comms::option::def::HasName, comms::option::def::SequenceSerLengthFieldPrefix::LengthPrefix> > { @@ -75,6 +78,7 @@ class S1 : public t23_ext::field::FieldBase<>, TExtraOpts..., typename TOpt::t23_ext::ns1::field::S1, + comms::option::def::HasName, comms::option::def::SequenceSerLengthFieldPrefix::LengthPrefix> >; public: diff --git a/tutorials/tutorial23/include/t23_ext/ns1/field/S1Common.h b/tutorials/tutorial23/include/t23_ext/ns1/field/S1Common.h index 69eab909..3e267425 100644 --- a/tutorials/tutorial23/include/t23_ext/ns1/field/S1Common.h +++ b/tutorials/tutorial23/include/t23_ext/ns1/field/S1Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial23/include/t23_ext/options/BareMetalDefaultOptions.h b/tutorials/tutorial23/include/t23_ext/options/BareMetalDefaultOptions.h index e9d35291..d67d47e6 100644 --- a/tutorials/tutorial23/include/t23_ext/options/BareMetalDefaultOptions.h +++ b/tutorials/tutorial23/include/t23_ext/options/BareMetalDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol bare metal default options. diff --git a/tutorials/tutorial23/include/t23_ext/options/ClientDefaultOptions.h b/tutorials/tutorial23/include/t23_ext/options/ClientDefaultOptions.h index b2863d4c..d46a4312 100644 --- a/tutorials/tutorial23/include/t23_ext/options/ClientDefaultOptions.h +++ b/tutorials/tutorial23/include/t23_ext/options/ClientDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client default options. diff --git a/tutorials/tutorial23/include/t23_ext/options/DataViewDefaultOptions.h b/tutorials/tutorial23/include/t23_ext/options/DataViewDefaultOptions.h index 51296a97..c7ec0630 100644 --- a/tutorials/tutorial23/include/t23_ext/options/DataViewDefaultOptions.h +++ b/tutorials/tutorial23/include/t23_ext/options/DataViewDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol data view default options. diff --git a/tutorials/tutorial23/include/t23_ext/options/DefaultOptions.h b/tutorials/tutorial23/include/t23_ext/options/DefaultOptions.h index 83227c7b..8233e05c 100644 --- a/tutorials/tutorial23/include/t23_ext/options/DefaultOptions.h +++ b/tutorials/tutorial23/include/t23_ext/options/DefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol default options. @@ -30,7 +30,7 @@ struct DefaultOptionsT : public TBase { /// @brief Extra options for @ref /// t23_ext::ns1::field::S1 field. - using S1 = comms::option::EmptyOption; + using S1 = comms::option::app::EmptyOption; }; // struct field }; // struct ns1 }; // struct t23_ext diff --git a/tutorials/tutorial23/include/t23_ext/options/ServerDefaultOptions.h b/tutorials/tutorial23/include/t23_ext/options/ServerDefaultOptions.h index 3d549bee..c25795f7 100644 --- a/tutorials/tutorial23/include/t23_ext/options/ServerDefaultOptions.h +++ b/tutorials/tutorial23/include/t23_ext/options/ServerDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server default options. diff --git a/tutorials/tutorial23/include/tutorial23/Message.h b/tutorials/tutorial23/include/tutorial23/Message.h index 16df1c62..8ee2b4e8 100644 --- a/tutorials/tutorial23/include/tutorial23/Message.h +++ b/tutorials/tutorial23/include/tutorial23/Message.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message" interface class. diff --git a/tutorials/tutorial23/include/tutorial23/MsgId.h b/tutorials/tutorial23/include/tutorial23/MsgId.h index f7be3570..296037c6 100644 --- a/tutorials/tutorial23/include/tutorial23/MsgId.h +++ b/tutorials/tutorial23/include/tutorial23/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of message ids enumeration. diff --git a/tutorials/tutorial23/include/tutorial23/Version.h b/tutorials/tutorial23/include/tutorial23/Version.h index 7fce219a..bd9064cf 100644 --- a/tutorials/tutorial23/include/tutorial23/Version.h +++ b/tutorials/tutorial23/include/tutorial23/Version.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains protocol version definition. @@ -22,5 +22,5 @@ inline constexpr unsigned specVersion() } // namespace tutorial23 // Generated compile time check for minimal supported version of the COMMS library -static_assert(COMMS_MAKE_VERSION(5, 2, 7) <= comms::version(), +static_assert(COMMS_MAKE_VERSION(5, 3, 0) <= comms::version(), "The version of COMMS library is too old"); diff --git a/tutorials/tutorial23/include/tutorial23/dispatch/DispatchClientInputMessage.h b/tutorials/tutorial23/include/tutorial23/dispatch/DispatchClientInputMessage.h index cef3ba0c..41a2e58e 100644 --- a/tutorials/tutorial23/include/tutorial23/dispatch/DispatchClientInputMessage.h +++ b/tutorials/tutorial23/include/tutorial23/dispatch/DispatchClientInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/tutorials/tutorial23/include/tutorial23/dispatch/DispatchMessage.h b/tutorials/tutorial23/include/tutorial23/dispatch/DispatchMessage.h index cad594b1..db0f6270 100644 --- a/tutorials/tutorial23/include/tutorial23/dispatch/DispatchMessage.h +++ b/tutorials/tutorial23/include/tutorial23/dispatch/DispatchMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for all input messages. diff --git a/tutorials/tutorial23/include/tutorial23/dispatch/DispatchServerInputMessage.h b/tutorials/tutorial23/include/tutorial23/dispatch/DispatchServerInputMessage.h index da012675..b0561fa5 100644 --- a/tutorials/tutorial23/include/tutorial23/dispatch/DispatchServerInputMessage.h +++ b/tutorials/tutorial23/include/tutorial23/dispatch/DispatchServerInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/tutorials/tutorial23/include/tutorial23/factory/AllMessagesDynMemMsgFactory.h b/tutorials/tutorial23/include/tutorial23/factory/AllMessagesDynMemMsgFactory.h index a2f29f8b..0469d590 100644 --- a/tutorials/tutorial23/include/tutorial23/factory/AllMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial23/include/tutorial23/factory/AllMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for all the messages. diff --git a/tutorials/tutorial23/include/tutorial23/factory/ClientInputMessagesDynMemMsgFactory.h b/tutorials/tutorial23/include/tutorial23/factory/ClientInputMessagesDynMemMsgFactory.h index 59977d3a..d201e037 100644 --- a/tutorials/tutorial23/include/tutorial23/factory/ClientInputMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial23/include/tutorial23/factory/ClientInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the client input messages. diff --git a/tutorials/tutorial23/include/tutorial23/factory/ServerInputMessagesDynMemMsgFactory.h b/tutorials/tutorial23/include/tutorial23/factory/ServerInputMessagesDynMemMsgFactory.h index 3abb601d..206d71f3 100644 --- a/tutorials/tutorial23/include/tutorial23/factory/ServerInputMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial23/include/tutorial23/factory/ServerInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the server input messages. diff --git a/tutorials/tutorial23/include/tutorial23/field/FieldBase.h b/tutorials/tutorial23/include/tutorial23/field/FieldBase.h index 43f9a4b1..17eee23f 100644 --- a/tutorials/tutorial23/include/tutorial23/field/FieldBase.h +++ b/tutorials/tutorial23/include/tutorial23/field/FieldBase.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of base class of all the fields. diff --git a/tutorials/tutorial23/include/tutorial23/field/I1.h b/tutorials/tutorial23/include/tutorial23/field/I1.h index f2587df3..382d8840 100644 --- a/tutorials/tutorial23/include/tutorial23/field/I1.h +++ b/tutorials/tutorial23/include/tutorial23/field/I1.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "I1" field. @@ -24,7 +24,8 @@ template ; } // namespace field diff --git a/tutorials/tutorial23/include/tutorial23/field/I1Common.h b/tutorials/tutorial23/include/tutorial23/field/I1Common.h index b4e3489c..14dc56bd 100644 --- a/tutorials/tutorial23/include/tutorial23/field/I1Common.h +++ b/tutorials/tutorial23/include/tutorial23/field/I1Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial23/include/tutorial23/field/Length.h b/tutorials/tutorial23/include/tutorial23/field/Length.h index f34b20c0..22642de7 100644 --- a/tutorials/tutorial23/include/tutorial23/field/Length.h +++ b/tutorials/tutorial23/include/tutorial23/field/Length.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Length" field. @@ -31,13 +31,15 @@ struct LengthMembers class Short : public comms::field::IntValue< tutorial23::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial23::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -97,13 +99,15 @@ struct LengthMembers class ActLong : public comms::field::IntValue< tutorial23::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial23::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -127,12 +131,14 @@ struct LengthMembers class Long : public comms::field::Optional< typename LongMembers::ActLong, + comms::option::def::HasName, comms::option::def::MissingByDefault > { using Base = comms::field::Optional< typename LongMembers::ActLong, + comms::option::def::HasName, comms::option::def::MissingByDefault >; public: @@ -160,6 +166,7 @@ class Length : public tutorial23::field::FieldBase<>, typename LengthMembers::All, TExtraOpts..., + comms::option::def::HasName, comms::option::def::HasCustomRead, comms::option::def::HasCustomRefresh, comms::option::def::HasVersionDependentMembers @@ -170,6 +177,7 @@ class Length : public tutorial23::field::FieldBase<>, typename LengthMembers::All, TExtraOpts..., + comms::option::def::HasName, comms::option::def::HasCustomRead, comms::option::def::HasCustomRefresh, comms::option::def::HasVersionDependentMembers diff --git a/tutorials/tutorial23/include/tutorial23/field/LengthCommon.h b/tutorials/tutorial23/include/tutorial23/field/LengthCommon.h index 5578e855..56995997 100644 --- a/tutorials/tutorial23/include/tutorial23/field/LengthCommon.h +++ b/tutorials/tutorial23/include/tutorial23/field/LengthCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial23/include/tutorial23/field/MsgId.h b/tutorials/tutorial23/include/tutorial23/field/MsgId.h index b09b098a..a02496fb 100644 --- a/tutorials/tutorial23/include/tutorial23/field/MsgId.h +++ b/tutorials/tutorial23/include/tutorial23/field/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "MsgId" field. @@ -27,6 +27,7 @@ class MsgId : public tutorial23::field::FieldBase<>, tutorial23::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 3> > { @@ -35,6 +36,7 @@ class MsgId : public tutorial23::field::FieldBase<>, tutorial23::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 3> >; public: diff --git a/tutorials/tutorial23/include/tutorial23/field/MsgIdCommon.h b/tutorials/tutorial23/include/tutorial23/field/MsgIdCommon.h index 1481d985..3d98b21a 100644 --- a/tutorials/tutorial23/include/tutorial23/field/MsgIdCommon.h +++ b/tutorials/tutorial23/include/tutorial23/field/MsgIdCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial23/include/tutorial23/frame/Frame.h b/tutorials/tutorial23/include/tutorial23/frame/Frame.h index eff9d033..ef9fcb05 100644 --- a/tutorials/tutorial23/include/tutorial23/frame/Frame.h +++ b/tutorials/tutorial23/include/tutorial23/frame/Frame.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Frame" frame class. @@ -32,10 +32,30 @@ namespace frame template struct FrameLayers { + /// @brief Scope for field(s) of @ref Data layer. + struct DataMembers + { + /// @brief Custom field for @ref tutorial23::frame::FrameLayers::Data layer + class Field : public + comms::field::ArrayList< + tutorial23::field::FieldBase<>, + std::uint8_t, + typename TOpt::tutorial23::frame::FrameLayers::DataMembers::Field, + comms::option::def::HasName + > + { + public: + static const char* name() + { + return "Data"; + } + }; + }; + /// @brief Definition of layer "Data". using Data = comms::protocol::MsgDataLayer< - typename TOpt::tutorial23::frame::FrameLayers::Data + comms::option::def::FieldType >; /// @brief Definition of layer "Id". @@ -69,6 +89,7 @@ struct FrameLayers comms::field::IntValue< tutorial23::field::FieldBase<>, std::uint16_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid, comms::option::def::DefaultNumValue<43996L> > @@ -77,6 +98,7 @@ struct FrameLayers comms::field::IntValue< tutorial23::field::FieldBase<>, std::uint16_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid, comms::option::def::DefaultNumValue<43996L> >; diff --git a/tutorials/tutorial23/include/tutorial23/frame/FrameCommon.h b/tutorials/tutorial23/include/tutorial23/frame/FrameCommon.h index 5acfc9ee..bfb0f5c3 100644 --- a/tutorials/tutorial23/include/tutorial23/frame/FrameCommon.h +++ b/tutorials/tutorial23/include/tutorial23/frame/FrameCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial23/include/tutorial23/input/AllMessages.h b/tutorials/tutorial23/include/tutorial23/input/AllMessages.h index 66c0eb77..b2b4cad3 100644 --- a/tutorials/tutorial23/include/tutorial23/input/AllMessages.h +++ b/tutorials/tutorial23/include/tutorial23/input/AllMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the AllMessages messages bundle. diff --git a/tutorials/tutorial23/include/tutorial23/input/ClientInputMessages.h b/tutorials/tutorial23/include/tutorial23/input/ClientInputMessages.h index bde8786a..cf53e1d5 100644 --- a/tutorials/tutorial23/include/tutorial23/input/ClientInputMessages.h +++ b/tutorials/tutorial23/include/tutorial23/input/ClientInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ClientInputMessages messages bundle. diff --git a/tutorials/tutorial23/include/tutorial23/input/ServerInputMessages.h b/tutorials/tutorial23/include/tutorial23/input/ServerInputMessages.h index 77cf65c3..0aea752f 100644 --- a/tutorials/tutorial23/include/tutorial23/input/ServerInputMessages.h +++ b/tutorials/tutorial23/include/tutorial23/input/ServerInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ServerInputMessages messages bundle. diff --git a/tutorials/tutorial23/include/tutorial23/message/Msg1.h b/tutorials/tutorial23/include/tutorial23/message/Msg1.h index 7f1a2234..4eb91bf4 100644 --- a/tutorials/tutorial23/include/tutorial23/message/Msg1.h +++ b/tutorials/tutorial23/include/tutorial23/message/Msg1.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 1" message and its fields. @@ -31,12 +31,14 @@ struct Msg1Fields /// @brief Definition of "F1" field. class F1 : public tutorial23::field::I1< - TOpt + TOpt, + comms::option::def::HasName > { using Base = tutorial23::field::I1< - TOpt + TOpt, + comms::option::def::HasName >; public: /// @brief Name of the field. @@ -50,13 +52,15 @@ struct Msg1Fields class F2 : public t23_ext::ns1::field::S1< TOpt, - typename TOpt::tutorial23::message::Msg1Fields::F2 + typename TOpt::tutorial23::message::Msg1Fields::F2, + comms::option::def::HasName > { using Base = t23_ext::ns1::field::S1< TOpt, - typename TOpt::tutorial23::message::Msg1Fields::F2 + typename TOpt::tutorial23::message::Msg1Fields::F2, + comms::option::def::HasName >; public: /// @brief Name of the field. diff --git a/tutorials/tutorial23/include/tutorial23/message/Msg1Common.h b/tutorials/tutorial23/include/tutorial23/message/Msg1Common.h index ae1b3284..d5286521 100644 --- a/tutorials/tutorial23/include/tutorial23/message/Msg1Common.h +++ b/tutorials/tutorial23/include/tutorial23/message/Msg1Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial23/include/tutorial23/options/AllMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial23/include/tutorial23/options/AllMessagesDynMemMsgFactoryDefaultOptions.h index 35c02142..9a0132f4 100644 --- a/tutorials/tutorial23/include/tutorial23/options/AllMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial23/include/tutorial23/options/AllMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol all messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial23/include/tutorial23/options/BareMetalDefaultOptions.h b/tutorials/tutorial23/include/tutorial23/options/BareMetalDefaultOptions.h index 45c538c1..15bedc47 100644 --- a/tutorials/tutorial23/include/tutorial23/options/BareMetalDefaultOptions.h +++ b/tutorials/tutorial23/include/tutorial23/options/BareMetalDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol bare metal default options. @@ -33,13 +33,15 @@ struct BareMetalDefaultOptionsT : public TBase struct FrameLayers : public TBase::tutorial23::frame::FrameLayers { /// @brief Extra options for @ref - /// tutorial23::frame::FrameLayers::Data - /// layer. - using Data = - std::tuple< - comms::option::app::FixedSizeStorage, - typename TBase::tutorial23::frame::FrameLayers::Data - >; + /// tutorial23::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::FixedSizeStorage, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers /// @brief Extra options for @ref /// tutorial23::frame::FrameLayers::Id diff --git a/tutorials/tutorial23/include/tutorial23/options/ClientDefaultOptions.h b/tutorials/tutorial23/include/tutorial23/options/ClientDefaultOptions.h index f7866ab1..d6188d35 100644 --- a/tutorials/tutorial23/include/tutorial23/options/ClientDefaultOptions.h +++ b/tutorials/tutorial23/include/tutorial23/options/ClientDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client default options. diff --git a/tutorials/tutorial23/include/tutorial23/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial23/include/tutorial23/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h index 3a3a4d15..4a1236c4 100644 --- a/tutorials/tutorial23/include/tutorial23/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial23/include/tutorial23/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client input messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial23/include/tutorial23/options/DataViewDefaultOptions.h b/tutorials/tutorial23/include/tutorial23/options/DataViewDefaultOptions.h index 07b5a139..7532cf0b 100644 --- a/tutorials/tutorial23/include/tutorial23/options/DataViewDefaultOptions.h +++ b/tutorials/tutorial23/include/tutorial23/options/DataViewDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol data view default options. @@ -27,13 +27,15 @@ struct DataViewDefaultOptionsT : public TBase struct FrameLayers : public TBase::tutorial23::frame::FrameLayers { /// @brief Extra options for @ref - /// tutorial23::frame::FrameLayers::Data - /// layer. - using Data = - std::tuple< - comms::option::app::OrigDataView, - typename TBase::tutorial23::frame::FrameLayers::Data - >; + /// tutorial23::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::OrigDataView, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers }; // struct FrameLayers }; // struct frame }; // struct tutorial23 diff --git a/tutorials/tutorial23/include/tutorial23/options/DefaultOptions.h b/tutorials/tutorial23/include/tutorial23/options/DefaultOptions.h index 228be121..243a5730 100644 --- a/tutorials/tutorial23/include/tutorial23/options/DefaultOptions.h +++ b/tutorials/tutorial23/include/tutorial23/options/DefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol default options. @@ -32,7 +32,7 @@ struct DefaultOptionsT : public TBase /// @brief Extra options for @ref /// tutorial23::message::Msg1Fields::F2 /// field. - using F2 = comms::option::EmptyOption; + using F2 = comms::option::app::EmptyOption; }; }; // struct message @@ -44,14 +44,16 @@ struct DefaultOptionsT : public TBase struct FrameLayers { /// @brief Extra options for @ref - /// tutorial23::frame::FrameLayers::Data - /// layer. - using Data = comms::option::EmptyOption; + /// tutorial23::frame::FrameLayers::DataMembers::Field field. + struct DataMembers + { + using Field = comms::option::app::EmptyOption; + }; // struct DataMembers /// @brief Extra options for @ref /// tutorial23::frame::FrameLayers::Id /// layer. - using Id = comms::option::EmptyOption; + using Id = comms::option::app::EmptyOption; }; // struct FrameLayers }; // struct frame }; // struct tutorial23 diff --git a/tutorials/tutorial23/include/tutorial23/options/ServerDefaultOptions.h b/tutorials/tutorial23/include/tutorial23/options/ServerDefaultOptions.h index b355f012..8041d0d7 100644 --- a/tutorials/tutorial23/include/tutorial23/options/ServerDefaultOptions.h +++ b/tutorials/tutorial23/include/tutorial23/options/ServerDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server default options. diff --git a/tutorials/tutorial23/include/tutorial23/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial23/include/tutorial23/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h index 75b6d219..30d748a0 100644 --- a/tutorials/tutorial23/include/tutorial23/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial23/include/tutorial23/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server input messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial24/include/tutorial24/Message.h b/tutorials/tutorial24/include/tutorial24/Message.h index 338601cd..bc5abefd 100644 --- a/tutorials/tutorial24/include/tutorial24/Message.h +++ b/tutorials/tutorial24/include/tutorial24/Message.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message" interface class. diff --git a/tutorials/tutorial24/include/tutorial24/MsgId.h b/tutorials/tutorial24/include/tutorial24/MsgId.h index 38c3536e..f9394b83 100644 --- a/tutorials/tutorial24/include/tutorial24/MsgId.h +++ b/tutorials/tutorial24/include/tutorial24/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of message ids enumeration. diff --git a/tutorials/tutorial24/include/tutorial24/Version.h b/tutorials/tutorial24/include/tutorial24/Version.h index 29db0d34..aa84881f 100644 --- a/tutorials/tutorial24/include/tutorial24/Version.h +++ b/tutorials/tutorial24/include/tutorial24/Version.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains protocol version definition. @@ -22,5 +22,5 @@ inline constexpr unsigned specVersion() } // namespace tutorial24 // Generated compile time check for minimal supported version of the COMMS library -static_assert(COMMS_MAKE_VERSION(5, 2, 7) <= comms::version(), +static_assert(COMMS_MAKE_VERSION(5, 3, 0) <= comms::version(), "The version of COMMS library is too old"); diff --git a/tutorials/tutorial24/include/tutorial24/dispatch/DispatchClientInputMessage.h b/tutorials/tutorial24/include/tutorial24/dispatch/DispatchClientInputMessage.h index d2915627..a370a662 100644 --- a/tutorials/tutorial24/include/tutorial24/dispatch/DispatchClientInputMessage.h +++ b/tutorials/tutorial24/include/tutorial24/dispatch/DispatchClientInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/tutorials/tutorial24/include/tutorial24/dispatch/DispatchMessage.h b/tutorials/tutorial24/include/tutorial24/dispatch/DispatchMessage.h index 18320368..a6ed35aa 100644 --- a/tutorials/tutorial24/include/tutorial24/dispatch/DispatchMessage.h +++ b/tutorials/tutorial24/include/tutorial24/dispatch/DispatchMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for all input messages. diff --git a/tutorials/tutorial24/include/tutorial24/dispatch/DispatchServerInputMessage.h b/tutorials/tutorial24/include/tutorial24/dispatch/DispatchServerInputMessage.h index dfcbe351..7c9ab548 100644 --- a/tutorials/tutorial24/include/tutorial24/dispatch/DispatchServerInputMessage.h +++ b/tutorials/tutorial24/include/tutorial24/dispatch/DispatchServerInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/tutorials/tutorial24/include/tutorial24/factory/AllMessagesDynMemMsgFactory.h b/tutorials/tutorial24/include/tutorial24/factory/AllMessagesDynMemMsgFactory.h index 33bd2e40..17ce7b68 100644 --- a/tutorials/tutorial24/include/tutorial24/factory/AllMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial24/include/tutorial24/factory/AllMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for all the messages. diff --git a/tutorials/tutorial24/include/tutorial24/factory/ClientInputMessagesDynMemMsgFactory.h b/tutorials/tutorial24/include/tutorial24/factory/ClientInputMessagesDynMemMsgFactory.h index 996c324a..e131cbed 100644 --- a/tutorials/tutorial24/include/tutorial24/factory/ClientInputMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial24/include/tutorial24/factory/ClientInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the client input messages. diff --git a/tutorials/tutorial24/include/tutorial24/factory/ServerInputMessagesDynMemMsgFactory.h b/tutorials/tutorial24/include/tutorial24/factory/ServerInputMessagesDynMemMsgFactory.h index 1f2a20df..2b7628d3 100644 --- a/tutorials/tutorial24/include/tutorial24/factory/ServerInputMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial24/include/tutorial24/factory/ServerInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the server input messages. diff --git a/tutorials/tutorial24/include/tutorial24/field/FieldBase.h b/tutorials/tutorial24/include/tutorial24/field/FieldBase.h index ae3758c5..843155e6 100644 --- a/tutorials/tutorial24/include/tutorial24/field/FieldBase.h +++ b/tutorials/tutorial24/include/tutorial24/field/FieldBase.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of base class of all the fields. diff --git a/tutorials/tutorial24/include/tutorial24/field/MsgId.h b/tutorials/tutorial24/include/tutorial24/field/MsgId.h index d6691498..c6fe8d8d 100644 --- a/tutorials/tutorial24/include/tutorial24/field/MsgId.h +++ b/tutorials/tutorial24/include/tutorial24/field/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "MsgId" field. @@ -27,6 +27,7 @@ class MsgId : public tutorial24::field::FieldBase<>, tutorial24::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 2> > { @@ -35,6 +36,7 @@ class MsgId : public tutorial24::field::FieldBase<>, tutorial24::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 2> >; public: diff --git a/tutorials/tutorial24/include/tutorial24/field/MsgIdCommon.h b/tutorials/tutorial24/include/tutorial24/field/MsgIdCommon.h index 052a2e65..71515d5b 100644 --- a/tutorials/tutorial24/include/tutorial24/field/MsgIdCommon.h +++ b/tutorials/tutorial24/include/tutorial24/field/MsgIdCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial24/include/tutorial24/frame/Frame.h b/tutorials/tutorial24/include/tutorial24/frame/Frame.h index 6fbd350a..e1308510 100644 --- a/tutorials/tutorial24/include/tutorial24/frame/Frame.h +++ b/tutorials/tutorial24/include/tutorial24/frame/Frame.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Frame" frame class. @@ -30,10 +30,30 @@ namespace frame template struct FrameLayers { + /// @brief Scope for field(s) of @ref Data layer. + struct DataMembers + { + /// @brief Custom field for @ref tutorial24::frame::FrameLayers::Data layer + class Field : public + comms::field::ArrayList< + tutorial24::field::FieldBase<>, + std::uint8_t, + typename TOpt::frame::FrameLayers::DataMembers::Field, + comms::option::def::HasName + > + { + public: + static const char* name() + { + return "Data"; + } + }; + }; + /// @brief Definition of layer "Data". using Data = comms::protocol::MsgDataLayer< - typename TOpt::frame::FrameLayers::Data + comms::option::def::FieldType >; /// @brief Definition of layer "Id". @@ -56,13 +76,15 @@ struct FrameLayers class SizeField : public comms::field::IntValue< tutorial24::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial24::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/tutorials/tutorial24/include/tutorial24/frame/FrameCommon.h b/tutorials/tutorial24/include/tutorial24/frame/FrameCommon.h index 1b2fbb21..f591ede7 100644 --- a/tutorials/tutorial24/include/tutorial24/frame/FrameCommon.h +++ b/tutorials/tutorial24/include/tutorial24/frame/FrameCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial24/include/tutorial24/input/AllMessages.h b/tutorials/tutorial24/include/tutorial24/input/AllMessages.h index 37b560a7..48e99951 100644 --- a/tutorials/tutorial24/include/tutorial24/input/AllMessages.h +++ b/tutorials/tutorial24/include/tutorial24/input/AllMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the AllMessages messages bundle. diff --git a/tutorials/tutorial24/include/tutorial24/input/ClientInputMessages.h b/tutorials/tutorial24/include/tutorial24/input/ClientInputMessages.h index 67c17f0b..01f0c5d1 100644 --- a/tutorials/tutorial24/include/tutorial24/input/ClientInputMessages.h +++ b/tutorials/tutorial24/include/tutorial24/input/ClientInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ClientInputMessages messages bundle. diff --git a/tutorials/tutorial24/include/tutorial24/input/ServerInputMessages.h b/tutorials/tutorial24/include/tutorial24/input/ServerInputMessages.h index a92da598..47980c42 100644 --- a/tutorials/tutorial24/include/tutorial24/input/ServerInputMessages.h +++ b/tutorials/tutorial24/include/tutorial24/input/ServerInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ServerInputMessages messages bundle. diff --git a/tutorials/tutorial24/include/tutorial24/message/Msg1.h b/tutorials/tutorial24/include/tutorial24/message/Msg1.h index 213131a4..430e0eb6 100644 --- a/tutorials/tutorial24/include/tutorial24/message/Msg1.h +++ b/tutorials/tutorial24/include/tutorial24/message/Msg1.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 1" message and its fields. @@ -32,13 +32,15 @@ struct Msg1Fields class F1 : public comms::field::IntValue< tutorial24::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial24::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -61,13 +63,15 @@ struct Msg1Fields class F2 : public comms::field::IntValue< tutorial24::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial24::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/tutorials/tutorial24/include/tutorial24/message/Msg1Common.h b/tutorials/tutorial24/include/tutorial24/message/Msg1Common.h index 0d2cea19..68623b9e 100644 --- a/tutorials/tutorial24/include/tutorial24/message/Msg1Common.h +++ b/tutorials/tutorial24/include/tutorial24/message/Msg1Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial24/include/tutorial24/message/Msg2.h b/tutorials/tutorial24/include/tutorial24/message/Msg2.h index 0104bec0..6f15085f 100644 --- a/tutorials/tutorial24/include/tutorial24/message/Msg2.h +++ b/tutorials/tutorial24/include/tutorial24/message/Msg2.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 2" message and its fields. @@ -33,6 +33,7 @@ struct Msg2Fields comms::field::IntValue< tutorial24::field::FieldBase<>, std::uint8_t, + comms::option::def::HasName, comms::option::def::ValidNumValueRange<0, 10> > { @@ -40,6 +41,7 @@ struct Msg2Fields comms::field::IntValue< tutorial24::field::FieldBase<>, std::uint8_t, + comms::option::def::HasName, comms::option::def::ValidNumValueRange<0, 10> >; public: @@ -64,6 +66,7 @@ struct Msg2Fields comms::field::IntValue< tutorial24::field::FieldBase<>, std::uint8_t, + comms::option::def::HasName, comms::option::def::ValidNumValueRange<10, 20> > { @@ -71,6 +74,7 @@ struct Msg2Fields comms::field::IntValue< tutorial24::field::FieldBase<>, std::uint8_t, + comms::option::def::HasName, comms::option::def::ValidNumValueRange<10, 20> >; public: diff --git a/tutorials/tutorial24/include/tutorial24/message/Msg2Common.h b/tutorials/tutorial24/include/tutorial24/message/Msg2Common.h index aaacafc3..022900b5 100644 --- a/tutorials/tutorial24/include/tutorial24/message/Msg2Common.h +++ b/tutorials/tutorial24/include/tutorial24/message/Msg2Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial24/include/tutorial24/options/AllMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial24/include/tutorial24/options/AllMessagesDynMemMsgFactoryDefaultOptions.h index 152f7214..cad456dd 100644 --- a/tutorials/tutorial24/include/tutorial24/options/AllMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial24/include/tutorial24/options/AllMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol all messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial24/include/tutorial24/options/BareMetalDefaultOptions.h b/tutorials/tutorial24/include/tutorial24/options/BareMetalDefaultOptions.h index 219ad972..576bdb55 100644 --- a/tutorials/tutorial24/include/tutorial24/options/BareMetalDefaultOptions.h +++ b/tutorials/tutorial24/include/tutorial24/options/BareMetalDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol bare metal default options. @@ -31,13 +31,15 @@ struct BareMetalDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// tutorial24::frame::FrameLayers::Data - /// layer. - using Data = - std::tuple< - comms::option::app::FixedSizeStorage, - typename TBase::frame::FrameLayers::Data - >; + /// tutorial24::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::FixedSizeStorage, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers /// @brief Extra options for @ref /// tutorial24::frame::FrameLayers::Id diff --git a/tutorials/tutorial24/include/tutorial24/options/ClientDefaultOptions.h b/tutorials/tutorial24/include/tutorial24/options/ClientDefaultOptions.h index 6584d406..233e66ed 100644 --- a/tutorials/tutorial24/include/tutorial24/options/ClientDefaultOptions.h +++ b/tutorials/tutorial24/include/tutorial24/options/ClientDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client default options. diff --git a/tutorials/tutorial24/include/tutorial24/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial24/include/tutorial24/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h index faf5d896..147caf8e 100644 --- a/tutorials/tutorial24/include/tutorial24/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial24/include/tutorial24/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client input messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial24/include/tutorial24/options/DataViewDefaultOptions.h b/tutorials/tutorial24/include/tutorial24/options/DataViewDefaultOptions.h index fdcdec6d..e70eb3f0 100644 --- a/tutorials/tutorial24/include/tutorial24/options/DataViewDefaultOptions.h +++ b/tutorials/tutorial24/include/tutorial24/options/DataViewDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol data view default options. @@ -25,13 +25,15 @@ struct DataViewDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// tutorial24::frame::FrameLayers::Data - /// layer. - using Data = - std::tuple< - comms::option::app::OrigDataView, - typename TBase::frame::FrameLayers::Data - >; + /// tutorial24::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::OrigDataView, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers }; // struct FrameLayers }; // struct frame }; diff --git a/tutorials/tutorial24/include/tutorial24/options/DefaultOptions.h b/tutorials/tutorial24/include/tutorial24/options/DefaultOptions.h index eee29f11..e3161cbb 100644 --- a/tutorials/tutorial24/include/tutorial24/options/DefaultOptions.h +++ b/tutorials/tutorial24/include/tutorial24/options/DefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol default options. @@ -28,14 +28,16 @@ struct DefaultOptionsT : public TBase struct FrameLayers { /// @brief Extra options for @ref - /// tutorial24::frame::FrameLayers::Data - /// layer. - using Data = comms::option::EmptyOption; + /// tutorial24::frame::FrameLayers::DataMembers::Field field. + struct DataMembers + { + using Field = comms::option::app::EmptyOption; + }; // struct DataMembers /// @brief Extra options for @ref /// tutorial24::frame::FrameLayers::Id /// layer. - using Id = comms::option::EmptyOption; + using Id = comms::option::app::EmptyOption; }; // struct FrameLayers }; // struct frame }; diff --git a/tutorials/tutorial24/include/tutorial24/options/ServerDefaultOptions.h b/tutorials/tutorial24/include/tutorial24/options/ServerDefaultOptions.h index 770e2ea5..72958fc0 100644 --- a/tutorials/tutorial24/include/tutorial24/options/ServerDefaultOptions.h +++ b/tutorials/tutorial24/include/tutorial24/options/ServerDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server default options. diff --git a/tutorials/tutorial24/include/tutorial24/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial24/include/tutorial24/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h index 78999bd0..70d7d474 100644 --- a/tutorials/tutorial24/include/tutorial24/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial24/include/tutorial24/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server input messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial25/include/tutorial25/Message.h b/tutorials/tutorial25/include/tutorial25/Message.h index e3aa4c46..f173062b 100644 --- a/tutorials/tutorial25/include/tutorial25/Message.h +++ b/tutorials/tutorial25/include/tutorial25/Message.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message" interface class. diff --git a/tutorials/tutorial25/include/tutorial25/MsgId.h b/tutorials/tutorial25/include/tutorial25/MsgId.h index f4b791e2..3db8c55d 100644 --- a/tutorials/tutorial25/include/tutorial25/MsgId.h +++ b/tutorials/tutorial25/include/tutorial25/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of message ids enumeration. diff --git a/tutorials/tutorial25/include/tutorial25/Version.h b/tutorials/tutorial25/include/tutorial25/Version.h index 6e068266..836fcd8f 100644 --- a/tutorials/tutorial25/include/tutorial25/Version.h +++ b/tutorials/tutorial25/include/tutorial25/Version.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains protocol version definition. @@ -22,5 +22,5 @@ inline constexpr unsigned specVersion() } // namespace tutorial25 // Generated compile time check for minimal supported version of the COMMS library -static_assert(COMMS_MAKE_VERSION(5, 2, 7) <= comms::version(), +static_assert(COMMS_MAKE_VERSION(5, 3, 0) <= comms::version(), "The version of COMMS library is too old"); diff --git a/tutorials/tutorial25/include/tutorial25/dispatch/DispatchClientInputMessage.h b/tutorials/tutorial25/include/tutorial25/dispatch/DispatchClientInputMessage.h index 8458fcac..aaf0abd0 100644 --- a/tutorials/tutorial25/include/tutorial25/dispatch/DispatchClientInputMessage.h +++ b/tutorials/tutorial25/include/tutorial25/dispatch/DispatchClientInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/tutorials/tutorial25/include/tutorial25/dispatch/DispatchMessage.h b/tutorials/tutorial25/include/tutorial25/dispatch/DispatchMessage.h index 5dde2583..ea6aee01 100644 --- a/tutorials/tutorial25/include/tutorial25/dispatch/DispatchMessage.h +++ b/tutorials/tutorial25/include/tutorial25/dispatch/DispatchMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for all input messages. diff --git a/tutorials/tutorial25/include/tutorial25/dispatch/DispatchServerInputMessage.h b/tutorials/tutorial25/include/tutorial25/dispatch/DispatchServerInputMessage.h index 406458b0..7036b228 100644 --- a/tutorials/tutorial25/include/tutorial25/dispatch/DispatchServerInputMessage.h +++ b/tutorials/tutorial25/include/tutorial25/dispatch/DispatchServerInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/tutorials/tutorial25/include/tutorial25/factory/AllMessagesDynMemMsgFactory.h b/tutorials/tutorial25/include/tutorial25/factory/AllMessagesDynMemMsgFactory.h index 6f06ed08..991e44d0 100644 --- a/tutorials/tutorial25/include/tutorial25/factory/AllMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial25/include/tutorial25/factory/AllMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for all the messages. diff --git a/tutorials/tutorial25/include/tutorial25/factory/ClientInputMessagesDynMemMsgFactory.h b/tutorials/tutorial25/include/tutorial25/factory/ClientInputMessagesDynMemMsgFactory.h index 5185c56a..491ba621 100644 --- a/tutorials/tutorial25/include/tutorial25/factory/ClientInputMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial25/include/tutorial25/factory/ClientInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the client input messages. diff --git a/tutorials/tutorial25/include/tutorial25/factory/ServerInputMessagesDynMemMsgFactory.h b/tutorials/tutorial25/include/tutorial25/factory/ServerInputMessagesDynMemMsgFactory.h index 2506916f..9a355522 100644 --- a/tutorials/tutorial25/include/tutorial25/factory/ServerInputMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial25/include/tutorial25/factory/ServerInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the server input messages. diff --git a/tutorials/tutorial25/include/tutorial25/field/FieldBase.h b/tutorials/tutorial25/include/tutorial25/field/FieldBase.h index 2baec60f..37783a31 100644 --- a/tutorials/tutorial25/include/tutorial25/field/FieldBase.h +++ b/tutorials/tutorial25/include/tutorial25/field/FieldBase.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of base class of all the fields. diff --git a/tutorials/tutorial25/include/tutorial25/field/MsgId.h b/tutorials/tutorial25/include/tutorial25/field/MsgId.h index 060a942c..73db74f3 100644 --- a/tutorials/tutorial25/include/tutorial25/field/MsgId.h +++ b/tutorials/tutorial25/include/tutorial25/field/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "MsgId" field. @@ -27,6 +27,7 @@ class MsgId : public tutorial25::field::FieldBase<>, tutorial25::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 10> > { @@ -35,6 +36,7 @@ class MsgId : public tutorial25::field::FieldBase<>, tutorial25::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 10> >; public: diff --git a/tutorials/tutorial25/include/tutorial25/field/MsgIdCommon.h b/tutorials/tutorial25/include/tutorial25/field/MsgIdCommon.h index 7e03b7c1..9a8fe4e5 100644 --- a/tutorials/tutorial25/include/tutorial25/field/MsgIdCommon.h +++ b/tutorials/tutorial25/include/tutorial25/field/MsgIdCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial25/include/tutorial25/frame/Frame.h b/tutorials/tutorial25/include/tutorial25/frame/Frame.h index 55931462..d094f910 100644 --- a/tutorials/tutorial25/include/tutorial25/frame/Frame.h +++ b/tutorials/tutorial25/include/tutorial25/frame/Frame.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Frame" frame class. @@ -30,10 +30,30 @@ namespace frame template struct FrameLayers { + /// @brief Scope for field(s) of @ref Data layer. + struct DataMembers + { + /// @brief Custom field for @ref tutorial25::frame::FrameLayers::Data layer + class Field : public + comms::field::ArrayList< + tutorial25::field::FieldBase<>, + std::uint8_t, + typename TOpt::frame::FrameLayers::DataMembers::Field, + comms::option::def::HasName + > + { + public: + static const char* name() + { + return "Data"; + } + }; + }; + /// @brief Definition of layer "Data". using Data = comms::protocol::MsgDataLayer< - typename TOpt::frame::FrameLayers::Data + comms::option::def::FieldType >; /// @brief Definition of layer "Id". @@ -56,13 +76,15 @@ struct FrameLayers class SizeField : public comms::field::IntValue< tutorial25::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial25::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/tutorials/tutorial25/include/tutorial25/frame/FrameCommon.h b/tutorials/tutorial25/include/tutorial25/frame/FrameCommon.h index be2c3ca0..aa4126c5 100644 --- a/tutorials/tutorial25/include/tutorial25/frame/FrameCommon.h +++ b/tutorials/tutorial25/include/tutorial25/frame/FrameCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial25/include/tutorial25/input/AllMessages.h b/tutorials/tutorial25/include/tutorial25/input/AllMessages.h index a6fdaf23..1b9506ac 100644 --- a/tutorials/tutorial25/include/tutorial25/input/AllMessages.h +++ b/tutorials/tutorial25/include/tutorial25/input/AllMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the AllMessages messages bundle. diff --git a/tutorials/tutorial25/include/tutorial25/input/ClientInputMessages.h b/tutorials/tutorial25/include/tutorial25/input/ClientInputMessages.h index beb44ae6..98431ad9 100644 --- a/tutorials/tutorial25/include/tutorial25/input/ClientInputMessages.h +++ b/tutorials/tutorial25/include/tutorial25/input/ClientInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ClientInputMessages messages bundle. diff --git a/tutorials/tutorial25/include/tutorial25/input/ServerInputMessages.h b/tutorials/tutorial25/include/tutorial25/input/ServerInputMessages.h index e1923b4c..16808e66 100644 --- a/tutorials/tutorial25/include/tutorial25/input/ServerInputMessages.h +++ b/tutorials/tutorial25/include/tutorial25/input/ServerInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ServerInputMessages messages bundle. diff --git a/tutorials/tutorial25/include/tutorial25/message/Msg1.h b/tutorials/tutorial25/include/tutorial25/message/Msg1.h index 6a7af9f3..b0ffd173 100644 --- a/tutorials/tutorial25/include/tutorial25/message/Msg1.h +++ b/tutorials/tutorial25/include/tutorial25/message/Msg1.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 1" message and its fields. diff --git a/tutorials/tutorial25/include/tutorial25/message/Msg10.h b/tutorials/tutorial25/include/tutorial25/message/Msg10.h index 2fac2103..731f1061 100644 --- a/tutorials/tutorial25/include/tutorial25/message/Msg10.h +++ b/tutorials/tutorial25/include/tutorial25/message/Msg10.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 10" message and its fields. diff --git a/tutorials/tutorial25/include/tutorial25/message/Msg10Common.h b/tutorials/tutorial25/include/tutorial25/message/Msg10Common.h index 65693f2d..95a179e6 100644 --- a/tutorials/tutorial25/include/tutorial25/message/Msg10Common.h +++ b/tutorials/tutorial25/include/tutorial25/message/Msg10Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial25/include/tutorial25/message/Msg1Common.h b/tutorials/tutorial25/include/tutorial25/message/Msg1Common.h index 0288b654..98dc7f51 100644 --- a/tutorials/tutorial25/include/tutorial25/message/Msg1Common.h +++ b/tutorials/tutorial25/include/tutorial25/message/Msg1Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial25/include/tutorial25/message/Msg2.h b/tutorials/tutorial25/include/tutorial25/message/Msg2.h index 606227b2..8a175f32 100644 --- a/tutorials/tutorial25/include/tutorial25/message/Msg2.h +++ b/tutorials/tutorial25/include/tutorial25/message/Msg2.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 2" message and its fields. diff --git a/tutorials/tutorial25/include/tutorial25/message/Msg2Common.h b/tutorials/tutorial25/include/tutorial25/message/Msg2Common.h index ad603a44..eda4530f 100644 --- a/tutorials/tutorial25/include/tutorial25/message/Msg2Common.h +++ b/tutorials/tutorial25/include/tutorial25/message/Msg2Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial25/include/tutorial25/message/Msg3.h b/tutorials/tutorial25/include/tutorial25/message/Msg3.h index d2d98f1f..e4513126 100644 --- a/tutorials/tutorial25/include/tutorial25/message/Msg3.h +++ b/tutorials/tutorial25/include/tutorial25/message/Msg3.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 3" message and its fields. diff --git a/tutorials/tutorial25/include/tutorial25/message/Msg3Common.h b/tutorials/tutorial25/include/tutorial25/message/Msg3Common.h index fd212895..3c77fd84 100644 --- a/tutorials/tutorial25/include/tutorial25/message/Msg3Common.h +++ b/tutorials/tutorial25/include/tutorial25/message/Msg3Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial25/include/tutorial25/message/Msg4.h b/tutorials/tutorial25/include/tutorial25/message/Msg4.h index 80e1b7fd..a72a5227 100644 --- a/tutorials/tutorial25/include/tutorial25/message/Msg4.h +++ b/tutorials/tutorial25/include/tutorial25/message/Msg4.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 4" message and its fields. diff --git a/tutorials/tutorial25/include/tutorial25/message/Msg4Common.h b/tutorials/tutorial25/include/tutorial25/message/Msg4Common.h index 633f8e9b..2ecd2321 100644 --- a/tutorials/tutorial25/include/tutorial25/message/Msg4Common.h +++ b/tutorials/tutorial25/include/tutorial25/message/Msg4Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial25/include/tutorial25/message/Msg5.h b/tutorials/tutorial25/include/tutorial25/message/Msg5.h index 4c2a5c83..4e8cb135 100644 --- a/tutorials/tutorial25/include/tutorial25/message/Msg5.h +++ b/tutorials/tutorial25/include/tutorial25/message/Msg5.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 5" message and its fields. diff --git a/tutorials/tutorial25/include/tutorial25/message/Msg5Common.h b/tutorials/tutorial25/include/tutorial25/message/Msg5Common.h index 72e5a729..6c9ef3a4 100644 --- a/tutorials/tutorial25/include/tutorial25/message/Msg5Common.h +++ b/tutorials/tutorial25/include/tutorial25/message/Msg5Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial25/include/tutorial25/message/Msg6.h b/tutorials/tutorial25/include/tutorial25/message/Msg6.h index 295d6f65..3ccea120 100644 --- a/tutorials/tutorial25/include/tutorial25/message/Msg6.h +++ b/tutorials/tutorial25/include/tutorial25/message/Msg6.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 6" message and its fields. diff --git a/tutorials/tutorial25/include/tutorial25/message/Msg6Common.h b/tutorials/tutorial25/include/tutorial25/message/Msg6Common.h index a1e98aa6..7bdfa8e2 100644 --- a/tutorials/tutorial25/include/tutorial25/message/Msg6Common.h +++ b/tutorials/tutorial25/include/tutorial25/message/Msg6Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial25/include/tutorial25/message/Msg7.h b/tutorials/tutorial25/include/tutorial25/message/Msg7.h index d0feb5b1..d723669c 100644 --- a/tutorials/tutorial25/include/tutorial25/message/Msg7.h +++ b/tutorials/tutorial25/include/tutorial25/message/Msg7.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 7" message and its fields. diff --git a/tutorials/tutorial25/include/tutorial25/message/Msg7Common.h b/tutorials/tutorial25/include/tutorial25/message/Msg7Common.h index ff9ccc7b..528ed3a1 100644 --- a/tutorials/tutorial25/include/tutorial25/message/Msg7Common.h +++ b/tutorials/tutorial25/include/tutorial25/message/Msg7Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial25/include/tutorial25/message/Msg8.h b/tutorials/tutorial25/include/tutorial25/message/Msg8.h index 52daae37..0ab0cd99 100644 --- a/tutorials/tutorial25/include/tutorial25/message/Msg8.h +++ b/tutorials/tutorial25/include/tutorial25/message/Msg8.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 8" message and its fields. diff --git a/tutorials/tutorial25/include/tutorial25/message/Msg8Common.h b/tutorials/tutorial25/include/tutorial25/message/Msg8Common.h index b0bbde08..0b37bb76 100644 --- a/tutorials/tutorial25/include/tutorial25/message/Msg8Common.h +++ b/tutorials/tutorial25/include/tutorial25/message/Msg8Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial25/include/tutorial25/message/Msg9.h b/tutorials/tutorial25/include/tutorial25/message/Msg9.h index 37dcc909..f08e14b1 100644 --- a/tutorials/tutorial25/include/tutorial25/message/Msg9.h +++ b/tutorials/tutorial25/include/tutorial25/message/Msg9.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 9" message and its fields. diff --git a/tutorials/tutorial25/include/tutorial25/message/Msg9Common.h b/tutorials/tutorial25/include/tutorial25/message/Msg9Common.h index ad31e3ad..8b1f59ec 100644 --- a/tutorials/tutorial25/include/tutorial25/message/Msg9Common.h +++ b/tutorials/tutorial25/include/tutorial25/message/Msg9Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial25/include/tutorial25/options/AllMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial25/include/tutorial25/options/AllMessagesDynMemMsgFactoryDefaultOptions.h index cf8c74b2..b5d8bc1d 100644 --- a/tutorials/tutorial25/include/tutorial25/options/AllMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial25/include/tutorial25/options/AllMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol all messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial25/include/tutorial25/options/BareMetalDefaultOptions.h b/tutorials/tutorial25/include/tutorial25/options/BareMetalDefaultOptions.h index 6b5fece3..3bacee55 100644 --- a/tutorials/tutorial25/include/tutorial25/options/BareMetalDefaultOptions.h +++ b/tutorials/tutorial25/include/tutorial25/options/BareMetalDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol bare metal default options. @@ -31,13 +31,15 @@ struct BareMetalDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// tutorial25::frame::FrameLayers::Data - /// layer. - using Data = - std::tuple< - comms::option::app::FixedSizeStorage, - typename TBase::frame::FrameLayers::Data - >; + /// tutorial25::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::FixedSizeStorage, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers /// @brief Extra options for @ref /// tutorial25::frame::FrameLayers::Id diff --git a/tutorials/tutorial25/include/tutorial25/options/ClientDefaultOptions.h b/tutorials/tutorial25/include/tutorial25/options/ClientDefaultOptions.h index e4085da2..e0f7d4e0 100644 --- a/tutorials/tutorial25/include/tutorial25/options/ClientDefaultOptions.h +++ b/tutorials/tutorial25/include/tutorial25/options/ClientDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client default options. diff --git a/tutorials/tutorial25/include/tutorial25/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial25/include/tutorial25/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h index b738498c..f0001f4e 100644 --- a/tutorials/tutorial25/include/tutorial25/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial25/include/tutorial25/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client input messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial25/include/tutorial25/options/DataViewDefaultOptions.h b/tutorials/tutorial25/include/tutorial25/options/DataViewDefaultOptions.h index 6fe0e32b..3c9d3479 100644 --- a/tutorials/tutorial25/include/tutorial25/options/DataViewDefaultOptions.h +++ b/tutorials/tutorial25/include/tutorial25/options/DataViewDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol data view default options. @@ -25,13 +25,15 @@ struct DataViewDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// tutorial25::frame::FrameLayers::Data - /// layer. - using Data = - std::tuple< - comms::option::app::OrigDataView, - typename TBase::frame::FrameLayers::Data - >; + /// tutorial25::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::OrigDataView, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers }; // struct FrameLayers }; // struct frame }; diff --git a/tutorials/tutorial25/include/tutorial25/options/DefaultOptions.h b/tutorials/tutorial25/include/tutorial25/options/DefaultOptions.h index 2acd7aeb..9ff74f20 100644 --- a/tutorials/tutorial25/include/tutorial25/options/DefaultOptions.h +++ b/tutorials/tutorial25/include/tutorial25/options/DefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol default options. @@ -28,14 +28,16 @@ struct DefaultOptionsT : public TBase struct FrameLayers { /// @brief Extra options for @ref - /// tutorial25::frame::FrameLayers::Data - /// layer. - using Data = comms::option::EmptyOption; + /// tutorial25::frame::FrameLayers::DataMembers::Field field. + struct DataMembers + { + using Field = comms::option::app::EmptyOption; + }; // struct DataMembers /// @brief Extra options for @ref /// tutorial25::frame::FrameLayers::Id /// layer. - using Id = comms::option::EmptyOption; + using Id = comms::option::app::EmptyOption; }; // struct FrameLayers }; // struct frame }; diff --git a/tutorials/tutorial25/include/tutorial25/options/ServerDefaultOptions.h b/tutorials/tutorial25/include/tutorial25/options/ServerDefaultOptions.h index e56a2eda..57f7cc29 100644 --- a/tutorials/tutorial25/include/tutorial25/options/ServerDefaultOptions.h +++ b/tutorials/tutorial25/include/tutorial25/options/ServerDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server default options. diff --git a/tutorials/tutorial25/include/tutorial25/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial25/include/tutorial25/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h index 2e5ae7d3..60df6687 100644 --- a/tutorials/tutorial25/include/tutorial25/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial25/include/tutorial25/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server input messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial3/include/tutorial3/Message.h b/tutorials/tutorial3/include/tutorial3/Message.h index 2d06e9e6..25bd776e 100644 --- a/tutorials/tutorial3/include/tutorial3/Message.h +++ b/tutorials/tutorial3/include/tutorial3/Message.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message" interface class. diff --git a/tutorials/tutorial3/include/tutorial3/MsgId.h b/tutorials/tutorial3/include/tutorial3/MsgId.h index 68d92118..0f1617b6 100644 --- a/tutorials/tutorial3/include/tutorial3/MsgId.h +++ b/tutorials/tutorial3/include/tutorial3/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of message ids enumeration. diff --git a/tutorials/tutorial3/include/tutorial3/Version.h b/tutorials/tutorial3/include/tutorial3/Version.h index d26027ac..721cd71d 100644 --- a/tutorials/tutorial3/include/tutorial3/Version.h +++ b/tutorials/tutorial3/include/tutorial3/Version.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains protocol version definition. @@ -22,5 +22,5 @@ inline constexpr unsigned specVersion() } // namespace tutorial3 // Generated compile time check for minimal supported version of the COMMS library -static_assert(COMMS_MAKE_VERSION(5, 2, 7) <= comms::version(), +static_assert(COMMS_MAKE_VERSION(5, 3, 0) <= comms::version(), "The version of COMMS library is too old"); diff --git a/tutorials/tutorial3/include/tutorial3/dispatch/DispatchClientInputMessage.h b/tutorials/tutorial3/include/tutorial3/dispatch/DispatchClientInputMessage.h index cbc84582..66c83685 100644 --- a/tutorials/tutorial3/include/tutorial3/dispatch/DispatchClientInputMessage.h +++ b/tutorials/tutorial3/include/tutorial3/dispatch/DispatchClientInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/tutorials/tutorial3/include/tutorial3/dispatch/DispatchMessage.h b/tutorials/tutorial3/include/tutorial3/dispatch/DispatchMessage.h index 43667ee9..202454d9 100644 --- a/tutorials/tutorial3/include/tutorial3/dispatch/DispatchMessage.h +++ b/tutorials/tutorial3/include/tutorial3/dispatch/DispatchMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for all input messages. diff --git a/tutorials/tutorial3/include/tutorial3/dispatch/DispatchServerInputMessage.h b/tutorials/tutorial3/include/tutorial3/dispatch/DispatchServerInputMessage.h index a3c1f39f..274e1693 100644 --- a/tutorials/tutorial3/include/tutorial3/dispatch/DispatchServerInputMessage.h +++ b/tutorials/tutorial3/include/tutorial3/dispatch/DispatchServerInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/tutorials/tutorial3/include/tutorial3/factory/AllMessagesDynMemMsgFactory.h b/tutorials/tutorial3/include/tutorial3/factory/AllMessagesDynMemMsgFactory.h index 1e663f10..fa3c61d0 100644 --- a/tutorials/tutorial3/include/tutorial3/factory/AllMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial3/include/tutorial3/factory/AllMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for all the messages. diff --git a/tutorials/tutorial3/include/tutorial3/factory/ClientInputMessagesDynMemMsgFactory.h b/tutorials/tutorial3/include/tutorial3/factory/ClientInputMessagesDynMemMsgFactory.h index feb88d09..5684ce5d 100644 --- a/tutorials/tutorial3/include/tutorial3/factory/ClientInputMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial3/include/tutorial3/factory/ClientInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the client input messages. diff --git a/tutorials/tutorial3/include/tutorial3/factory/ServerInputMessagesDynMemMsgFactory.h b/tutorials/tutorial3/include/tutorial3/factory/ServerInputMessagesDynMemMsgFactory.h index 0d66827b..d7f0ba62 100644 --- a/tutorials/tutorial3/include/tutorial3/factory/ServerInputMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial3/include/tutorial3/factory/ServerInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the server input messages. diff --git a/tutorials/tutorial3/include/tutorial3/field/FieldBase.h b/tutorials/tutorial3/include/tutorial3/field/FieldBase.h index a0c14239..5518a98c 100644 --- a/tutorials/tutorial3/include/tutorial3/field/FieldBase.h +++ b/tutorials/tutorial3/include/tutorial3/field/FieldBase.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of base class of all the fields. diff --git a/tutorials/tutorial3/include/tutorial3/field/MsgId.h b/tutorials/tutorial3/include/tutorial3/field/MsgId.h index cb3fce72..10dc2984 100644 --- a/tutorials/tutorial3/include/tutorial3/field/MsgId.h +++ b/tutorials/tutorial3/include/tutorial3/field/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "MsgId" field. @@ -27,6 +27,7 @@ class MsgId : public tutorial3::field::FieldBase<>, tutorial3::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 3> > { @@ -35,6 +36,7 @@ class MsgId : public tutorial3::field::FieldBase<>, tutorial3::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 3> >; public: diff --git a/tutorials/tutorial3/include/tutorial3/field/MsgIdCommon.h b/tutorials/tutorial3/include/tutorial3/field/MsgIdCommon.h index 071630b6..dd1e181b 100644 --- a/tutorials/tutorial3/include/tutorial3/field/MsgIdCommon.h +++ b/tutorials/tutorial3/include/tutorial3/field/MsgIdCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial3/include/tutorial3/frame/Frame.h b/tutorials/tutorial3/include/tutorial3/frame/Frame.h index 06cb5eea..b937fb9d 100644 --- a/tutorials/tutorial3/include/tutorial3/frame/Frame.h +++ b/tutorials/tutorial3/include/tutorial3/frame/Frame.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Frame" frame class. @@ -30,10 +30,30 @@ namespace frame template struct FrameLayers { + /// @brief Scope for field(s) of @ref Data layer. + struct DataMembers + { + /// @brief Custom field for @ref tutorial3::frame::FrameLayers::Data layer + class Field : public + comms::field::ArrayList< + tutorial3::field::FieldBase<>, + std::uint8_t, + typename TOpt::frame::FrameLayers::DataMembers::Field, + comms::option::def::HasName + > + { + public: + static const char* name() + { + return "Data"; + } + }; + }; + /// @brief Definition of layer "Data". using Data = comms::protocol::MsgDataLayer< - typename TOpt::frame::FrameLayers::Data + comms::option::def::FieldType >; /// @brief Definition of layer "ID". @@ -56,13 +76,15 @@ struct FrameLayers class SizeField : public comms::field::IntValue< tutorial3::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial3::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/tutorials/tutorial3/include/tutorial3/frame/FrameCommon.h b/tutorials/tutorial3/include/tutorial3/frame/FrameCommon.h index 7eedfbe9..c623f73c 100644 --- a/tutorials/tutorial3/include/tutorial3/frame/FrameCommon.h +++ b/tutorials/tutorial3/include/tutorial3/frame/FrameCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial3/include/tutorial3/input/AllMessages.h b/tutorials/tutorial3/include/tutorial3/input/AllMessages.h index 0be9dcb4..bb90f74b 100644 --- a/tutorials/tutorial3/include/tutorial3/input/AllMessages.h +++ b/tutorials/tutorial3/include/tutorial3/input/AllMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the AllMessages messages bundle. diff --git a/tutorials/tutorial3/include/tutorial3/input/ClientInputMessages.h b/tutorials/tutorial3/include/tutorial3/input/ClientInputMessages.h index 47581574..520104af 100644 --- a/tutorials/tutorial3/include/tutorial3/input/ClientInputMessages.h +++ b/tutorials/tutorial3/include/tutorial3/input/ClientInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ClientInputMessages messages bundle. diff --git a/tutorials/tutorial3/include/tutorial3/input/ServerInputMessages.h b/tutorials/tutorial3/include/tutorial3/input/ServerInputMessages.h index 1b2c50e9..25717f79 100644 --- a/tutorials/tutorial3/include/tutorial3/input/ServerInputMessages.h +++ b/tutorials/tutorial3/include/tutorial3/input/ServerInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ServerInputMessages messages bundle. diff --git a/tutorials/tutorial3/include/tutorial3/message/Msg1.h b/tutorials/tutorial3/include/tutorial3/message/Msg1.h index 9e9f7eea..2a1ae064 100644 --- a/tutorials/tutorial3/include/tutorial3/message/Msg1.h +++ b/tutorials/tutorial3/include/tutorial3/message/Msg1.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 1" message and its fields. @@ -33,6 +33,7 @@ struct Msg1Fields comms::field::IntValue< tutorial3::field::FieldBase<>, std::uint16_t, + comms::option::def::HasName, comms::option::def::ScalingRatio<1, 1000> > { @@ -40,6 +41,7 @@ struct Msg1Fields comms::field::IntValue< tutorial3::field::FieldBase<>, std::uint16_t, + comms::option::def::HasName, comms::option::def::ScalingRatio<1, 1000> >; public: @@ -71,6 +73,7 @@ struct Msg1Fields comms::field::IntValue< tutorial3::field::FieldBase<>, std::int32_t, + comms::option::def::HasName, comms::option::def::ScalingRatio<1, 1000000L> > { @@ -78,6 +81,7 @@ struct Msg1Fields comms::field::IntValue< tutorial3::field::FieldBase<>, std::int32_t, + comms::option::def::HasName, comms::option::def::ScalingRatio<1, 1000000L> >; public: diff --git a/tutorials/tutorial3/include/tutorial3/message/Msg1Common.h b/tutorials/tutorial3/include/tutorial3/message/Msg1Common.h index 9248ca65..8ef77f0e 100644 --- a/tutorials/tutorial3/include/tutorial3/message/Msg1Common.h +++ b/tutorials/tutorial3/include/tutorial3/message/Msg1Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial3/include/tutorial3/message/Msg2.h b/tutorials/tutorial3/include/tutorial3/message/Msg2.h index d7f0fece..400a1669 100644 --- a/tutorials/tutorial3/include/tutorial3/message/Msg2.h +++ b/tutorials/tutorial3/include/tutorial3/message/Msg2.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 2" message and its fields. @@ -34,6 +34,7 @@ struct Msg2Fields comms::field::IntValue< tutorial3::field::FieldBase<>, std::uint32_t, + comms::option::def::HasName, comms::option::def::UnitsSeconds > { @@ -41,6 +42,7 @@ struct Msg2Fields comms::field::IntValue< tutorial3::field::FieldBase<>, std::uint32_t, + comms::option::def::HasName, comms::option::def::UnitsSeconds >; public: @@ -65,6 +67,7 @@ struct Msg2Fields comms::field::FloatValue< tutorial3::field::FieldBase<>, double, + comms::option::def::HasName, comms::option::def::UnitsMillimeters > { @@ -72,6 +75,7 @@ struct Msg2Fields comms::field::FloatValue< tutorial3::field::FieldBase<>, double, + comms::option::def::HasName, comms::option::def::UnitsMillimeters >; public: diff --git a/tutorials/tutorial3/include/tutorial3/message/Msg2Common.h b/tutorials/tutorial3/include/tutorial3/message/Msg2Common.h index 40cf8181..69965e3f 100644 --- a/tutorials/tutorial3/include/tutorial3/message/Msg2Common.h +++ b/tutorials/tutorial3/include/tutorial3/message/Msg2Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial3/include/tutorial3/message/Msg3.h b/tutorials/tutorial3/include/tutorial3/message/Msg3.h index 8605b49a..13cbb5a5 100644 --- a/tutorials/tutorial3/include/tutorial3/message/Msg3.h +++ b/tutorials/tutorial3/include/tutorial3/message/Msg3.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 3" message and its fields. @@ -33,6 +33,7 @@ struct Msg3Fields comms::field::IntValue< tutorial3::field::FieldBase<>, std::uint32_t, + comms::option::def::HasName, comms::option::def::ScalingRatio<1, 100000L>, comms::option::def::UnitsCentimeters > @@ -41,6 +42,7 @@ struct Msg3Fields comms::field::IntValue< tutorial3::field::FieldBase<>, std::uint32_t, + comms::option::def::HasName, comms::option::def::ScalingRatio<1, 100000L>, comms::option::def::UnitsCentimeters >; diff --git a/tutorials/tutorial3/include/tutorial3/message/Msg3Common.h b/tutorials/tutorial3/include/tutorial3/message/Msg3Common.h index fa311148..859c1f03 100644 --- a/tutorials/tutorial3/include/tutorial3/message/Msg3Common.h +++ b/tutorials/tutorial3/include/tutorial3/message/Msg3Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial3/include/tutorial3/options/AllMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial3/include/tutorial3/options/AllMessagesDynMemMsgFactoryDefaultOptions.h index 493297c7..889ac67c 100644 --- a/tutorials/tutorial3/include/tutorial3/options/AllMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial3/include/tutorial3/options/AllMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol all messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial3/include/tutorial3/options/BareMetalDefaultOptions.h b/tutorials/tutorial3/include/tutorial3/options/BareMetalDefaultOptions.h index b5a4f0c1..dbc4fe27 100644 --- a/tutorials/tutorial3/include/tutorial3/options/BareMetalDefaultOptions.h +++ b/tutorials/tutorial3/include/tutorial3/options/BareMetalDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol bare metal default options. @@ -31,13 +31,15 @@ struct BareMetalDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// tutorial3::frame::FrameLayers::Data - /// layer. - using Data = - std::tuple< - comms::option::app::FixedSizeStorage, - typename TBase::frame::FrameLayers::Data - >; + /// tutorial3::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::FixedSizeStorage, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers /// @brief Extra options for @ref /// tutorial3::frame::FrameLayers::ID layer. diff --git a/tutorials/tutorial3/include/tutorial3/options/ClientDefaultOptions.h b/tutorials/tutorial3/include/tutorial3/options/ClientDefaultOptions.h index a3d9546f..95e71e04 100644 --- a/tutorials/tutorial3/include/tutorial3/options/ClientDefaultOptions.h +++ b/tutorials/tutorial3/include/tutorial3/options/ClientDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client default options. diff --git a/tutorials/tutorial3/include/tutorial3/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial3/include/tutorial3/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h index 913ca87b..7b0fc368 100644 --- a/tutorials/tutorial3/include/tutorial3/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial3/include/tutorial3/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client input messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial3/include/tutorial3/options/DataViewDefaultOptions.h b/tutorials/tutorial3/include/tutorial3/options/DataViewDefaultOptions.h index 9ef333eb..d587ca9a 100644 --- a/tutorials/tutorial3/include/tutorial3/options/DataViewDefaultOptions.h +++ b/tutorials/tutorial3/include/tutorial3/options/DataViewDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol data view default options. @@ -25,13 +25,15 @@ struct DataViewDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// tutorial3::frame::FrameLayers::Data - /// layer. - using Data = - std::tuple< - comms::option::app::OrigDataView, - typename TBase::frame::FrameLayers::Data - >; + /// tutorial3::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::OrigDataView, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers }; // struct FrameLayers }; // struct frame }; diff --git a/tutorials/tutorial3/include/tutorial3/options/DefaultOptions.h b/tutorials/tutorial3/include/tutorial3/options/DefaultOptions.h index 918d4779..610cdc78 100644 --- a/tutorials/tutorial3/include/tutorial3/options/DefaultOptions.h +++ b/tutorials/tutorial3/include/tutorial3/options/DefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol default options. @@ -28,13 +28,15 @@ struct DefaultOptionsT : public TBase struct FrameLayers { /// @brief Extra options for @ref - /// tutorial3::frame::FrameLayers::Data - /// layer. - using Data = comms::option::EmptyOption; + /// tutorial3::frame::FrameLayers::DataMembers::Field field. + struct DataMembers + { + using Field = comms::option::app::EmptyOption; + }; // struct DataMembers /// @brief Extra options for @ref /// tutorial3::frame::FrameLayers::ID layer. - using ID = comms::option::EmptyOption; + using ID = comms::option::app::EmptyOption; }; // struct FrameLayers }; // struct frame }; diff --git a/tutorials/tutorial3/include/tutorial3/options/ServerDefaultOptions.h b/tutorials/tutorial3/include/tutorial3/options/ServerDefaultOptions.h index f6983106..0f54cb94 100644 --- a/tutorials/tutorial3/include/tutorial3/options/ServerDefaultOptions.h +++ b/tutorials/tutorial3/include/tutorial3/options/ServerDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server default options. diff --git a/tutorials/tutorial3/include/tutorial3/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial3/include/tutorial3/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h index 54cf6618..cb36638d 100644 --- a/tutorials/tutorial3/include/tutorial3/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial3/include/tutorial3/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server input messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial4/include/tutorial4/Message.h b/tutorials/tutorial4/include/tutorial4/Message.h index 5865fecc..e2aa76c6 100644 --- a/tutorials/tutorial4/include/tutorial4/Message.h +++ b/tutorials/tutorial4/include/tutorial4/Message.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message" interface class. diff --git a/tutorials/tutorial4/include/tutorial4/MsgId.h b/tutorials/tutorial4/include/tutorial4/MsgId.h index 03e0fabe..4879c5f9 100644 --- a/tutorials/tutorial4/include/tutorial4/MsgId.h +++ b/tutorials/tutorial4/include/tutorial4/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of message ids enumeration. diff --git a/tutorials/tutorial4/include/tutorial4/Version.h b/tutorials/tutorial4/include/tutorial4/Version.h index 99078a48..ae0916c4 100644 --- a/tutorials/tutorial4/include/tutorial4/Version.h +++ b/tutorials/tutorial4/include/tutorial4/Version.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains protocol version definition. @@ -22,5 +22,5 @@ inline constexpr unsigned specVersion() } // namespace tutorial4 // Generated compile time check for minimal supported version of the COMMS library -static_assert(COMMS_MAKE_VERSION(5, 2, 7) <= comms::version(), +static_assert(COMMS_MAKE_VERSION(5, 3, 0) <= comms::version(), "The version of COMMS library is too old"); diff --git a/tutorials/tutorial4/include/tutorial4/dispatch/DispatchClientInputMessage.h b/tutorials/tutorial4/include/tutorial4/dispatch/DispatchClientInputMessage.h index a25833d0..a83e80d5 100644 --- a/tutorials/tutorial4/include/tutorial4/dispatch/DispatchClientInputMessage.h +++ b/tutorials/tutorial4/include/tutorial4/dispatch/DispatchClientInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/tutorials/tutorial4/include/tutorial4/dispatch/DispatchMessage.h b/tutorials/tutorial4/include/tutorial4/dispatch/DispatchMessage.h index d30a1daf..83bebf1a 100644 --- a/tutorials/tutorial4/include/tutorial4/dispatch/DispatchMessage.h +++ b/tutorials/tutorial4/include/tutorial4/dispatch/DispatchMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for all input messages. diff --git a/tutorials/tutorial4/include/tutorial4/dispatch/DispatchServerInputMessage.h b/tutorials/tutorial4/include/tutorial4/dispatch/DispatchServerInputMessage.h index 26c64bed..4d511dd6 100644 --- a/tutorials/tutorial4/include/tutorial4/dispatch/DispatchServerInputMessage.h +++ b/tutorials/tutorial4/include/tutorial4/dispatch/DispatchServerInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/tutorials/tutorial4/include/tutorial4/factory/AllMessagesDynMemMsgFactory.h b/tutorials/tutorial4/include/tutorial4/factory/AllMessagesDynMemMsgFactory.h index d38a59b9..67b70fc3 100644 --- a/tutorials/tutorial4/include/tutorial4/factory/AllMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial4/include/tutorial4/factory/AllMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for all the messages. diff --git a/tutorials/tutorial4/include/tutorial4/factory/ClientInputMessagesDynMemMsgFactory.h b/tutorials/tutorial4/include/tutorial4/factory/ClientInputMessagesDynMemMsgFactory.h index fc6c425f..cfb3e059 100644 --- a/tutorials/tutorial4/include/tutorial4/factory/ClientInputMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial4/include/tutorial4/factory/ClientInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the client input messages. diff --git a/tutorials/tutorial4/include/tutorial4/factory/ServerInputMessagesDynMemMsgFactory.h b/tutorials/tutorial4/include/tutorial4/factory/ServerInputMessagesDynMemMsgFactory.h index f7402332..1dd053f6 100644 --- a/tutorials/tutorial4/include/tutorial4/factory/ServerInputMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial4/include/tutorial4/factory/ServerInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the server input messages. diff --git a/tutorials/tutorial4/include/tutorial4/field/FieldBase.h b/tutorials/tutorial4/include/tutorial4/field/FieldBase.h index 0ce6544e..2027b4cc 100644 --- a/tutorials/tutorial4/include/tutorial4/field/FieldBase.h +++ b/tutorials/tutorial4/include/tutorial4/field/FieldBase.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of base class of all the fields. diff --git a/tutorials/tutorial4/include/tutorial4/field/KeyValueProp.h b/tutorials/tutorial4/include/tutorial4/field/KeyValueProp.h index 3dd5d5ce..7225cd06 100644 --- a/tutorials/tutorial4/include/tutorial4/field/KeyValueProp.h +++ b/tutorials/tutorial4/include/tutorial4/field/KeyValueProp.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "KeyValueProp" field. @@ -42,6 +42,7 @@ struct KeyValuePropMembers comms::field::IntValue< tutorial4::field::FieldBase<>, std::uint8_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid<>, comms::option::def::ValidNumValue<0>, comms::option::def::HasCustomRefresh @@ -51,6 +52,7 @@ struct KeyValuePropMembers comms::field::IntValue< tutorial4::field::FieldBase<>, std::uint8_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid<>, comms::option::def::ValidNumValue<0>, comms::option::def::HasCustomRefresh @@ -87,13 +89,15 @@ struct KeyValuePropMembers class Val : public comms::field::IntValue< tutorial4::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial4::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -125,6 +129,7 @@ struct KeyValuePropMembers comms::field::Bundle< tutorial4::field::FieldBase<>, typename Prop1Members::All, + comms::option::def::HasName, comms::option::def::HasVersionDependentMembers > { @@ -132,6 +137,7 @@ struct KeyValuePropMembers comms::field::Bundle< tutorial4::field::FieldBase<>, typename Prop1Members::All, + comms::option::def::HasName, comms::option::def::HasVersionDependentMembers >; public: @@ -166,6 +172,7 @@ struct KeyValuePropMembers comms::field::IntValue< tutorial4::field::FieldBase<>, std::uint8_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid<>, comms::option::def::DefaultNumValue<2>, comms::option::def::ValidNumValue<2>, @@ -176,6 +183,7 @@ struct KeyValuePropMembers comms::field::IntValue< tutorial4::field::FieldBase<>, std::uint8_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid<>, comms::option::def::DefaultNumValue<2>, comms::option::def::ValidNumValue<2>, @@ -213,13 +221,15 @@ struct KeyValuePropMembers class Val : public comms::field::FloatValue< tutorial4::field::FieldBase<>, - float + float, + comms::option::def::HasName > { using Base = comms::field::FloatValue< tutorial4::field::FieldBase<>, - float + float, + comms::option::def::HasName >; public: /// @brief Default constructor. @@ -264,6 +274,7 @@ struct KeyValuePropMembers comms::field::Bundle< tutorial4::field::FieldBase<>, typename Prop2Members::All, + comms::option::def::HasName, comms::option::def::HasVersionDependentMembers > { @@ -271,6 +282,7 @@ struct KeyValuePropMembers comms::field::Bundle< tutorial4::field::FieldBase<>, typename Prop2Members::All, + comms::option::def::HasName, comms::option::def::HasVersionDependentMembers >; public: @@ -305,6 +317,7 @@ struct KeyValuePropMembers comms::field::IntValue< tutorial4::field::FieldBase<>, std::uint8_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid<>, comms::option::def::DefaultNumValue<5>, comms::option::def::ValidNumValue<5>, @@ -315,6 +328,7 @@ struct KeyValuePropMembers comms::field::IntValue< tutorial4::field::FieldBase<>, std::uint8_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid<>, comms::option::def::DefaultNumValue<5>, comms::option::def::ValidNumValue<5>, @@ -356,13 +370,15 @@ struct KeyValuePropMembers class Length : public comms::field::IntValue< tutorial4::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial4::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -387,6 +403,7 @@ struct KeyValuePropMembers comms::field::String< tutorial4::field::FieldBase<>, typename TOpt::field::KeyValuePropMembers::Prop3Members::Val, + comms::option::def::HasName, comms::option::def::SequenceSerLengthFieldPrefix > { @@ -394,6 +411,7 @@ struct KeyValuePropMembers comms::field::String< tutorial4::field::FieldBase<>, typename TOpt::field::KeyValuePropMembers::Prop3Members::Val, + comms::option::def::HasName, comms::option::def::SequenceSerLengthFieldPrefix >; public: @@ -417,6 +435,7 @@ struct KeyValuePropMembers comms::field::Bundle< tutorial4::field::FieldBase<>, typename Prop3Members::All, + comms::option::def::HasName, comms::option::def::HasVersionDependentMembers > { @@ -424,6 +443,7 @@ struct KeyValuePropMembers comms::field::Bundle< tutorial4::field::FieldBase<>, typename Prop3Members::All, + comms::option::def::HasName, comms::option::def::HasVersionDependentMembers >; public: @@ -467,6 +487,7 @@ class KeyValueProp : public tutorial4::field::FieldBase<>, typename KeyValuePropMembers::All, TExtraOpts..., + comms::option::def::HasName, comms::option::def::HasCustomRead, comms::option::def::HasCustomWrite, comms::option::def::HasCustomRefresh, @@ -479,6 +500,7 @@ class KeyValueProp : public tutorial4::field::FieldBase<>, typename KeyValuePropMembers::All, TExtraOpts..., + comms::option::def::HasName, comms::option::def::HasCustomRead, comms::option::def::HasCustomWrite, comms::option::def::HasCustomRefresh, @@ -495,6 +517,13 @@ class KeyValueProp : public reset(); } + /// @brief Single member name info entry + using MemberNameInfo = tutorial4::field::KeyValuePropCommon::MemberNameInfo; + + /// @brief Type returned from @ref memberNamesMap() member function. + /// @see @ref tutorial4::field::KeyValuePropCommon::MemberNamesMapInfo. + using MemberNamesMapInfo = tutorial4::field::KeyValuePropCommon::MemberNamesMapInfo; + /// @brief Allow access to internal fields. /// @details See definition of @b COMMS_VARIANT_MEMBERS_NAMES macro /// related to @b comms::field::Variant class from COMMS library @@ -594,7 +623,6 @@ class KeyValueProp : public } if (Base::currentField() != other.currentField()) { - return false; } @@ -768,6 +796,27 @@ class KeyValueProp : public return false; } + /// @brief Retrieve name of the member + /// @see @ref tutorial4::field::KeyValuePropCommon::memberName(). + static const char* memberName(std::size_t idx) + { + return tutorial4::field::KeyValuePropCommon::memberName(idx); + } + + /// @brief Retrieve name of the member + /// @see @ref tutorial4::field::KeyValuePropCommon::memberName(). + static const char* memberName(FieldIdx idx) + { + return memberName(static_cast(idx)); + } + + /// @brief Retrieve map of members names + /// @see @ref tutorial4::field::KeyValuePropCommon::memberNamesMap(). + static MemberNamesMapInfo memberNamesMap() + { + return tutorial4::field::KeyValuePropCommon::memberNamesMap(); + } + /// @brief Name of the field. static const char* name() { diff --git a/tutorials/tutorial4/include/tutorial4/field/KeyValuePropCommon.h b/tutorials/tutorial4/include/tutorial4/field/KeyValuePropCommon.h index 4eda2b84..5f7c83d9 100644 --- a/tutorials/tutorial4/include/tutorial4/field/KeyValuePropCommon.h +++ b/tutorials/tutorial4/include/tutorial4/field/KeyValuePropCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of @@ -7,6 +7,8 @@ #pragma once #include +#include +#include namespace tutorial4 { @@ -213,11 +215,43 @@ struct KeyValuePropMembersCommon /// @ref tutorial4::field::KeyValueProp field. struct KeyValuePropCommon { + /// @brief Single member name info entry + using MemberNameInfo = const char*; + + /// @brief Type returned from @ref memberNamesMap() member function. + /// @details The @b first value of the pair is pointer to the map array, + /// The @b second value of the pair is the size of the array. + using MemberNamesMapInfo = std::pair; + /// @brief Name of the @ref tutorial4::field::KeyValueProp field. static const char* name() { return "KeyValueProp"; } + + /// @brief Retrieve name of the member + static const char* memberName(std::size_t idx) + { + auto namesMapInfo = memberNamesMap(); + if (namesMapInfo.second <= idx) { + return nullptr; + } + + return namesMapInfo.first[idx]; + } + + /// @brief Retrieve map of members names + static MemberNamesMapInfo memberNamesMap() + { + static const MemberNameInfo Map[] = { + KeyValuePropMembersCommon::Prop1Common::name(), + KeyValuePropMembersCommon::Prop2Common::name(), + KeyValuePropMembersCommon::Prop3Common::name() + }; + static const std::size_t MapSize = std::extent::value; + + return std::make_pair(&Map[0], MapSize); + } }; } // namespace field diff --git a/tutorials/tutorial4/include/tutorial4/field/MsgId.h b/tutorials/tutorial4/include/tutorial4/field/MsgId.h index f1b4dfcf..c51070b8 100644 --- a/tutorials/tutorial4/include/tutorial4/field/MsgId.h +++ b/tutorials/tutorial4/include/tutorial4/field/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "MsgId" field. @@ -27,6 +27,7 @@ class MsgId : public tutorial4::field::FieldBase<>, tutorial4::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 2> > { @@ -35,6 +36,7 @@ class MsgId : public tutorial4::field::FieldBase<>, tutorial4::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 2> >; public: diff --git a/tutorials/tutorial4/include/tutorial4/field/MsgIdCommon.h b/tutorials/tutorial4/include/tutorial4/field/MsgIdCommon.h index 46e0ba8f..be255038 100644 --- a/tutorials/tutorial4/include/tutorial4/field/MsgIdCommon.h +++ b/tutorials/tutorial4/include/tutorial4/field/MsgIdCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial4/include/tutorial4/field/TlvProp.h b/tutorials/tutorial4/include/tutorial4/field/TlvProp.h index ccde528e..b8ca8589 100644 --- a/tutorials/tutorial4/include/tutorial4/field/TlvProp.h +++ b/tutorials/tutorial4/include/tutorial4/field/TlvProp.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "TlvProp" field. @@ -43,6 +43,7 @@ struct TlvPropMembers comms::field::IntValue< tutorial4::field::FieldBase<>, std::uint8_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid<>, comms::option::def::DefaultNumValue<10>, comms::option::def::ValidNumValue<10>, @@ -53,6 +54,7 @@ struct TlvPropMembers comms::field::IntValue< tutorial4::field::FieldBase<>, std::uint8_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid<>, comms::option::def::DefaultNumValue<10>, comms::option::def::ValidNumValue<10>, @@ -90,13 +92,15 @@ struct TlvPropMembers class Length : public comms::field::IntValue< tutorial4::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial4::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -119,13 +123,15 @@ struct TlvPropMembers class Val : public comms::field::IntValue< tutorial4::field::FieldBase<>, - std::uint32_t + std::uint32_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial4::field::FieldBase<>, - std::uint32_t + std::uint32_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -158,6 +164,7 @@ struct TlvPropMembers comms::field::Bundle< tutorial4::field::FieldBase<>, typename Prop4Members::All, + comms::option::def::HasName, comms::option::def::RemLengthMemberField<1U>, comms::option::def::HasVersionDependentMembers > @@ -166,6 +173,7 @@ struct TlvPropMembers comms::field::Bundle< tutorial4::field::FieldBase<>, typename Prop4Members::All, + comms::option::def::HasName, comms::option::def::RemLengthMemberField<1U>, comms::option::def::HasVersionDependentMembers >; @@ -204,6 +212,7 @@ struct TlvPropMembers comms::field::IntValue< tutorial4::field::FieldBase<>, std::uint8_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid<>, comms::option::def::DefaultNumValue<15>, comms::option::def::ValidNumValue<15>, @@ -214,6 +223,7 @@ struct TlvPropMembers comms::field::IntValue< tutorial4::field::FieldBase<>, std::uint8_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid<>, comms::option::def::DefaultNumValue<15>, comms::option::def::ValidNumValue<15>, @@ -251,13 +261,15 @@ struct TlvPropMembers class Length : public comms::field::IntValue< tutorial4::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial4::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -280,13 +292,15 @@ struct TlvPropMembers class Val : public comms::field::FloatValue< tutorial4::field::FieldBase<>, - double + double, + comms::option::def::HasName > { using Base = comms::field::FloatValue< tutorial4::field::FieldBase<>, - double + double, + comms::option::def::HasName >; public: /// @brief Default constructor. @@ -332,6 +346,7 @@ struct TlvPropMembers comms::field::Bundle< tutorial4::field::FieldBase<>, typename Prop5Members::All, + comms::option::def::HasName, comms::option::def::RemLengthMemberField<1U>, comms::option::def::HasVersionDependentMembers > @@ -340,6 +355,7 @@ struct TlvPropMembers comms::field::Bundle< tutorial4::field::FieldBase<>, typename Prop5Members::All, + comms::option::def::HasName, comms::option::def::RemLengthMemberField<1U>, comms::option::def::HasVersionDependentMembers >; @@ -378,6 +394,7 @@ struct TlvPropMembers comms::field::IntValue< tutorial4::field::FieldBase<>, std::uint8_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid<>, comms::option::def::DefaultNumValue<25>, comms::option::def::ValidNumValue<25>, @@ -388,6 +405,7 @@ struct TlvPropMembers comms::field::IntValue< tutorial4::field::FieldBase<>, std::uint8_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid<>, comms::option::def::DefaultNumValue<25>, comms::option::def::ValidNumValue<25>, @@ -425,13 +443,15 @@ struct TlvPropMembers class Length : public comms::field::IntValue< tutorial4::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial4::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -454,13 +474,15 @@ struct TlvPropMembers class Val : public comms::field::String< tutorial4::field::FieldBase<>, - typename TOpt::field::TlvPropMembers::Prop6Members::Val + typename TOpt::field::TlvPropMembers::Prop6Members::Val, + comms::option::def::HasName > { using Base = comms::field::String< tutorial4::field::FieldBase<>, - typename TOpt::field::TlvPropMembers::Prop6Members::Val + typename TOpt::field::TlvPropMembers::Prop6Members::Val, + comms::option::def::HasName >; public: /// @brief Name of the field. @@ -484,6 +506,7 @@ struct TlvPropMembers comms::field::Bundle< tutorial4::field::FieldBase<>, typename Prop6Members::All, + comms::option::def::HasName, comms::option::def::RemLengthMemberField<1U>, comms::option::def::HasVersionDependentMembers > @@ -492,6 +515,7 @@ struct TlvPropMembers comms::field::Bundle< tutorial4::field::FieldBase<>, typename Prop6Members::All, + comms::option::def::HasName, comms::option::def::RemLengthMemberField<1U>, comms::option::def::HasVersionDependentMembers >; @@ -530,6 +554,7 @@ struct TlvPropMembers comms::field::IntValue< tutorial4::field::FieldBase<>, std::uint8_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid<>, comms::option::def::DefaultNumValue<30>, comms::option::def::ValidNumValue<30>, @@ -540,6 +565,7 @@ struct TlvPropMembers comms::field::IntValue< tutorial4::field::FieldBase<>, std::uint8_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid<>, comms::option::def::DefaultNumValue<30>, comms::option::def::ValidNumValue<30>, @@ -577,13 +603,15 @@ struct TlvPropMembers class Length : public comms::field::IntValue< tutorial4::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial4::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -607,6 +635,7 @@ struct TlvPropMembers comms::field::IntValue< tutorial4::field::FieldBase<>, std::uint64_t, + comms::option::def::HasName, comms::option::def::AvailableLengthLimit > { @@ -614,6 +643,7 @@ struct TlvPropMembers comms::field::IntValue< tutorial4::field::FieldBase<>, std::uint64_t, + comms::option::def::HasName, comms::option::def::AvailableLengthLimit >; public: @@ -647,6 +677,7 @@ struct TlvPropMembers comms::field::Bundle< tutorial4::field::FieldBase<>, typename Prop7Members::All, + comms::option::def::HasName, comms::option::def::RemLengthMemberField<1U>, comms::option::def::HasVersionDependentMembers > @@ -655,6 +686,7 @@ struct TlvPropMembers comms::field::Bundle< tutorial4::field::FieldBase<>, typename Prop7Members::All, + comms::option::def::HasName, comms::option::def::RemLengthMemberField<1U>, comms::option::def::HasVersionDependentMembers >; @@ -692,13 +724,15 @@ struct TlvPropMembers class Key : public comms::field::IntValue< tutorial4::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial4::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -721,13 +755,15 @@ struct TlvPropMembers class Length : public comms::field::IntValue< tutorial4::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial4::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -751,14 +787,16 @@ struct TlvPropMembers comms::field::ArrayList< tutorial4::field::FieldBase<>, std::uint8_t, - typename TOpt::field::TlvPropMembers::AnyMembers::Val + typename TOpt::field::TlvPropMembers::AnyMembers::Val, + comms::option::def::HasName > { using Base = comms::field::ArrayList< tutorial4::field::FieldBase<>, std::uint8_t, - typename TOpt::field::TlvPropMembers::AnyMembers::Val + typename TOpt::field::TlvPropMembers::AnyMembers::Val, + comms::option::def::HasName >; public: /// @brief Name of the field. @@ -782,6 +820,7 @@ struct TlvPropMembers comms::field::Bundle< tutorial4::field::FieldBase<>, typename AnyMembers::All, + comms::option::def::HasName, comms::option::def::RemLengthMemberField<1U>, comms::option::def::HasVersionDependentMembers > @@ -790,6 +829,7 @@ struct TlvPropMembers comms::field::Bundle< tutorial4::field::FieldBase<>, typename AnyMembers::All, + comms::option::def::HasName, comms::option::def::RemLengthMemberField<1U>, comms::option::def::HasVersionDependentMembers >; @@ -841,6 +881,7 @@ class TlvProp : public tutorial4::field::FieldBase<>, typename TlvPropMembers::All, TExtraOpts..., + comms::option::def::HasName, comms::option::def::HasCustomRead, comms::option::def::HasCustomWrite, comms::option::def::HasCustomRefresh, @@ -853,6 +894,7 @@ class TlvProp : public tutorial4::field::FieldBase<>, typename TlvPropMembers::All, TExtraOpts..., + comms::option::def::HasName, comms::option::def::HasCustomRead, comms::option::def::HasCustomWrite, comms::option::def::HasCustomRefresh, @@ -869,6 +911,13 @@ class TlvProp : public reset(); } + /// @brief Single member name info entry + using MemberNameInfo = tutorial4::field::TlvPropCommon::MemberNameInfo; + + /// @brief Type returned from @ref memberNamesMap() member function. + /// @see @ref tutorial4::field::TlvPropCommon::MemberNamesMapInfo. + using MemberNamesMapInfo = tutorial4::field::TlvPropCommon::MemberNamesMapInfo; + /// @brief Allow access to internal fields. /// @details See definition of @b COMMS_VARIANT_MEMBERS_NAMES macro /// related to @b comms::field::Variant class from COMMS library @@ -980,7 +1029,6 @@ class TlvProp : public } if (Base::currentField() != other.currentField()) { - return false; } @@ -1176,6 +1224,27 @@ class TlvProp : public return false; } + /// @brief Retrieve name of the member + /// @see @ref tutorial4::field::TlvPropCommon::memberName(). + static const char* memberName(std::size_t idx) + { + return tutorial4::field::TlvPropCommon::memberName(idx); + } + + /// @brief Retrieve name of the member + /// @see @ref tutorial4::field::TlvPropCommon::memberName(). + static const char* memberName(FieldIdx idx) + { + return memberName(static_cast(idx)); + } + + /// @brief Retrieve map of members names + /// @see @ref tutorial4::field::TlvPropCommon::memberNamesMap(). + static MemberNamesMapInfo memberNamesMap() + { + return tutorial4::field::TlvPropCommon::memberNamesMap(); + } + /// @brief Name of the field. static const char* name() { diff --git a/tutorials/tutorial4/include/tutorial4/field/TlvPropCommon.h b/tutorials/tutorial4/include/tutorial4/field/TlvPropCommon.h index 4263bed3..80986dce 100644 --- a/tutorials/tutorial4/include/tutorial4/field/TlvPropCommon.h +++ b/tutorials/tutorial4/include/tutorial4/field/TlvPropCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of @@ -7,6 +7,8 @@ #pragma once #include +#include +#include namespace tutorial4 { @@ -398,11 +400,45 @@ struct TlvPropMembersCommon /// @ref tutorial4::field::TlvProp field. struct TlvPropCommon { + /// @brief Single member name info entry + using MemberNameInfo = const char*; + + /// @brief Type returned from @ref memberNamesMap() member function. + /// @details The @b first value of the pair is pointer to the map array, + /// The @b second value of the pair is the size of the array. + using MemberNamesMapInfo = std::pair; + /// @brief Name of the @ref tutorial4::field::TlvProp field. static const char* name() { return "TlvProp"; } + + /// @brief Retrieve name of the member + static const char* memberName(std::size_t idx) + { + auto namesMapInfo = memberNamesMap(); + if (namesMapInfo.second <= idx) { + return nullptr; + } + + return namesMapInfo.first[idx]; + } + + /// @brief Retrieve map of members names + static MemberNamesMapInfo memberNamesMap() + { + static const MemberNameInfo Map[] = { + TlvPropMembersCommon::Prop4Common::name(), + TlvPropMembersCommon::Prop5Common::name(), + TlvPropMembersCommon::Prop6Common::name(), + TlvPropMembersCommon::Prop7Common::name(), + TlvPropMembersCommon::AnyCommon::name() + }; + static const std::size_t MapSize = std::extent::value; + + return std::make_pair(&Map[0], MapSize); + } }; } // namespace field diff --git a/tutorials/tutorial4/include/tutorial4/frame/Frame.h b/tutorials/tutorial4/include/tutorial4/frame/Frame.h index b8639377..d35aa6dd 100644 --- a/tutorials/tutorial4/include/tutorial4/frame/Frame.h +++ b/tutorials/tutorial4/include/tutorial4/frame/Frame.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Frame" frame class. @@ -30,10 +30,30 @@ namespace frame template struct FrameLayers { + /// @brief Scope for field(s) of @ref Data layer. + struct DataMembers + { + /// @brief Custom field for @ref tutorial4::frame::FrameLayers::Data layer + class Field : public + comms::field::ArrayList< + tutorial4::field::FieldBase<>, + std::uint8_t, + typename TOpt::frame::FrameLayers::DataMembers::Field, + comms::option::def::HasName + > + { + public: + static const char* name() + { + return "Data"; + } + }; + }; + /// @brief Definition of layer "Data". using Data = comms::protocol::MsgDataLayer< - typename TOpt::frame::FrameLayers::Data + comms::option::def::FieldType >; /// @brief Definition of layer "ID". @@ -56,13 +76,15 @@ struct FrameLayers class SizeField : public comms::field::IntValue< tutorial4::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial4::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/tutorials/tutorial4/include/tutorial4/frame/FrameCommon.h b/tutorials/tutorial4/include/tutorial4/frame/FrameCommon.h index 59a77b21..355ae50e 100644 --- a/tutorials/tutorial4/include/tutorial4/frame/FrameCommon.h +++ b/tutorials/tutorial4/include/tutorial4/frame/FrameCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial4/include/tutorial4/input/AllMessages.h b/tutorials/tutorial4/include/tutorial4/input/AllMessages.h index 05803ddf..8dccea38 100644 --- a/tutorials/tutorial4/include/tutorial4/input/AllMessages.h +++ b/tutorials/tutorial4/include/tutorial4/input/AllMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the AllMessages messages bundle. diff --git a/tutorials/tutorial4/include/tutorial4/input/ClientInputMessages.h b/tutorials/tutorial4/include/tutorial4/input/ClientInputMessages.h index 16889b3d..657f9a2d 100644 --- a/tutorials/tutorial4/include/tutorial4/input/ClientInputMessages.h +++ b/tutorials/tutorial4/include/tutorial4/input/ClientInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ClientInputMessages messages bundle. diff --git a/tutorials/tutorial4/include/tutorial4/input/ServerInputMessages.h b/tutorials/tutorial4/include/tutorial4/input/ServerInputMessages.h index 4c96896d..3d51e86a 100644 --- a/tutorials/tutorial4/include/tutorial4/input/ServerInputMessages.h +++ b/tutorials/tutorial4/include/tutorial4/input/ServerInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ServerInputMessages messages bundle. diff --git a/tutorials/tutorial4/include/tutorial4/message/Msg1.h b/tutorials/tutorial4/include/tutorial4/message/Msg1.h index 83e3f5f6..646f2ae7 100644 --- a/tutorials/tutorial4/include/tutorial4/message/Msg1.h +++ b/tutorials/tutorial4/include/tutorial4/message/Msg1.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 1" message and its fields. @@ -38,13 +38,15 @@ struct Msg1Fields class Count : public comms::field::IntValue< tutorial4::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial4::field::FieldBase<>, - std::uint8_t + std::uint8_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -70,6 +72,7 @@ struct Msg1Fields tutorial4::field::FieldBase<>, tutorial4::field::KeyValueProp, typename TOpt::message::Msg1Fields::F1, + comms::option::def::HasName, comms::option::def::SequenceSizeFieldPrefix > { @@ -78,6 +81,7 @@ struct Msg1Fields tutorial4::field::FieldBase<>, tutorial4::field::KeyValueProp, typename TOpt::message::Msg1Fields::F1, + comms::option::def::HasName, comms::option::def::SequenceSizeFieldPrefix >; public: diff --git a/tutorials/tutorial4/include/tutorial4/message/Msg1Common.h b/tutorials/tutorial4/include/tutorial4/message/Msg1Common.h index c5190944..00e9afb0 100644 --- a/tutorials/tutorial4/include/tutorial4/message/Msg1Common.h +++ b/tutorials/tutorial4/include/tutorial4/message/Msg1Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial4/include/tutorial4/message/Msg2.h b/tutorials/tutorial4/include/tutorial4/message/Msg2.h index 7f018ea5..9319224a 100644 --- a/tutorials/tutorial4/include/tutorial4/message/Msg2.h +++ b/tutorials/tutorial4/include/tutorial4/message/Msg2.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 2" message and its fields. @@ -33,14 +33,16 @@ struct Msg2Fields comms::field::ArrayList< tutorial4::field::FieldBase<>, tutorial4::field::TlvProp, - typename TOpt::message::Msg2Fields::F1 + typename TOpt::message::Msg2Fields::F1, + comms::option::def::HasName > { using Base = comms::field::ArrayList< tutorial4::field::FieldBase<>, tutorial4::field::TlvProp, - typename TOpt::message::Msg2Fields::F1 + typename TOpt::message::Msg2Fields::F1, + comms::option::def::HasName >; public: /// @brief Name of the field. diff --git a/tutorials/tutorial4/include/tutorial4/message/Msg2Common.h b/tutorials/tutorial4/include/tutorial4/message/Msg2Common.h index 9282da6e..4698bd5b 100644 --- a/tutorials/tutorial4/include/tutorial4/message/Msg2Common.h +++ b/tutorials/tutorial4/include/tutorial4/message/Msg2Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial4/include/tutorial4/options/AllMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial4/include/tutorial4/options/AllMessagesDynMemMsgFactoryDefaultOptions.h index 467729b4..f82aaaf1 100644 --- a/tutorials/tutorial4/include/tutorial4/options/AllMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial4/include/tutorial4/options/AllMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol all messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial4/include/tutorial4/options/BareMetalDefaultOptions.h b/tutorials/tutorial4/include/tutorial4/options/BareMetalDefaultOptions.h index 0ec90000..adbe1833 100644 --- a/tutorials/tutorial4/include/tutorial4/options/BareMetalDefaultOptions.h +++ b/tutorials/tutorial4/include/tutorial4/options/BareMetalDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol bare metal default options. @@ -109,13 +109,15 @@ struct BareMetalDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// tutorial4::frame::FrameLayers::Data - /// layer. - using Data = - std::tuple< - comms::option::app::FixedSizeStorage, - typename TBase::frame::FrameLayers::Data - >; + /// tutorial4::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::FixedSizeStorage, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers /// @brief Extra options for @ref /// tutorial4::frame::FrameLayers::ID layer. diff --git a/tutorials/tutorial4/include/tutorial4/options/ClientDefaultOptions.h b/tutorials/tutorial4/include/tutorial4/options/ClientDefaultOptions.h index dbd96000..e7d74a9c 100644 --- a/tutorials/tutorial4/include/tutorial4/options/ClientDefaultOptions.h +++ b/tutorials/tutorial4/include/tutorial4/options/ClientDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client default options. diff --git a/tutorials/tutorial4/include/tutorial4/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial4/include/tutorial4/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h index 9289a607..a0ea3920 100644 --- a/tutorials/tutorial4/include/tutorial4/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial4/include/tutorial4/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client input messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial4/include/tutorial4/options/DataViewDefaultOptions.h b/tutorials/tutorial4/include/tutorial4/options/DataViewDefaultOptions.h index 68a843fa..3b5660e1 100644 --- a/tutorials/tutorial4/include/tutorial4/options/DataViewDefaultOptions.h +++ b/tutorials/tutorial4/include/tutorial4/options/DataViewDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol data view default options. @@ -71,13 +71,15 @@ struct DataViewDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// tutorial4::frame::FrameLayers::Data - /// layer. - using Data = - std::tuple< - comms::option::app::OrigDataView, - typename TBase::frame::FrameLayers::Data - >; + /// tutorial4::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::OrigDataView, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers }; // struct FrameLayers }; // struct frame }; diff --git a/tutorials/tutorial4/include/tutorial4/options/DefaultOptions.h b/tutorials/tutorial4/include/tutorial4/options/DefaultOptions.h index d2eca21c..7a85a6a4 100644 --- a/tutorials/tutorial4/include/tutorial4/options/DefaultOptions.h +++ b/tutorials/tutorial4/include/tutorial4/options/DefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol default options. @@ -30,7 +30,7 @@ struct DefaultOptionsT : public TBase /// @brief Extra options for @ref /// tutorial4::field::KeyValuePropMembers::Prop3Members::Val /// field. - using Val = comms::option::EmptyOption; + using Val = comms::option::app::EmptyOption; }; // struct Prop3Members }; // struct KeyValuePropMembers @@ -41,7 +41,7 @@ struct DefaultOptionsT : public TBase /// @brief Extra options for @ref /// tutorial4::field::TlvPropMembers::Prop6Members::Val /// field. - using Val = comms::option::EmptyOption; + using Val = comms::option::app::EmptyOption; }; // struct Prop6Members struct AnyMembers @@ -49,7 +49,7 @@ struct DefaultOptionsT : public TBase /// @brief Extra options for @ref /// tutorial4::field::TlvPropMembers::AnyMembers::Val /// field. - using Val = comms::option::EmptyOption; + using Val = comms::option::app::EmptyOption; }; // struct AnyMembers }; // struct TlvPropMembers }; // struct field @@ -64,7 +64,7 @@ struct DefaultOptionsT : public TBase /// @brief Extra options for @ref /// tutorial4::message::Msg1Fields::F1 /// field. - using F1 = comms::option::EmptyOption; + using F1 = comms::option::app::EmptyOption; }; /// @brief Extra options for fields of @@ -74,7 +74,7 @@ struct DefaultOptionsT : public TBase /// @brief Extra options for @ref /// tutorial4::message::Msg2Fields::F1 /// field. - using F1 = comms::option::EmptyOption; + using F1 = comms::option::app::EmptyOption; }; }; // struct message @@ -86,13 +86,15 @@ struct DefaultOptionsT : public TBase struct FrameLayers { /// @brief Extra options for @ref - /// tutorial4::frame::FrameLayers::Data - /// layer. - using Data = comms::option::EmptyOption; + /// tutorial4::frame::FrameLayers::DataMembers::Field field. + struct DataMembers + { + using Field = comms::option::app::EmptyOption; + }; // struct DataMembers /// @brief Extra options for @ref /// tutorial4::frame::FrameLayers::ID layer. - using ID = comms::option::EmptyOption; + using ID = comms::option::app::EmptyOption; }; // struct FrameLayers }; // struct frame }; diff --git a/tutorials/tutorial4/include/tutorial4/options/ServerDefaultOptions.h b/tutorials/tutorial4/include/tutorial4/options/ServerDefaultOptions.h index 55bb47dd..1fadb272 100644 --- a/tutorials/tutorial4/include/tutorial4/options/ServerDefaultOptions.h +++ b/tutorials/tutorial4/include/tutorial4/options/ServerDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server default options. diff --git a/tutorials/tutorial4/include/tutorial4/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial4/include/tutorial4/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h index e09e9f40..e238252c 100644 --- a/tutorials/tutorial4/include/tutorial4/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial4/include/tutorial4/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server input messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial5/include/tutorial5/Message.h b/tutorials/tutorial5/include/tutorial5/Message.h index fbdeab6e..cb315212 100644 --- a/tutorials/tutorial5/include/tutorial5/Message.h +++ b/tutorials/tutorial5/include/tutorial5/Message.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message" interface class. diff --git a/tutorials/tutorial5/include/tutorial5/MsgId.h b/tutorials/tutorial5/include/tutorial5/MsgId.h index 954c25d2..3d61aa2b 100644 --- a/tutorials/tutorial5/include/tutorial5/MsgId.h +++ b/tutorials/tutorial5/include/tutorial5/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of message ids enumeration. diff --git a/tutorials/tutorial5/include/tutorial5/Version.h b/tutorials/tutorial5/include/tutorial5/Version.h index 52ebe425..cf06793b 100644 --- a/tutorials/tutorial5/include/tutorial5/Version.h +++ b/tutorials/tutorial5/include/tutorial5/Version.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains protocol version definition. @@ -22,5 +22,5 @@ inline constexpr unsigned specVersion() } // namespace tutorial5 // Generated compile time check for minimal supported version of the COMMS library -static_assert(COMMS_MAKE_VERSION(5, 2, 7) <= comms::version(), +static_assert(COMMS_MAKE_VERSION(5, 3, 0) <= comms::version(), "The version of COMMS library is too old"); diff --git a/tutorials/tutorial5/include/tutorial5/dispatch/DispatchClientInputMessage.h b/tutorials/tutorial5/include/tutorial5/dispatch/DispatchClientInputMessage.h index 3a4e5a63..1c078f7e 100644 --- a/tutorials/tutorial5/include/tutorial5/dispatch/DispatchClientInputMessage.h +++ b/tutorials/tutorial5/include/tutorial5/dispatch/DispatchClientInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/tutorials/tutorial5/include/tutorial5/dispatch/DispatchMessage.h b/tutorials/tutorial5/include/tutorial5/dispatch/DispatchMessage.h index 90bb4d34..9e1ebead 100644 --- a/tutorials/tutorial5/include/tutorial5/dispatch/DispatchMessage.h +++ b/tutorials/tutorial5/include/tutorial5/dispatch/DispatchMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for all input messages. diff --git a/tutorials/tutorial5/include/tutorial5/dispatch/DispatchServerInputMessage.h b/tutorials/tutorial5/include/tutorial5/dispatch/DispatchServerInputMessage.h index 4c0e4940..cfbfea4f 100644 --- a/tutorials/tutorial5/include/tutorial5/dispatch/DispatchServerInputMessage.h +++ b/tutorials/tutorial5/include/tutorial5/dispatch/DispatchServerInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/tutorials/tutorial5/include/tutorial5/factory/AllMessagesDynMemMsgFactory.h b/tutorials/tutorial5/include/tutorial5/factory/AllMessagesDynMemMsgFactory.h index fcacc7bd..a14062a3 100644 --- a/tutorials/tutorial5/include/tutorial5/factory/AllMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial5/include/tutorial5/factory/AllMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for all the messages. diff --git a/tutorials/tutorial5/include/tutorial5/factory/ClientInputMessagesDynMemMsgFactory.h b/tutorials/tutorial5/include/tutorial5/factory/ClientInputMessagesDynMemMsgFactory.h index f38f36b1..cba57160 100644 --- a/tutorials/tutorial5/include/tutorial5/factory/ClientInputMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial5/include/tutorial5/factory/ClientInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the client input messages. diff --git a/tutorials/tutorial5/include/tutorial5/factory/ServerInputMessagesDynMemMsgFactory.h b/tutorials/tutorial5/include/tutorial5/factory/ServerInputMessagesDynMemMsgFactory.h index ba53a46c..59ba4b48 100644 --- a/tutorials/tutorial5/include/tutorial5/factory/ServerInputMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial5/include/tutorial5/factory/ServerInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the server input messages. diff --git a/tutorials/tutorial5/include/tutorial5/field/FieldBase.h b/tutorials/tutorial5/include/tutorial5/field/FieldBase.h index 01d1b50a..face906d 100644 --- a/tutorials/tutorial5/include/tutorial5/field/FieldBase.h +++ b/tutorials/tutorial5/include/tutorial5/field/FieldBase.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of base class of all the fields. diff --git a/tutorials/tutorial5/include/tutorial5/field/MsgId.h b/tutorials/tutorial5/include/tutorial5/field/MsgId.h index f3399d93..fcf3e1cb 100644 --- a/tutorials/tutorial5/include/tutorial5/field/MsgId.h +++ b/tutorials/tutorial5/include/tutorial5/field/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "MsgId" field. @@ -27,6 +27,7 @@ class MsgId : public tutorial5::field::FieldBase<>, tutorial5::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 3> > { @@ -35,6 +36,7 @@ class MsgId : public tutorial5::field::FieldBase<>, tutorial5::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 3> >; public: diff --git a/tutorials/tutorial5/include/tutorial5/field/MsgIdCommon.h b/tutorials/tutorial5/include/tutorial5/field/MsgIdCommon.h index 2bcc04f4..06c58871 100644 --- a/tutorials/tutorial5/include/tutorial5/field/MsgIdCommon.h +++ b/tutorials/tutorial5/include/tutorial5/field/MsgIdCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial5/include/tutorial5/frame/ClientToServerFrame.h b/tutorials/tutorial5/include/tutorial5/frame/ClientToServerFrame.h index baa5ae11..960cdebb 100644 --- a/tutorials/tutorial5/include/tutorial5/frame/ClientToServerFrame.h +++ b/tutorials/tutorial5/include/tutorial5/frame/ClientToServerFrame.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "ClientToServerFrame" frame class. @@ -33,10 +33,30 @@ namespace frame template struct ClientToServerFrameLayers { + /// @brief Scope for field(s) of @ref Data layer. + struct DataMembers + { + /// @brief Custom field for @ref tutorial5::frame::ClientToServerFrameLayers::Data layer + class Field : public + comms::field::ArrayList< + tutorial5::field::FieldBase<>, + std::uint8_t, + typename TOpt::frame::ClientToServerFrameLayers::DataMembers::Field, + comms::option::def::HasName + > + { + public: + static const char* name() + { + return "Data"; + } + }; + }; + /// @brief Definition of layer "Data". using Data = comms::protocol::MsgDataLayer< - typename TOpt::frame::ClientToServerFrameLayers::Data + comms::option::def::FieldType >; /// @brief Definition of layer "Id". @@ -60,14 +80,18 @@ struct ClientToServerFrameLayers comms::field::IntValue< tutorial5::field::FieldBase<>, std::uint16_t, - comms::option::def::NumValueSerOffset<2> + comms::option::def::HasName, + comms::option::def::NumValueSerOffset<2>, + comms::option::def::DisplayOffset<2> > { using Base = comms::field::IntValue< tutorial5::field::FieldBase<>, std::uint16_t, - comms::option::def::NumValueSerOffset<2> + comms::option::def::HasName, + comms::option::def::NumValueSerOffset<2>, + comms::option::def::DisplayOffset<2> >; public: /// @brief Re-definition of the value type. @@ -102,13 +126,15 @@ struct ClientToServerFrameLayers class ChecksumField : public comms::field::IntValue< tutorial5::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial5::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. @@ -145,6 +171,7 @@ struct ClientToServerFrameLayers comms::field::IntValue< tutorial5::field::FieldBase<>, std::uint16_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid, comms::option::def::DefaultNumValue<43981L> > @@ -153,6 +180,7 @@ struct ClientToServerFrameLayers comms::field::IntValue< tutorial5::field::FieldBase<>, std::uint16_t, + comms::option::def::HasName, comms::option::def::FailOnInvalid, comms::option::def::DefaultNumValue<43981L> >; diff --git a/tutorials/tutorial5/include/tutorial5/frame/ClientToServerFrameCommon.h b/tutorials/tutorial5/include/tutorial5/frame/ClientToServerFrameCommon.h index b17ebb6a..afeba91e 100644 --- a/tutorials/tutorial5/include/tutorial5/frame/ClientToServerFrameCommon.h +++ b/tutorials/tutorial5/include/tutorial5/frame/ClientToServerFrameCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial5/include/tutorial5/frame/ServerToClientFrame.h b/tutorials/tutorial5/include/tutorial5/frame/ServerToClientFrame.h index feefe465..048953d2 100644 --- a/tutorials/tutorial5/include/tutorial5/frame/ServerToClientFrame.h +++ b/tutorials/tutorial5/include/tutorial5/frame/ServerToClientFrame.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "ServerToClientFrame" frame class. @@ -30,10 +30,30 @@ namespace frame template struct ServerToClientFrameLayers { + /// @brief Scope for field(s) of @ref Data layer. + struct DataMembers + { + /// @brief Custom field for @ref tutorial5::frame::ServerToClientFrameLayers::Data layer + class Field : public + comms::field::ArrayList< + tutorial5::field::FieldBase<>, + std::uint8_t, + typename TOpt::frame::ServerToClientFrameLayers::DataMembers::Field, + comms::option::def::HasName + > + { + public: + static const char* name() + { + return "Data"; + } + }; + }; + /// @brief Definition of layer "Data". using Data = comms::protocol::MsgDataLayer< - typename TOpt::frame::ServerToClientFrameLayers::Data + comms::option::def::FieldType >; /// @brief Definition of layer "Id". @@ -56,13 +76,15 @@ struct ServerToClientFrameLayers class SizeField : public comms::field::IntValue< tutorial5::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial5::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/tutorials/tutorial5/include/tutorial5/frame/ServerToClientFrameCommon.h b/tutorials/tutorial5/include/tutorial5/frame/ServerToClientFrameCommon.h index b2c48da1..6b2349bc 100644 --- a/tutorials/tutorial5/include/tutorial5/frame/ServerToClientFrameCommon.h +++ b/tutorials/tutorial5/include/tutorial5/frame/ServerToClientFrameCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial5/include/tutorial5/input/AllMessages.h b/tutorials/tutorial5/include/tutorial5/input/AllMessages.h index 2479b46e..7e121c2d 100644 --- a/tutorials/tutorial5/include/tutorial5/input/AllMessages.h +++ b/tutorials/tutorial5/include/tutorial5/input/AllMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the AllMessages messages bundle. diff --git a/tutorials/tutorial5/include/tutorial5/input/ClientInputMessages.h b/tutorials/tutorial5/include/tutorial5/input/ClientInputMessages.h index e07f5330..26c1927b 100644 --- a/tutorials/tutorial5/include/tutorial5/input/ClientInputMessages.h +++ b/tutorials/tutorial5/include/tutorial5/input/ClientInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ClientInputMessages messages bundle. diff --git a/tutorials/tutorial5/include/tutorial5/input/ServerInputMessages.h b/tutorials/tutorial5/include/tutorial5/input/ServerInputMessages.h index f19c8dcd..0c8c4bcd 100644 --- a/tutorials/tutorial5/include/tutorial5/input/ServerInputMessages.h +++ b/tutorials/tutorial5/include/tutorial5/input/ServerInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ServerInputMessages messages bundle. diff --git a/tutorials/tutorial5/include/tutorial5/message/Msg1.h b/tutorials/tutorial5/include/tutorial5/message/Msg1.h index e3cab5f6..ffa50c61 100644 --- a/tutorials/tutorial5/include/tutorial5/message/Msg1.h +++ b/tutorials/tutorial5/include/tutorial5/message/Msg1.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 1" message and its fields. diff --git a/tutorials/tutorial5/include/tutorial5/message/Msg1Common.h b/tutorials/tutorial5/include/tutorial5/message/Msg1Common.h index 38e168a7..3308a782 100644 --- a/tutorials/tutorial5/include/tutorial5/message/Msg1Common.h +++ b/tutorials/tutorial5/include/tutorial5/message/Msg1Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial5/include/tutorial5/message/Msg2.h b/tutorials/tutorial5/include/tutorial5/message/Msg2.h index eec1df1c..56f608bb 100644 --- a/tutorials/tutorial5/include/tutorial5/message/Msg2.h +++ b/tutorials/tutorial5/include/tutorial5/message/Msg2.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 2" message and its fields. diff --git a/tutorials/tutorial5/include/tutorial5/message/Msg2Common.h b/tutorials/tutorial5/include/tutorial5/message/Msg2Common.h index 06216497..849fb177 100644 --- a/tutorials/tutorial5/include/tutorial5/message/Msg2Common.h +++ b/tutorials/tutorial5/include/tutorial5/message/Msg2Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial5/include/tutorial5/message/Msg3.h b/tutorials/tutorial5/include/tutorial5/message/Msg3.h index d486ca33..a61e0666 100644 --- a/tutorials/tutorial5/include/tutorial5/message/Msg3.h +++ b/tutorials/tutorial5/include/tutorial5/message/Msg3.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 3" message and its fields. diff --git a/tutorials/tutorial5/include/tutorial5/message/Msg3Common.h b/tutorials/tutorial5/include/tutorial5/message/Msg3Common.h index ef70ba9b..3fa54d3f 100644 --- a/tutorials/tutorial5/include/tutorial5/message/Msg3Common.h +++ b/tutorials/tutorial5/include/tutorial5/message/Msg3Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial5/include/tutorial5/options/AllMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial5/include/tutorial5/options/AllMessagesDynMemMsgFactoryDefaultOptions.h index 6369dd8f..f9ce2f46 100644 --- a/tutorials/tutorial5/include/tutorial5/options/AllMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial5/include/tutorial5/options/AllMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol all messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial5/include/tutorial5/options/BareMetalDefaultOptions.h b/tutorials/tutorial5/include/tutorial5/options/BareMetalDefaultOptions.h index ff3f6bc9..40c1afab 100644 --- a/tutorials/tutorial5/include/tutorial5/options/BareMetalDefaultOptions.h +++ b/tutorials/tutorial5/include/tutorial5/options/BareMetalDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol bare metal default options. @@ -31,13 +31,15 @@ struct BareMetalDefaultOptionsT : public TBase struct ClientToServerFrameLayers : public TBase::frame::ClientToServerFrameLayers { /// @brief Extra options for @ref - /// tutorial5::frame::ClientToServerFrameLayers::Data - /// layer. - using Data = - std::tuple< - comms::option::app::FixedSizeStorage, - typename TBase::frame::ClientToServerFrameLayers::Data - >; + /// tutorial5::frame::ClientToServerFrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::ClientToServerFrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::FixedSizeStorage, + typename TBase::frame::ClientToServerFrameLayers::DataMembers::Field + >; + }; // struct DataMembers /// @brief Extra options for @ref /// tutorial5::frame::ClientToServerFrameLayers::Id @@ -54,13 +56,15 @@ struct BareMetalDefaultOptionsT : public TBase struct ServerToClientFrameLayers : public TBase::frame::ServerToClientFrameLayers { /// @brief Extra options for @ref - /// tutorial5::frame::ServerToClientFrameLayers::Data - /// layer. - using Data = - std::tuple< - comms::option::app::FixedSizeStorage, - typename TBase::frame::ServerToClientFrameLayers::Data - >; + /// tutorial5::frame::ServerToClientFrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::ServerToClientFrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::FixedSizeStorage, + typename TBase::frame::ServerToClientFrameLayers::DataMembers::Field + >; + }; // struct DataMembers /// @brief Extra options for @ref /// tutorial5::frame::ServerToClientFrameLayers::Id diff --git a/tutorials/tutorial5/include/tutorial5/options/ClientDefaultOptions.h b/tutorials/tutorial5/include/tutorial5/options/ClientDefaultOptions.h index d727ba6e..6692a01a 100644 --- a/tutorials/tutorial5/include/tutorial5/options/ClientDefaultOptions.h +++ b/tutorials/tutorial5/include/tutorial5/options/ClientDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client default options. diff --git a/tutorials/tutorial5/include/tutorial5/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial5/include/tutorial5/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h index 6f294d63..05a0eaae 100644 --- a/tutorials/tutorial5/include/tutorial5/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial5/include/tutorial5/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client input messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial5/include/tutorial5/options/DataViewDefaultOptions.h b/tutorials/tutorial5/include/tutorial5/options/DataViewDefaultOptions.h index 54972c5d..149e7f8e 100644 --- a/tutorials/tutorial5/include/tutorial5/options/DataViewDefaultOptions.h +++ b/tutorials/tutorial5/include/tutorial5/options/DataViewDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol data view default options. @@ -25,13 +25,15 @@ struct DataViewDefaultOptionsT : public TBase struct ClientToServerFrameLayers : public TBase::frame::ClientToServerFrameLayers { /// @brief Extra options for @ref - /// tutorial5::frame::ClientToServerFrameLayers::Data - /// layer. - using Data = - std::tuple< - comms::option::app::OrigDataView, - typename TBase::frame::ClientToServerFrameLayers::Data - >; + /// tutorial5::frame::ClientToServerFrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::ClientToServerFrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::OrigDataView, + typename TBase::frame::ClientToServerFrameLayers::DataMembers::Field + >; + }; // struct DataMembers }; // struct ClientToServerFrameLayers /// @brief Extra options for layers of @@ -39,13 +41,15 @@ struct DataViewDefaultOptionsT : public TBase struct ServerToClientFrameLayers : public TBase::frame::ServerToClientFrameLayers { /// @brief Extra options for @ref - /// tutorial5::frame::ServerToClientFrameLayers::Data - /// layer. - using Data = - std::tuple< - comms::option::app::OrigDataView, - typename TBase::frame::ServerToClientFrameLayers::Data - >; + /// tutorial5::frame::ServerToClientFrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::ServerToClientFrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::OrigDataView, + typename TBase::frame::ServerToClientFrameLayers::DataMembers::Field + >; + }; // struct DataMembers }; // struct ServerToClientFrameLayers }; // struct frame }; diff --git a/tutorials/tutorial5/include/tutorial5/options/DefaultOptions.h b/tutorials/tutorial5/include/tutorial5/options/DefaultOptions.h index 67f8f923..f2ec5745 100644 --- a/tutorials/tutorial5/include/tutorial5/options/DefaultOptions.h +++ b/tutorials/tutorial5/include/tutorial5/options/DefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol default options. @@ -28,14 +28,16 @@ struct DefaultOptionsT : public TBase struct ClientToServerFrameLayers { /// @brief Extra options for @ref - /// tutorial5::frame::ClientToServerFrameLayers::Data - /// layer. - using Data = comms::option::EmptyOption; + /// tutorial5::frame::ClientToServerFrameLayers::DataMembers::Field field. + struct DataMembers + { + using Field = comms::option::app::EmptyOption; + }; // struct DataMembers /// @brief Extra options for @ref /// tutorial5::frame::ClientToServerFrameLayers::Id /// layer. - using Id = comms::option::EmptyOption; + using Id = comms::option::app::EmptyOption; }; // struct ClientToServerFrameLayers /// @brief Extra options for layers of @@ -43,14 +45,16 @@ struct DefaultOptionsT : public TBase struct ServerToClientFrameLayers { /// @brief Extra options for @ref - /// tutorial5::frame::ServerToClientFrameLayers::Data - /// layer. - using Data = comms::option::EmptyOption; + /// tutorial5::frame::ServerToClientFrameLayers::DataMembers::Field field. + struct DataMembers + { + using Field = comms::option::app::EmptyOption; + }; // struct DataMembers /// @brief Extra options for @ref /// tutorial5::frame::ServerToClientFrameLayers::Id /// layer. - using Id = comms::option::EmptyOption; + using Id = comms::option::app::EmptyOption; }; // struct ServerToClientFrameLayers }; // struct frame }; diff --git a/tutorials/tutorial5/include/tutorial5/options/ServerDefaultOptions.h b/tutorials/tutorial5/include/tutorial5/options/ServerDefaultOptions.h index c3500109..db0e6c65 100644 --- a/tutorials/tutorial5/include/tutorial5/options/ServerDefaultOptions.h +++ b/tutorials/tutorial5/include/tutorial5/options/ServerDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server default options. diff --git a/tutorials/tutorial5/include/tutorial5/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial5/include/tutorial5/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h index eeec012a..14a434d6 100644 --- a/tutorials/tutorial5/include/tutorial5/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial5/include/tutorial5/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server input messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial6/include/tutorial6/Message.h b/tutorials/tutorial6/include/tutorial6/Message.h index 9c517066..4e03f82f 100644 --- a/tutorials/tutorial6/include/tutorial6/Message.h +++ b/tutorials/tutorial6/include/tutorial6/Message.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message" interface class. diff --git a/tutorials/tutorial6/include/tutorial6/MsgId.h b/tutorials/tutorial6/include/tutorial6/MsgId.h index c4ef63ad..f7de53e0 100644 --- a/tutorials/tutorial6/include/tutorial6/MsgId.h +++ b/tutorials/tutorial6/include/tutorial6/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of message ids enumeration. diff --git a/tutorials/tutorial6/include/tutorial6/Version.h b/tutorials/tutorial6/include/tutorial6/Version.h index 76fd2253..7f39af40 100644 --- a/tutorials/tutorial6/include/tutorial6/Version.h +++ b/tutorials/tutorial6/include/tutorial6/Version.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains protocol version definition. @@ -22,5 +22,5 @@ inline constexpr unsigned specVersion() } // namespace tutorial6 // Generated compile time check for minimal supported version of the COMMS library -static_assert(COMMS_MAKE_VERSION(5, 2, 7) <= comms::version(), +static_assert(COMMS_MAKE_VERSION(5, 3, 0) <= comms::version(), "The version of COMMS library is too old"); diff --git a/tutorials/tutorial6/include/tutorial6/dispatch/DispatchClientInputMessage.h b/tutorials/tutorial6/include/tutorial6/dispatch/DispatchClientInputMessage.h index 1ebec631..4872da59 100644 --- a/tutorials/tutorial6/include/tutorial6/dispatch/DispatchClientInputMessage.h +++ b/tutorials/tutorial6/include/tutorial6/dispatch/DispatchClientInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/tutorials/tutorial6/include/tutorial6/dispatch/DispatchMessage.h b/tutorials/tutorial6/include/tutorial6/dispatch/DispatchMessage.h index 0c867712..147ee111 100644 --- a/tutorials/tutorial6/include/tutorial6/dispatch/DispatchMessage.h +++ b/tutorials/tutorial6/include/tutorial6/dispatch/DispatchMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for all input messages. diff --git a/tutorials/tutorial6/include/tutorial6/dispatch/DispatchServerInputMessage.h b/tutorials/tutorial6/include/tutorial6/dispatch/DispatchServerInputMessage.h index 2ca2304e..acbbec2f 100644 --- a/tutorials/tutorial6/include/tutorial6/dispatch/DispatchServerInputMessage.h +++ b/tutorials/tutorial6/include/tutorial6/dispatch/DispatchServerInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/tutorials/tutorial6/include/tutorial6/factory/AllMessagesDynMemMsgFactory.h b/tutorials/tutorial6/include/tutorial6/factory/AllMessagesDynMemMsgFactory.h index 5e2f503c..52cf922a 100644 --- a/tutorials/tutorial6/include/tutorial6/factory/AllMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial6/include/tutorial6/factory/AllMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for all the messages. diff --git a/tutorials/tutorial6/include/tutorial6/factory/ClientInputMessagesDynMemMsgFactory.h b/tutorials/tutorial6/include/tutorial6/factory/ClientInputMessagesDynMemMsgFactory.h index d473a7f4..d1648e4c 100644 --- a/tutorials/tutorial6/include/tutorial6/factory/ClientInputMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial6/include/tutorial6/factory/ClientInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the client input messages. diff --git a/tutorials/tutorial6/include/tutorial6/factory/ServerInputMessagesDynMemMsgFactory.h b/tutorials/tutorial6/include/tutorial6/factory/ServerInputMessagesDynMemMsgFactory.h index 3ec78861..d3db0757 100644 --- a/tutorials/tutorial6/include/tutorial6/factory/ServerInputMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial6/include/tutorial6/factory/ServerInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the server input messages. diff --git a/tutorials/tutorial6/include/tutorial6/field/FieldBase.h b/tutorials/tutorial6/include/tutorial6/field/FieldBase.h index 75622667..6b154f63 100644 --- a/tutorials/tutorial6/include/tutorial6/field/FieldBase.h +++ b/tutorials/tutorial6/include/tutorial6/field/FieldBase.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of base class of all the fields. diff --git a/tutorials/tutorial6/include/tutorial6/field/MsgId.h b/tutorials/tutorial6/include/tutorial6/field/MsgId.h index 944ebe7b..2b775acc 100644 --- a/tutorials/tutorial6/include/tutorial6/field/MsgId.h +++ b/tutorials/tutorial6/include/tutorial6/field/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "MsgId" field. @@ -27,6 +27,7 @@ class MsgId : public tutorial6::field::FieldBase<>, tutorial6::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 3> > { @@ -35,6 +36,7 @@ class MsgId : public tutorial6::field::FieldBase<>, tutorial6::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 3> >; public: diff --git a/tutorials/tutorial6/include/tutorial6/field/MsgIdCommon.h b/tutorials/tutorial6/include/tutorial6/field/MsgIdCommon.h index ac286507..168f8d7e 100644 --- a/tutorials/tutorial6/include/tutorial6/field/MsgIdCommon.h +++ b/tutorials/tutorial6/include/tutorial6/field/MsgIdCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial6/include/tutorial6/frame/Frame.h b/tutorials/tutorial6/include/tutorial6/frame/Frame.h index 55742abf..0bf731ed 100644 --- a/tutorials/tutorial6/include/tutorial6/frame/Frame.h +++ b/tutorials/tutorial6/include/tutorial6/frame/Frame.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Frame" frame class. @@ -30,10 +30,30 @@ namespace frame template struct FrameLayers { + /// @brief Scope for field(s) of @ref Data layer. + struct DataMembers + { + /// @brief Custom field for @ref tutorial6::frame::FrameLayers::Data layer + class Field : public + comms::field::ArrayList< + tutorial6::field::FieldBase<>, + std::uint8_t, + typename TOpt::frame::FrameLayers::DataMembers::Field, + comms::option::def::HasName + > + { + public: + static const char* name() + { + return "Data"; + } + }; + }; + /// @brief Definition of layer "Data". using Data = comms::protocol::MsgDataLayer< - typename TOpt::frame::FrameLayers::Data + comms::option::def::FieldType >; /// @brief Definition of layer "Id". @@ -56,13 +76,15 @@ struct FrameLayers class SizeField : public comms::field::IntValue< tutorial6::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial6::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/tutorials/tutorial6/include/tutorial6/frame/FrameCommon.h b/tutorials/tutorial6/include/tutorial6/frame/FrameCommon.h index 4c75b990..40c5d33a 100644 --- a/tutorials/tutorial6/include/tutorial6/frame/FrameCommon.h +++ b/tutorials/tutorial6/include/tutorial6/frame/FrameCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial6/include/tutorial6/input/AllMessages.h b/tutorials/tutorial6/include/tutorial6/input/AllMessages.h index 8b8e07e8..9de7fbb6 100644 --- a/tutorials/tutorial6/include/tutorial6/input/AllMessages.h +++ b/tutorials/tutorial6/include/tutorial6/input/AllMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the AllMessages messages bundle. diff --git a/tutorials/tutorial6/include/tutorial6/input/ClientInputMessages.h b/tutorials/tutorial6/include/tutorial6/input/ClientInputMessages.h index c331da48..65a5c600 100644 --- a/tutorials/tutorial6/include/tutorial6/input/ClientInputMessages.h +++ b/tutorials/tutorial6/include/tutorial6/input/ClientInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ClientInputMessages messages bundle. diff --git a/tutorials/tutorial6/include/tutorial6/input/ServerInputMessages.h b/tutorials/tutorial6/include/tutorial6/input/ServerInputMessages.h index 8b2b1292..bdc0537d 100644 --- a/tutorials/tutorial6/include/tutorial6/input/ServerInputMessages.h +++ b/tutorials/tutorial6/include/tutorial6/input/ServerInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ServerInputMessages messages bundle. diff --git a/tutorials/tutorial6/include/tutorial6/message/Msg1.h b/tutorials/tutorial6/include/tutorial6/message/Msg1.h index c11cdcd4..a5484894 100644 --- a/tutorials/tutorial6/include/tutorial6/message/Msg1.h +++ b/tutorials/tutorial6/include/tutorial6/message/Msg1.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 1" message and its fields. diff --git a/tutorials/tutorial6/include/tutorial6/message/Msg1Common.h b/tutorials/tutorial6/include/tutorial6/message/Msg1Common.h index 81410d6d..1b1bb9b4 100644 --- a/tutorials/tutorial6/include/tutorial6/message/Msg1Common.h +++ b/tutorials/tutorial6/include/tutorial6/message/Msg1Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial6/include/tutorial6/message/Msg2.h b/tutorials/tutorial6/include/tutorial6/message/Msg2.h index 43aa268e..10e95e95 100644 --- a/tutorials/tutorial6/include/tutorial6/message/Msg2.h +++ b/tutorials/tutorial6/include/tutorial6/message/Msg2.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 2" message and its fields. diff --git a/tutorials/tutorial6/include/tutorial6/message/Msg2Common.h b/tutorials/tutorial6/include/tutorial6/message/Msg2Common.h index c0e20ba7..8cc9c5bd 100644 --- a/tutorials/tutorial6/include/tutorial6/message/Msg2Common.h +++ b/tutorials/tutorial6/include/tutorial6/message/Msg2Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial6/include/tutorial6/message/Msg3.h b/tutorials/tutorial6/include/tutorial6/message/Msg3.h index 14ed5db3..2bf57061 100644 --- a/tutorials/tutorial6/include/tutorial6/message/Msg3.h +++ b/tutorials/tutorial6/include/tutorial6/message/Msg3.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 3" message and its fields. diff --git a/tutorials/tutorial6/include/tutorial6/message/Msg3Common.h b/tutorials/tutorial6/include/tutorial6/message/Msg3Common.h index bb42521c..6b992cf5 100644 --- a/tutorials/tutorial6/include/tutorial6/message/Msg3Common.h +++ b/tutorials/tutorial6/include/tutorial6/message/Msg3Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial6/include/tutorial6/options/AllMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial6/include/tutorial6/options/AllMessagesDynMemMsgFactoryDefaultOptions.h index f248cb98..b0ccac7d 100644 --- a/tutorials/tutorial6/include/tutorial6/options/AllMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial6/include/tutorial6/options/AllMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol all messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial6/include/tutorial6/options/BareMetalDefaultOptions.h b/tutorials/tutorial6/include/tutorial6/options/BareMetalDefaultOptions.h index a634d675..847d2f39 100644 --- a/tutorials/tutorial6/include/tutorial6/options/BareMetalDefaultOptions.h +++ b/tutorials/tutorial6/include/tutorial6/options/BareMetalDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol bare metal default options. @@ -31,13 +31,15 @@ struct BareMetalDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// tutorial6::frame::FrameLayers::Data - /// layer. - using Data = - std::tuple< - comms::option::app::FixedSizeStorage, - typename TBase::frame::FrameLayers::Data - >; + /// tutorial6::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::FixedSizeStorage, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers /// @brief Extra options for @ref /// tutorial6::frame::FrameLayers::Id layer. diff --git a/tutorials/tutorial6/include/tutorial6/options/ClientDefaultOptions.h b/tutorials/tutorial6/include/tutorial6/options/ClientDefaultOptions.h index d60c1861..8c60a3c5 100644 --- a/tutorials/tutorial6/include/tutorial6/options/ClientDefaultOptions.h +++ b/tutorials/tutorial6/include/tutorial6/options/ClientDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client default options. diff --git a/tutorials/tutorial6/include/tutorial6/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial6/include/tutorial6/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h index 4580bc49..d42d5369 100644 --- a/tutorials/tutorial6/include/tutorial6/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial6/include/tutorial6/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client input messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial6/include/tutorial6/options/DataViewDefaultOptions.h b/tutorials/tutorial6/include/tutorial6/options/DataViewDefaultOptions.h index e240df9e..8435d223 100644 --- a/tutorials/tutorial6/include/tutorial6/options/DataViewDefaultOptions.h +++ b/tutorials/tutorial6/include/tutorial6/options/DataViewDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol data view default options. @@ -25,13 +25,15 @@ struct DataViewDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// tutorial6::frame::FrameLayers::Data - /// layer. - using Data = - std::tuple< - comms::option::app::OrigDataView, - typename TBase::frame::FrameLayers::Data - >; + /// tutorial6::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::OrigDataView, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers }; // struct FrameLayers }; // struct frame }; diff --git a/tutorials/tutorial6/include/tutorial6/options/DefaultOptions.h b/tutorials/tutorial6/include/tutorial6/options/DefaultOptions.h index 75947c6b..881d4c4f 100644 --- a/tutorials/tutorial6/include/tutorial6/options/DefaultOptions.h +++ b/tutorials/tutorial6/include/tutorial6/options/DefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol default options. @@ -28,13 +28,15 @@ struct DefaultOptionsT : public TBase struct FrameLayers { /// @brief Extra options for @ref - /// tutorial6::frame::FrameLayers::Data - /// layer. - using Data = comms::option::EmptyOption; + /// tutorial6::frame::FrameLayers::DataMembers::Field field. + struct DataMembers + { + using Field = comms::option::app::EmptyOption; + }; // struct DataMembers /// @brief Extra options for @ref /// tutorial6::frame::FrameLayers::Id layer. - using Id = comms::option::EmptyOption; + using Id = comms::option::app::EmptyOption; }; // struct FrameLayers }; // struct frame }; diff --git a/tutorials/tutorial6/include/tutorial6/options/ServerDefaultOptions.h b/tutorials/tutorial6/include/tutorial6/options/ServerDefaultOptions.h index f18f1091..82400277 100644 --- a/tutorials/tutorial6/include/tutorial6/options/ServerDefaultOptions.h +++ b/tutorials/tutorial6/include/tutorial6/options/ServerDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server default options. diff --git a/tutorials/tutorial6/include/tutorial6/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial6/include/tutorial6/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h index fb822849..2c1a5c08 100644 --- a/tutorials/tutorial6/include/tutorial6/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial6/include/tutorial6/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server input messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial7/include/tutorial7/Message.h b/tutorials/tutorial7/include/tutorial7/Message.h index 9b1ae939..c8d89008 100644 --- a/tutorials/tutorial7/include/tutorial7/Message.h +++ b/tutorials/tutorial7/include/tutorial7/Message.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message" interface class. diff --git a/tutorials/tutorial7/include/tutorial7/MsgId.h b/tutorials/tutorial7/include/tutorial7/MsgId.h index 2f6c4268..18165c06 100644 --- a/tutorials/tutorial7/include/tutorial7/MsgId.h +++ b/tutorials/tutorial7/include/tutorial7/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of message ids enumeration. diff --git a/tutorials/tutorial7/include/tutorial7/Version.h b/tutorials/tutorial7/include/tutorial7/Version.h index e891ff79..5e1e513d 100644 --- a/tutorials/tutorial7/include/tutorial7/Version.h +++ b/tutorials/tutorial7/include/tutorial7/Version.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains protocol version definition. @@ -22,5 +22,5 @@ inline constexpr unsigned specVersion() } // namespace tutorial7 // Generated compile time check for minimal supported version of the COMMS library -static_assert(COMMS_MAKE_VERSION(5, 2, 7) <= comms::version(), +static_assert(COMMS_MAKE_VERSION(5, 3, 0) <= comms::version(), "The version of COMMS library is too old"); diff --git a/tutorials/tutorial7/include/tutorial7/dispatch/DispatchClientInputMessage.h b/tutorials/tutorial7/include/tutorial7/dispatch/DispatchClientInputMessage.h index ac63aa45..35ce77ec 100644 --- a/tutorials/tutorial7/include/tutorial7/dispatch/DispatchClientInputMessage.h +++ b/tutorials/tutorial7/include/tutorial7/dispatch/DispatchClientInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/tutorials/tutorial7/include/tutorial7/dispatch/DispatchMessage.h b/tutorials/tutorial7/include/tutorial7/dispatch/DispatchMessage.h index bfc630cd..0a3791cc 100644 --- a/tutorials/tutorial7/include/tutorial7/dispatch/DispatchMessage.h +++ b/tutorials/tutorial7/include/tutorial7/dispatch/DispatchMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for all input messages. diff --git a/tutorials/tutorial7/include/tutorial7/dispatch/DispatchServerInputMessage.h b/tutorials/tutorial7/include/tutorial7/dispatch/DispatchServerInputMessage.h index f1f8a493..efcde813 100644 --- a/tutorials/tutorial7/include/tutorial7/dispatch/DispatchServerInputMessage.h +++ b/tutorials/tutorial7/include/tutorial7/dispatch/DispatchServerInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/tutorials/tutorial7/include/tutorial7/factory/AllMessagesDynMemMsgFactory.h b/tutorials/tutorial7/include/tutorial7/factory/AllMessagesDynMemMsgFactory.h index 6f7b1647..d8af0dfd 100644 --- a/tutorials/tutorial7/include/tutorial7/factory/AllMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial7/include/tutorial7/factory/AllMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for all the messages. diff --git a/tutorials/tutorial7/include/tutorial7/factory/ClientInputMessagesDynMemMsgFactory.h b/tutorials/tutorial7/include/tutorial7/factory/ClientInputMessagesDynMemMsgFactory.h index 07e5c6cb..dbc5bebd 100644 --- a/tutorials/tutorial7/include/tutorial7/factory/ClientInputMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial7/include/tutorial7/factory/ClientInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the client input messages. diff --git a/tutorials/tutorial7/include/tutorial7/factory/ServerInputMessagesDynMemMsgFactory.h b/tutorials/tutorial7/include/tutorial7/factory/ServerInputMessagesDynMemMsgFactory.h index e5631ca8..9d1b3bd1 100644 --- a/tutorials/tutorial7/include/tutorial7/factory/ServerInputMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial7/include/tutorial7/factory/ServerInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the server input messages. diff --git a/tutorials/tutorial7/include/tutorial7/field/FieldBase.h b/tutorials/tutorial7/include/tutorial7/field/FieldBase.h index 50d29153..56404f69 100644 --- a/tutorials/tutorial7/include/tutorial7/field/FieldBase.h +++ b/tutorials/tutorial7/include/tutorial7/field/FieldBase.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of base class of all the fields. diff --git a/tutorials/tutorial7/include/tutorial7/field/MsgId.h b/tutorials/tutorial7/include/tutorial7/field/MsgId.h index b1b04b21..db79c1bf 100644 --- a/tutorials/tutorial7/include/tutorial7/field/MsgId.h +++ b/tutorials/tutorial7/include/tutorial7/field/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "MsgId" field. @@ -27,6 +27,7 @@ class MsgId : public tutorial7::field::FieldBase<>, tutorial7::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 3> > { @@ -35,6 +36,7 @@ class MsgId : public tutorial7::field::FieldBase<>, tutorial7::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 3> >; public: diff --git a/tutorials/tutorial7/include/tutorial7/field/MsgIdCommon.h b/tutorials/tutorial7/include/tutorial7/field/MsgIdCommon.h index f24af2a3..f7924fb9 100644 --- a/tutorials/tutorial7/include/tutorial7/field/MsgIdCommon.h +++ b/tutorials/tutorial7/include/tutorial7/field/MsgIdCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial7/include/tutorial7/frame/Frame.h b/tutorials/tutorial7/include/tutorial7/frame/Frame.h index 6bf80f53..1c7aec02 100644 --- a/tutorials/tutorial7/include/tutorial7/frame/Frame.h +++ b/tutorials/tutorial7/include/tutorial7/frame/Frame.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Frame" frame class. @@ -30,10 +30,30 @@ namespace frame template struct FrameLayers { + /// @brief Scope for field(s) of @ref Data layer. + struct DataMembers + { + /// @brief Custom field for @ref tutorial7::frame::FrameLayers::Data layer + class Field : public + comms::field::ArrayList< + tutorial7::field::FieldBase<>, + std::uint8_t, + typename TOpt::frame::FrameLayers::DataMembers::Field, + comms::option::def::HasName + > + { + public: + static const char* name() + { + return "Data"; + } + }; + }; + /// @brief Definition of layer "Data". using Data = comms::protocol::MsgDataLayer< - typename TOpt::frame::FrameLayers::Data + comms::option::def::FieldType >; /// @brief Definition of layer "Id". @@ -56,13 +76,15 @@ struct FrameLayers class SizeField : public comms::field::IntValue< tutorial7::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial7::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/tutorials/tutorial7/include/tutorial7/frame/FrameCommon.h b/tutorials/tutorial7/include/tutorial7/frame/FrameCommon.h index 53ee3bcd..01d9c2f2 100644 --- a/tutorials/tutorial7/include/tutorial7/frame/FrameCommon.h +++ b/tutorials/tutorial7/include/tutorial7/frame/FrameCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial7/include/tutorial7/input/AllMessages.h b/tutorials/tutorial7/include/tutorial7/input/AllMessages.h index 8407247e..80fbeb20 100644 --- a/tutorials/tutorial7/include/tutorial7/input/AllMessages.h +++ b/tutorials/tutorial7/include/tutorial7/input/AllMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the AllMessages messages bundle. diff --git a/tutorials/tutorial7/include/tutorial7/input/ClientInputMessages.h b/tutorials/tutorial7/include/tutorial7/input/ClientInputMessages.h index e074e405..6448aaca 100644 --- a/tutorials/tutorial7/include/tutorial7/input/ClientInputMessages.h +++ b/tutorials/tutorial7/include/tutorial7/input/ClientInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ClientInputMessages messages bundle. diff --git a/tutorials/tutorial7/include/tutorial7/input/ServerInputMessages.h b/tutorials/tutorial7/include/tutorial7/input/ServerInputMessages.h index 17692507..24c6bb62 100644 --- a/tutorials/tutorial7/include/tutorial7/input/ServerInputMessages.h +++ b/tutorials/tutorial7/include/tutorial7/input/ServerInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ServerInputMessages messages bundle. diff --git a/tutorials/tutorial7/include/tutorial7/message/Msg1.h b/tutorials/tutorial7/include/tutorial7/message/Msg1.h index 7657e8e2..87487b8f 100644 --- a/tutorials/tutorial7/include/tutorial7/message/Msg1.h +++ b/tutorials/tutorial7/include/tutorial7/message/Msg1.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 1" message and its fields. diff --git a/tutorials/tutorial7/include/tutorial7/message/Msg1Common.h b/tutorials/tutorial7/include/tutorial7/message/Msg1Common.h index 43b4fd08..0dac0eeb 100644 --- a/tutorials/tutorial7/include/tutorial7/message/Msg1Common.h +++ b/tutorials/tutorial7/include/tutorial7/message/Msg1Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial7/include/tutorial7/message/Msg2.h b/tutorials/tutorial7/include/tutorial7/message/Msg2.h index ad9e015d..3ebc89cf 100644 --- a/tutorials/tutorial7/include/tutorial7/message/Msg2.h +++ b/tutorials/tutorial7/include/tutorial7/message/Msg2.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 2" message and its fields. diff --git a/tutorials/tutorial7/include/tutorial7/message/Msg2Common.h b/tutorials/tutorial7/include/tutorial7/message/Msg2Common.h index f0b56b85..477fe03d 100644 --- a/tutorials/tutorial7/include/tutorial7/message/Msg2Common.h +++ b/tutorials/tutorial7/include/tutorial7/message/Msg2Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial7/include/tutorial7/message/Msg3.h b/tutorials/tutorial7/include/tutorial7/message/Msg3.h index 5c7d1307..d5104019 100644 --- a/tutorials/tutorial7/include/tutorial7/message/Msg3.h +++ b/tutorials/tutorial7/include/tutorial7/message/Msg3.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 3" message and its fields. diff --git a/tutorials/tutorial7/include/tutorial7/message/Msg3Common.h b/tutorials/tutorial7/include/tutorial7/message/Msg3Common.h index 00639c5d..0bf1a53c 100644 --- a/tutorials/tutorial7/include/tutorial7/message/Msg3Common.h +++ b/tutorials/tutorial7/include/tutorial7/message/Msg3Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial7/include/tutorial7/options/AllMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial7/include/tutorial7/options/AllMessagesDynMemMsgFactoryDefaultOptions.h index 92d8a6e5..4c69f643 100644 --- a/tutorials/tutorial7/include/tutorial7/options/AllMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial7/include/tutorial7/options/AllMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol all messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial7/include/tutorial7/options/BareMetalDefaultOptions.h b/tutorials/tutorial7/include/tutorial7/options/BareMetalDefaultOptions.h index 2aa41e80..c4f2a7c2 100644 --- a/tutorials/tutorial7/include/tutorial7/options/BareMetalDefaultOptions.h +++ b/tutorials/tutorial7/include/tutorial7/options/BareMetalDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol bare metal default options. @@ -31,13 +31,15 @@ struct BareMetalDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// tutorial7::frame::FrameLayers::Data - /// layer. - using Data = - std::tuple< - comms::option::app::FixedSizeStorage, - typename TBase::frame::FrameLayers::Data - >; + /// tutorial7::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::FixedSizeStorage, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers /// @brief Extra options for @ref /// tutorial7::frame::FrameLayers::Id layer. diff --git a/tutorials/tutorial7/include/tutorial7/options/ClientDefaultOptions.h b/tutorials/tutorial7/include/tutorial7/options/ClientDefaultOptions.h index ee937543..b8945d18 100644 --- a/tutorials/tutorial7/include/tutorial7/options/ClientDefaultOptions.h +++ b/tutorials/tutorial7/include/tutorial7/options/ClientDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client default options. diff --git a/tutorials/tutorial7/include/tutorial7/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial7/include/tutorial7/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h index 1a69e173..0148aa98 100644 --- a/tutorials/tutorial7/include/tutorial7/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial7/include/tutorial7/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client input messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial7/include/tutorial7/options/DataViewDefaultOptions.h b/tutorials/tutorial7/include/tutorial7/options/DataViewDefaultOptions.h index eca21ae2..ded89340 100644 --- a/tutorials/tutorial7/include/tutorial7/options/DataViewDefaultOptions.h +++ b/tutorials/tutorial7/include/tutorial7/options/DataViewDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol data view default options. @@ -25,13 +25,15 @@ struct DataViewDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// tutorial7::frame::FrameLayers::Data - /// layer. - using Data = - std::tuple< - comms::option::app::OrigDataView, - typename TBase::frame::FrameLayers::Data - >; + /// tutorial7::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::OrigDataView, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers }; // struct FrameLayers }; // struct frame }; diff --git a/tutorials/tutorial7/include/tutorial7/options/DefaultOptions.h b/tutorials/tutorial7/include/tutorial7/options/DefaultOptions.h index ffdd1509..8da3f4d1 100644 --- a/tutorials/tutorial7/include/tutorial7/options/DefaultOptions.h +++ b/tutorials/tutorial7/include/tutorial7/options/DefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol default options. @@ -28,13 +28,15 @@ struct DefaultOptionsT : public TBase struct FrameLayers { /// @brief Extra options for @ref - /// tutorial7::frame::FrameLayers::Data - /// layer. - using Data = comms::option::EmptyOption; + /// tutorial7::frame::FrameLayers::DataMembers::Field field. + struct DataMembers + { + using Field = comms::option::app::EmptyOption; + }; // struct DataMembers /// @brief Extra options for @ref /// tutorial7::frame::FrameLayers::Id layer. - using Id = comms::option::EmptyOption; + using Id = comms::option::app::EmptyOption; }; // struct FrameLayers }; // struct frame }; diff --git a/tutorials/tutorial7/include/tutorial7/options/ServerDefaultOptions.h b/tutorials/tutorial7/include/tutorial7/options/ServerDefaultOptions.h index fdc4a648..4800aaf3 100644 --- a/tutorials/tutorial7/include/tutorial7/options/ServerDefaultOptions.h +++ b/tutorials/tutorial7/include/tutorial7/options/ServerDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server default options. diff --git a/tutorials/tutorial7/include/tutorial7/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial7/include/tutorial7/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h index 0218a28f..77f10e72 100644 --- a/tutorials/tutorial7/include/tutorial7/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial7/include/tutorial7/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server input messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial8/include/tutorial8/Message.h b/tutorials/tutorial8/include/tutorial8/Message.h index f878b68d..70288de6 100644 --- a/tutorials/tutorial8/include/tutorial8/Message.h +++ b/tutorials/tutorial8/include/tutorial8/Message.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message" interface class. diff --git a/tutorials/tutorial8/include/tutorial8/MsgId.h b/tutorials/tutorial8/include/tutorial8/MsgId.h index 9360ab6b..2a2f3a3d 100644 --- a/tutorials/tutorial8/include/tutorial8/MsgId.h +++ b/tutorials/tutorial8/include/tutorial8/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of message ids enumeration. diff --git a/tutorials/tutorial8/include/tutorial8/Version.h b/tutorials/tutorial8/include/tutorial8/Version.h index b8967705..5f138899 100644 --- a/tutorials/tutorial8/include/tutorial8/Version.h +++ b/tutorials/tutorial8/include/tutorial8/Version.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains protocol version definition. @@ -22,5 +22,5 @@ inline constexpr unsigned specVersion() } // namespace tutorial8 // Generated compile time check for minimal supported version of the COMMS library -static_assert(COMMS_MAKE_VERSION(5, 2, 7) <= comms::version(), +static_assert(COMMS_MAKE_VERSION(5, 3, 0) <= comms::version(), "The version of COMMS library is too old"); diff --git a/tutorials/tutorial8/include/tutorial8/dispatch/DispatchClientInputMessage.h b/tutorials/tutorial8/include/tutorial8/dispatch/DispatchClientInputMessage.h index 07b4ffed..5a607921 100644 --- a/tutorials/tutorial8/include/tutorial8/dispatch/DispatchClientInputMessage.h +++ b/tutorials/tutorial8/include/tutorial8/dispatch/DispatchClientInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/tutorials/tutorial8/include/tutorial8/dispatch/DispatchMessage.h b/tutorials/tutorial8/include/tutorial8/dispatch/DispatchMessage.h index 3bbda430..b571dcb7 100644 --- a/tutorials/tutorial8/include/tutorial8/dispatch/DispatchMessage.h +++ b/tutorials/tutorial8/include/tutorial8/dispatch/DispatchMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for all input messages. diff --git a/tutorials/tutorial8/include/tutorial8/dispatch/DispatchServerInputMessage.h b/tutorials/tutorial8/include/tutorial8/dispatch/DispatchServerInputMessage.h index 0e42fb71..48f8ab96 100644 --- a/tutorials/tutorial8/include/tutorial8/dispatch/DispatchServerInputMessage.h +++ b/tutorials/tutorial8/include/tutorial8/dispatch/DispatchServerInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/tutorials/tutorial8/include/tutorial8/factory/AllMessagesDynMemMsgFactory.h b/tutorials/tutorial8/include/tutorial8/factory/AllMessagesDynMemMsgFactory.h index fd1985ca..ad32d26c 100644 --- a/tutorials/tutorial8/include/tutorial8/factory/AllMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial8/include/tutorial8/factory/AllMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for all the messages. diff --git a/tutorials/tutorial8/include/tutorial8/factory/ClientInputMessagesDynMemMsgFactory.h b/tutorials/tutorial8/include/tutorial8/factory/ClientInputMessagesDynMemMsgFactory.h index d3cb4294..2fc51538 100644 --- a/tutorials/tutorial8/include/tutorial8/factory/ClientInputMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial8/include/tutorial8/factory/ClientInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the client input messages. diff --git a/tutorials/tutorial8/include/tutorial8/factory/ServerInputMessagesDynMemMsgFactory.h b/tutorials/tutorial8/include/tutorial8/factory/ServerInputMessagesDynMemMsgFactory.h index 248463d0..a2259d69 100644 --- a/tutorials/tutorial8/include/tutorial8/factory/ServerInputMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial8/include/tutorial8/factory/ServerInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the server input messages. diff --git a/tutorials/tutorial8/include/tutorial8/field/FieldBase.h b/tutorials/tutorial8/include/tutorial8/field/FieldBase.h index a29d234f..e62be6fa 100644 --- a/tutorials/tutorial8/include/tutorial8/field/FieldBase.h +++ b/tutorials/tutorial8/include/tutorial8/field/FieldBase.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of base class of all the fields. diff --git a/tutorials/tutorial8/include/tutorial8/field/MsgId.h b/tutorials/tutorial8/include/tutorial8/field/MsgId.h index 3ec795af..07d8c48b 100644 --- a/tutorials/tutorial8/include/tutorial8/field/MsgId.h +++ b/tutorials/tutorial8/include/tutorial8/field/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "MsgId" field. @@ -27,6 +27,7 @@ class MsgId : public tutorial8::field::FieldBase<>, tutorial8::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 3> > { @@ -35,6 +36,7 @@ class MsgId : public tutorial8::field::FieldBase<>, tutorial8::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 3> >; public: diff --git a/tutorials/tutorial8/include/tutorial8/field/MsgIdCommon.h b/tutorials/tutorial8/include/tutorial8/field/MsgIdCommon.h index a5d7431b..a1e759a3 100644 --- a/tutorials/tutorial8/include/tutorial8/field/MsgIdCommon.h +++ b/tutorials/tutorial8/include/tutorial8/field/MsgIdCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial8/include/tutorial8/frame/Frame.h b/tutorials/tutorial8/include/tutorial8/frame/Frame.h index bf698001..5b7a4f74 100644 --- a/tutorials/tutorial8/include/tutorial8/frame/Frame.h +++ b/tutorials/tutorial8/include/tutorial8/frame/Frame.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Frame" frame class. @@ -30,10 +30,30 @@ namespace frame template struct FrameLayers { + /// @brief Scope for field(s) of @ref Data layer. + struct DataMembers + { + /// @brief Custom field for @ref tutorial8::frame::FrameLayers::Data layer + class Field : public + comms::field::ArrayList< + tutorial8::field::FieldBase<>, + std::uint8_t, + typename TOpt::frame::FrameLayers::DataMembers::Field, + comms::option::def::HasName + > + { + public: + static const char* name() + { + return "Data"; + } + }; + }; + /// @brief Definition of layer "Data". using Data = comms::protocol::MsgDataLayer< - typename TOpt::frame::FrameLayers::Data + comms::option::def::FieldType >; /// @brief Definition of layer "Id". @@ -56,13 +76,15 @@ struct FrameLayers class SizeField : public comms::field::IntValue< tutorial8::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial8::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/tutorials/tutorial8/include/tutorial8/frame/FrameCommon.h b/tutorials/tutorial8/include/tutorial8/frame/FrameCommon.h index fb0476da..01465ab4 100644 --- a/tutorials/tutorial8/include/tutorial8/frame/FrameCommon.h +++ b/tutorials/tutorial8/include/tutorial8/frame/FrameCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial8/include/tutorial8/input/AllMessages.h b/tutorials/tutorial8/include/tutorial8/input/AllMessages.h index 23e222fe..b6a4bde1 100644 --- a/tutorials/tutorial8/include/tutorial8/input/AllMessages.h +++ b/tutorials/tutorial8/include/tutorial8/input/AllMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the AllMessages messages bundle. diff --git a/tutorials/tutorial8/include/tutorial8/input/ClientInputMessages.h b/tutorials/tutorial8/include/tutorial8/input/ClientInputMessages.h index 64341611..8c9ce9ed 100644 --- a/tutorials/tutorial8/include/tutorial8/input/ClientInputMessages.h +++ b/tutorials/tutorial8/include/tutorial8/input/ClientInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ClientInputMessages messages bundle. diff --git a/tutorials/tutorial8/include/tutorial8/input/ServerInputMessages.h b/tutorials/tutorial8/include/tutorial8/input/ServerInputMessages.h index 4e038f88..aab40b56 100644 --- a/tutorials/tutorial8/include/tutorial8/input/ServerInputMessages.h +++ b/tutorials/tutorial8/include/tutorial8/input/ServerInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ServerInputMessages messages bundle. diff --git a/tutorials/tutorial8/include/tutorial8/message/Msg1.h b/tutorials/tutorial8/include/tutorial8/message/Msg1.h index 7e4d609b..4c4dac0b 100644 --- a/tutorials/tutorial8/include/tutorial8/message/Msg1.h +++ b/tutorials/tutorial8/include/tutorial8/message/Msg1.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 1" message and its fields. diff --git a/tutorials/tutorial8/include/tutorial8/message/Msg1Common.h b/tutorials/tutorial8/include/tutorial8/message/Msg1Common.h index 9966f154..c66de583 100644 --- a/tutorials/tutorial8/include/tutorial8/message/Msg1Common.h +++ b/tutorials/tutorial8/include/tutorial8/message/Msg1Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial8/include/tutorial8/message/Msg2.h b/tutorials/tutorial8/include/tutorial8/message/Msg2.h index ed70d2f7..33ac18cf 100644 --- a/tutorials/tutorial8/include/tutorial8/message/Msg2.h +++ b/tutorials/tutorial8/include/tutorial8/message/Msg2.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 2" message and its fields. diff --git a/tutorials/tutorial8/include/tutorial8/message/Msg2Common.h b/tutorials/tutorial8/include/tutorial8/message/Msg2Common.h index c56d661c..4390bfdb 100644 --- a/tutorials/tutorial8/include/tutorial8/message/Msg2Common.h +++ b/tutorials/tutorial8/include/tutorial8/message/Msg2Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial8/include/tutorial8/message/Msg3.h b/tutorials/tutorial8/include/tutorial8/message/Msg3.h index 93c67f95..958bab1a 100644 --- a/tutorials/tutorial8/include/tutorial8/message/Msg3.h +++ b/tutorials/tutorial8/include/tutorial8/message/Msg3.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 3" message and its fields. diff --git a/tutorials/tutorial8/include/tutorial8/message/Msg3Common.h b/tutorials/tutorial8/include/tutorial8/message/Msg3Common.h index 60339eec..bbfb42ef 100644 --- a/tutorials/tutorial8/include/tutorial8/message/Msg3Common.h +++ b/tutorials/tutorial8/include/tutorial8/message/Msg3Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial8/include/tutorial8/options/AllMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial8/include/tutorial8/options/AllMessagesDynMemMsgFactoryDefaultOptions.h index 5b187dc3..df08c05f 100644 --- a/tutorials/tutorial8/include/tutorial8/options/AllMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial8/include/tutorial8/options/AllMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol all messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial8/include/tutorial8/options/BareMetalDefaultOptions.h b/tutorials/tutorial8/include/tutorial8/options/BareMetalDefaultOptions.h index 3e40037c..c8e5bfcd 100644 --- a/tutorials/tutorial8/include/tutorial8/options/BareMetalDefaultOptions.h +++ b/tutorials/tutorial8/include/tutorial8/options/BareMetalDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol bare metal default options. @@ -31,13 +31,15 @@ struct BareMetalDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// tutorial8::frame::FrameLayers::Data - /// layer. - using Data = - std::tuple< - comms::option::app::FixedSizeStorage, - typename TBase::frame::FrameLayers::Data - >; + /// tutorial8::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::FixedSizeStorage, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers /// @brief Extra options for @ref /// tutorial8::frame::FrameLayers::Id layer. diff --git a/tutorials/tutorial8/include/tutorial8/options/ClientDefaultOptions.h b/tutorials/tutorial8/include/tutorial8/options/ClientDefaultOptions.h index 0d3c6f7d..7e75c900 100644 --- a/tutorials/tutorial8/include/tutorial8/options/ClientDefaultOptions.h +++ b/tutorials/tutorial8/include/tutorial8/options/ClientDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client default options. diff --git a/tutorials/tutorial8/include/tutorial8/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial8/include/tutorial8/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h index d2508590..09257347 100644 --- a/tutorials/tutorial8/include/tutorial8/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial8/include/tutorial8/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client input messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial8/include/tutorial8/options/DataViewDefaultOptions.h b/tutorials/tutorial8/include/tutorial8/options/DataViewDefaultOptions.h index ac67a6c8..715f36cb 100644 --- a/tutorials/tutorial8/include/tutorial8/options/DataViewDefaultOptions.h +++ b/tutorials/tutorial8/include/tutorial8/options/DataViewDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol data view default options. @@ -25,13 +25,15 @@ struct DataViewDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// tutorial8::frame::FrameLayers::Data - /// layer. - using Data = - std::tuple< - comms::option::app::OrigDataView, - typename TBase::frame::FrameLayers::Data - >; + /// tutorial8::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::OrigDataView, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers }; // struct FrameLayers }; // struct frame }; diff --git a/tutorials/tutorial8/include/tutorial8/options/DefaultOptions.h b/tutorials/tutorial8/include/tutorial8/options/DefaultOptions.h index 1f4125fe..ae7e8c12 100644 --- a/tutorials/tutorial8/include/tutorial8/options/DefaultOptions.h +++ b/tutorials/tutorial8/include/tutorial8/options/DefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol default options. @@ -28,13 +28,15 @@ struct DefaultOptionsT : public TBase struct FrameLayers { /// @brief Extra options for @ref - /// tutorial8::frame::FrameLayers::Data - /// layer. - using Data = comms::option::EmptyOption; + /// tutorial8::frame::FrameLayers::DataMembers::Field field. + struct DataMembers + { + using Field = comms::option::app::EmptyOption; + }; // struct DataMembers /// @brief Extra options for @ref /// tutorial8::frame::FrameLayers::Id layer. - using Id = comms::option::EmptyOption; + using Id = comms::option::app::EmptyOption; }; // struct FrameLayers }; // struct frame }; diff --git a/tutorials/tutorial8/include/tutorial8/options/ServerDefaultOptions.h b/tutorials/tutorial8/include/tutorial8/options/ServerDefaultOptions.h index 9b2b14b9..b9a98cb3 100644 --- a/tutorials/tutorial8/include/tutorial8/options/ServerDefaultOptions.h +++ b/tutorials/tutorial8/include/tutorial8/options/ServerDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server default options. diff --git a/tutorials/tutorial8/include/tutorial8/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial8/include/tutorial8/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h index 94fc2a01..25550902 100644 --- a/tutorials/tutorial8/include/tutorial8/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial8/include/tutorial8/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server input messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial9/include/tutorial9/Message.h b/tutorials/tutorial9/include/tutorial9/Message.h index bfd8c99a..12fd17d6 100644 --- a/tutorials/tutorial9/include/tutorial9/Message.h +++ b/tutorials/tutorial9/include/tutorial9/Message.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message" interface class. diff --git a/tutorials/tutorial9/include/tutorial9/MsgId.h b/tutorials/tutorial9/include/tutorial9/MsgId.h index 718127f7..5e986818 100644 --- a/tutorials/tutorial9/include/tutorial9/MsgId.h +++ b/tutorials/tutorial9/include/tutorial9/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of message ids enumeration. diff --git a/tutorials/tutorial9/include/tutorial9/Version.h b/tutorials/tutorial9/include/tutorial9/Version.h index 5f4bd96d..5e575790 100644 --- a/tutorials/tutorial9/include/tutorial9/Version.h +++ b/tutorials/tutorial9/include/tutorial9/Version.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains protocol version definition. @@ -22,5 +22,5 @@ inline constexpr unsigned specVersion() } // namespace tutorial9 // Generated compile time check for minimal supported version of the COMMS library -static_assert(COMMS_MAKE_VERSION(5, 2, 7) <= comms::version(), +static_assert(COMMS_MAKE_VERSION(5, 3, 0) <= comms::version(), "The version of COMMS library is too old"); diff --git a/tutorials/tutorial9/include/tutorial9/dispatch/DispatchClientInputMessage.h b/tutorials/tutorial9/include/tutorial9/dispatch/DispatchClientInputMessage.h index b2e3d8d2..a0ae78b5 100644 --- a/tutorials/tutorial9/include/tutorial9/dispatch/DispatchClientInputMessage.h +++ b/tutorials/tutorial9/include/tutorial9/dispatch/DispatchClientInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/tutorials/tutorial9/include/tutorial9/dispatch/DispatchMessage.h b/tutorials/tutorial9/include/tutorial9/dispatch/DispatchMessage.h index 334d4922..f446445c 100644 --- a/tutorials/tutorial9/include/tutorial9/dispatch/DispatchMessage.h +++ b/tutorials/tutorial9/include/tutorial9/dispatch/DispatchMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for all input messages. diff --git a/tutorials/tutorial9/include/tutorial9/dispatch/DispatchServerInputMessage.h b/tutorials/tutorial9/include/tutorial9/dispatch/DispatchServerInputMessage.h index f23f81f5..9e407c3d 100644 --- a/tutorials/tutorial9/include/tutorial9/dispatch/DispatchServerInputMessage.h +++ b/tutorials/tutorial9/include/tutorial9/dispatch/DispatchServerInputMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains dispatch to handling function(s) for client input input messages. diff --git a/tutorials/tutorial9/include/tutorial9/factory/AllMessagesDynMemMsgFactory.h b/tutorials/tutorial9/include/tutorial9/factory/AllMessagesDynMemMsgFactory.h index ea3ff91c..fcd66502 100644 --- a/tutorials/tutorial9/include/tutorial9/factory/AllMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial9/include/tutorial9/factory/AllMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for all the messages. diff --git a/tutorials/tutorial9/include/tutorial9/factory/ClientInputMessagesDynMemMsgFactory.h b/tutorials/tutorial9/include/tutorial9/factory/ClientInputMessagesDynMemMsgFactory.h index a0e80e16..903e0413 100644 --- a/tutorials/tutorial9/include/tutorial9/factory/ClientInputMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial9/include/tutorial9/factory/ClientInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the client input messages. diff --git a/tutorials/tutorial9/include/tutorial9/factory/ServerInputMessagesDynMemMsgFactory.h b/tutorials/tutorial9/include/tutorial9/factory/ServerInputMessagesDynMemMsgFactory.h index fa1f67fb..3cccc9e4 100644 --- a/tutorials/tutorial9/include/tutorial9/factory/ServerInputMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial9/include/tutorial9/factory/ServerInputMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains message factory with dynamic memory allocation for the server input messages. diff --git a/tutorials/tutorial9/include/tutorial9/field/FieldBase.h b/tutorials/tutorial9/include/tutorial9/field/FieldBase.h index f3c28009..12a16799 100644 --- a/tutorials/tutorial9/include/tutorial9/field/FieldBase.h +++ b/tutorials/tutorial9/include/tutorial9/field/FieldBase.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of base class of all the fields. diff --git a/tutorials/tutorial9/include/tutorial9/field/MsgId.h b/tutorials/tutorial9/include/tutorial9/field/MsgId.h index c7c3b2ff..009ee1ed 100644 --- a/tutorials/tutorial9/include/tutorial9/field/MsgId.h +++ b/tutorials/tutorial9/include/tutorial9/field/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "MsgId" field. @@ -27,6 +27,7 @@ class MsgId : public tutorial9::field::FieldBase<>, tutorial9::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 4> > { @@ -35,6 +36,7 @@ class MsgId : public tutorial9::field::FieldBase<>, tutorial9::field::MsgIdCommon::ValueType, TExtraOpts..., + comms::option::def::HasName, comms::option::def::ValidNumValueRange<1, 4> >; public: diff --git a/tutorials/tutorial9/include/tutorial9/field/MsgIdCommon.h b/tutorials/tutorial9/include/tutorial9/field/MsgIdCommon.h index 4be02128..53a7c997 100644 --- a/tutorials/tutorial9/include/tutorial9/field/MsgIdCommon.h +++ b/tutorials/tutorial9/include/tutorial9/field/MsgIdCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial9/include/tutorial9/frame/Frame.h b/tutorials/tutorial9/include/tutorial9/frame/Frame.h index b590c296..77cd0fc7 100644 --- a/tutorials/tutorial9/include/tutorial9/frame/Frame.h +++ b/tutorials/tutorial9/include/tutorial9/frame/Frame.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Frame" frame class. @@ -30,10 +30,30 @@ namespace frame template struct FrameLayers { + /// @brief Scope for field(s) of @ref Data layer. + struct DataMembers + { + /// @brief Custom field for @ref tutorial9::frame::FrameLayers::Data layer + class Field : public + comms::field::ArrayList< + tutorial9::field::FieldBase<>, + std::uint8_t, + typename TOpt::frame::FrameLayers::DataMembers::Field, + comms::option::def::HasName + > + { + public: + static const char* name() + { + return "Data"; + } + }; + }; + /// @brief Definition of layer "Data". using Data = comms::protocol::MsgDataLayer< - typename TOpt::frame::FrameLayers::Data + comms::option::def::FieldType >; /// @brief Definition of layer "Id". @@ -56,13 +76,15 @@ struct FrameLayers class SizeField : public comms::field::IntValue< tutorial9::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName > { using Base = comms::field::IntValue< tutorial9::field::FieldBase<>, - std::uint16_t + std::uint16_t, + comms::option::def::HasName >; public: /// @brief Re-definition of the value type. diff --git a/tutorials/tutorial9/include/tutorial9/frame/FrameCommon.h b/tutorials/tutorial9/include/tutorial9/frame/FrameCommon.h index a500d2dd..6d5900d2 100644 --- a/tutorials/tutorial9/include/tutorial9/frame/FrameCommon.h +++ b/tutorials/tutorial9/include/tutorial9/frame/FrameCommon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial9/include/tutorial9/input/AllMessages.h b/tutorials/tutorial9/include/tutorial9/input/AllMessages.h index 185fb5e6..1abe1d34 100644 --- a/tutorials/tutorial9/include/tutorial9/input/AllMessages.h +++ b/tutorials/tutorial9/include/tutorial9/input/AllMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the AllMessages messages bundle. diff --git a/tutorials/tutorial9/include/tutorial9/input/ClientInputMessages.h b/tutorials/tutorial9/include/tutorial9/input/ClientInputMessages.h index c7a07570..cab78fa9 100644 --- a/tutorials/tutorial9/include/tutorial9/input/ClientInputMessages.h +++ b/tutorials/tutorial9/include/tutorial9/input/ClientInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ClientInputMessages messages bundle. diff --git a/tutorials/tutorial9/include/tutorial9/input/ServerInputMessages.h b/tutorials/tutorial9/include/tutorial9/input/ServerInputMessages.h index e72183fb..2dc9a2cb 100644 --- a/tutorials/tutorial9/include/tutorial9/input/ServerInputMessages.h +++ b/tutorials/tutorial9/include/tutorial9/input/ServerInputMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of the ServerInputMessages messages bundle. diff --git a/tutorials/tutorial9/include/tutorial9/message/Msg1.h b/tutorials/tutorial9/include/tutorial9/message/Msg1.h index d762e7c7..7c27f3c0 100644 --- a/tutorials/tutorial9/include/tutorial9/message/Msg1.h +++ b/tutorials/tutorial9/include/tutorial9/message/Msg1.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 1" message and its fields. diff --git a/tutorials/tutorial9/include/tutorial9/message/Msg1Common.h b/tutorials/tutorial9/include/tutorial9/message/Msg1Common.h index ae82b26c..c7cf774c 100644 --- a/tutorials/tutorial9/include/tutorial9/message/Msg1Common.h +++ b/tutorials/tutorial9/include/tutorial9/message/Msg1Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial9/include/tutorial9/message/Msg2.h b/tutorials/tutorial9/include/tutorial9/message/Msg2.h index e679f87f..1a0ec462 100644 --- a/tutorials/tutorial9/include/tutorial9/message/Msg2.h +++ b/tutorials/tutorial9/include/tutorial9/message/Msg2.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 2" message and its fields. diff --git a/tutorials/tutorial9/include/tutorial9/message/Msg2Common.h b/tutorials/tutorial9/include/tutorial9/message/Msg2Common.h index 20ab31e0..b09d078b 100644 --- a/tutorials/tutorial9/include/tutorial9/message/Msg2Common.h +++ b/tutorials/tutorial9/include/tutorial9/message/Msg2Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial9/include/tutorial9/message/Msg3.h b/tutorials/tutorial9/include/tutorial9/message/Msg3.h index b42f913a..53895012 100644 --- a/tutorials/tutorial9/include/tutorial9/message/Msg3.h +++ b/tutorials/tutorial9/include/tutorial9/message/Msg3.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 3" message and its fields. diff --git a/tutorials/tutorial9/include/tutorial9/message/Msg3Common.h b/tutorials/tutorial9/include/tutorial9/message/Msg3Common.h index e27a21e4..896ea01b 100644 --- a/tutorials/tutorial9/include/tutorial9/message/Msg3Common.h +++ b/tutorials/tutorial9/include/tutorial9/message/Msg3Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial9/include/tutorial9/message/Msg4.h b/tutorials/tutorial9/include/tutorial9/message/Msg4.h index 4ebd7bcb..5b4d1afe 100644 --- a/tutorials/tutorial9/include/tutorial9/message/Msg4.h +++ b/tutorials/tutorial9/include/tutorial9/message/Msg4.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of "Message 4" message and its fields. diff --git a/tutorials/tutorial9/include/tutorial9/message/Msg4Common.h b/tutorials/tutorial9/include/tutorial9/message/Msg4Common.h index 1155eb38..11ff7e63 100644 --- a/tutorials/tutorial9/include/tutorial9/message/Msg4Common.h +++ b/tutorials/tutorial9/include/tutorial9/message/Msg4Common.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains common template parameters independent functionality of diff --git a/tutorials/tutorial9/include/tutorial9/options/AllMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial9/include/tutorial9/options/AllMessagesDynMemMsgFactoryDefaultOptions.h index 1a10062b..03990604 100644 --- a/tutorials/tutorial9/include/tutorial9/options/AllMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial9/include/tutorial9/options/AllMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol all messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial9/include/tutorial9/options/BareMetalDefaultOptions.h b/tutorials/tutorial9/include/tutorial9/options/BareMetalDefaultOptions.h index 36fe8a17..b5f158b3 100644 --- a/tutorials/tutorial9/include/tutorial9/options/BareMetalDefaultOptions.h +++ b/tutorials/tutorial9/include/tutorial9/options/BareMetalDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol bare metal default options. @@ -31,13 +31,15 @@ struct BareMetalDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// tutorial9::frame::FrameLayers::Data - /// layer. - using Data = - std::tuple< - comms::option::app::FixedSizeStorage, - typename TBase::frame::FrameLayers::Data - >; + /// tutorial9::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::FixedSizeStorage, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers /// @brief Extra options for @ref /// tutorial9::frame::FrameLayers::Id layer. diff --git a/tutorials/tutorial9/include/tutorial9/options/ClientDefaultOptions.h b/tutorials/tutorial9/include/tutorial9/options/ClientDefaultOptions.h index 9f09bad5..db11d252 100644 --- a/tutorials/tutorial9/include/tutorial9/options/ClientDefaultOptions.h +++ b/tutorials/tutorial9/include/tutorial9/options/ClientDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client default options. diff --git a/tutorials/tutorial9/include/tutorial9/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial9/include/tutorial9/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h index 599f28ac..0d8dc800 100644 --- a/tutorials/tutorial9/include/tutorial9/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial9/include/tutorial9/options/ClientInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol client input messages dynamic memory allocation message factory options. diff --git a/tutorials/tutorial9/include/tutorial9/options/DataViewDefaultOptions.h b/tutorials/tutorial9/include/tutorial9/options/DataViewDefaultOptions.h index 29d5eb65..23907b73 100644 --- a/tutorials/tutorial9/include/tutorial9/options/DataViewDefaultOptions.h +++ b/tutorials/tutorial9/include/tutorial9/options/DataViewDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol data view default options. @@ -25,13 +25,15 @@ struct DataViewDefaultOptionsT : public TBase struct FrameLayers : public TBase::frame::FrameLayers { /// @brief Extra options for @ref - /// tutorial9::frame::FrameLayers::Data - /// layer. - using Data = - std::tuple< - comms::option::app::OrigDataView, - typename TBase::frame::FrameLayers::Data - >; + /// tutorial9::frame::FrameLayers::DataMembers::Field field. + struct DataMembers : public TBase::frame::FrameLayers::DataMembers + { + using Field = + std::tuple< + comms::option::app::OrigDataView, + typename TBase::frame::FrameLayers::DataMembers::Field + >; + }; // struct DataMembers }; // struct FrameLayers }; // struct frame }; diff --git a/tutorials/tutorial9/include/tutorial9/options/DefaultOptions.h b/tutorials/tutorial9/include/tutorial9/options/DefaultOptions.h index 50bc0189..785c7fe4 100644 --- a/tutorials/tutorial9/include/tutorial9/options/DefaultOptions.h +++ b/tutorials/tutorial9/include/tutorial9/options/DefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol default options. @@ -25,19 +25,19 @@ struct DefaultOptionsT : public TBase { /// @brief Extra options for @ref /// tutorial9::message::Msg1 message. - using Msg1 = comms::option::EmptyOption; + using Msg1 = comms::option::app::EmptyOption; /// @brief Extra options for @ref /// tutorial9::message::Msg2 message. - using Msg2 = comms::option::EmptyOption; + using Msg2 = comms::option::app::EmptyOption; /// @brief Extra options for @ref /// tutorial9::message::Msg3 message. - using Msg3 = comms::option::EmptyOption; + using Msg3 = comms::option::app::EmptyOption; /// @brief Extra options for @ref /// tutorial9::message::Msg4 message. - using Msg4 = comms::option::EmptyOption; + using Msg4 = comms::option::app::EmptyOption; }; // struct message /// @brief Extra options for frames. @@ -48,13 +48,15 @@ struct DefaultOptionsT : public TBase struct FrameLayers { /// @brief Extra options for @ref - /// tutorial9::frame::FrameLayers::Data - /// layer. - using Data = comms::option::EmptyOption; + /// tutorial9::frame::FrameLayers::DataMembers::Field field. + struct DataMembers + { + using Field = comms::option::app::EmptyOption; + }; // struct DataMembers /// @brief Extra options for @ref /// tutorial9::frame::FrameLayers::Id layer. - using Id = comms::option::EmptyOption; + using Id = comms::option::app::EmptyOption; }; // struct FrameLayers }; // struct frame }; diff --git a/tutorials/tutorial9/include/tutorial9/options/ServerDefaultOptions.h b/tutorials/tutorial9/include/tutorial9/options/ServerDefaultOptions.h index 4b0a6b4b..e632f18d 100644 --- a/tutorials/tutorial9/include/tutorial9/options/ServerDefaultOptions.h +++ b/tutorials/tutorial9/include/tutorial9/options/ServerDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server default options. diff --git a/tutorials/tutorial9/include/tutorial9/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h b/tutorials/tutorial9/include/tutorial9/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h index f8477b15..1d05b56c 100644 --- a/tutorials/tutorial9/include/tutorial9/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h +++ b/tutorials/tutorial9/include/tutorial9/options/ServerInputMessagesDynMemMsgFactoryDefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2comms v6.3.4 +// Generated by commsdsl2comms v7.0.2 /// @file /// @brief Contains definition of protocol server input messages dynamic memory allocation message factory options. From 41157a9805439074d9ac3a0bf102a66b2a73ae57 Mon Sep 17 00:00:00 2001 From: Alex Robenko Date: Thu, 23 Jan 2025 08:14:22 +1000 Subject: [PATCH 3/9] Using boost v1.87 on windows runners in github actions. --- .github/workflows/actions_build.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/actions_build.yml b/.github/workflows/actions_build.yml index a28dfff7..73b4c1e7 100644 --- a/.github/workflows/actions_build.yml +++ b/.github/workflows/actions_build.yml @@ -5,6 +5,8 @@ on: [push] env: COMMS_TAG: v5.3 COMMSDSL_TAG: v7.0.2 + WIN_BOOST_VERSION: "1.87.0" + WIN_BOOST_DIR: "C:/local/boost_1_87_0" jobs: @@ -486,7 +488,8 @@ jobs: - name: Install Boost shell: cmd run: | - choco install boost-msvc-14.2 --version=1.85.0 + choco install boost-msvc-14.2 --version=${{env.WIN_BOOST_VERSION}} + echo BOOST_DIR=${{env.WIN_BOOST_DIR}}/lib64-msvc-14.2/cmake >>%GITHUB_ENV% - name: Prepare externals shell: cmd @@ -508,8 +511,8 @@ jobs: working-directory: ${{runner.workspace}}/build run: | cmake %GITHUB_WORKSPACE% -A ${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install ^ - -DCMAKE_PREFIX_PATH="${{runner.workspace}}/build/install" ^ - -DCMAKE_POLICY_DEFAULT_CMP0167=OLD -DBoost_USE_STATIC_LIBS=ON ^ + -DCMAKE_PREFIX_PATH="${{runner.workspace}}/build/install;${{env.BOOST_DIR}}" ^ + -DCMAKE_POLICY_DEFAULT_CMP0167=NEW ^ -DCMAKE_CXX_STANDARD=${{matrix.cpp}} -DOPT_FORCE_EXTRA_BOOST_LIBS=ON - name: Build Target @@ -538,7 +541,8 @@ jobs: if: matrix.arch == 'x64' shell: cmd run: | - choco install boost-msvc-14.3 --version=1.85.0 + choco install boost-msvc-14.3 --version=${{env.WIN_BOOST_VERSION}} + echo BOOST_DIR=${{env.WIN_BOOST_DIR}}/lib64-msvc-14.3/cmake >>%GITHUB_ENV% - name: Prepare externals shell: cmd @@ -560,8 +564,8 @@ jobs: working-directory: ${{runner.workspace}}/build run: | cmake %GITHUB_WORKSPACE% -A ${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install ^ - -DCMAKE_PREFIX_PATH="${{runner.workspace}}/build/install" ^ - -DCMAKE_POLICY_DEFAULT_CMP0167=OLD -DBoost_USE_STATIC_LIBS=ON ^ + -DCMAKE_PREFIX_PATH="${{runner.workspace}}/build/install;${{env.BOOST_DIR}}" ^ + -DCMAKE_POLICY_DEFAULT_CMP0167=NEW ^ -DCMAKE_CXX_STANDARD=${{matrix.cpp}} -DOPT_FORCE_EXTRA_BOOST_LIBS=ON - name: Build Target From 60bb7e9e7a2f8a960d98b94ac418e96ed0a831d1 Mon Sep 17 00:00:00 2001 From: Alex Robenko Date: Thu, 23 Jan 2025 08:27:38 +1000 Subject: [PATCH 4/9] Added mention of "validateMinLength" property for field. --- tutorials/tutorial2/README.md | 14 ++++++++++++++ tutorials/tutorial2/dsl/msg8.xml | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/tutorials/tutorial2/README.md b/tutorials/tutorial2/README.md index 0b5d96e9..7b729656 100644 --- a/tutorials/tutorial2/README.md +++ b/tutorials/tutorial2/README.md @@ -160,6 +160,20 @@ property is optional and was introduced in **v4.0** of the **NOTE**, that the value of the **validateMinLength** property is expected to be the serialization length of the message fields, **not** including the message transport framing. +Since **v7.0** of the [CommsDSL](https://github.com/commschamp/CommsDSL-Specification) specification +the serialization length of the composite fields like [<bundle>](#bundle-fields) +can also be verified (from [dsl/msg8.xml](dsl/msg8.xml)): +```xml + + + + + + + + +``` + ## Client / Server Sessions Both server and client sessions are very similar to the ones presented in [tutorial1](../tutorial1). The **server** is just the simple diff --git a/tutorials/tutorial2/dsl/msg8.xml b/tutorials/tutorial2/dsl/msg8.xml index 6585884c..ae3d3420 100644 --- a/tutorials/tutorial2/dsl/msg8.xml +++ b/tutorials/tutorial2/dsl/msg8.xml @@ -1,7 +1,7 @@ - + From 6c4fd156f1dc24527c6a4eba363c3b488fa1d226 Mon Sep 17 00:00:00 2001 From: Alex Robenko Date: Thu, 23 Jan 2025 09:05:59 +1000 Subject: [PATCH 5/9] Added mention of the **fixedValue** property in the tutorial4. --- howtos/howto4/dsl/schema.xml | 4 +- howtos/howto4/include/howto4/field/TlvProp.h | 60 ++++---------- tutorials/tutorial22/dsl/schema.xml | 4 +- .../include/tutorial22/field/TlvProp.h | 41 +++------- tutorials/tutorial4/README.md | 21 +++-- tutorials/tutorial4/dsl/schema.xml | 4 +- .../include/tutorial4/field/KeyValueProp.h | 60 ++++---------- .../include/tutorial4/field/TlvProp.h | 79 +++++-------------- 8 files changed, 77 insertions(+), 196 deletions(-) diff --git a/howtos/howto4/dsl/schema.xml b/howtos/howto4/dsl/schema.xml index a34baf0c..964c28a1 100644 --- a/howtos/howto4/dsl/schema.xml +++ b/howtos/howto4/dsl/schema.xml @@ -13,7 +13,7 @@ - + @@ -39,7 +39,7 @@ - + diff --git a/howtos/howto4/include/howto4/field/TlvProp.h b/howtos/howto4/include/howto4/field/TlvProp.h index 7f487fab..6075aeb4 100644 --- a/howtos/howto4/include/howto4/field/TlvProp.h +++ b/howtos/howto4/include/howto4/field/TlvProp.h @@ -45,8 +45,8 @@ struct TlvPropMembers std::uint8_t, comms::option::def::HasName, comms::option::def::FailOnInvalid<>, - comms::option::def::ValidNumValue<0>, - comms::option::def::HasCustomRefresh + comms::option::def::FixedValue, + comms::option::def::ValidNumValue<0> > { using Base = @@ -55,8 +55,8 @@ struct TlvPropMembers std::uint8_t, comms::option::def::HasName, comms::option::def::FailOnInvalid<>, - comms::option::def::ValidNumValue<0>, - comms::option::def::HasCustomRefresh + comms::option::def::FixedValue, + comms::option::def::ValidNumValue<0> >; public: /// @brief Re-definition of the value type. @@ -73,17 +73,6 @@ struct TlvPropMembers { return howto4::field::TlvPropMembersCommon::Prop1MembersCommon::KeyCommon::name(); } - - /// @brief Generated refresh functionality. - bool refresh() - { - bool updated = Base::refresh(); - if (Base::valid()) { - return updated; - }; - Base::setValue(0); - return true; - } }; /// @brief Definition of "Length" field. @@ -212,9 +201,9 @@ struct TlvPropMembers std::uint8_t, comms::option::def::HasName, comms::option::def::FailOnInvalid<>, + comms::option::def::FixedValue, comms::option::def::DefaultNumValue<2>, - comms::option::def::ValidNumValue<2>, - comms::option::def::HasCustomRefresh + comms::option::def::ValidNumValue<2> > { using Base = @@ -223,9 +212,9 @@ struct TlvPropMembers std::uint8_t, comms::option::def::HasName, comms::option::def::FailOnInvalid<>, + comms::option::def::FixedValue, comms::option::def::DefaultNumValue<2>, - comms::option::def::ValidNumValue<2>, - comms::option::def::HasCustomRefresh + comms::option::def::ValidNumValue<2> >; public: /// @brief Re-definition of the value type. @@ -242,17 +231,6 @@ struct TlvPropMembers { return howto4::field::TlvPropMembersCommon::Prop2MembersCommon::KeyCommon::name(); } - - /// @brief Generated refresh functionality. - bool refresh() - { - bool updated = Base::refresh(); - if (Base::valid()) { - return updated; - }; - Base::setValue(2); - return true; - } }; /// @brief Definition of "Length" field. @@ -394,9 +372,9 @@ struct TlvPropMembers std::uint8_t, comms::option::def::HasName, comms::option::def::FailOnInvalid<>, + comms::option::def::FixedValue, comms::option::def::DefaultNumValue<5>, - comms::option::def::ValidNumValue<5>, - comms::option::def::HasCustomRefresh + comms::option::def::ValidNumValue<5> > { using Base = @@ -405,9 +383,9 @@ struct TlvPropMembers std::uint8_t, comms::option::def::HasName, comms::option::def::FailOnInvalid<>, + comms::option::def::FixedValue, comms::option::def::DefaultNumValue<5>, - comms::option::def::ValidNumValue<5>, - comms::option::def::HasCustomRefresh + comms::option::def::ValidNumValue<5> >; public: /// @brief Re-definition of the value type. @@ -424,17 +402,6 @@ struct TlvPropMembers { return howto4::field::TlvPropMembersCommon::Prop3MembersCommon::KeyCommon::name(); } - - /// @brief Generated refresh functionality. - bool refresh() - { - bool updated = Base::refresh(); - if (Base::valid()) { - return updated; - }; - Base::setValue(5); - return true; - } }; /// @brief Definition of "Length" field. @@ -1073,7 +1040,8 @@ class TlvProp : public comms::field::IntValue< howto4::field::FieldBase<>, std::uint8_t, - comms::option::def::FailOnInvalid<> + comms::option::def::FailOnInvalid<>, + comms::option::def::FixedValue >; CommonKeyField commonKeyField; diff --git a/tutorials/tutorial22/dsl/schema.xml b/tutorials/tutorial22/dsl/schema.xml index 7b533de1..4a01f2e8 100644 --- a/tutorials/tutorial22/dsl/schema.xml +++ b/tutorials/tutorial22/dsl/schema.xml @@ -26,7 +26,7 @@ - + @@ -46,7 +46,7 @@ - + diff --git a/tutorials/tutorial22/include/tutorial22/field/TlvProp.h b/tutorials/tutorial22/include/tutorial22/field/TlvProp.h index 97d72638..74b9ca5f 100644 --- a/tutorials/tutorial22/include/tutorial22/field/TlvProp.h +++ b/tutorials/tutorial22/include/tutorial22/field/TlvProp.h @@ -43,8 +43,8 @@ struct TlvPropMembers std::uint8_t, comms::option::def::HasName, comms::option::def::FailOnInvalid<>, - comms::option::def::ValidNumValue<0>, - comms::option::def::HasCustomRefresh + comms::option::def::FixedValue, + comms::option::def::ValidNumValue<0> > { using Base = @@ -53,8 +53,8 @@ struct TlvPropMembers std::uint8_t, comms::option::def::HasName, comms::option::def::FailOnInvalid<>, - comms::option::def::ValidNumValue<0>, - comms::option::def::HasCustomRefresh + comms::option::def::FixedValue, + comms::option::def::ValidNumValue<0> >; public: /// @brief Re-definition of the value type. @@ -71,17 +71,6 @@ struct TlvPropMembers { return tutorial22::field::TlvPropMembersCommon::Prop1MembersCommon::KeyCommon::name(); } - - /// @brief Generated refresh functionality. - bool refresh() - { - bool updated = Base::refresh(); - if (Base::valid()) { - return updated; - }; - Base::setValue(0); - return true; - } }; /// @brief Definition of "Length" field. @@ -188,9 +177,9 @@ struct TlvPropMembers std::uint8_t, comms::option::def::HasName, comms::option::def::FailOnInvalid<>, + comms::option::def::FixedValue, comms::option::def::DefaultNumValue<2>, - comms::option::def::ValidNumValue<2>, - comms::option::def::HasCustomRefresh + comms::option::def::ValidNumValue<2> > { using Base = @@ -199,9 +188,9 @@ struct TlvPropMembers std::uint8_t, comms::option::def::HasName, comms::option::def::FailOnInvalid<>, + comms::option::def::FixedValue, comms::option::def::DefaultNumValue<2>, - comms::option::def::ValidNumValue<2>, - comms::option::def::HasCustomRefresh + comms::option::def::ValidNumValue<2> >; public: /// @brief Re-definition of the value type. @@ -218,17 +207,6 @@ struct TlvPropMembers { return tutorial22::field::TlvPropMembersCommon::Prop2MembersCommon::KeyCommon::name(); } - - /// @brief Generated refresh functionality. - bool refresh() - { - bool updated = Base::refresh(); - if (Base::valid()) { - return updated; - }; - Base::setValue(2); - return true; - } }; /// @brief Definition of "Length" field. @@ -823,7 +801,8 @@ class TlvProp : public comms::field::IntValue< tutorial22::field::FieldBase<>, std::uint8_t, - comms::option::def::FailOnInvalid<> + comms::option::def::FailOnInvalid<>, + comms::option::def::FixedValue >; CommonKeyField commonKeyField; diff --git a/tutorials/tutorial4/README.md b/tutorials/tutorial4/README.md index 5c5c34c4..ac811c97 100644 --- a/tutorials/tutorial4/README.md +++ b/tutorials/tutorial4/README.md @@ -31,7 +31,7 @@ as stand-alone `` first. The definition of a heterogeneous field that can hold **any** (but one at a time) of the properties listed above looks like this: ```xml - + @@ -73,6 +73,9 @@ There are multiple important aspects that require a closer look and deeper under - To fail reading of the property on different **key** value the latter sets the **validValue** property to appropriate one and has **failOnInvalid** property set to **true** as well (defined in and reused from **PropKeyCommon** field). +- It is wise to forbid the application to modify the **key** field after the construction. To do so + the **fixedValue** property is set to **true**. Any attempt to set a value or grab a non-const reference + to such field's value will result in compilation error. - In order to default construct a property with the correct key value without any need to implement boilerplate code that does so the **defaultValue** property is used to set the same value as a valid one. - The definition of the key valid values as a separate `` (PropKey) allows referencing its @@ -135,7 +138,7 @@ might contain. For every such name **X** the following is defined: - `FieldIdx_X` - Numeric compile time known index of the member field **X** in order of members definition inside the schema. - `initField_X()` - Member function to initialize the variant field to hold member **X**, returns reference to the initialized member. To be able to use this member function the variant mustn't contain other field before. -- `deinitField_X()` - Member funttion to de-initialize (destruct) the help member **X**. +- `deinitField_X()` - Member function to de-initialize (destruct) the help member **X**. - `accessField_X()` - Member function to access (via cast to appropriate type) held member of known type. Note, that `ValueType` inner type defined by every field class is a variant of @@ -144,7 +147,7 @@ accessed directly via usual `.value()` member function. Instead, generated `init `accessField_X()` member functions need to be used to access the storage and perform the cast to the appropriate type. -It is important to understand that the defult implementation provided by the +It is important to understand that the default implementation provided by the [comms::field::Variant](https://commschamp.github.io/comms_doc/classcomms_1_1field_1_1Variant.html) class is sufficient to be used "as-is" without any extra functionality. However, it has to do a lot of meta-programming and regular code magic to translate runtime information of the detected member field @@ -415,7 +418,7 @@ this tutorial. - + @@ -447,7 +450,7 @@ this tutorial. - + @@ -495,7 +498,12 @@ ones. The example above allows ignoring and skipping over unknown properties by defining the **last** member (`Any`) with non-failing read operation on the `Key`. The latter in the example above doesn't specify which values are considered to be -valid (hence all possible ones are valid). The `Val` in such property is defined to be ``. +valid (hence all possible ones are valid). The `Val` in such property is defined to be ``. Note +that the **fixedValue** properties of the `Key` field is forcefully set to **false** to +allow update of the value after the creation. It is necessary because +`reuse="PropKeyCommon"` property resulted in setting it to **true**. Also note that forcing **failOnInvalid** property +to **false** is not functionally necessary, it is just recommended for more efficient code (there is no need to invoke +validity check during read operation). Th **TLV** type of properties also allows reducing serialization length of some value types. The example of is is the definition of `Prop7`. The default serialization length of its `Val` member value (of `uint64` type) is 8 bytes. @@ -607,6 +615,7 @@ dispatch held property into appropriate `ClientSession::handleProp()` member fun [CommsDSL](https://github.com/commschamp/CommsDSL-Specification). - Usually the heterogeneous fields are defined as **Key-Value** pairs or **Type-Length-Value** (**TLV**) triplets. +- The _key_/_type_ field is expected to have **failOnInvalid** and **fixedValue** properties set to **true**. - The **TLV** variant is usually chosen when **forward** compatibility of the protocol is important. - In **TLV** variant it is required to mark the `Length` field with `semanticType="length"` attribute. - The `Length` inside **TLV** always represents the **remaining** length of the value that follows **NOT** diff --git a/tutorials/tutorial4/dsl/schema.xml b/tutorials/tutorial4/dsl/schema.xml index f760a58b..2b982c55 100644 --- a/tutorials/tutorial4/dsl/schema.xml +++ b/tutorials/tutorial4/dsl/schema.xml @@ -19,7 +19,7 @@ - + @@ -72,7 +72,7 @@ - + diff --git a/tutorials/tutorial4/include/tutorial4/field/KeyValueProp.h b/tutorials/tutorial4/include/tutorial4/field/KeyValueProp.h index 7225cd06..2a146ca1 100644 --- a/tutorials/tutorial4/include/tutorial4/field/KeyValueProp.h +++ b/tutorials/tutorial4/include/tutorial4/field/KeyValueProp.h @@ -44,8 +44,8 @@ struct KeyValuePropMembers std::uint8_t, comms::option::def::HasName, comms::option::def::FailOnInvalid<>, - comms::option::def::ValidNumValue<0>, - comms::option::def::HasCustomRefresh + comms::option::def::FixedValue, + comms::option::def::ValidNumValue<0> > { using Base = @@ -54,8 +54,8 @@ struct KeyValuePropMembers std::uint8_t, comms::option::def::HasName, comms::option::def::FailOnInvalid<>, - comms::option::def::ValidNumValue<0>, - comms::option::def::HasCustomRefresh + comms::option::def::FixedValue, + comms::option::def::ValidNumValue<0> >; public: /// @brief Re-definition of the value type. @@ -72,17 +72,6 @@ struct KeyValuePropMembers { return tutorial4::field::KeyValuePropMembersCommon::Prop1MembersCommon::KeyCommon::name(); } - - /// @brief Generated refresh functionality. - bool refresh() - { - bool updated = Base::refresh(); - if (Base::valid()) { - return updated; - }; - Base::setValue(0); - return true; - } }; /// @brief Definition of "Val" field. @@ -174,9 +163,9 @@ struct KeyValuePropMembers std::uint8_t, comms::option::def::HasName, comms::option::def::FailOnInvalid<>, + comms::option::def::FixedValue, comms::option::def::DefaultNumValue<2>, - comms::option::def::ValidNumValue<2>, - comms::option::def::HasCustomRefresh + comms::option::def::ValidNumValue<2> > { using Base = @@ -185,9 +174,9 @@ struct KeyValuePropMembers std::uint8_t, comms::option::def::HasName, comms::option::def::FailOnInvalid<>, + comms::option::def::FixedValue, comms::option::def::DefaultNumValue<2>, - comms::option::def::ValidNumValue<2>, - comms::option::def::HasCustomRefresh + comms::option::def::ValidNumValue<2> >; public: /// @brief Re-definition of the value type. @@ -204,17 +193,6 @@ struct KeyValuePropMembers { return tutorial4::field::KeyValuePropMembersCommon::Prop2MembersCommon::KeyCommon::name(); } - - /// @brief Generated refresh functionality. - bool refresh() - { - bool updated = Base::refresh(); - if (Base::valid()) { - return updated; - }; - Base::setValue(2); - return true; - } }; /// @brief Definition of "Val" field. @@ -319,9 +297,9 @@ struct KeyValuePropMembers std::uint8_t, comms::option::def::HasName, comms::option::def::FailOnInvalid<>, + comms::option::def::FixedValue, comms::option::def::DefaultNumValue<5>, - comms::option::def::ValidNumValue<5>, - comms::option::def::HasCustomRefresh + comms::option::def::ValidNumValue<5> > { using Base = @@ -330,9 +308,9 @@ struct KeyValuePropMembers std::uint8_t, comms::option::def::HasName, comms::option::def::FailOnInvalid<>, + comms::option::def::FixedValue, comms::option::def::DefaultNumValue<5>, - comms::option::def::ValidNumValue<5>, - comms::option::def::HasCustomRefresh + comms::option::def::ValidNumValue<5> >; public: /// @brief Re-definition of the value type. @@ -349,17 +327,6 @@ struct KeyValuePropMembers { return tutorial4::field::KeyValuePropMembersCommon::Prop3MembersCommon::KeyCommon::name(); } - - /// @brief Generated refresh functionality. - bool refresh() - { - bool updated = Base::refresh(); - if (Base::valid()) { - return updated; - }; - Base::setValue(5); - return true; - } }; /// @brief Scope for all the member fields of @@ -834,7 +801,8 @@ class KeyValueProp : public comms::field::IntValue< tutorial4::field::FieldBase<>, std::uint8_t, - comms::option::def::FailOnInvalid<> + comms::option::def::FailOnInvalid<>, + comms::option::def::FixedValue >; CommonKeyField commonKeyField; diff --git a/tutorials/tutorial4/include/tutorial4/field/TlvProp.h b/tutorials/tutorial4/include/tutorial4/field/TlvProp.h index b8ca8589..3b7ffb69 100644 --- a/tutorials/tutorial4/include/tutorial4/field/TlvProp.h +++ b/tutorials/tutorial4/include/tutorial4/field/TlvProp.h @@ -45,9 +45,9 @@ struct TlvPropMembers std::uint8_t, comms::option::def::HasName, comms::option::def::FailOnInvalid<>, + comms::option::def::FixedValue, comms::option::def::DefaultNumValue<10>, - comms::option::def::ValidNumValue<10>, - comms::option::def::HasCustomRefresh + comms::option::def::ValidNumValue<10> > { using Base = @@ -56,9 +56,9 @@ struct TlvPropMembers std::uint8_t, comms::option::def::HasName, comms::option::def::FailOnInvalid<>, + comms::option::def::FixedValue, comms::option::def::DefaultNumValue<10>, - comms::option::def::ValidNumValue<10>, - comms::option::def::HasCustomRefresh + comms::option::def::ValidNumValue<10> >; public: /// @brief Re-definition of the value type. @@ -75,17 +75,6 @@ struct TlvPropMembers { return tutorial4::field::TlvPropMembersCommon::Prop4MembersCommon::KeyCommon::name(); } - - /// @brief Generated refresh functionality. - bool refresh() - { - bool updated = Base::refresh(); - if (Base::valid()) { - return updated; - }; - Base::setValue(10); - return true; - } }; /// @brief Definition of "Length" field. @@ -214,9 +203,9 @@ struct TlvPropMembers std::uint8_t, comms::option::def::HasName, comms::option::def::FailOnInvalid<>, + comms::option::def::FixedValue, comms::option::def::DefaultNumValue<15>, - comms::option::def::ValidNumValue<15>, - comms::option::def::HasCustomRefresh + comms::option::def::ValidNumValue<15> > { using Base = @@ -225,9 +214,9 @@ struct TlvPropMembers std::uint8_t, comms::option::def::HasName, comms::option::def::FailOnInvalid<>, + comms::option::def::FixedValue, comms::option::def::DefaultNumValue<15>, - comms::option::def::ValidNumValue<15>, - comms::option::def::HasCustomRefresh + comms::option::def::ValidNumValue<15> >; public: /// @brief Re-definition of the value type. @@ -244,17 +233,6 @@ struct TlvPropMembers { return tutorial4::field::TlvPropMembersCommon::Prop5MembersCommon::KeyCommon::name(); } - - /// @brief Generated refresh functionality. - bool refresh() - { - bool updated = Base::refresh(); - if (Base::valid()) { - return updated; - }; - Base::setValue(15); - return true; - } }; /// @brief Definition of "Length" field. @@ -396,9 +374,9 @@ struct TlvPropMembers std::uint8_t, comms::option::def::HasName, comms::option::def::FailOnInvalid<>, + comms::option::def::FixedValue, comms::option::def::DefaultNumValue<25>, - comms::option::def::ValidNumValue<25>, - comms::option::def::HasCustomRefresh + comms::option::def::ValidNumValue<25> > { using Base = @@ -407,9 +385,9 @@ struct TlvPropMembers std::uint8_t, comms::option::def::HasName, comms::option::def::FailOnInvalid<>, + comms::option::def::FixedValue, comms::option::def::DefaultNumValue<25>, - comms::option::def::ValidNumValue<25>, - comms::option::def::HasCustomRefresh + comms::option::def::ValidNumValue<25> >; public: /// @brief Re-definition of the value type. @@ -426,17 +404,6 @@ struct TlvPropMembers { return tutorial4::field::TlvPropMembersCommon::Prop6MembersCommon::KeyCommon::name(); } - - /// @brief Generated refresh functionality. - bool refresh() - { - bool updated = Base::refresh(); - if (Base::valid()) { - return updated; - }; - Base::setValue(25); - return true; - } }; /// @brief Definition of "Length" field. @@ -556,9 +523,9 @@ struct TlvPropMembers std::uint8_t, comms::option::def::HasName, comms::option::def::FailOnInvalid<>, + comms::option::def::FixedValue, comms::option::def::DefaultNumValue<30>, - comms::option::def::ValidNumValue<30>, - comms::option::def::HasCustomRefresh + comms::option::def::ValidNumValue<30> > { using Base = @@ -567,9 +534,9 @@ struct TlvPropMembers std::uint8_t, comms::option::def::HasName, comms::option::def::FailOnInvalid<>, + comms::option::def::FixedValue, comms::option::def::DefaultNumValue<30>, - comms::option::def::ValidNumValue<30>, - comms::option::def::HasCustomRefresh + comms::option::def::ValidNumValue<30> >; public: /// @brief Re-definition of the value type. @@ -586,17 +553,6 @@ struct TlvPropMembers { return tutorial4::field::TlvPropMembersCommon::Prop7MembersCommon::KeyCommon::name(); } - - /// @brief Generated refresh functionality. - bool refresh() - { - bool updated = Base::refresh(); - if (Base::valid()) { - return updated; - }; - Base::setValue(30); - return true; - } }; /// @brief Definition of "Length" field. @@ -1262,7 +1218,8 @@ class TlvProp : public comms::field::IntValue< tutorial4::field::FieldBase<>, std::uint8_t, - comms::option::def::FailOnInvalid<> + comms::option::def::FailOnInvalid<>, + comms::option::def::FixedValue >; CommonKeyField commonKeyField; From 91fd91aa3a0cd8b575d15ece000ebc279593a5dc Mon Sep 17 00:00:00 2001 From: Alex Robenko Date: Thu, 23 Jan 2025 09:10:06 +1000 Subject: [PATCH 6/9] Simplifying cmake script. --- CMakeLists.txt | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 089c980d..19fda721 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -97,23 +97,14 @@ function (dsl_parse type name) string(REPLACE ";" "\n" schema_files "${DSL_PARSE_SCHEMAS}") file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${name}/schema_files.txt "${schema_files}") - add_custom_target(${name}_prot_rm - COMMAND ${CMAKE_COMMAND} -E remove_directory ${output_dir} - ) - - add_custom_command( - OUTPUT ${output_dir} - DEPENDS ${DSL_PARSE_SCHEMAS} ${src_files} ${name}_prot_rm + add_custom_target(${name}_dsl ALL COMMAND ${CMAKE_COMMAND} -E remove_directory ${output_dir} COMMAND ${COMMSDSL2COMMS} --warn-as-err ${multi_schema_param} ${code_input_param} "--comms-tag=${CC_COMMS_TAG}" - -o ${output_dir} -i ${CMAKE_CURRENT_BINARY_DIR}/${name}/schema_files.txt - ) - - add_custom_target(${name}_dsl ALL + -o ${output_dir} -i ${CMAKE_CURRENT_BINARY_DIR}/${name}/schema_files.txt COMMAND ${CMAKE_COMMAND} -DGENERATED="${output_dir}/include" -DOUTPUT="${PROJECT_SOURCE_DIR}/${type}/${name}/include" -P "${PROJECT_SOURCE_DIR}/CopyGenerated.cmake" - DEPENDS ${name}_prot_rm ${output_dir} "${PROJECT_SOURCE_DIR}/CopyGenerated.cmake" ${DSL_PARSE_SCHEMAS} ${src_files} + DEPENDS ${output_dir} "${PROJECT_SOURCE_DIR}/CopyGenerated.cmake" ${DSL_PARSE_SCHEMAS} ${src_files} ) endfunction () From 4b171dcbc13ecf130cbfeeedd5a49d85473810e7 Mon Sep 17 00:00:00 2001 From: Alex Robenko Date: Thu, 23 Jan 2025 09:11:36 +1000 Subject: [PATCH 7/9] Attempt to fix build with boost 1.87. --- lib/src/TcpServer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/TcpServer.cpp b/lib/src/TcpServer.cpp index 67365e4c..1499d4ce 100644 --- a/lib/src/TcpServer.cpp +++ b/lib/src/TcpServer.cpp @@ -29,7 +29,7 @@ bool TcpServer::start(PortType port) } - m_acceptor.listen(boost::asio::socket_base::max_connections, ec); + m_acceptor.listen(boost::asio::socket_base::max_listen_connections, ec); if (ec) { std::cerr << "ERROR: Failed to put acceptor in the listen state with error: " << ec.message() << std::endl; m_acceptor.close(ec); From a855ec06ebaed137f2b6358726e743ba4f846b74 Mon Sep 17 00:00:00 2001 From: Alex Robenko Date: Thu, 23 Jan 2025 18:20:24 +1000 Subject: [PATCH 8/9] Fixing cmake script. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 19fda721..ad3e7782 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -104,7 +104,7 @@ function (dsl_parse type name) COMMAND ${CMAKE_COMMAND} -DGENERATED="${output_dir}/include" -DOUTPUT="${PROJECT_SOURCE_DIR}/${type}/${name}/include" -P "${PROJECT_SOURCE_DIR}/CopyGenerated.cmake" - DEPENDS ${output_dir} "${PROJECT_SOURCE_DIR}/CopyGenerated.cmake" ${DSL_PARSE_SCHEMAS} ${src_files} + DEPENDS "${PROJECT_SOURCE_DIR}/CopyGenerated.cmake" ${DSL_PARSE_SCHEMAS} ${src_files} ) endfunction () From 79f917b961b0ae19c3290a09954e302365d68d1d Mon Sep 17 00:00:00 2001 From: Alex Robenko Date: Fri, 24 Jan 2025 08:42:37 +1000 Subject: [PATCH 9/9] Added mention of the ".x_body" code injection fiels in the tutorial14. --- tutorials/tutorial14/README.md | 16 ++ tutorials/tutorial14/dsl/schema.xml | 8 +- .../include/tutorial14/message/Msg3.h.inc | 1 + .../tutorial14/message/Msg3.h.length_body | 2 + .../tutorial14/message/Msg3.h.read_body | 2 + .../tutorial14/message/Msg3.h.refresh_body | 2 + .../tutorial14/message/Msg3.h.valid_body | 2 + .../tutorial14/message/Msg3.h.write_body | 2 + .../tutorial14/include/tutorial14/MsgId.h | 5 +- .../dispatch/DispatchClientInputMessage.h | 5 + .../tutorial14/dispatch/DispatchMessage.h | 5 + .../dispatch/DispatchServerInputMessage.h | 5 + .../factory/AllMessagesDynMemMsgFactory.h | 2 + .../ClientInputMessagesDynMemMsgFactory.h | 2 + .../ServerInputMessagesDynMemMsgFactory.h | 2 + .../include/tutorial14/field/MsgId.h | 4 +- .../include/tutorial14/field/MsgIdCommon.h | 3 +- .../include/tutorial14/input/AllMessages.h | 7 +- .../tutorial14/input/ClientInputMessages.h | 7 +- .../tutorial14/input/ServerInputMessages.h | 7 +- .../include/tutorial14/message/Msg3.h | 163 ++++++++++++++++++ .../include/tutorial14/message/Msg3Common.h | 57 ++++++ 22 files changed, 297 insertions(+), 12 deletions(-) create mode 100644 tutorials/tutorial14/dsl_src/include/tutorial14/message/Msg3.h.inc create mode 100644 tutorials/tutorial14/dsl_src/include/tutorial14/message/Msg3.h.length_body create mode 100644 tutorials/tutorial14/dsl_src/include/tutorial14/message/Msg3.h.read_body create mode 100644 tutorials/tutorial14/dsl_src/include/tutorial14/message/Msg3.h.refresh_body create mode 100644 tutorials/tutorial14/dsl_src/include/tutorial14/message/Msg3.h.valid_body create mode 100644 tutorials/tutorial14/dsl_src/include/tutorial14/message/Msg3.h.write_body create mode 100644 tutorials/tutorial14/include/tutorial14/message/Msg3.h create mode 100644 tutorials/tutorial14/include/tutorial14/message/Msg3Common.h diff --git a/tutorials/tutorial14/README.md b/tutorials/tutorial14/README.md index e4f10a53..ee3cd6bc 100644 --- a/tutorials/tutorial14/README.md +++ b/tutorials/tutorial14/README.md @@ -256,6 +256,22 @@ The `Msg1` definition of the schema uses these properties: ... ``` + +To avoid an explicit implementation of the function signature the **v7.0** of the [commsdsl2comms](https://github.com/commschamp/commsdsl) +allows usage of the **<class>.h.<op>_body** files (instead of **<class>.h.<op>** ones) contents +of which is expected to be only a body of the function without the signature. + +- **.read_body** - Overwrites default read function body. +- **.write_body** - Overwrites default write function body. +- **.length_body** - Overwrites default serialization length function body. +- **.valid_body** - Overwrites default validity check function body. +- **.refresh_body** - Overwrites default refresh function body. +- **.name_body** - Overwrites default name retrieval function body. + +There are multiple **Msg3.h.X_body** files inside [dsl_src/include/tutorial14/message](dsl_src/include/tutorial14/message) folder that +demonstrate usage of the suffixes above and the injected code finds its way to +[include/tutorial14/message/Msg3.h](include/tutorial14/message/Msg3.h). + ---- ## Summary diff --git a/tutorials/tutorial14/dsl/schema.xml b/tutorials/tutorial14/dsl/schema.xml index 51d4aea5..a68dbe1c 100644 --- a/tutorials/tutorial14/dsl/schema.xml +++ b/tutorials/tutorial14/dsl/schema.xml @@ -3,10 +3,12 @@ + + @@ -45,6 +47,10 @@ - + + + + + diff --git a/tutorials/tutorial14/dsl_src/include/tutorial14/message/Msg3.h.inc b/tutorials/tutorial14/dsl_src/include/tutorial14/message/Msg3.h.inc new file mode 100644 index 00000000..604782e4 --- /dev/null +++ b/tutorials/tutorial14/dsl_src/include/tutorial14/message/Msg3.h.inc @@ -0,0 +1 @@ +#include diff --git a/tutorials/tutorial14/dsl_src/include/tutorial14/message/Msg3.h.length_body b/tutorials/tutorial14/dsl_src/include/tutorial14/message/Msg3.h.length_body new file mode 100644 index 00000000..db2a158c --- /dev/null +++ b/tutorials/tutorial14/dsl_src/include/tutorial14/message/Msg3.h.length_body @@ -0,0 +1,2 @@ +std::cout << "Call of custom " << __FUNCTION__ << std::endl; +return Base::doLength(); diff --git a/tutorials/tutorial14/dsl_src/include/tutorial14/message/Msg3.h.read_body b/tutorials/tutorial14/dsl_src/include/tutorial14/message/Msg3.h.read_body new file mode 100644 index 00000000..c9e44b50 --- /dev/null +++ b/tutorials/tutorial14/dsl_src/include/tutorial14/message/Msg3.h.read_body @@ -0,0 +1,2 @@ +std::cout << "Call of custom " << __FUNCTION__ << std::endl; +return Base::doRead(iter, len); diff --git a/tutorials/tutorial14/dsl_src/include/tutorial14/message/Msg3.h.refresh_body b/tutorials/tutorial14/dsl_src/include/tutorial14/message/Msg3.h.refresh_body new file mode 100644 index 00000000..6f6caff2 --- /dev/null +++ b/tutorials/tutorial14/dsl_src/include/tutorial14/message/Msg3.h.refresh_body @@ -0,0 +1,2 @@ +std::cout << "Call of custom " << __FUNCTION__ << std::endl; +return Base::doRefresh(); diff --git a/tutorials/tutorial14/dsl_src/include/tutorial14/message/Msg3.h.valid_body b/tutorials/tutorial14/dsl_src/include/tutorial14/message/Msg3.h.valid_body new file mode 100644 index 00000000..ba6f69ae --- /dev/null +++ b/tutorials/tutorial14/dsl_src/include/tutorial14/message/Msg3.h.valid_body @@ -0,0 +1,2 @@ +std::cout << "Call of custom " << __FUNCTION__ << std::endl; +return Base::doValid(); \ No newline at end of file diff --git a/tutorials/tutorial14/dsl_src/include/tutorial14/message/Msg3.h.write_body b/tutorials/tutorial14/dsl_src/include/tutorial14/message/Msg3.h.write_body new file mode 100644 index 00000000..fd55e583 --- /dev/null +++ b/tutorials/tutorial14/dsl_src/include/tutorial14/message/Msg3.h.write_body @@ -0,0 +1,2 @@ +std::cout << "Call of custom " << __FUNCTION__ << std::endl; +return Base::doWrite(iter, len); \ No newline at end of file diff --git a/tutorials/tutorial14/include/tutorial14/MsgId.h b/tutorials/tutorial14/include/tutorial14/MsgId.h index 57c4bf4c..f185f4ec 100644 --- a/tutorials/tutorial14/include/tutorial14/MsgId.h +++ b/tutorials/tutorial14/include/tutorial14/MsgId.h @@ -15,11 +15,12 @@ enum MsgId : std::uint8_t { MsgId_M1 = 1, ///< message id of Message 1 message. MsgId_M2 = 2, ///< message id of Message 2 message. + MsgId_M3 = 3, ///< message id of Message 3 message. // --- Extra values generated for convenience --- MsgId_FirstValue = 1, ///< First defined value. - MsgId_LastValue = 2, ///< Last defined value. - MsgId_ValuesLimit = 3, ///< Upper limit for defined values. + MsgId_LastValue = 3, ///< Last defined value. + MsgId_ValuesLimit = 4, ///< Upper limit for defined values. }; } // namespace tutorial14 diff --git a/tutorials/tutorial14/include/tutorial14/dispatch/DispatchClientInputMessage.h b/tutorials/tutorial14/include/tutorial14/dispatch/DispatchClientInputMessage.h index 8dfe6cdf..66afcb8a 100644 --- a/tutorials/tutorial14/include/tutorial14/dispatch/DispatchClientInputMessage.h +++ b/tutorials/tutorial14/include/tutorial14/dispatch/DispatchClientInputMessage.h @@ -57,6 +57,11 @@ auto dispatchClientInputMessage( using MsgType = tutorial14::message::Msg2; return handler.handle(static_cast(msg)); } + case tutorial14::MsgId_M3: + { + using MsgType = tutorial14::message::Msg3; + return handler.handle(static_cast(msg)); + } default: break; }; diff --git a/tutorials/tutorial14/include/tutorial14/dispatch/DispatchMessage.h b/tutorials/tutorial14/include/tutorial14/dispatch/DispatchMessage.h index 45c5c3ea..88a1a56b 100644 --- a/tutorials/tutorial14/include/tutorial14/dispatch/DispatchMessage.h +++ b/tutorials/tutorial14/include/tutorial14/dispatch/DispatchMessage.h @@ -57,6 +57,11 @@ auto dispatchMessage( using MsgType = tutorial14::message::Msg2; return handler.handle(static_cast(msg)); } + case tutorial14::MsgId_M3: + { + using MsgType = tutorial14::message::Msg3; + return handler.handle(static_cast(msg)); + } default: break; }; diff --git a/tutorials/tutorial14/include/tutorial14/dispatch/DispatchServerInputMessage.h b/tutorials/tutorial14/include/tutorial14/dispatch/DispatchServerInputMessage.h index 23878d4e..de2fa36b 100644 --- a/tutorials/tutorial14/include/tutorial14/dispatch/DispatchServerInputMessage.h +++ b/tutorials/tutorial14/include/tutorial14/dispatch/DispatchServerInputMessage.h @@ -57,6 +57,11 @@ auto dispatchServerInputMessage( using MsgType = tutorial14::message::Msg2; return handler.handle(static_cast(msg)); } + case tutorial14::MsgId_M3: + { + using MsgType = tutorial14::message::Msg3; + return handler.handle(static_cast(msg)); + } default: break; }; diff --git a/tutorials/tutorial14/include/tutorial14/factory/AllMessagesDynMemMsgFactory.h b/tutorials/tutorial14/include/tutorial14/factory/AllMessagesDynMemMsgFactory.h index 2f2b8ab9..a1bafd87 100644 --- a/tutorials/tutorial14/include/tutorial14/factory/AllMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial14/include/tutorial14/factory/AllMessagesDynMemMsgFactory.h @@ -66,6 +66,7 @@ class AllMessagesDynMemMsgFactory switch (id) { case tutorial14::MsgId_M1: return MsgPtr(new tutorial14::message::Msg1); case tutorial14::MsgId_M2: return MsgPtr(new tutorial14::message::Msg2); + case tutorial14::MsgId_M3: return MsgPtr(new tutorial14::message::Msg3); default: break; } @@ -96,6 +97,7 @@ class AllMessagesDynMemMsgFactory { case tutorial14::MsgId_M1: return 1U; case tutorial14::MsgId_M2: return 1U; + case tutorial14::MsgId_M3: return 1U; default: break; } diff --git a/tutorials/tutorial14/include/tutorial14/factory/ClientInputMessagesDynMemMsgFactory.h b/tutorials/tutorial14/include/tutorial14/factory/ClientInputMessagesDynMemMsgFactory.h index 49b7c91a..9cfcdb4b 100644 --- a/tutorials/tutorial14/include/tutorial14/factory/ClientInputMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial14/include/tutorial14/factory/ClientInputMessagesDynMemMsgFactory.h @@ -66,6 +66,7 @@ class ClientInputMessagesDynMemMsgFactory switch (id) { case tutorial14::MsgId_M1: return MsgPtr(new tutorial14::message::Msg1); case tutorial14::MsgId_M2: return MsgPtr(new tutorial14::message::Msg2); + case tutorial14::MsgId_M3: return MsgPtr(new tutorial14::message::Msg3); default: break; } @@ -96,6 +97,7 @@ class ClientInputMessagesDynMemMsgFactory { case tutorial14::MsgId_M1: return 1U; case tutorial14::MsgId_M2: return 1U; + case tutorial14::MsgId_M3: return 1U; default: break; } diff --git a/tutorials/tutorial14/include/tutorial14/factory/ServerInputMessagesDynMemMsgFactory.h b/tutorials/tutorial14/include/tutorial14/factory/ServerInputMessagesDynMemMsgFactory.h index 1192f6ed..23d1ee59 100644 --- a/tutorials/tutorial14/include/tutorial14/factory/ServerInputMessagesDynMemMsgFactory.h +++ b/tutorials/tutorial14/include/tutorial14/factory/ServerInputMessagesDynMemMsgFactory.h @@ -66,6 +66,7 @@ class ServerInputMessagesDynMemMsgFactory switch (id) { case tutorial14::MsgId_M1: return MsgPtr(new tutorial14::message::Msg1); case tutorial14::MsgId_M2: return MsgPtr(new tutorial14::message::Msg2); + case tutorial14::MsgId_M3: return MsgPtr(new tutorial14::message::Msg3); default: break; } @@ -96,6 +97,7 @@ class ServerInputMessagesDynMemMsgFactory { case tutorial14::MsgId_M1: return 1U; case tutorial14::MsgId_M2: return 1U; + case tutorial14::MsgId_M3: return 1U; default: break; } diff --git a/tutorials/tutorial14/include/tutorial14/field/MsgId.h b/tutorials/tutorial14/include/tutorial14/field/MsgId.h index af48baca..564a78ea 100644 --- a/tutorials/tutorial14/include/tutorial14/field/MsgId.h +++ b/tutorials/tutorial14/include/tutorial14/field/MsgId.h @@ -28,7 +28,7 @@ class MsgId : public tutorial14::field::MsgIdCommon::ValueType, TExtraOpts..., comms::option::def::HasName, - comms::option::def::ValidNumValueRange<1, 2> + comms::option::def::ValidNumValueRange<1, 3> > { using Base = @@ -37,7 +37,7 @@ class MsgId : public tutorial14::field::MsgIdCommon::ValueType, TExtraOpts..., comms::option::def::HasName, - comms::option::def::ValidNumValueRange<1, 2> + comms::option::def::ValidNumValueRange<1, 3> >; public: /// @brief Re-definition of the value type. diff --git a/tutorials/tutorial14/include/tutorial14/field/MsgIdCommon.h b/tutorials/tutorial14/include/tutorial14/field/MsgIdCommon.h index ce96e65b..0ce94ba6 100644 --- a/tutorials/tutorial14/include/tutorial14/field/MsgIdCommon.h +++ b/tutorials/tutorial14/include/tutorial14/field/MsgIdCommon.h @@ -56,7 +56,8 @@ struct MsgIdCommon static const char* Map[] = { nullptr, "Message 1", - "Message 2" + "Message 2", + "Message 3" }; static const std::size_t MapSize = std::extent::value; diff --git a/tutorials/tutorial14/include/tutorial14/input/AllMessages.h b/tutorials/tutorial14/include/tutorial14/input/AllMessages.h index 57cc0bb5..7945e1b9 100644 --- a/tutorials/tutorial14/include/tutorial14/input/AllMessages.h +++ b/tutorials/tutorial14/include/tutorial14/input/AllMessages.h @@ -8,6 +8,7 @@ #include #include "tutorial14/message/Msg1.h" #include "tutorial14/message/Msg2.h" +#include "tutorial14/message/Msg3.h" #include "tutorial14/options/DefaultOptions.h" namespace tutorial14 @@ -23,7 +24,8 @@ template using AllMessages = std::tuple< tutorial14::message::Msg1, - tutorial14::message::Msg2 + tutorial14::message::Msg2, + tutorial14::message::Msg3 >; } // namespace input @@ -37,7 +39,8 @@ using AllMessages = /// @param opts_ Type of the used protocol definition options. #define TUTORIAL14_ALIASES_FOR_ALL_MESSAGES(prefix_, suffix_, interface_, opts_) \ using prefix_ ## Msg1 ## suffix_ = tutorial14::message::Msg1; \ - using prefix_ ## Msg2 ## suffix_ = tutorial14::message::Msg2; + using prefix_ ## Msg2 ## suffix_ = tutorial14::message::Msg2; \ + using prefix_ ## Msg3 ## suffix_ = tutorial14::message::Msg3; /// @brief Create type aliases for the all messages of the protocol using default options. /// @param prefix_ Prefix of the alias message type. diff --git a/tutorials/tutorial14/include/tutorial14/input/ClientInputMessages.h b/tutorials/tutorial14/include/tutorial14/input/ClientInputMessages.h index 79ed2fcb..a17a53d7 100644 --- a/tutorials/tutorial14/include/tutorial14/input/ClientInputMessages.h +++ b/tutorials/tutorial14/include/tutorial14/input/ClientInputMessages.h @@ -8,6 +8,7 @@ #include #include "tutorial14/message/Msg1.h" #include "tutorial14/message/Msg2.h" +#include "tutorial14/message/Msg3.h" #include "tutorial14/options/DefaultOptions.h" namespace tutorial14 @@ -23,7 +24,8 @@ template using ClientInputMessages = std::tuple< tutorial14::message::Msg1, - tutorial14::message::Msg2 + tutorial14::message::Msg2, + tutorial14::message::Msg3 >; } // namespace input @@ -37,7 +39,8 @@ using ClientInputMessages = /// @param opts_ Type of the used protocol definition options. #define TUTORIAL14_ALIASES_FOR_CLIENT_INPUT_MESSAGES(prefix_, suffix_, interface_, opts_) \ using prefix_ ## Msg1 ## suffix_ = tutorial14::message::Msg1; \ - using prefix_ ## Msg2 ## suffix_ = tutorial14::message::Msg2; + using prefix_ ## Msg2 ## suffix_ = tutorial14::message::Msg2; \ + using prefix_ ## Msg3 ## suffix_ = tutorial14::message::Msg3; /// @brief Create type aliases for the client input messages of the protocol using default options. /// @param prefix_ Prefix of the alias message type. diff --git a/tutorials/tutorial14/include/tutorial14/input/ServerInputMessages.h b/tutorials/tutorial14/include/tutorial14/input/ServerInputMessages.h index 2c978e81..024fe291 100644 --- a/tutorials/tutorial14/include/tutorial14/input/ServerInputMessages.h +++ b/tutorials/tutorial14/include/tutorial14/input/ServerInputMessages.h @@ -8,6 +8,7 @@ #include #include "tutorial14/message/Msg1.h" #include "tutorial14/message/Msg2.h" +#include "tutorial14/message/Msg3.h" #include "tutorial14/options/DefaultOptions.h" namespace tutorial14 @@ -23,7 +24,8 @@ template using ServerInputMessages = std::tuple< tutorial14::message::Msg1, - tutorial14::message::Msg2 + tutorial14::message::Msg2, + tutorial14::message::Msg3 >; } // namespace input @@ -37,7 +39,8 @@ using ServerInputMessages = /// @param opts_ Type of the used protocol definition options. #define TUTORIAL14_ALIASES_FOR_SERVER_INPUT_MESSAGES(prefix_, suffix_, interface_, opts_) \ using prefix_ ## Msg1 ## suffix_ = tutorial14::message::Msg1; \ - using prefix_ ## Msg2 ## suffix_ = tutorial14::message::Msg2; + using prefix_ ## Msg2 ## suffix_ = tutorial14::message::Msg2; \ + using prefix_ ## Msg3 ## suffix_ = tutorial14::message::Msg3; /// @brief Create type aliases for the server input messages of the protocol using default options. /// @param prefix_ Prefix of the alias message type. diff --git a/tutorials/tutorial14/include/tutorial14/message/Msg3.h b/tutorials/tutorial14/include/tutorial14/message/Msg3.h new file mode 100644 index 00000000..c607639c --- /dev/null +++ b/tutorials/tutorial14/include/tutorial14/message/Msg3.h @@ -0,0 +1,163 @@ +// Generated by commsdsl2comms v7.0.2 + +/// @file +/// @brief Contains definition of "Message 3" message and its fields. + +#pragma once + +#include +#include +#include "comms/MessageBase.h" +#include "comms/field/IntValue.h" +#include "comms/options.h" +#include "tutorial14/MsgId.h" +#include "tutorial14/field/FieldBase.h" +#include "tutorial14/message/Msg3Common.h" +#include "tutorial14/options/DefaultOptions.h" + +#include + +namespace tutorial14 +{ + +namespace message +{ + +/// @brief Fields of @ref Msg3. +/// @tparam TOpt Extra options +/// @see @ref Msg3 +/// @headerfile tutorial14/message/Msg3.h +template +struct Msg3Fields +{ + /// @brief Definition of "F1" field. + class F1 : public + comms::field::IntValue< + tutorial14::field::FieldBase<>, + std::uint32_t, + comms::option::def::HasName + > + { + using Base = + comms::field::IntValue< + tutorial14::field::FieldBase<>, + std::uint32_t, + comms::option::def::HasName + >; + public: + /// @brief Re-definition of the value type. + using ValueType = typename Base::ValueType; + + /// @brief Compile time detection of special values presence. + static constexpr bool hasSpecials() + { + return tutorial14::message::Msg3FieldsCommon::F1Common::hasSpecials(); + } + + /// @brief Name of the field. + static const char* name() + { + return tutorial14::message::Msg3FieldsCommon::F1Common::name(); + } + }; + + /// @brief All the fields bundled in std::tuple. + using All = std::tuple< + F1 + >; +}; + +/// @brief Definition of "Message 3" message class. +/// @details +/// See @ref Msg3Fields for definition of the fields this message contains. +/// @tparam TMsgBase Base (interface) class. +/// @tparam TOpt Extra options +/// @headerfile tutorial14/message/Msg3.h +template +class Msg3 : public + comms::MessageBase< + TMsgBase, + comms::option::def::StaticNumIdImpl, + comms::option::def::FieldsImpl::All>, + comms::option::def::MsgType >, + comms::option::def::HasName, + comms::option::def::HasCustomRefresh + > +{ + // Redefinition of the base class type + using Base = + comms::MessageBase< + TMsgBase, + comms::option::def::StaticNumIdImpl, + comms::option::def::FieldsImpl::All>, + comms::option::def::MsgType >, + comms::option::def::HasName, + comms::option::def::HasCustomRefresh + >; + +public: + /// @brief Provide names and allow access to internal fields. + /// @details See definition of @b COMMS_MSG_FIELDS_NAMES macro + /// related to @b comms::MessageBase class from COMMS library + /// for details. + /// + /// The generated values, types and functions are: + /// @li @b FieldIdx_f1 index, @b Field_f1 type and @b field_f1() access fuction + /// for @ref Msg3Fields::F1 field. + COMMS_MSG_FIELDS_NAMES( + f1 + ); + + // Compile time check for serialisation length. + static const std::size_t MsgMinLen = Base::doMinLength(); + static const std::size_t MsgMaxLen = Base::doMaxLength(); + static_assert(MsgMinLen == 4U, "Unexpected min serialisation length"); + static_assert(MsgMaxLen == 4U, "Unexpected max serialisation length"); + + /// @brief Name of the message. + static const char* doName() + { + return tutorial14::message::Msg3Common::name(); + } + + /// @brief Custom read functionality + template + comms::ErrorStatus doRead(TIter& iter, std::size_t len) + { + std::cout << "Call of custom " << __FUNCTION__ << std::endl; + return Base::doRead(iter, len); + } + + /// @brief Custom write functionality + template + comms::ErrorStatus doWrite(TIter& iter, std::size_t len) const + { + std::cout << "Call of custom " << __FUNCTION__ << std::endl; + return Base::doWrite(iter, len); + } + + /// @brief Custom length calculation functionality + std::size_t doLength() const + { + std::cout << "Call of custom " << __FUNCTION__ << std::endl; + return Base::doLength(); + } + + /// @brief Custom validity check functionality + bool doValid() const + { + std::cout << "Call of custom " << __FUNCTION__ << std::endl; + return Base::doValid(); + } + + /// @brief Custom refresh functionality + bool doRefresh() + { + std::cout << "Call of custom " << __FUNCTION__ << std::endl; + return Base::doRefresh(); + } +}; + +} // namespace message + +} // namespace tutorial14 diff --git a/tutorials/tutorial14/include/tutorial14/message/Msg3Common.h b/tutorials/tutorial14/include/tutorial14/message/Msg3Common.h new file mode 100644 index 00000000..44d7fe24 --- /dev/null +++ b/tutorials/tutorial14/include/tutorial14/message/Msg3Common.h @@ -0,0 +1,57 @@ +// Generated by commsdsl2comms v7.0.2 + +/// @file +/// @brief Contains common template parameters independent functionality of +/// @ref tutorial14::message::Msg3 message and its fields. + +#pragma once + +#include + +namespace tutorial14 +{ + +namespace message +{ + +/// @brief Common types and functions for fields of +/// @ref tutorial14::message::Msg3 message. +/// @see tutorial14::message::Msg3Fields +struct Msg3FieldsCommon +{ + /// @brief Common types and functions for + /// @ref tutorial14::message::Msg3Fields::F1 field. + struct F1Common + { + /// @brief Re-definition of the value type used by + /// tutorial14::message::Msg3Fields::F1 field. + using ValueType = std::uint32_t; + + /// @brief Name of the @ref tutorial14::message::Msg3Fields::F1 field. + static const char* name() + { + return "F1"; + } + + /// @brief Compile time detection of special values presence. + static constexpr bool hasSpecials() + { + return false; + } + }; +}; + +/// @brief Common types and functions of +/// @ref tutorial14::message::Msg3 message. +struct Msg3Common +{ + /// @brief Name of the @ref tutorial14::message::Msg3 message. + static const char* name() + { + return "Message 3"; + } +}; + +} // namespace message + +} // namespace tutorial14