Update some E1.33 Vectors

(cherry picked from commit 674ea51)
OpenLightingProject · Mar 2, 2024 · bd89fea · bd89fea
1 parent 3599bb0
commit bd89fea
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/include/ola/acn/ACNVectors.h b/include/ola/acn/ACNVectors.h
@@ -45,7 +45,7 @@ namespace acn {
 enum RootVector {
   VECTOR_ROOT_E131_REV2 = 3,  /**< Draft E1.31, used by some old gear. */
   VECTOR_ROOT_E131 = 4,  /**< E1.31 (sACN) */
-  VECTOR_ROOT_E133 = 5,  /**< E1.33 (RDNNet) */
+  VECTOR_ROOT_RPT = 5,  /**< E1.33 (RPT) */
   VECTOR_ROOT_NULL = 6,  /**< NULL (empty) root */
   VECTOR_ROOT_BROKER = 9,  /**< E1.33 (Broker) */
   VECTOR_ROOT_LLRP = 0x0A,  /**< E1.33 (LLRP) */
@@ -90,6 +90,14 @@ enum E133ControllerVector {
   VECTOR_CONTROLLER_EXPECT_MASTER = 5,  /**< Expect master message */
 };
 
+/**
+ * @brief Vectors used at the E1.33 LLRP layer.
+ */
+enum LLRPVector {
+  VECTOR_LLRP_PROBE_REQUEST = 1,  /**< LLRP Probe Request */
+  VECTOR_LLRP_PROBE_REPLY = 1,  /**< LLRP Probe Reply */
+  VECTOR_LLRP_RDM_CMD = 1,  /**< LLRP RDM Command */
+};
 /**
  * @}
  */

diff --git a/libs/acn/E133Inflator.h b/libs/acn/E133Inflator.h
@@ -38,7 +38,7 @@ class E133Inflator: public BaseInflator {
     }
     ~E133Inflator() {}
 
-    uint32_t Id() const { return ola::acn::VECTOR_ROOT_E133; }
+    uint32_t Id() const { return ola::acn::VECTOR_ROOT_RPT; }
 
  protected:
     bool DecodeHeader(HeaderSet *headers,

diff --git a/tools/e133/MessageBuilder.cpp b/tools/e133/MessageBuilder.cpp
@@ -109,7 +109,7 @@ void MessageBuilder::BuildTCPRootE133(IOStack *packet,
                                       uint16_t endpoint_id) {
   E133PDU::PrependPDU(packet, vector, m_source_name, sequence_number,
                       endpoint_id);
-  RootPDU::PrependPDU(packet, ola::acn::VECTOR_ROOT_E133, m_cid);
+  RootPDU::PrependPDU(packet, ola::acn::VECTOR_ROOT_RPT, m_cid);
   PreamblePacker::AddTCPPreamble(packet);
 }
 
@@ -123,7 +123,7 @@ void MessageBuilder::BuildUDPRootE133(IOStack *packet,
                                       uint16_t endpoint_id) {
   E133PDU::PrependPDU(packet, vector, m_source_name, sequence_number,
                       endpoint_id);
-  RootPDU::PrependPDU(packet, ola::acn::VECTOR_ROOT_E133, m_cid);
+  RootPDU::PrependPDU(packet, ola::acn::VECTOR_ROOT_RPT, m_cid);
   PreamblePacker::AddUDPPreamble(packet);
 }
 }  // namespace e133