OpenLightingProject · peternewman · Jan 13, 2018 · Dec 31, 2017 · Dec 31, 2017 · Dec 31, 2017
diff --git a/common/protocol/Ola.proto b/common/protocol/Ola.proto
@@ -67,6 +67,7 @@ enum PluginIds {
   OLA_PLUGIN_OPENPIXELCONTROL = 21;
   OLA_PLUGIN_GPIO = 22;
   OLA_PLUGIN_SPIDMX = 23;
+  OLA_PLUGIN_NANOLEAF = 10000;
 
   /*
    * To obtain a new plugin ID, open a ticket at

diff --git a/configure.ac b/configure.ac
@@ -825,6 +825,7 @@ PLUGIN_SUPPORT(gpio, USE_GPIO)
 PLUGIN_SUPPORT(karate, USE_KARATE)
 PLUGIN_SUPPORT(kinet, USE_KINET)
 PLUGIN_SUPPORT(milinst, USE_MILINST)
+PLUGIN_SUPPORT(nanoleaf, USE_NANOLEAF)
 PLUGIN_SUPPORT(opendmx, USE_OPENDMX)
 PLUGIN_SUPPORT(openpixelcontrol, USE_OPENPIXELCONTROL)
 PLUGIN_SUPPORT(osc, USE_OSC, [$have_liblo])

diff --git a/include/ola/io/BigEndianStream.h b/include/ola/io/BigEndianStream.h
@@ -22,6 +22,7 @@
 #ifndef INCLUDE_OLA_IO_BIGENDIANSTREAM_H_
 #define INCLUDE_OLA_IO_BIGENDIANSTREAM_H_
 
+#include <ola/base/Macro.h>
 #include <ola/io/InputStream.h>
 #include <ola/io/OutputStream.h>
 #include <ola/network/NetworkUtils.h>
@@ -67,8 +68,7 @@ class BigEndianInputStreamAdaptor: public BigEndianInputStreamInterface {
       return ok;
     }
 
-    BigEndianInputStreamAdaptor(const BigEndianInputStreamAdaptor&);
-    BigEndianInputStreamAdaptor& operator=(const BigEndianInputStreamAdaptor&);
+    DISALLOW_COPY_AND_ASSIGN(BigEndianInputStreamAdaptor);
 };
 
 
@@ -99,8 +99,7 @@ class BigEndianInputStream: public BigEndianInputStreamInterface {
     InputStream m_input_stream;
     BigEndianInputStreamAdaptor m_adaptor;
 
-    BigEndianInputStream(const BigEndianInputStream&);
-    BigEndianInputStream& operator=(const BigEndianInputStream&);
+    DISALLOW_COPY_AND_ASSIGN(BigEndianInputStream);
 };
 
 
@@ -157,9 +156,7 @@ class BigEndianOutputStreamAdaptor: public BigEndianOutputStreamInterface {
       return *this;
     }
 
-    BigEndianOutputStreamAdaptor(const BigEndianOutputStreamAdaptor&);
-    BigEndianOutputStreamAdaptor& operator=(
-        const BigEndianOutputStreamAdaptor&);
+    DISALLOW_COPY_AND_ASSIGN(BigEndianOutputStreamAdaptor);
 };
 
 
@@ -196,8 +193,7 @@ class BigEndianOutputStream: public BigEndianOutputStreamInterface {
       return *this;
     }
 
-    BigEndianOutputStream(const BigEndianOutputStream&);
-    BigEndianOutputStream& operator=(const BigEndianOutputStream&);
+    DISALLOW_COPY_AND_ASSIGN(BigEndianOutputStream);
 };
 }  // namespace io
 }  // namespace ola

diff --git a/include/ola/io/IOQueue.h b/include/ola/io/IOQueue.h
@@ -21,6 +21,7 @@
 #ifndef INCLUDE_OLA_IO_IOQUEUE_H_
 #define INCLUDE_OLA_IO_IOQUEUE_H_
 
+#include <ola/base/Macro.h>
 #include <ola/io/IOVecInterface.h>
 #include <ola/io/InputBuffer.h>
 #include <ola/io/OutputBuffer.h>
@@ -91,8 +92,7 @@ class IOQueue: public InputBufferInterface,
     void AppendBlock();
 
     // no copying / assignment for now
-    IOQueue(const IOQueue&);
-    IOQueue& operator=(const IOQueue&);
+    DISALLOW_COPY_AND_ASSIGN(IOQueue);
 };
 }  // namespace io
 }  // namespace ola

diff --git a/include/ola/io/IOStack.h b/include/ola/io/IOStack.h
@@ -21,6 +21,7 @@
 #ifndef INCLUDE_OLA_IO_IOSTACK_H_
 #define INCLUDE_OLA_IO_IOSTACK_H_
 
+#include <ola/base/Macro.h>
 #include <ola/io/IOVecInterface.h>
 #include <ola/io/InputBuffer.h>
 #include <ola/io/OutputBuffer.h>
@@ -82,8 +83,7 @@ class IOStack: public IOVecInterface,
     void PrependBlock();
 
     // no copying / assignment for now
-    IOStack(const IOStack&);
-    IOStack& operator=(const IOStack&);
+    DISALLOW_COPY_AND_ASSIGN(IOStack);
 };
 }  // namespace io
 }  // namespace ola

diff --git a/include/ola/io/InputStream.h b/include/ola/io/InputStream.h
@@ -22,6 +22,7 @@
 #define INCLUDE_OLA_IO_INPUTSTREAM_H_
 
 #include <stdint.h>
+#include <ola/base/Macro.h>
 #include <ola/io/InputBuffer.h>
 #include <string>
 
@@ -87,8 +88,7 @@ class InputStream: public InputStreamInterface {
       return length == sizeof(*val);
     }
 
-    InputStream(const InputStream&);
-    InputStream& operator=(const InputStream&);
+    DISALLOW_COPY_AND_ASSIGN(InputStream);
 };
 }  // namespace io
 }  // namespace ola

diff --git a/include/ola/io/MemoryBuffer.h b/include/ola/io/MemoryBuffer.h
@@ -21,6 +21,7 @@
 #ifndef INCLUDE_OLA_IO_MEMORYBUFFER_H_
 #define INCLUDE_OLA_IO_MEMORYBUFFER_H_
 
+#include <ola/base/Macro.h>
 #include <ola/io/InputBuffer.h>
 #include <stdint.h>
 #include <string.h>
@@ -63,8 +64,7 @@ class MemoryBuffer: public InputBufferInterface {
     const unsigned int m_size;
     unsigned int m_cursor;
 
-    MemoryBuffer(const MemoryBuffer&);
-    MemoryBuffer& operator=(const MemoryBuffer&);
+    DISALLOW_COPY_AND_ASSIGN(MemoryBuffer);
 };
 }  // namespace io
 }  // namespace ola

diff --git a/include/ola/io/OutputStream.h b/include/ola/io/OutputStream.h
@@ -22,6 +22,7 @@
 #define INCLUDE_OLA_IO_OUTPUTSTREAM_H_
 
 #include <stdint.h>
+#include <ola/base/Macro.h>
 #include <ola/io/OutputBuffer.h>
 
 namespace ola {
@@ -80,8 +81,7 @@ class OutputStream: public OutputStreamInterface {
       return *this;
     }
 
-    OutputStream(const OutputStream&);
-    OutputStream& operator=(const OutputStream&);
+    DISALLOW_COPY_AND_ASSIGN(OutputStream);
 };
 }  // namespace io
 }  // namespace ola

diff --git a/include/ola/network/Socket.h b/include/ola/network/Socket.h
@@ -39,7 +39,7 @@ namespace network {
 /**
  * @brief The interface for UDPSockets.
  *
- * This only supports IPv4 sockets. Its an Interface so we can mock it out for
+ * This only supports IPv4 sockets. Its an %Interface so we can mock it out for
  * testing.
  */
 class UDPSocketInterface: public ola::io::BidirectionalFileDescriptor {

diff --git a/libs/acn/RootSender.h b/libs/acn/RootSender.h
@@ -22,6 +22,7 @@
 #define LIBS_ACN_ROOTSENDER_H_
 
 #include "ola/acn/CID.h"
+#include "ola/base/Macro.h"
 #include "libs/acn/PDU.h"
 #include "libs/acn/RootPDU.h"
 #include "libs/acn/Transport.h"
@@ -59,8 +60,7 @@ class RootSender {
     PDUBlock<PDU> m_root_block;
     RootPDU m_root_pdu;
 
-    RootSender(const RootSender&);
-    RootSender& operator=(const RootSender&);
+    DISALLOW_COPY_AND_ASSIGN(RootSender);
 };
 }  // namespace acn
 }  // namespace ola

