Merge pull request wled#1711 from Aircoookie/dev-multipin-select

Multipin select working!

Author: Aircoookie

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ### Development versions after 0.11.1 release
 
+#### Build 2101310
+
+-   First alpha configurable multipin
+
 #### Build 2101130
 
 -   Added color transitions for all segments and slots and for segment brightness

usermods/Temperature/usermod_temperature.h

@@ -5,11 +5,13 @@
 #include <DallasTemperature.h> //DS18B20
 
 //Pin defaults for QuinLed Dig-Uno
+#ifndef TEMPERATURE_PIN
 #ifdef ARDUINO_ARCH_ESP32
 #define TEMPERATURE_PIN 18
 #else //ESP8266 boards
 #define TEMPERATURE_PIN 14
 #endif
+#endif
 
 // the frequency to check temperature, 1 minute
 #ifndef USERMOD_DALLASTEMPERATURE_MEASUREMENT_INTERVAL
@@ -58,6 +60,7 @@ class UsermodTemperature : public Usermod {
     }
 
     void getTemperature() {
+      if (strip.isUpdating()) return;
       #ifdef USERMOD_DALLASTEMPERATURE_CELSIUS
       temperature = sensor.getTempC(sensorDeviceAddress);
       #else
@@ -80,30 +83,28 @@ class UsermodTemperature : public Usermod {
       disabled = !sensor.getAddress(sensorDeviceAddress, 0);
 
       if (!disabled) {
-        DEBUG_PRINTLN("Dallas Temperature found");
+        DEBUG_PRINTLN(F("Dallas Temperature found"));
         // set the resolution for this specific device
         sensor.setResolution(sensorDeviceAddress, 9, true);
         // do not block waiting for reading
-        sensor.setWaitForConversion(false); 
+        sensor.setWaitForConversion(false);
+        // allocate pin & prevent other use
+        if (!pinManager.allocatePin(TEMPERATURE_PIN,false))
+          disabled = true;
       } else {
-        DEBUG_PRINTLN("Dallas Temperature not found");
+        DEBUG_PRINTLN(F("Dallas Temperature not found"));
       }
     }
 
     void loop() {
-      if (disabled) {
-        return;
-      }
+      if (disabled || strip.isUpdating()) return;
 
       unsigned long now = millis();
 
       // check to see if we are due for taking a measurement
       // lastMeasurement will not be updated until the conversion
       // is complete the the reading is finished
-      if (now - lastMeasurement < USERMOD_DALLASTEMPERATURE_MEASUREMENT_INTERVAL)
-      {
-        return;
-      }
+      if (now - lastMeasurement < USERMOD_DALLASTEMPERATURE_MEASUREMENT_INTERVAL) return;
 
       // we are due for a measurement, if we are not already waiting 
       // for a conversion to complete, then make a new request for temps
@@ -125,7 +126,7 @@ class UsermodTemperature : public Usermod {
             // dont publish super low temperature as the graph will get messed up
             // the DallasTemperature library returns -127C or -196.6F when problem
             // reading the sensor
-            strcat(subuf, "/temperature");
+            strcat_P(subuf, PSTR("/temperature"));
             mqtt->publish(subuf, 0, true, String(temperature).c_str());
           } else {
             // publish something else to indicate status?
@@ -136,34 +137,32 @@ class UsermodTemperature : public Usermod {
 
     void addToJsonInfo(JsonObject& root) {
       // dont add temperature to info if we are disabled
-      if (disabled) {
-        return;
-      }
+      if (disabled) return;
 
-      JsonObject user = root["u"];
-      if (user.isNull()) user = root.createNestedObject("u");
+      JsonObject user = root[F("u")];
+      if (user.isNull()) user = root.createNestedObject(F("u"));
 
-      JsonArray temp = user.createNestedArray("Temperature");
+      JsonArray temp = user.createNestedArray(F("Temperature"));
 
       if (!getTemperatureComplete) {
         // if we haven't read the sensor yet, let the user know
         // that we are still waiting for the first measurement
         temp.add((USERMOD_DALLASTEMPERATURE_FIRST_MEASUREMENT_AT - millis()) / 1000);
-        temp.add(" sec until read");
+        temp.add(F(" sec until read"));
         return;
       }
 
       if (temperature <= -100) {
         temp.add(0);
-        temp.add(" Sensor Error!");
+        temp.add(F(" Sensor Error!"));
         return;
       }
 
       temp.add(temperature);
       #ifdef USERMOD_DALLASTEMPERATURE_CELSIUS
-      temp.add("°C");
+      temp.add(F("°C"));
       #else
-      temp.add("°F");
+      temp.add(F("°F"));
       #endif
     }
 

wled00/FX.cpp

@@ -1265,7 +1265,7 @@ uint16_t WS2812FX::police_base(uint32_t color1, uint32_t color2, bool all)
       for (uint16_t i = idexB; i < idexR; i++) setPixelColor(i, color2);
     } 
   } else { //regular dot-only mode
-    uint8_t size = 1 + SEGMENT.intensity >> 3;
+    uint8_t size = 1 + (SEGMENT.intensity >> 3);
     if (size > SEGLEN/2) size = 1+ SEGLEN/2;
     for (uint8_t i=0; i <= size; i++) {
       setPixelColor(idexR+i, color1);

wled00/FX.h

@@ -29,42 +29,6 @@
 #ifndef WS2812FX_h
 #define WS2812FX_h
 
-//TEMPORARY DEFINES FOR TESTING - MAKE THESE RUNTIME CONFIGURABLE TOO!
-#ifndef LEDPIN
-#define LEDPIN 2
-#endif
-
-#ifndef BTNPIN
-#define BTNPIN  0  //button pin. Needs to have pullup (gpio0 recommended)
-#endif
-
-#ifndef TOUCHPIN
-//#define TOUCHPIN T0 //touch pin. Behaves the same as button. ESP32 only.
-#endif
-
-#ifndef IRPIN
-#define IRPIN  4  //infrared pin (-1 to disable)  MagicHome: 4, H801 Wifi: 0
-#endif
-
-#ifndef RLYPIN
-#define RLYPIN 12  //pin for relay, will be set HIGH if LEDs are on (-1 to disable). Also usable for standby leds, triggers,...
-#endif
-
-#ifndef AUXPIN
-#define AUXPIN -1  //debug auxiliary output pin (-1 to disable)
-#endif
-
-#ifndef RLYMDE
-#define RLYMDE  1  //mode for relay, 0: LOW if LEDs are on 1: HIGH if LEDs are on
-#endif
-//END OF TEMP DEFINES
-
-#ifdef ESP32_MULTISTRIP
-  #include "../usermods/esp32_multistrip/NpbWrapper.h"
-#else
-  #include "bus_manager.h"
-#endif
-
 #include "const.h"
 
 #define FASTLED_INTERNAL //remove annoying pragma messages
@@ -616,12 +580,11 @@ class WS2812FX {
       ablMilliampsMax = 850;
       currentMilliamps = 0;
       timebase = 0;
-      busses = new BusManager();
       resetSegments();
     }
 
     void
-      init(bool supportWhite, uint16_t countPixels, bool skipFirst),
+      finalizeInit(bool supportWhite, uint16_t countPixels, bool skipFirst),
       service(void),
       blur(uint8_t),
       fill(uint32_t),
@@ -661,6 +624,8 @@ class WS2812FX {
       paletteFade = 0,
       paletteBlend = 0,
       milliampsPerLed = 55,
+//      getStripType(uint8_t strip=0),
+//      setStripType(uint8_t type, uint8_t strip=0),
       getBrightness(void),
       getMode(void),
       getSpeed(void),
@@ -675,11 +640,17 @@ class WS2812FX {
       get_random_wheel_index(uint8_t);
 
     int8_t
+//      setStripPin(uint8_t strip, int8_t pin),
+//      getStripPin(uint8_t strip=0),
+//      setStripPinClk(uint8_t strip, int8_t pin),
+//      getStripPinClk(uint8_t strip=0),
       tristate_square8(uint8_t x, uint8_t pulsewidth, uint8_t attdec);
 
     uint16_t
       ablMilliampsMax,
       currentMilliamps,
+//      setStripLen(uint8_t strip, uint16_t len),
+//      getStripLen(uint8_t strip=0),
       triwave16(uint16_t);
 
     uint32_t
@@ -826,8 +797,6 @@ class WS2812FX {
       mode_dynamic_smooth(void);
 
   private:
-    BusManager *busses;
-
     uint32_t crgb_to_col(CRGB fastled);
     CRGB col_to_crgb(uint32_t);
     CRGBPalette16 currentPalette;

wled00/FX_fcn.cpp

@@ -49,7 +49,7 @@ const uint16_t customMappingSize = sizeof(customMappingTable)/sizeof(uint16_t);
 #endif
 
 //do not call this method from system context (network callback)
-void WS2812FX::init(bool supportWhite, uint16_t countPixels, bool skipFirst)
+void WS2812FX::finalizeInit(bool supportWhite, uint16_t countPixels, bool skipFirst)
 {
   if (supportWhite == _useRgbw && countPixels == _length && _skipFirstMode == skipFirst) return;
   RESET_RUNTIME;
@@ -62,20 +62,21 @@ void WS2812FX::init(bool supportWhite, uint16_t countPixels, bool skipFirst)
     _lengthRaw += LED_SKIP_AMOUNT;
   }
 
-  uint8_t pins[] = {LEDPIN};
-
-  while (!busses->canAllShow()) yield();
-  busses->removeAll();
-  busses->add(supportWhite? TYPE_SK6812_RGBW : TYPE_WS2812_RGB, pins, 0, countPixels, COL_ORDER_GRB);
+  //if busses failed to load, add default (FS issue...)
+  if (busses.getNumBusses() == 0) {
+    uint8_t defPin[] = {LEDPIN};
+    BusConfig defCfg = BusConfig(TYPE_WS2812_RGB, defPin, 0, _lengthRaw, COL_ORDER_GRB);
+    busses.add(defCfg);
+  }
 
   _segments[0].start = 0;
   _segments[0].stop = _length;
 
   setBrightness(_brightness);
 
   #ifdef ESP8266
-  for (uint8_t i = 0; i < busses->getNumBusses(); i++) {
-    Bus* b = busses->getBus(i);
+  for (uint8_t i = 0; i < busses.getNumBusses(); i++) {
+    Bus* b = busses.getBus(i);
     if ((!IS_DIGITAL(b->getType()) || IS_2PIN(b->getType()))) continue;
     uint8_t pins[5];
     b->getPins(pins);
@@ -205,12 +206,12 @@ void WS2812FX::setPixelColor(uint16_t i, byte r, byte g, byte b, byte w)
       if (indexSet < customMappingSize) indexSet = customMappingTable[indexSet];
       #endif
       if (indexSetRev >= SEGMENT.start && indexSetRev < SEGMENT.stop) {
-        busses->setPixelColor(indexSet + skip, col);
+        busses.setPixelColor(indexSet + skip, col);
         if (IS_MIRROR) { //set the corresponding mirrored pixel
           if (reverseMode) {
-            busses->setPixelColor(REV(SEGMENT.start) - indexSet + skip + REV(SEGMENT.stop) + 1, col);
+            busses.setPixelColor(REV(SEGMENT.start) - indexSet + skip + REV(SEGMENT.stop) + 1, col);
           } else {
-            busses->setPixelColor(SEGMENT.stop - indexSet + skip + SEGMENT.start - 1, col);
+            busses.setPixelColor(SEGMENT.stop - indexSet + skip + SEGMENT.start - 1, col);
           }
         }
       }
@@ -221,11 +222,11 @@ void WS2812FX::setPixelColor(uint16_t i, byte r, byte g, byte b, byte w)
     if (i < customMappingSize) i = customMappingTable[i];
     #endif
     uint32_t col = ((w << 24) | (r << 16) | (g << 8) | (b));
-    busses->setPixelColor(i + skip, col);
+    busses.setPixelColor(i + skip, col);
   }
   if (skip && i == 0) {
     for (uint16_t j = 0; j < skip; j++) {
-      busses->setPixelColor(j, BLACK);
+      busses.setPixelColor(j, BLACK);
     }
   }
 }
@@ -276,7 +277,7 @@ void WS2812FX::show(void) {
 
     for (uint16_t i = 0; i < _length; i++) //sum up the usage of each LED
     {
-      RgbwColor c = busses->getPixelColor(i);
+      RgbwColor c = busses.getPixelColor(i);
 
       if(useWackyWS2815PowerModel)
       {
@@ -305,24 +306,24 @@ void WS2812FX::show(void) {
       uint16_t scaleI = scale * 255;
       uint8_t scaleB = (scaleI > 255) ? 255 : scaleI;
       uint8_t newBri = scale8(_brightness, scaleB);
-      busses->setBrightness(newBri);
+      busses.setBrightness(newBri);
       currentMilliamps = (powerSum0 * newBri) / puPerMilliamp;
     } else
     {
       currentMilliamps = powerSum / puPerMilliamp;
-      busses->setBrightness(_brightness);
+      busses.setBrightness(_brightness);
     }
     currentMilliamps += MA_FOR_ESP; //add power of ESP back to estimate
     currentMilliamps += _length; //add standby power back to estimate
   } else {
     currentMilliamps = 0;
-    busses->setBrightness(_brightness);
+    busses.setBrightness(_brightness);
   }
 
   // some buses send asynchronously and this method will return before
   // all of the data has been sent.
   // See https://github.com/Makuna/NeoPixelBus/wiki/ESP32-NeoMethods#neoesp32rmt-methods
-  busses->show();
+  busses.show();
   _lastShow = millis();
 }
 
@@ -331,7 +332,7 @@ void WS2812FX::show(void) {
  * On some hardware (ESP32), strip updates are done asynchronously.
  */
 bool WS2812FX::isUpdating() {
-  return !busses->canAllShow();
+  return !busses.canAllShow();
 }
 
 /**
@@ -492,7 +493,7 @@ uint32_t WS2812FX::getPixelColor(uint16_t i)
 
   if (i >= _lengthRaw) return 0;
 
-  return busses->getPixelColor(i);
+  return busses.getPixelColor(i);
 }
 
 WS2812FX::Segment& WS2812FX::getSegment(uint8_t id) {