correct BLEAdafruitRgbPixel

Author: hathach

libraries/BLEAdafruitService/src/BLEAdafruitService.h

@@ -31,12 +31,11 @@
 
 #include "services/BLEAdafruitSensor.h"
 #include "services/BLEAdafruitTemperature.h"
-#include "services/BLEAdafruitTemperature.h"
-#include "services/BLEAdafruitRgbPixel.h"
 #include "services/BLEAdafruitAccel.h"
 #include "services/BLEAdafruitLightSensor.h"
 #include "services/BLEAdafruitButton.h"
 #include "services/BLEAdafruitTone.h"
+#include "services/BLEAdafruitRgbPixel.h"
 
 
 #endif /* BLEADAFRUITSERVICE_H_ */

libraries/BLEAdafruitService/src/services/BLEAdafruitRgbPixel.cpp

@@ -22,7 +22,11 @@
  * THE SOFTWARE.
  */
 
-#include "BLEAdafruitService.h"
+#include "bluefruit_common.h"
+#include "BLECharacteristic.h"
+#include "BLEService.h"
+
+#include "BLEAdafruitRgbPixel.h"
 
 //--------------------------------------------------------------------+
 // MACRO TYPEDEF CONSTANT ENUM DECLARATION
@@ -66,10 +70,16 @@ const uint8_t BLEAdafruitRgbPixel::UUID128_CHR_DATA[16] =
 BLEAdafruitRgbPixel::BLEAdafruitRgbPixel(void)
   : BLEService(UUID128_SERVICE), Pin(UUID128_CHR_PIN), Type(UUID128_CHR_TYPE), Data(UUID128_CHR_DATA)
 {
+  _neo = NULL;
+}
 
+err_t BLEAdafruitRgbPixel::begin (Adafruit_NeoPixel_Type* neo_pixel)
+{
+  _neo = neo_pixel;
+  return begin((uint8_t) _neo->getPin(), 0);
 }
 
-err_t BLEAdafruitRgbPixel::begin (/*Adafruit_NeoPixel* neo_pixel*/)
+err_t BLEAdafruitRgbPixel::begin(uint8_t pin, uint8_t type)
 {
   // Invoke base class begin()
   VERIFY_STATUS( BLEService::begin() );
@@ -79,14 +89,14 @@ err_t BLEAdafruitRgbPixel::begin (/*Adafruit_NeoPixel* neo_pixel*/)
   Pin.setPermission(SECMODE_OPEN, SECMODE_OPEN);
   Pin.setFixedLen(1);
   VERIFY_STATUS( Pin.begin() );
-  Pin.write8(0);
+  Pin.write8(pin);
 
   // Add Characteristic
   Type.setProperties(CHR_PROPS_READ | CHR_PROPS_WRITE);
   Type.setPermission(SECMODE_OPEN, SECMODE_OPEN);
   Type.setFixedLen(1);
   VERIFY_STATUS( Type.begin() );
-  Type.write16(0);
+  Type.write8(type);
 
   // Add Characteristic
   Data.setProperties(CHR_PROPS_WRITE);

libraries/BLEAdafruitService/src/services/BLEAdafruitRgbPixel.h

@@ -25,6 +25,17 @@
 #ifndef BLEADAFRUITRGBPIXEL_H_
 #define BLEADAFRUITRGBPIXEL_H_
 
+// use Adafruit_CPlay_NeoPixel instead of Adafruit_NeoPixel
+#define USE_CPLAY_NEOPIXEL  0
+
+#if USE_CPLAY_NEOPIXEL
+  #include "Adafruit_CPlay_NeoPixel.h"
+  #define Adafruit_NeoPixel_Type  Adafruit_CPlay_NeoPixel
+#else
+  #include "Adafruit_NeoPixel.h"
+  #define Adafruit_NeoPixel_Type  Adafruit_NeoPixel
+#endif
+
 class BLEAdafruitRgbPixel : public BLEService
 {
   public:
@@ -40,7 +51,12 @@ class BLEAdafruitRgbPixel : public BLEService
     BLECharacteristic Data;
 
     BLEAdafruitRgbPixel(void);
-    virtual err_t begin(void);
+    virtual err_t begin(Adafruit_NeoPixel_Type* neo);
+
+  private:
+    Adafruit_NeoPixel_Type* _neo;
+
+    err_t begin(uint8_t pin, uint8_t type);
 };