E1.33 controller

.gitignore

@@ -224,6 +224,10 @@ tools/e133/e133_monitor
 tools/e133/e133_monitor.exe
 tools/e133/e133_receiver
 tools/e133/e133_receiver.exe
+tools/e133/llrp_manager
+tools/e133/llrp_manager.exe
+tools/e133/llrp_target
+tools/e133/llrp_target.exe
 tools/e133/slp_locate
 tools/e133/slp_locate.exe
 tools/e133/slp_register

common/protocol/Ola.proto

@@ -68,6 +68,7 @@ enum PluginIds {
   OLA_PLUGIN_GPIO = 22;
   OLA_PLUGIN_SPIDMX = 23;
   OLA_PLUGIN_NANOLEAF = 24;
+  OLA_PLUGIN_E133 = 25;
 
   /*
    * To obtain a new plugin ID, open a ticket at

common/rdm/UIDTest.cpp

@@ -166,13 +166,13 @@ void UIDTest::testRPTUID() {
                 static_cast<uint32_t>(0x0001ffff));
   // TODO(Peter): Handle the more complicated RPT vendorcast tests
   OLA_ASSERT_TRUE(rpt_all_controllers.IsBroadcast());
-  // OLA_ASSERT_FALSE(rpt_all_controllers.IsVendorcast());
+  OLA_ASSERT_FALSE(rpt_all_controllers.IsVendorcast());
   OLA_ASSERT_TRUE(rpt_all_devices.IsBroadcast());
-  // OLA_ASSERT_FALSE(rpt_all_devices.IsVendorcast());
-  // OLA_ASSERT_TRUE(rpt_manufacturer_devices.IsBroadcast());
-  // OLA_ASSERT_TRUE(rpt_manufacturer_devices.IsVendorcast());
-  // OLA_ASSERT_TRUE(rpt_manufacturer_devices2.IsBroadcast());
-  // OLA_ASSERT_TRUE(rpt_manufacturer_devices2.IsVendorcast());
+  OLA_ASSERT_FALSE(rpt_all_devices.IsVendorcast());
+  OLA_ASSERT_TRUE(rpt_manufacturer_devices.IsBroadcast());
+  OLA_ASSERT_TRUE(rpt_manufacturer_devices.IsVendorcast());
+  OLA_ASSERT_TRUE(rpt_manufacturer_devices2.IsBroadcast());
+  OLA_ASSERT_TRUE(rpt_manufacturer_devices2.IsVendorcast());
 }
 
 

configure.ac

@@ -894,6 +894,7 @@ PLUGIN_SUPPORT(artnet, USE_ARTNET)
 PLUGIN_SUPPORT(dmx4linux, USE_DMX4LINUX, [$have_dmx4linux])
 PLUGIN_SUPPORT(dummy, USE_DUMMY)
 PLUGIN_SUPPORT(e131, USE_E131)
+PLUGIN_SUPPORT(e133, USE_E133)
 PLUGIN_SUPPORT(espnet, USE_ESPNET)
 PLUGIN_SUPPORT(ftdidmx, USE_FTDI, [$have_libftdi])
 PLUGIN_SUPPORT(gpio, USE_GPIO)

libs/acn/BrokerNullInflatorTest.cpp

@@ -36,6 +36,7 @@ using ola::network::HostToNetwork;
 
 class BrokerNullInflatorTest: public CppUnit::TestFixture {
   CPPUNIT_TEST_SUITE(BrokerNullInflatorTest);
+//  CPPUNIT_TEST(testDecodeHeader);
   CPPUNIT_TEST(testInflatePDU);
   CPPUNIT_TEST_SUITE_END();
 

libs/acn/LLRPProbeRequestPDU.cpp

@@ -30,7 +30,6 @@ namespace acn {
 using ola::io::OutputStream;
 using ola::network::HostToNetwork;
 using ola::rdm::UID;
-using std::vector;
 
 unsigned int LLRPProbeRequestPDU::DataSize() const {
   llrp_probe_request_pdu_data data;
@@ -103,6 +102,7 @@ void LLRPProbeRequestPDU::PrependPDU(ola::io::IOStack *stack,
     filter |= FILTER_BROKERS_ONLY;
   }
   data.filter = HostToNetwork(filter);
+  // TODO(Peter): We need to check we've got <= 200 UIDs here
   known_uids.Pack(data.known_uids, sizeof(data.known_uids));
   stack->Write(reinterpret_cast<uint8_t*>(&data),
                static_cast<unsigned int>(sizeof(llrp_probe_request_pdu_data) -

libs/acn/Makefile.mk

@@ -59,44 +59,18 @@ libs_acn_libolae131core_la_SOURCES = \
     libs/acn/E131Sender.cpp \
     libs/acn/E131Sender.h \
     libs/acn/HeaderSet.h \
-    libs/acn/LLRPHeader.h \
-    libs/acn/LLRPInflator.cpp \
-    libs/acn/LLRPInflator.h \
-    libs/acn/LLRPProbeReplyInflator.cpp \
-    libs/acn/LLRPProbeReplyInflator.h \
-    libs/acn/LLRPProbeReplyPDU.cpp \
-    libs/acn/LLRPProbeReplyPDU.h \
-    libs/acn/LLRPProbeRequestInflator.cpp \
-    libs/acn/LLRPProbeRequestInflator.h \
-    libs/acn/LLRPProbeRequestPDU.cpp \
-    libs/acn/LLRPProbeRequestPDU.h \
-    libs/acn/LLRPPDU.cpp \
-    libs/acn/LLRPPDU.h \
     libs/acn/PDU.cpp \
     libs/acn/PDU.h \
     libs/acn/PDUTestCommon.h \
     libs/acn/PreamblePacker.cpp \
     libs/acn/PreamblePacker.h \
-    libs/acn/RDMInflator.cpp \
-    libs/acn/RDMInflator.h \
-    libs/acn/RDMPDU.cpp \
-    libs/acn/RDMPDU.h \
     libs/acn/RootHeader.h \
     libs/acn/RootInflator.cpp \
     libs/acn/RootInflator.h \
     libs/acn/RootPDU.cpp \
     libs/acn/RootPDU.h \
     libs/acn/RootSender.cpp \
     libs/acn/RootSender.h \
-    libs/acn/RPTHeader.h \
-    libs/acn/RPTInflator.cpp \
-    libs/acn/RPTInflator.h \
-    libs/acn/RPTNotificationInflator.h \
-    libs/acn/RPTPDU.cpp \
-    libs/acn/RPTPDU.h \
-    libs/acn/RPTRequestInflator.h \
-    libs/acn/RPTRequestPDU.cpp \
-    libs/acn/RPTRequestPDU.h \
     libs/acn/TCPTransport.cpp \
     libs/acn/TCPTransport.h \
     libs/acn/Transport.h \
@@ -113,32 +87,31 @@ libs_acn_libolae131core_la_LIBADD = $(uuid_LIBS) \
 # libolae133core.la
 # This needs to be after libolaacn.la and libolae131core.la since it depends on
 # them. Otherwise it breaks the freeBSD build
-# TODO(Peter): Re-add these classes
-#    libs/acn/BrokerConnectedClientListInflator.cpp
-#    libs/acn/BrokerConnectedClientListInflator.h
-#    libs/acn/BrokerHeader.h
-#    libs/acn/BrokerManager.cpp
-#    libs/acn/BrokerManagerImpl.cpp
-#    libs/acn/BrokerManagerImpl.h
 libs_acn_libolae133core_la_SOURCES = \
     libs/acn/BrokerClientAddInflator.h \
     libs/acn/BrokerClientEntryChangeInflator.h \
     libs/acn/BrokerClientEntryHeader.h \
     libs/acn/BrokerClientEntryPDU.cpp \
     libs/acn/BrokerClientEntryPDU.h \
-    libs/acn/BrokerClientEntryRPTPDU.cpp \
-    libs/acn/BrokerClientEntryRPTPDU.h \
     libs/acn/BrokerClientEntryRPTInflator.cpp \
     libs/acn/BrokerClientEntryRPTInflator.h \
+    libs/acn/BrokerClientEntryRPTPDU.cpp \
+    libs/acn/BrokerClientEntryRPTPDU.h \
     libs/acn/BrokerClientEntryUpdateInflator.h \
     libs/acn/BrokerClientRemoveInflator.h \
+    libs/acn/BrokerConnectedClientListInflator.cpp \
+    libs/acn/BrokerConnectedClientListInflator.h \
     libs/acn/BrokerConnectPDU.cpp \
     libs/acn/BrokerConnectPDU.h \
     libs/acn/BrokerConnectReplyInflator.cpp \
     libs/acn/BrokerConnectReplyInflator.h \
     libs/acn/BrokerFetchClientListPDU.cpp \
     libs/acn/BrokerFetchClientListPDU.h \
+    libs/acn/BrokerHeader.h \
     libs/acn/BrokerInflator.h \
+    libs/acn/BrokerManager.cpp \
+    libs/acn/BrokerManagerImpl.cpp \
+    libs/acn/BrokerManagerImpl.h \
     libs/acn/BrokerNullInflator.h \
     libs/acn/BrokerNullPDU.cpp \
     libs/acn/BrokerNullPDU.h \
@@ -157,7 +130,35 @@ libs_acn_libolae133core_la_SOURCES = \
     libs/acn/E133StatusInflator.h \
     libs/acn/E133StatusPDU.cpp \
     libs/acn/E133StatusPDU.h \
-    libs/acn/MessageBuilder.cpp
+    libs/acn/LLRPHeader.h \
+    libs/acn/LLRPInflator.cpp \
+    libs/acn/LLRPInflator.h \
+    libs/acn/LLRPProbeReplyInflator.cpp \
+    libs/acn/LLRPProbeReplyInflator.h \
+    libs/acn/LLRPProbeReplyPDU.cpp \
+    libs/acn/LLRPProbeReplyPDU.h \
+    libs/acn/LLRPProbeRequestInflator.cpp \
+    libs/acn/LLRPProbeRequestInflator.h \
+    libs/acn/LLRPProbeRequestPDU.cpp \
+    libs/acn/LLRPProbeRequestPDU.h \
+    libs/acn/LLRPPDU.cpp \
+    libs/acn/LLRPPDU.h \
+    libs/acn/MessageBuilder.cpp \
+    libs/acn/RDMInflator.cpp \
+    libs/acn/RDMInflator.h \
+    libs/acn/RDMPDU.cpp \
+    libs/acn/RDMPDU.h \
+    libs/acn/RPTHeader.h \
+    libs/acn/RPTInflator.cpp \
+    libs/acn/RPTInflator.h \
+    libs/acn/RPTNotificationInflator.h \
+    libs/acn/RPTPDU.cpp \
+    libs/acn/RPTPDU.h \
+    libs/acn/RPTRequestInflator.h \
+    libs/acn/RPTRequestPDU.cpp \
+    libs/acn/RPTRequestPDU.h \
+    libs/acn/RPTStatusInflator.cpp \
+    libs/acn/RPTStatusInflator.h
 
 libs_acn_libolae133core_la_CXXFLAGS = \
     $(COMMON_E133_CXXFLAGS) $(uuid_CFLAGS)
@@ -208,6 +209,7 @@ libs_acn_E131Tester_LDADD = \
     libs/acn/libolae131core.la \
     $(COMMON_TESTING_LIBS)
 
+#    libs/acn/BrokerClientEntryRPTInflatorTest.cpp
 #    libs/acn/BrokerInflatorTest.cpp
 libs_acn_E133Tester_SOURCES = \
     libs/acn/BrokerClientEntryPDUTest.cpp \
@@ -238,6 +240,7 @@ libs_acn_LLRPTester_SOURCES = \
 libs_acn_LLRPTester_CPPFLAGS = $(COMMON_TESTING_FLAGS)
 libs_acn_LLRPTester_LDADD = \
     libs/acn/libolae131core.la \
+    libs/acn/libolae133core.la \
     $(COMMON_TESTING_LIBS)
 
 libs_acn_TransportTester_SOURCES = \

libs/acn/RDMInflator.h

@@ -46,8 +46,8 @@ class RDMInflator: public BaseInflator {
                          const std::string&  // rdm data
                         > GenericRDMMessageHandler;
 
-    // TODO(Peter): Set a better default vector for RDM use (possibly the RPT
-    // one)
+  // TODO(Peter): Set a better default vector for RDM use (possibly the RPT
+  // one)
   explicit RDMInflator(unsigned int vector = ola::acn::VECTOR_FRAMING_RDMNET);
   ~RDMInflator() {}
 

olad/DynamicPluginLoader.cpp

@@ -39,6 +39,10 @@
 #include "plugins/e131/E131Plugin.h"
 #endif  // USE_E131
 
+#ifdef USE_E133
+#include "plugins/e133/E133Plugin.h"
+#endif  // USE_E133
+
 #ifdef USE_ESPNET
 #include "plugins/espnet/EspNetPlugin.h"
 #endif  // USE_ESPNET
@@ -159,6 +163,10 @@ void DynamicPluginLoader::PopulatePlugins() {
   m_plugins.push_back(new ola::plugin::e131::E131Plugin(m_plugin_adaptor));
 #endif  // USE_E131
 
+#ifdef USE_E133
+  m_plugins.push_back(new ola::plugin::e133::E133Plugin(m_plugin_adaptor));
+#endif  // USE_E133
+
 #ifdef USE_ESPNET
   m_plugins.push_back(new ola::plugin::espnet::EspNetPlugin(m_plugin_adaptor));
 #endif  // USE_ESPNET

plugins/Makefile.mk

@@ -23,6 +23,7 @@ if !USING_WIN32
 include plugins/usbpro/Makefile.mk
 include plugins/dmx4linux/Makefile.mk
 include plugins/e131/Makefile.mk
+include plugins/e133/Makefile.mk
 include plugins/uartdmx/Makefile.mk
 endif