Skip to content

Commit b3468dc

Browse files
arobenkoarobenko
committed
Release 2025-01-28
2 parents d009f84 + 79f917b commit b3468dc

File tree

1,267 files changed

+5203
-2792
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,267 files changed

+5203
-2792
lines changed

‎.github/workflows/actions_build.yml

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@ name: Github Actions Build
33
on: [push]
44

55
env:
6-
COMMS_TAG: v5.2.7
7-
COMMSDSL_TAG: v6.3.4
6+
COMMS_TAG: v5.3
7+
COMMSDSL_TAG: v7.0.2
8+
WIN_BOOST_VERSION: "1.87.0"
9+
WIN_BOOST_DIR: "C:/local/boost_1_87_0"
810

911
jobs:
1012

@@ -473,8 +475,8 @@ jobs:
473475
strategy:
474476
fail-fast: false
475477
matrix:
476-
type: [Debug, Release, MinSizeRel]
477-
arch: [Win32, x64]
478+
type: [Debug, Release]
479+
arch: [x64]
478480
cpp: [11, 14, 17]
479481

480482
steps:
@@ -486,7 +488,8 @@ jobs:
486488
- name: Install Boost
487489
shell: cmd
488490
run: |
489-
choco install boost-msvc-14.2
491+
choco install boost-msvc-14.2 --version=${{env.WIN_BOOST_VERSION}}
492+
echo BOOST_DIR=${{env.WIN_BOOST_DIR}}/lib64-msvc-14.2/cmake >>%GITHUB_ENV%
490493
491494
- name: Prepare externals
492495
shell: cmd
@@ -508,8 +511,8 @@ jobs:
508511
working-directory: ${{runner.workspace}}/build
509512
run: |
510513
cmake %GITHUB_WORKSPACE% -A ${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install ^
511-
-DCMAKE_PREFIX_PATH="${{runner.workspace}}/build/install" ^
512-
-DCMAKE_POLICY_DEFAULT_CMP0167=OLD -DBoost_USE_STATIC_LIBS=ON ^
514+
-DCMAKE_PREFIX_PATH="${{runner.workspace}}/build/install;${{env.BOOST_DIR}}" ^
515+
-DCMAKE_POLICY_DEFAULT_CMP0167=NEW ^
513516
-DCMAKE_CXX_STANDARD=${{matrix.cpp}} -DOPT_FORCE_EXTRA_BOOST_LIBS=ON
514517
515518
- name: Build Target
@@ -524,7 +527,7 @@ jobs:
524527
strategy:
525528
fail-fast: false
526529
matrix:
527-
type: [Debug, Release, MinSizeRel]
530+
type: [Debug, Release]
528531
arch: [x64]
529532
cpp: [11, 14, 17, 20]
530533

@@ -538,7 +541,8 @@ jobs:
538541
if: matrix.arch == 'x64'
539542
shell: cmd
540543
run: |
541-
choco install boost-msvc-14.3 --version=1.85.0
544+
choco install boost-msvc-14.3 --version=${{env.WIN_BOOST_VERSION}}
545+
echo BOOST_DIR=${{env.WIN_BOOST_DIR}}/lib64-msvc-14.3/cmake >>%GITHUB_ENV%
542546
543547
- name: Prepare externals
544548
shell: cmd
@@ -560,8 +564,8 @@ jobs:
560564
working-directory: ${{runner.workspace}}/build
561565
run: |
562566
cmake %GITHUB_WORKSPACE% -A ${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install ^
563-
-DCMAKE_PREFIX_PATH="${{runner.workspace}}/build/install" ^
564-
-DCMAKE_POLICY_DEFAULT_CMP0167=OLD -DBoost_USE_STATIC_LIBS=ON ^
567+
-DCMAKE_PREFIX_PATH="${{runner.workspace}}/build/install;${{env.BOOST_DIR}}" ^
568+
-DCMAKE_POLICY_DEFAULT_CMP0167=NEW ^
565569
-DCMAKE_CXX_STANDARD=${{matrix.cpp}} -DOPT_FORCE_EXTRA_BOOST_LIBS=ON
566570
567571
- name: Build Target

‎CMakeLists.txt

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ option (OPT_USE_SANITIZERS "Compile with sanitizers." OFF)
1111

1212
#####################################################
1313

14-
set (MIN_COMMSDSL_VERSION "6.3.4")
14+
set (MIN_COMMSDSL_VERSION "7.0.2")
1515

1616
if ("${CMAKE_CXX_STANDARD}" STREQUAL "")
1717
set(CMAKE_CXX_STANDARD 11)
@@ -97,23 +97,14 @@ function (dsl_parse type name)
9797
string(REPLACE ";" "\n" schema_files "${DSL_PARSE_SCHEMAS}")
9898
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${name}/schema_files.txt "${schema_files}")
9999

100-
add_custom_target(${name}_prot_rm
101-
COMMAND ${CMAKE_COMMAND} -E remove_directory ${output_dir}
102-
)
103-
104-
add_custom_command(
105-
OUTPUT ${output_dir}
106-
DEPENDS ${DSL_PARSE_SCHEMAS} ${src_files} ${name}_prot_rm
100+
add_custom_target(${name}_dsl ALL
107101
COMMAND ${CMAKE_COMMAND} -E remove_directory ${output_dir}
108102
COMMAND ${COMMSDSL2COMMS} --warn-as-err ${multi_schema_param} ${code_input_param} "--comms-tag=${CC_COMMS_TAG}"
109-
-o ${output_dir} -i ${CMAKE_CURRENT_BINARY_DIR}/${name}/schema_files.txt
110-
)
111-
112-
add_custom_target(${name}_dsl ALL
103+
-o ${output_dir} -i ${CMAKE_CURRENT_BINARY_DIR}/${name}/schema_files.txt
113104
COMMAND ${CMAKE_COMMAND}
114105
-DGENERATED="${output_dir}/include" -DOUTPUT="${PROJECT_SOURCE_DIR}/${type}/${name}/include"
115106
-P "${PROJECT_SOURCE_DIR}/CopyGenerated.cmake"
116-
DEPENDS ${name}_prot_rm ${output_dir} "${PROJECT_SOURCE_DIR}/CopyGenerated.cmake" ${DSL_PARSE_SCHEMAS} ${src_files}
107+
DEPENDS "${PROJECT_SOURCE_DIR}/CopyGenerated.cmake" ${DSL_PARSE_SCHEMAS} ${src_files}
117108
)
118109

119110
endfunction ()

‎howtos/howto1/include/howto1/Interface.h

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Generated by commsdsl2comms v6.3.4
1+
// Generated by commsdsl2comms v7.0.2
22

33
/// @file
44
/// @brief Contains definition of <b>"Interface"</b> interface class.
@@ -24,12 +24,14 @@ struct InterfaceFields
2424
/// @brief Definition of <b>"Flags"</b> field.
2525
class Flags : public
2626
howto1::field::InterfaceFlags<
27-
howto1::options::DefaultOptions
27+
howto1::options::DefaultOptions,
28+
comms::option::def::HasName
2829
>
2930
{
3031
using Base =
3132
howto1::field::InterfaceFlags<
32-
howto1::options::DefaultOptions
33+
howto1::options::DefaultOptions,
34+
comms::option::def::HasName
3335
>;
3436
public:
3537
/// @brief Name of the field.

‎howtos/howto1/include/howto1/InterfaceCommon.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Generated by commsdsl2comms v6.3.4
1+
// Generated by commsdsl2comms v7.0.2
22

33
/// @file
44
/// @brief Contains common template parameters independent functionality of

‎howtos/howto1/include/howto1/MsgId.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Generated by commsdsl2comms v6.3.4
1+
// Generated by commsdsl2comms v7.0.2
22

33
/// @file
44
/// @brief Contains definition of message ids enumeration.

‎howtos/howto1/include/howto1/Version.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Generated by commsdsl2comms v6.3.4
1+
// Generated by commsdsl2comms v7.0.2
22

33
/// @file
44
/// @brief Contains protocol version definition.
@@ -22,5 +22,5 @@ inline constexpr unsigned specVersion()
2222
} // namespace howto1
2323

2424
// Generated compile time check for minimal supported version of the COMMS library
25-
static_assert(COMMS_MAKE_VERSION(5, 2, 7) <= comms::version(),
25+
static_assert(COMMS_MAKE_VERSION(5, 3, 0) <= comms::version(),
2626
"The version of COMMS library is too old");

‎howtos/howto1/include/howto1/dispatch/DispatchClientInputMessage.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Generated by commsdsl2comms v6.3.4
1+
// Generated by commsdsl2comms v7.0.2
22

33
/// @file
44
/// @brief Contains dispatch to handling function(s) for client input input messages.

‎howtos/howto1/include/howto1/dispatch/DispatchMessage.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Generated by commsdsl2comms v6.3.4
1+
// Generated by commsdsl2comms v7.0.2
22

33
/// @file
44
/// @brief Contains dispatch to handling function(s) for all input messages.

‎howtos/howto1/include/howto1/dispatch/DispatchServerInputMessage.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Generated by commsdsl2comms v6.3.4
1+
// Generated by commsdsl2comms v7.0.2
22

33
/// @file
44
/// @brief Contains dispatch to handling function(s) for client input input messages.

‎howtos/howto1/include/howto1/factory/AllMessagesDynMemMsgFactory.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Generated by commsdsl2comms v6.3.4
1+
// Generated by commsdsl2comms v7.0.2
22

33
/// @file
44
/// @brief Contains message factory with dynamic memory allocation for all the messages.

‎howtos/howto1/include/howto1/factory/ClientInputMessagesDynMemMsgFactory.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Generated by commsdsl2comms v6.3.4
1+
// Generated by commsdsl2comms v7.0.2
22

33
/// @file
44
/// @brief Contains message factory with dynamic memory allocation for the client input messages.

‎howtos/howto1/include/howto1/factory/ServerInputMessagesDynMemMsgFactory.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Generated by commsdsl2comms v6.3.4
1+
// Generated by commsdsl2comms v7.0.2
22

33
/// @file
44
/// @brief Contains message factory with dynamic memory allocation for the server input messages.

‎howtos/howto1/include/howto1/field/FieldBase.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Generated by commsdsl2comms v6.3.4
1+
// Generated by commsdsl2comms v7.0.2
22

33
/// @file
44
/// @brief Contains definition of base class of all the fields.

‎howtos/howto1/include/howto1/field/InterfaceFlags.h

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Generated by commsdsl2comms v6.3.4
1+
// Generated by commsdsl2comms v7.0.2
22

33
/// @file
44
/// @brief Contains definition of <b>"InterfaceFlags"</b> field.
@@ -25,6 +25,7 @@ class InterfaceFlags : public
2525
comms::field::BitmaskValue<
2626
howto1::field::FieldBase<>,
2727
TExtraOpts...,
28+
comms::option::def::HasName,
2829
comms::option::def::FixedLength<1U>,
2930
comms::option::def::BitmaskReservedBits<0xFCU, 0x0U>
3031
>
@@ -33,6 +34,7 @@ class InterfaceFlags : public
3334
comms::field::BitmaskValue<
3435
howto1::field::FieldBase<>,
3536
TExtraOpts...,
37+
comms::option::def::HasName,
3638
comms::option::def::FixedLength<1U>,
3739
comms::option::def::BitmaskReservedBits<0xFCU, 0x0U>
3840
>;
@@ -50,13 +52,18 @@ class InterfaceFlags : public
5052
B1
5153
);
5254

55+
/// @brief Retrieve name of the bit.
56+
/// @see @ref howto1::field::InterfaceFlagsCommon::bitName().
57+
static const char* bitName(std::size_t idx)
58+
{
59+
return howto1::field::InterfaceFlagsCommon::bitName(idx);
60+
}
61+
5362
/// @brief Retrieve name of the bit.
5463
/// @see @ref howto1::field::InterfaceFlagsCommon::bitName().
5564
static const char* bitName(BitIdx idx)
5665
{
57-
return
58-
howto1::field::InterfaceFlagsCommon::bitName(
59-
static_cast<std::size_t>(idx));
66+
return bitName(static_cast<std::size_t>(idx));
6067
}
6168

6269
/// @brief Name of the field.

‎howtos/howto1/include/howto1/field/InterfaceFlagsCommon.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Generated by commsdsl2comms v6.3.4
1+
// Generated by commsdsl2comms v7.0.2
22

33
/// @file
44
/// @brief Contains common template parameters independent functionality of

‎howtos/howto1/include/howto1/field/MsgId.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Generated by commsdsl2comms v6.3.4
1+
// Generated by commsdsl2comms v7.0.2
22

33
/// @file
44
/// @brief Contains definition of <b>"MsgId"</b> field.
@@ -27,6 +27,7 @@ class MsgId : public
2727
howto1::field::FieldBase<>,
2828
howto1::field::MsgIdCommon::ValueType,
2929
TExtraOpts...,
30+
comms::option::def::HasName,
3031
comms::option::def::ValidNumValueRange<1, 2>
3132
>
3233
{
@@ -35,6 +36,7 @@ class MsgId : public
3536
howto1::field::FieldBase<>,
3637
howto1::field::MsgIdCommon::ValueType,
3738
TExtraOpts...,
39+
comms::option::def::HasName,
3840
comms::option::def::ValidNumValueRange<1, 2>
3941
>;
4042
public:

‎howtos/howto1/include/howto1/field/MsgIdCommon.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Generated by commsdsl2comms v6.3.4
1+
// Generated by commsdsl2comms v7.0.2
22

33
/// @file
44
/// @brief Contains common template parameters independent functionality of

‎howtos/howto1/include/howto1/frame/Frame.h

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Generated by commsdsl2comms v6.3.4
1+
// Generated by commsdsl2comms v7.0.2
22

33
/// @file
44
/// @brief Contains definition of <b>"Frame"</b> frame class.
@@ -34,10 +34,30 @@ namespace frame
3434
template <typename TOpt = howto1::options::DefaultOptions>
3535
struct FrameLayers
3636
{
37+
/// @brief Scope for field(s) of @ref Data layer.
38+
struct DataMembers
39+
{
40+
/// @brief Custom field for @ref howto1::frame::FrameLayers::Data layer
41+
class Field : public
42+
comms::field::ArrayList<
43+
howto1::field::FieldBase<>,
44+
std::uint8_t,
45+
typename TOpt::frame::FrameLayers::DataMembers::Field,
46+
comms::option::def::HasName
47+
>
48+
{
49+
public:
50+
static const char* name()
51+
{
52+
return "Data";
53+
}
54+
};
55+
};
56+
3757
/// @brief Definition of layer "Data".
3858
using Data =
3959
comms::protocol::MsgDataLayer<
40-
typename TOpt::frame::FrameLayers::Data
60+
comms::option::def::FieldType<typename DataMembers::Field>
4161
>;
4262

4363
/// @brief Definition of layer "Flags".
@@ -77,13 +97,15 @@ struct FrameLayers
7797
comms::field::IntValue<
7898
howto1::field::FieldBase<>,
7999
std::uint16_t,
100+
comms::option::def::HasName,
80101
comms::option::def::FixedBitLength<12U>
81102
>
82103
{
83104
using Base =
84105
comms::field::IntValue<
85106
howto1::field::FieldBase<>,
86107
std::uint16_t,
108+
comms::option::def::HasName,
87109
comms::option::def::FixedBitLength<12U>
88110
>;
89111
public:
@@ -107,12 +129,14 @@ struct FrameLayers
107129
class Flags : public
108130
howto1::field::InterfaceFlags<
109131
TOpt,
132+
comms::option::def::HasName,
110133
comms::option::def::FixedBitLength<4U>
111134
>
112135
{
113136
using Base =
114137
howto1::field::InterfaceFlags<
115138
TOpt,
139+
comms::option::def::HasName,
116140
comms::option::def::FixedBitLength<4U>
117141
>;
118142
public:
@@ -136,13 +160,15 @@ struct FrameLayers
136160
comms::field::Bitfield<
137161
howto1::field::FieldBase<>,
138162
typename FieldMembers::All,
163+
comms::option::def::HasName,
139164
comms::option::def::HasVersionDependentMembers<false>
140165
>
141166
{
142167
using Base =
143168
comms::field::Bitfield<
144169
howto1::field::FieldBase<>,
145170
typename FieldMembers::All,
171+
comms::option::def::HasName,
146172
comms::option::def::HasVersionDependentMembers<false>
147173
>;
148174
public:

‎howtos/howto1/include/howto1/frame/FrameCommon.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Generated by commsdsl2comms v6.3.4
1+
// Generated by commsdsl2comms v7.0.2
22

33
/// @file
44
/// @brief Contains common template parameters independent functionality of

‎howtos/howto1/include/howto1/input/AllMessages.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Generated by commsdsl2comms v6.3.4
1+
// Generated by commsdsl2comms v7.0.2
22

33
/// @file
44
/// @brief Contains definition of the AllMessages messages bundle.

‎howtos/howto1/include/howto1/input/ClientInputMessages.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Generated by commsdsl2comms v6.3.4
1+
// Generated by commsdsl2comms v7.0.2
22

33
/// @file
44
/// @brief Contains definition of the ClientInputMessages messages bundle.

‎howtos/howto1/include/howto1/input/ServerInputMessages.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Generated by commsdsl2comms v6.3.4
1+
// Generated by commsdsl2comms v7.0.2
22

33
/// @file
44
/// @brief Contains definition of the ServerInputMessages messages bundle.

0 commit comments

Comments
 (0)