diff --git a/libs/acn/UDPTransport.h b/libs/acn/UDPTransport.h
@@ -22,6 +22,7 @@
 #define LIBS_ACN_UDPTRANSPORT_H_
 
 #include "ola/acn/ACNPort.h"
+#include "ola/base/Macro.h"
 #include "ola/network/IPV4Address.h"
 #include "ola/network/Socket.h"
 #include "libs/acn/PDU.h"
@@ -51,8 +52,7 @@ class OutgoingUDPTransport: public OutgoingTransport {
     class OutgoingUDPTransportImpl *m_impl;
     ola::network::IPV4SocketAddress m_destination;
 
-    OutgoingUDPTransport(const OutgoingUDPTransport&);
-    OutgoingUDPTransport& operator=(const OutgoingUDPTransport&);
+    DISALLOW_COPY_AND_ASSIGN(OutgoingUDPTransport);
 };
 
 

diff --git a/olad/DynamicPluginLoader.cpp b/olad/DynamicPluginLoader.cpp
@@ -59,6 +59,10 @@
 #include "plugins/milinst/MilInstPlugin.h"
 #endif  // USE_MILINST
 
+#ifdef USE_NANOLEAF
+#include "plugins/nanoleaf/NanoleafPlugin.h"
+#endif  // USE_NANOLEAF
+
 #ifdef USE_OPENDMX
 #include "plugins/opendmx/OpenDmxPlugin.h"
 #endif  // USE_OPENDMX
