Requiring v3.0 of cc.mqttsn.generated and cc.mqtt311.generated.

commschamp · Jan 6, 2025 · b1b1c3b · b1b1c3b
1 parent 5429e8f
commit b1b1c3b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/.github/workflows/actions_build.yml b/.github/workflows/actions_build.yml
@@ -8,9 +8,9 @@ on:
       - '**'
 
 env:
-  COMMS_TAG: v5.2.7
-  CC_MQTTSN_TAG: v2.9
-  CC_MQTT311_TAG: v2.9
+  COMMS_TAG: develop
+  CC_MQTTSN_TAG: develop
+  CC_MQTT311_TAG: develop
 
 jobs:
   build_gcc_ubuntu_22_04:

diff --git a/client/lib/src/ProtocolDefs.h b/client/lib/src/ProtocolDefs.h
@@ -20,7 +20,7 @@
 
 #include <cstdint>
 
-static_assert(COMMS_MAKE_VERSION(2, 9, 0) <= cc_mqttsn::version(),
+static_assert(COMMS_MAKE_VERSION(3, 0, 0) <= cc_mqttsn::version(),
     "The version of cc.mqttsn.generated library is too old");
 
 namespace cc_mqttsn_client

diff --git a/client/lib/templ/ProtocolOptions.h.templ b/client/lib/templ/ProtocolOptions.h.templ
@@ -56,11 +56,14 @@ public:
     {
         struct FrameLayers : public BaseImpl::frame::FrameLayers
         {
-            using Data =
-                std::tuple<
-                    ##MAX_PACKET_SIZE##,
-                    BaseImpl::frame::FrameLayers::Data
-                >;
+            struct DataMembers : public BaseImpl::frame::FrameLayers::DataMembers
+            {
+                using Field =
+                    std::tuple<
+                        ##MAX_PACKET_SIZE##,
+                        BaseImpl::frame::FrameLayers::DataMembers::Field
+                    >;
+            }; // struct DataMembers
 
             using Id =
                 std::tuple<

diff --git a/gateway/lib/src/common.h b/gateway/lib/src/common.h
@@ -20,10 +20,10 @@
 
 #include "RegMgr.h"
 
-static_assert(COMMS_MAKE_VERSION(2, 9, 0) <= cc_mqttsn::version(),
+static_assert(COMMS_MAKE_VERSION(3, 0, 0) <= cc_mqttsn::version(),
     "The version of cc.mqttsn.generated library is too old");
 
-static_assert(COMMS_MAKE_VERSION(2, 9, 0) <= cc_mqtt311::version(),
+static_assert(COMMS_MAKE_VERSION(3, 0, 0) <= cc_mqtt311::version(),
     "The version of cc.mqtt311.generated library is too old");    
 
 namespace cc_mqttsn_gateway