Skip to content

Commit f88ecff

Browse files
committed
Added detection of incomplete custom configuration during cmake when dynamic memory allocation is disabled.
1 parent 786c861 commit f88ecff

File tree

2 files changed

+21
-2
lines changed

2 files changed

+21
-2
lines changed

client/lib/script/BareMetalTestConfig.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ set(CC_MQTT5_CLIENT_CLIENT_ID_FIELD_FIXED_LEN 50)
1717
set(CC_MQTT5_CLIENT_USERNAME_FIELD_FIXED_LEN 20)
1818

1919
# Limit the max length of the topics
20-
#set(CC_MQTT5_CLIENT_TOPIC_FIELD_FIXED_LEN 100)
20+
set(CC_MQTT5_CLIENT_TOPIC_FIELD_FIXED_LEN ${CC_MQTT5_CLIENT_STRING_FIELD_FIXED_LEN})
2121

2222
# Limit the length of all the binary data fields
2323
set (CC_MQTT5_CLIENT_BIN_DATA_FIELD_FIXED_LEN 512)

client/lib/script/WriteProtocolOptions.cmake

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,46 +58,65 @@ endif ()
5858

5959
if (NOT ${CC_MQTT5_CLIENT_BIN_DATA_FIELD_FIXED_LEN} EQUAL 0)
6060
set (FIELD_BIN_DATA "comms::option::app::FixedSizeStorage<${CC_MQTT5_CLIENT_BIN_DATA_FIELD_FIXED_LEN}>")
61+
elseif (NOT ${CC_MQTT5_CLIENT_HAS_DYN_MEM_ALLOC})
62+
message (FATAL_ERROR "When dynamic memory allocation is disabled, the CC_MQTT5_CLIENT_BIN_DATA_FIELD_FIXED_LEN needs to be set")
6163
endif ()
6264

6365
if (NOT ${CC_MQTT5_CLIENT_PROPERTIES_LIST_FIELD_FIXED_LEN} EQUAL 0)
6466
set (FIELD_PROPERTIES_LIST "comms::option::app::FixedSizeStorage<${CC_MQTT5_CLIENT_PROPERTIES_LIST_FIELD_FIXED_LEN}>")
67+
elseif (NOT ${CC_MQTT5_CLIENT_HAS_DYN_MEM_ALLOC})
68+
message (FATAL_ERROR "When dynamic memory allocation is disabled, the CC_MQTT5_CLIENT_PROPERTIES_LIST_FIELD_FIXED_LEN needs to be set")
6569
endif ()
6670

6771
if (NOT ${CC_MQTT5_CLIENT_STRING_FIELD_FIXED_LEN} EQUAL 0)
6872
set (FIELD_STRING "comms::option::app::FixedSizeStorage<${CC_MQTT5_CLIENT_STRING_FIELD_FIXED_LEN}>")
73+
elseif (NOT ${CC_MQTT5_CLIENT_HAS_DYN_MEM_ALLOC})
74+
message (FATAL_ERROR "When dynamic memory allocation is disabled, the CC_MQTT5_CLIENT_STRING_FIELD_FIXED_LEN needs to be set")
6975
endif ()
7076

7177
if (NOT ${CC_MQTT5_CLIENT_MAX_OUTPUT_PACKET_SIZE} EQUAL 0)
7278
set (MAX_PACKET_SIZE "comms::option::app::FixedSizeStorage<${CC_MQTT5_CLIENT_MAX_OUTPUT_PACKET_SIZE}>")
79+
elseif (NOT ${CC_MQTT5_CLIENT_HAS_DYN_MEM_ALLOC})
80+
message (FATAL_ERROR "When dynamic memory allocation is disabled, the CC_MQTT5_CLIENT_MAX_OUTPUT_PACKET_SIZE needs to be set")
7381
endif ()
7482

