New flame effect

Flame effect added Minor initialization issue fixed
bportaluri · Oct 11, 2015 · b2d397e · b2d397e
1 parent 6c6be05
commit b2d397e
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/src/Ala.h b/src/Ala.h
@@ -49,6 +49,7 @@
 #define ALA_FADECOLORS 351
 #define ALA_FADECOLORSLOOP 352
 #define ALA_PIXELSFADECOLORS 353
+#define ALA_FLAME 354
 
 #define ALA_FIRE 501
 #define ALA_BOUNCINGBALLS 502

diff --git a/src/AlaLed.cpp b/src/AlaLed.cpp
@@ -3,6 +3,7 @@
 #include "ExtTlc5940.h"
 
 
+
 AlaLed::AlaLed()
 {
 	maxOut=255;
@@ -16,7 +17,7 @@ AlaLed::AlaLed()
 
 void AlaLed::initPWM(byte pin)
 {
-	byte *pins_ = (byte *)malloc(numLeds);
+	byte *pins_ = (byte *)malloc(1);
     pins_[0] = pin;
 
     initPWM(1, pins_);
@@ -178,6 +179,8 @@ void AlaLed::setAnimationFunc(int animation)
 		case ALA_FADEOUT:               animFunc = &AlaLed::fadeOut;               break;
 		case ALA_FADEINOUT:             animFunc = &AlaLed::fadeInOut;             break;
 		case ALA_GLOW:                  animFunc = &AlaLed::glow;                  break;
+		case ALA_FLAME:                 animFunc = &AlaLed::flame;                 break;
+
 		default:                        animFunc = &AlaLed::off;
 	}
 }
@@ -442,3 +445,12 @@ void AlaLed::glow()
 		leds[x] = (-cos(s)+1)*maxOut/2;
 	}
 }
+
+void AlaLed::flame()
+{
+	for(int x=0; x<numLeds; x++)
+	{
+		if (random(4) == 0)
+			leds[x] = map(random(30)+70, 0, 100, 0, maxOut);
+	}
+}
diff --git a/src/AlaLed.h b/src/AlaLed.h
@@ -94,6 +94,7 @@ class AlaLed
     void fadeOut();
     void fadeInOut();
     void glow();
+	void flame();
 
 
     byte driver;

diff --git a/src/AlaLedRgb.cpp b/src/AlaLedRgb.cpp
@@ -25,7 +25,7 @@ AlaLedRgb::AlaLedRgb()
 
 void AlaLedRgb::initPWM(byte pinRed, byte pinGreen, byte pinBlue)
 {
-	byte *pins_ = (byte *)malloc(3*numLeds);
+	byte *pins_ = (byte *)malloc(3);
     pins_[0] = pinRed;
     pins_[1] = pinGreen;
     pins_[2] = pinBlue;
@@ -567,7 +567,6 @@ void AlaLedRgb::pixelsFadeColors()
 		AlaColor c = palette.getPalColor(t+7*x);
 		leds[x] = c;
 	}
-
 }
 
 void AlaLedRgb::fadeColorsLoop()
@@ -613,7 +612,6 @@ void AlaLedRgb::movingGradient()
 }
 
 
-
 void AlaLedRgb::fire()
 {
     // COOLING: How much does the air cool as it rises?