@@ -177,6 +181,11 @@ void DynamicPluginLoader::PopulatePlugins() {
       new ola::plugin::milinst::MilInstPlugin(m_plugin_adaptor));
 #endif  // USE_MILINST
 
+#ifdef USE_NANOLEAF
+  m_plugins.push_back(
+      new ola::plugin::nanoleaf::NanoleafPlugin(m_plugin_adaptor));
+#endif  // USE_NANOLEAF
+
 #ifdef USE_OPENDMX
   m_plugins.push_back(
       new ola::plugin::opendmx::OpenDmxPlugin(m_plugin_adaptor));

diff --git a/plugins/Makefile.mk b/plugins/Makefile.mk
@@ -6,6 +6,7 @@ include plugins/gpio/Makefile.mk
 include plugins/karate/Makefile.mk
 include plugins/kinet/Makefile.mk
 include plugins/milinst/Makefile.mk
+include plugins/nanoleaf/Makefile.mk
 include plugins/opendmx/Makefile.mk
 include plugins/openpixelcontrol/Makefile.mk
 include plugins/osc/Makefile.mk

diff --git a/plugins/espnet/EspNetNode.h b/plugins/espnet/EspNetNode.h
@@ -25,6 +25,7 @@
 #include <map>
 #include "ola/Callback.h"
 #include "ola/DmxBuffer.h"
+#include "ola/base/Macro.h"
 #include "ola/network/IPV4Address.h"
 #include "ola/network/Interface.h"
 #include "ola/network/Socket.h"
@@ -81,8 +82,6 @@ class EspNetNode {
       Callback0<void> *closure;
     } universe_handler;
 
-    EspNetNode(const EspNetNode&);
-    EspNetNode& operator=(const EspNetNode&);
     bool InitNetwork();
     void HandlePoll(const espnet_poll_t &poll, ssize_t length,
                     const ola::network::IPV4Address &source);