7583
if (NOT ${CC_MQTT5_CLIENT_CLIENT_ID_FIELD_FIXED_LEN} EQUAL 0)
7684
set (MESSAGE_CONNECT_FIELDS_CLIENT_ID "comms::option::app::FixedSizeStorage<${CC_MQTT5_CLIENT_CLIENT_ID_FIELD_FIXED_LEN}>")
85+
elseif (NOT ${CC_MQTT5_CLIENT_HAS_DYN_MEM_ALLOC})
86+
message (FATAL_ERROR "When dynamic memory allocation is disabled, the CC_MQTT5_CLIENT_CLIENT_ID_FIELD_FIXED_LEN needs to be set")
7787
endif ()
7888

7989
if (NOT ${CC_MQTT5_CLIENT_USERNAME_FIELD_FIXED_LEN} EQUAL 0)
8090
set (MESSAGE_CONNECT_FIELDS_USERNAME "comms::option::app::FixedSizeStorage<${CC_MQTT5_CLIENT_USERNAME_FIELD_FIXED_LEN}>")
91+
elseif (NOT ${CC_MQTT5_CLIENT_HAS_DYN_MEM_ALLOC})
92+
message (FATAL_ERROR "When dynamic memory allocation is disabled, the CC_MQTT5_CLIENT_USERNAME_FIELD_FIXED_LEN needs to be set")
8193
endif ()
8294

8395
if (NOT ${CC_MQTT5_CLIENT_PASSWORD_FIELD_FIXED_LEN} EQUAL 0)
8496
set (MESSAGE_CONNECT_FIELDS_PASSWORD "comms::option::app::FixedSizeStorage<${CC_MQTT5_CLIENT_PASSWORD_FIELD_FIXED_LEN}>")
97+
elseif (NOT ${CC_MQTT5_CLIENT_HAS_DYN_MEM_ALLOC})
98+
message (FATAL_ERROR "When dynamic memory allocation is disabled, the CC_MQTT5_CLIENT_PASSWORD_FIELD_FIXED_LEN needs to be set")
8599
endif ()
86100

87101
if (NOT ${CC_MQTT5_CLIENT_TOPIC_FIELD_FIXED_LEN} EQUAL 0)
88102
set (FIELD_TOPIC "comms::option::app::FixedSizeStorage<${CC_MQTT5_CLIENT_TOPIC_FIELD_FIXED_LEN}>")
89103
set (MESSAGE_CONNECT_FIELDS_WILL_TOPIC "comms::option::app::FixedSizeStorage<${CC_MQTT5_CLIENT_TOPIC_FIELD_FIXED_LEN}>")
104+
elseif (NOT ${CC_MQTT5_CLIENT_HAS_DYN_MEM_ALLOC})
105+
message (FATAL_ERROR "When dynamic memory allocation is disabled, the CC_MQTT5_CLIENT_TOPIC_FIELD_FIXED_LEN needs to be set")
90106
endif ()
91107

92108
if (NOT ${CC_MQTT5_CLIENT_ASYNC_SUBS_LIMIT} EQUAL 0)
93109
set (MESSAGE_SUBSCRIBE_FIELDS_LIST "comms::option::app::FixedSizeStorage<${CC_MQTT5_CLIENT_ASYNC_SUBS_LIMIT}>")
110+
elseif (NOT ${CC_MQTT5_CLIENT_HAS_DYN_MEM_ALLOC})
111+
message (FATAL_ERROR "When dynamic memory allocation is disabled, the CC_MQTT5_CLIENT_ASYNC_SUBS_LIMIT needs to be set")
94112
endif ()
95113

96114
if (NOT ${CC_MQTT5_CLIENT_ASYNC_UNSUBS_LIMIT} EQUAL 0)
97115
set (MESSAGE_UNSUBSCRIBE_FIELDS_LIST "comms::option::app::FixedSizeStorage<${CC_MQTT5_CLIENT_ASYNC_UNSUBS_LIMIT}>")
116+
elseif (NOT ${CC_MQTT5_CLIENT_HAS_DYN_MEM_ALLOC})
117+
message (FATAL_ERROR "When dynamic memory allocation is disabled, the CC_MQTT5_CLIENT_ASYNC_UNSUBS_LIMIT needs to be set")
98118
endif ()
99119

100-
101120
#########################################
102121

103122
replace_in_text (FIELD_BIN_DATA)

0 commit comments

Comments
 (0)