From 558451a4063ea0da74d0ffa0cba183957c5a0410 Mon Sep 17 00:00:00 2001
From: Alexander <kool@kool.ru>
Date: Sat, 10 Mar 2018 15:28:03 +0300
Subject: [PATCH] Use NeoMaple library for SMT32 (#203)

---
 .gitignore             |  1 +
 NodeManagerLibrary.h   |  8 ++++++++
 NodeManagerLibrary.ino | 43 ++++++++++++++++++++++++++++++++----------
 3 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 126fc83f..69afccb7 100755
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 *~
 *.tmp
 *.part
+*.rsls
diff --git a/NodeManagerLibrary.h b/NodeManagerLibrary.h
index 533b3298..45d2a834 100644
--- a/NodeManagerLibrary.h
+++ b/NodeManagerLibrary.h
@@ -206,8 +206,12 @@
   #include <SparkFun_APDS9960.h>
 #endif
 #ifdef USE_NEOPIXEL
+#if defined(ARDUINO_ARCH_STM32F0) || defined(ARDUINO_ARCH_STM32F1) || defined(ARDUINO_ARCH_STM32F3) || defined(ARDUINO_ARCH_STM32F4) || defined(ARDUINO_ARCH_STM32L4)
+  #include <NeoMaple.h>
+#else
   #include <Adafruit_NeoPixel.h>
 #endif
+#endif
 
 // include third party libraries for enabled features
 #ifdef MY_GATEWAY_SERIAL
@@ -1715,7 +1719,11 @@ class SensorNeopixel: public Sensor {
     void onLoop(Child* child);
     void onReceive(MyMessage* message);
   protected:
+#if defined(ARDUINO_ARCH_STM32F0) || defined(ARDUINO_ARCH_STM32F1) || defined(ARDUINO_ARCH_STM32F3) || defined(ARDUINO_ARCH_STM32F4) || defined(ARDUINO_ARCH_STM32L4)
+  NeoMaple* _pixels;
+#else  
   Adafruit_NeoPixel* _pixels;
+#endif
   int _num_pixels = 16;
 };
 #endif
diff --git a/NodeManagerLibrary.ino b/NodeManagerLibrary.ino
index 88ad3136..899090f8 100644
--- a/NodeManagerLibrary.ino
+++ b/NodeManagerLibrary.ino
@@ -3892,8 +3892,13 @@ void SensorNeopixel::setNumPixels(int value) {
 
 // what to do during setup
 void SensorNeopixel::onSetup() {
+#if defined(ARDUINO_ARCH_STM32F0) || defined(ARDUINO_ARCH_STM32F1) || defined(ARDUINO_ARCH_STM32F3) || defined(ARDUINO_ARCH_STM32F4) || defined(ARDUINO_ARCH_STM32L4)
+  _pixels = new NeoMaple(_num_pixels, NEO_GRB + NEO_KHZ800);
+#else  
   _pixels = new Adafruit_NeoPixel(_num_pixels, _pin, NEO_GRB + NEO_KHZ800);
+#endif
   _pixels->begin();
+  _pixels->show();
 }
 
 // what to do during loop
@@ -3904,17 +3909,26 @@ void SensorNeopixel::onLoop(Child *child) {
 void SensorNeopixel::onReceive(MyMessage* message) {
   Child* child = getChild(message->sensor);
   if (child == nullptr) return;
-  if (message->getCommand() == C_REQ && message->type == child->type) {
-    setColor(message->getString());
-  }
+  if (message->getCommand() == C_SET && message->type == child->type) {
+      char* string = (char*)message->getString();
+      setColor(string);
+ 		//setColor(message->getString());
+	  }
 }
 
 void SensorNeopixel::setColor(char* string) {
-    Child* child = children.get(1);
-    // if the second char is not a comma, return
-    if (strncmp(string+1,",",1) != 0) return;
-    int pixel_num = atoi(string);
-    int color = atoi(string+2);
+  Child* child = children.get(1);
+  long color = 0;
+  char * p = strstr(string, ",");
+  if (p){ 
+    char pixelnum[6];
+    int pos = (int) (p - string);
+    strncpy(pixelnum, string, pos);
+    pixelnum[pos] = 0;
+
+    int pixel_num = atoi(pixelnum);
+
+    color = strtol(string + pos+1, NULL, 16);
     #if FEATURE_DEBUG == ON
       Serial.print(_name);
       Serial.print(F(" I="));
@@ -3925,9 +3939,18 @@ void SensorNeopixel::setColor(char* string) {
       Serial.println(color);
     #endif
     _pixels->setPixelColor(pixel_num,color);
-    _pixels->show();
-    ((ChildInt*)child)->setValueInt(color);
+  }
+  else //set All pixels to single color
+  {
+    color = strtol(string, NULL, 16);
+    for(int i=0;i<_num_pixels;i++)
+        _pixels->setPixelColor(i,color);
+  }
+    
+  _pixels->show();
+  ((ChildInt*)child)->setValueInt(color);
 }
+
 #endif
 
 /*