@@ -130,6 +129,8 @@ class EspNetNode {
     static const uint8_t DATA_PAIRS = 2;
     static const uint8_t DATA_RLE = 4;
     static const uint8_t START_CODE = 0;
+
+    DISALLOW_COPY_AND_ASSIGN(EspNetNode);
 };
 }  // namespace espnet
 }  // namespace plugin

diff --git a/plugins/kinet/KiNetNode.h b/plugins/kinet/KiNetNode.h
@@ -24,6 +24,7 @@
 #include <memory>
 
 #include "ola/DmxBuffer.h"
+#include "ola/base/Macro.h"
 #include "ola/io/BigEndianStream.h"
 #include "ola/io/IOQueue.h"
 #include "ola/io/SelectServerInterface.h"
@@ -56,9 +57,6 @@ class KiNetNode {
     ola::network::Interface m_interface;
     std::auto_ptr<ola::network::UDPSocketInterface> m_socket;
 
-    KiNetNode(const KiNetNode&);
-    KiNetNode& operator=(const KiNetNode&);
-
     void SocketReady();
     void PopulatePacketHeader(uint16_t msg_type);
     bool InitNetwork();
@@ -67,6 +65,8 @@ class KiNetNode {
     static const uint32_t KINET_MAGIC_NUMBER = 0x0401dc4a;
     static const uint16_t KINET_VERSION_ONE = 0x0100;
     static const uint16_t KINET_DMX_MSG = 0x0101;
+
+    DISALLOW_COPY_AND_ASSIGN(KiNetNode);
 };
 }  // namespace kinet
 }  // namespace plugin

diff --git a/plugins/nanoleaf/Makefile.mk b/plugins/nanoleaf/Makefile.mk
@@ -0,0 +1,39 @@
+# LIBRARIES
+##################################################
+if USE_NANOLEAF
+# This is a library which isn't coupled to olad
+noinst_LTLIBRARIES += plugins/nanoleaf/libolananoleafnode.la
+plugins_nanoleaf_libolananoleafnode_la_SOURCES = plugins/nanoleaf/NanoleafNode.cpp \
+                                                 plugins/nanoleaf/NanoleafNode.h
+plugins_nanoleaf_libolananoleafnode_la_LIBADD = common/libolacommon.la
+
+lib_LTLIBRARIES += plugins/nanoleaf/libolananoleaf.la
+
+# Plugin description is generated from README.md
+built_sources += plugins/nanoleaf/NanoleafPluginDescription.h
+nodist_plugins_nanoleaf_libolananoleaf_la_SOURCES = \
+    plugins/nanoleaf/NanoleafPluginDescription.h
+plugins/nanoleaf/NanoleafPluginDescription.h: plugins/nanoleaf/README.md plugins/nanoleaf/Makefile.mk plugins/convert_README_to_header.sh
+	sh $(top_srcdir)/plugins/convert_README_to_header.sh $(top_srcdir)/plugins/nanoleaf $(top_builddir)/plugins/nanoleaf/NanoleafPluginDescription.h
+
+plugins_nanoleaf_libolananoleaf_la_SOURCES = \
+    plugins/nanoleaf/NanoleafPlugin.cpp \
+    plugins/nanoleaf/NanoleafPlugin.h \
+    plugins/nanoleaf/NanoleafDevice.cpp \
+    plugins/nanoleaf/NanoleafDevice.h \
+    plugins/nanoleaf/NanoleafPort.h
+plugins_nanoleaf_libolananoleaf_la_LIBADD = \
+    olad/plugin_api/libolaserverplugininterface.la \
+    plugins/nanoleaf/libolananoleafnode.la
+
+# TESTS
+##################################################
+test_programs += plugins/nanoleaf/NanoleafTester
+
+plugins_nanoleaf_NanoleafTester_SOURCES = plugins/nanoleaf/NanoleafNodeTest.cpp
+plugins_nanoleaf_NanoleafTester_CXXFLAGS = $(COMMON_TESTING_FLAGS)
+plugins_nanoleaf_NanoleafTester_LDADD = $(COMMON_TESTING_LIBS) \
+                                        plugins/nanoleaf/libolananoleafnode.la
+endif
+
+EXTRA_DIST += plugins/nanoleaf/README.md