From 01a396c67526400018e593e34189fb4586da750c Mon Sep 17 00:00:00 2001
From: Martin Santowski <martin.santowski@raritan.com>
Date: Wed, 24 Jul 2019 11:55:40 +0200
Subject: [PATCH 1/2] Added header and symbol exports

---
 src/Makefile                           | 5 +++++
 src/domain/zbmessage/aps.h             | 8 ++++++++
 src/domain/zbmessage/zclframecontrol.h | 9 +++++++++
 src/domain/zbmessage/zclheader.h       | 9 +++++++++
 4 files changed, 31 insertions(+)

diff --git a/src/Makefile b/src/Makefile
index a534470b..3444c5aa 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -51,6 +51,11 @@ domain/ezsp-dongle.h \
 domain/ezsp-dongle-observer.h \
 domain/zigbee-tools/zigbee-networking.h \
 domain/zigbee-tools/zigbee-messaging.h \
+domain/zbmessage/green-power-frame.h \
+domain/zigbee-tools/green-power-sink.h \
+domain/zigbee-tools/green-power-sink-table.h \
+domain/zbmessage/green-power-sink-table-entry.h \
+domain/green-power-observer.h \
 domain/zbmessage/zigbee-message.h \
 domain/zbmessage/aps.h \
 domain/zbmessage/apsoption.h \
diff --git a/src/domain/zbmessage/aps.h b/src/domain/zbmessage/aps.h
index 5e1241a5..4af9032e 100644
--- a/src/domain/zbmessage/aps.h
+++ b/src/domain/zbmessage/aps.h
@@ -12,6 +12,11 @@
 
 #include "apsoption.h"
 
+#ifdef USE_RARITAN
+/**** Start of the official API; no includes below this point! ***************/
+#include <pp/official_api_start.h>
+#endif // USE_RARITAN
+
 class CAPSFrame; /* Forward declaration */
 void swap(CAPSFrame& first, CAPSFrame& second); /* Declaration before qualifying ::swap() as friend for class CAPSFrame */
 
@@ -83,3 +88,6 @@ class CAPSFrame
   uint8_t src_ep;
 };
 
+#ifdef USE_RARITAN
+#include <pp/official_api_end.h>
+#endif // USE_RARITAN
diff --git a/src/domain/zbmessage/zclframecontrol.h b/src/domain/zbmessage/zclframecontrol.h
index 0d91d89a..722ac4fe 100644
--- a/src/domain/zbmessage/zclframecontrol.h
+++ b/src/domain/zbmessage/zclframecontrol.h
@@ -9,6 +9,11 @@
 #include <cstdint>
 #include <vector>
 
+#ifdef USE_RARITAN
+/**** Start of the official API; no includes below this point! ***************/
+#include <pp/official_api_start.h>
+#endif // USE_RARITAN
+
 typedef enum
 {
   E_DIR_CLIENT_TO_SERVER = 0,
@@ -106,3 +111,7 @@ class CZCLFrameControl
   /** software version indication, MSP : 0 for short frame (no deviceid and battery fields), 1 for long frame (generation 2.1) */
   EZCLFrameCtrlSoftwareCode software_code;
 };
+
+#ifdef USE_RARITAN
+#include <pp/official_api_end.h>
+#endif // USE_RARITAN
diff --git a/src/domain/zbmessage/zclheader.h b/src/domain/zbmessage/zclheader.h
index 0fa9073c..d8c5e05e 100644
--- a/src/domain/zbmessage/zclheader.h
+++ b/src/domain/zbmessage/zclheader.h
@@ -11,6 +11,11 @@
 
 #include "zclframecontrol.h"
 
+#ifdef USE_RARITAN
+/**** Start of the official API; no includes below this point! ***************/
+#include <pp/official_api_start.h>
+#endif // USE_RARITAN
+
 #define LG_MAN_CODE 0x1021
 
 class CZCLHeader; /* Forward declaration */
@@ -122,3 +127,7 @@ class CZCLHeader
   /** */
   uint8_t cmd_id;
 };
+
+#ifdef USE_RARITAN
+#include <pp/official_api_end.h>
+#endif // USE_RARITAN

From a6a72a4fab728b162f6de4afe86a353434285e27 Mon Sep 17 00:00:00 2001
From: Martin Santowski <martin.santowski@raritan.com>
Date: Wed, 24 Jul 2019 11:56:48 +0200
Subject: [PATCH 2/2] Removed some whitespace and a compiler warning

---
 src/domain/zbmessage/aps.h                  | 2 +-
 src/domain/zigbee-tools/zigbee-networking.h | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/domain/zbmessage/aps.h b/src/domain/zbmessage/aps.h
index 4af9032e..72d86825 100644
--- a/src/domain/zbmessage/aps.h
+++ b/src/domain/zbmessage/aps.h
@@ -1,6 +1,6 @@
 /**
  * @file aps.h
- * 
+ *
  * @brief Handles encoding/decoding of the APS header
  */
 
diff --git a/src/domain/zigbee-tools/zigbee-networking.h b/src/domain/zigbee-tools/zigbee-networking.h
index 87a6d49e..fd7266c2 100644
--- a/src/domain/zigbee-tools/zigbee-networking.h
+++ b/src/domain/zigbee-tools/zigbee-networking.h
@@ -32,17 +32,17 @@ class CZigbeeNetworking : public CEzspDongleObserver
     void OpenNetwork( uint8_t i_timeout );
     void CloseNetwork( void );
     void LeaveNetwork( void );
-    
+
     void startDiscoverProduct(std::function<void (EmberNodeType i_type, EmberEUI64 i_eui64, EmberNodeId i_id)> i_discoverCallbackFct = nullptr);
 
     // Green Power
-    
+
 
     /**
      * Observer
      */
-    void handleDongleState( EDongleState i_state ){;}
-    void handleEzspRxMessage( EEzspCmd i_cmd, std::vector<uint8_t> i_msg_receive );    
+    void handleDongleState( EDongleState /* i_state */ ){;}
+    void handleEzspRxMessage( EEzspCmd i_cmd, std::vector<uint8_t> i_msg_receive );
 
 private:
     CEzspDongle &dongle;