TEST PR

.github/.cSpellWords.txt

@@ -28,6 +28,10 @@ misra
 Misra
 MISRA
 MQTT
+mqttpropadd
+mqttpropertybuilder
+mqttpropget
+MQTTV
 mypy
 nondet
 Nondet
@@ -37,6 +41,7 @@ pytest
 pyyaml
 serializemqttvec
 sinclude
+subscriptionid
 UNACKED
 unpadded
 Unpadded

.github/memory_statistics_config.json

@@ -3,10 +3,14 @@
     "src": [
         "source/core_mqtt.c",
         "source/core_mqtt_state.c",
-        "source/core_mqtt_serializer.c"
+        "source/core_mqtt_serializer.c",
+        "source/core_mqtt_serializer_private.c",
+        "source/core_mqtt_prop_serializer.c",
+        "source/core_mqtt_prop_deserializer.c"
     ],
     "include": [
         "source/include",
+        "source/include/private",
         "source/interface"
     ],
     "compiler_flags": [

.github/workflows/ci.yml

@@ -10,7 +10,7 @@ on:
   push:
     branches: ["**"]
   pull_request:
-    branches: [main]
+    branches: [main, MQTTv5-reviewed-changes]
   workflow_dispatch:
 
 jobs:
@@ -83,6 +83,7 @@ jobs:
         uses: FreeRTOS/CI-CD-Github-Actions/coverage-cop@main
         with:
           coverage-file: ./build/coverage.info
+          branch-coverage-min: 94
 
   complexity:
     runs-on: ubuntu-latest
@@ -154,6 +155,7 @@ jobs:
           mkdir -p override-include
           cp source/include/stdbool.readme override-include/stdbool.h
           cp source/include/stdint.readme override-include/stdint.h
+          cp source/include/inttypes.readme override-include/inttypes.h
 
           # Build using the custom headers
           cmake -S test -B build/ \

docs/doxygen/config.doxyfile

@@ -54,7 +54,7 @@ PROJECT_NUMBER         = v2.3.1+
 # for a project that appears at the top of each page and should give viewer a
 # quick idea about the purpose of the project. Keep the description short.
 
-PROJECT_BRIEF          = "MQTT 3.1.1 Client Library"
+PROJECT_BRIEF          = "MQTT 5.0 Client Library"
 
 # With the PROJECT_LOGO tag one can specify a logo or an icon that is included
 # in the documentation. The maximum height of the logo should not exceed 55
@@ -923,6 +923,7 @@ WARN_LOGFILE           =
 
 INPUT                  = ./docs/doxygen \
                          ./source/include \
+                         ./source/include/private \
                          ./source/interface \
                          ./source
 

docs/doxygen/include/size_table.md

@@ -9,8 +9,8 @@
     </tr>
     <tr>
         <td>core_mqtt.c</td>
-        <td><center>4.9K</center></td>
-        <td><center>4.2K</center></td>
+        <td><center>8.1K</center></td>
+        <td><center>7.0K</center></td>
     </tr>
     <tr>
         <td>core_mqtt_state.c</td>
@@ -19,12 +19,27 @@
     </tr>
     <tr>
         <td>core_mqtt_serializer.c</td>
-        <td><center>2.9K</center></td>
-        <td><center>2.3K</center></td>
+        <td><center>9.2K</center></td>
+        <td><center>7.4K</center></td>
+    </tr>
+    <tr>
+        <td>core_mqtt_serializer_private.c</td>
+        <td><center>0.8K</center></td>
+        <td><center>0.7K</center></td>
+    </tr>
+    <tr>
+        <td>core_mqtt_prop_serializer.c</td>
+        <td><center>1.6K</center></td>
+        <td><center>1.3K</center></td>
+    </tr>
+    <tr>
+        <td>core_mqtt_prop_deserializer.c</td>
+        <td><center>1.3K</center></td>
+        <td><center>1.0K</center></td>
     </tr>
     <tr>
         <td><b>Total estimates</b></td>
-        <td><b><center>9.5K</center></b></td>
-        <td><b><center>7.8K</center></b></td>
+        <td><b><center>22.7K</center></b></td>
+        <td><b><center>18.7K</center></b></td>
     </tr>
 </table>

mqttFilePaths.cmake

@@ -12,7 +12,10 @@ set( MQTT_SOURCES
 
 # MQTT Serializer library source files.
 set( MQTT_SERIALIZER_SOURCES
-     "${CMAKE_CURRENT_LIST_DIR}/source/core_mqtt_serializer.c" )
+     "${CMAKE_CURRENT_LIST_DIR}/source/core_mqtt_serializer.c"
+     "${CMAKE_CURRENT_LIST_DIR}/source/core_mqtt_prop_serializer.c"
+     "${CMAKE_CURRENT_LIST_DIR}/source/core_mqtt_prop_deserializer.c"
+     "${CMAKE_CURRENT_LIST_DIR}/source/core_mqtt_serializer_private.c" )
 
 # MQTT library Public Include directories.
 set( MQTT_INCLUDE_PUBLIC_DIRS