Release 2.0

Minor changes and source code moved to 'src' subfolder.
bportaluri · Apr 2, 2015 · 313e625 · 313e625
1 parent 739bb8a
commit 313e625
Show file tree

Hide file tree

Showing 25 changed files with 31 additions and 16 deletions.
diff --git a/examples/RgbStripButtons/AlaRgbStripDemo.ino → examples/AlaRgbStripDemo/AlaRgbStripDemo.ino b/examples/RgbStripButtons/AlaRgbStripDemo.ino → examples/AlaRgbStripDemo/AlaRgbStripDemo.ino
diff --git a/examples/SimpleTlc5940/SimpleTlc5940.ino b/examples/SimpleTlc5940/SimpleTlc5940.ino
@@ -8,7 +8,7 @@
 //
 ///////////////////////////////////////////////////////////////////////////////////////////
 
-#include <AlaLed.h>
+#include "AlaLed.h"
 
 AlaLed alaLed;
 

diff --git a/examples/SimpleTlc5940/schematic/SimpleTlc5940.fzz b/examples/SimpleTlc5940/schematic/SimpleTlc5940.fzz
diff --git a/examples/SimpleTlc5940/schematic/SimpleTlc5940_bb.png b/examples/SimpleTlc5940/schematic/SimpleTlc5940_bb.png
diff --git a/examples/SimpleTlc5940/schematic/SimpleTlc5940_schem.png b/examples/SimpleTlc5940/schematic/SimpleTlc5940_schem.png
diff --git a/keywords.txt b/keywords.txt
@@ -43,6 +43,7 @@ ALA_STROBO	LITERAL1
 ALA_FADECOLORSLOOP	LITERAL1
 ALA_FADECOLORS	LITERAL1
 ALA_CYCLECOLORS	LITERAL1
+ALA_PIXELSFADECOLORS	LITERAL1
 
 ALA_PIXELSHIFTRIGHT	LITERAL1
 ALA_PIXELSHIFTLEFT	LITERAL1
@@ -57,6 +58,7 @@ ALA_BARSHIFTLEFT	LITERAL1
 ALA_LARSONSCANNER	LITERAL1
 ALA_LARSONSCANNER2	LITERAL1
 ALA_MOVINGBARS	LITERAL1
+ALA_MOVINGGRADIENT	LITERAL1
 
 ALA_FADEIN	LITERAL1
 ALA_FADEOUT	LITERAL1

diff --git a/library.properties b/library.properties
@@ -0,0 +1,9 @@
+name=ALA
+version=2.0
+author=bportaluri
+maintainer=Bruno Portaluri <[email protected]>
+sentence=Arduino Light Animation (ALA) is a library
+paragraph=Arduino Light Animation (ALA) is a library for Arduino boards to simplify the development of light animations using LEDs and LED strips.
+category=Other
+url=https://github.com/bportaluri/ALA
+architectures=*
diff --git a/Ala.cpp → src/Ala.cpp b/Ala.cpp → src/Ala.cpp
diff --git a/Ala.h → src/Ala.h b/Ala.h → src/Ala.h
@@ -97,12 +97,12 @@ typedef struct AlaColor
     {
         return(this->r == c.r and this->g == c.g and this->b == c.b);
     }
-    
+/*
     AlaColor getPixel(AlaColor maxOut)
     {
         return AlaColor(r*maxOut.r/255, g*maxOut.g/255, b*maxOut.b/255);
     }
-
+*/
     AlaColor sum(AlaColor color)
     {
         int r0 = min(color.r + r, 255);
@@ -194,9 +194,9 @@ typedef struct AlaPalette
 typedef struct AlaSeq
 {
     int animation;
-    int speed;
+    long speed;
     AlaPalette palette;
-    int duration;
+    long duration;
 };
 
 

diff --git a/AlaLed.cpp → src/AlaLed.cpp b/AlaLed.cpp → src/AlaLed.cpp
@@ -62,7 +62,7 @@ void AlaLed::setRefreshRate(int refreshRate)
 }
 
 
-void AlaLed::setAnimation(int animation, int speed)
+void AlaLed::setAnimation(int animation, long speed)
 {
 	if (this->animation == animation && this->speed == speed)
 		return;
@@ -88,6 +88,10 @@ void AlaLed::setAnimation(AlaSeq animSeq[])
 
 }
 
+void AlaLed::nextAnimation()
+{
+	currAnim = (currAnim+1)%animSeqLen;
+}
 
 void AlaLed::runAnimation()
 {

diff --git a/AlaLed.h → src/AlaLed.h b/AlaLed.h → src/AlaLed.h
@@ -57,13 +57,14 @@ class AlaLed
     * May be useful to reduce flickering in some cases.
     */
     void setRefreshRate(int refreshRate);
+
+	int getRefreshRate();
 
-
-    void setAnimation(int animation, int speed);
+    void setAnimation(int animation, long speed);
     void setAnimation(AlaSeq animSeq[]);
 
     void runAnimation();
-
+	void nextAnimation();
 
 
 private:
@@ -104,8 +105,8 @@ class AlaLed
     int refreshMillis;
 
     int animation;
+	int currAnim;
     long speed;
-
     AlaSeq *animSeq;
     int animSeqLen;
     long animSeqDuration;

diff --git a/AlaLedRgb.cpp → src/AlaLedRgb.cpp b/AlaLedRgb.cpp → src/AlaLedRgb.cpp
@@ -105,7 +105,7 @@ int AlaLedRgb::getRefreshRate()
 }
 
 
-void AlaLedRgb::setAnimation(int animation, int speed, AlaColor color)
+void AlaLedRgb::setAnimation(int animation, long speed, AlaColor color)
 {
 	if (this->animation == animation && this->speed == speed && this->palette.numColors == 1 && this->palette.colors[0] == color)
 		return;
@@ -127,7 +127,7 @@ void AlaLedRgb::setAnimation(int animation, int speed, AlaColor color)
 	animStartTime = millis();
 }
 
-void AlaLedRgb::setAnimation(int animation, int speed, AlaPalette palette)
+void AlaLedRgb::setAnimation(int animation, long speed, AlaPalette palette)
 {
 	if (this->animation == animation && this->speed == speed && this->palette == palette)
 		return;
@@ -268,7 +268,6 @@ void AlaLedRgb::setAnimationFunc(int animation)
 		case ALA_PIXELSFADECOLORS:      animFunc = &AlaLedRgb::pixelsFadeColors;      break;
 		case ALA_FADECOLORS:            animFunc = &AlaLedRgb::fadeColors;            break;
 		case ALA_FADECOLORSLOOP:        animFunc = &AlaLedRgb::fadeColorsLoop;        break;
-
 
 		case ALA_FIRE:                  animFunc = &AlaLedRgb::fire;                  break;
 		case ALA_BOUNCINGBALLS:         animFunc = &AlaLedRgb::bouncingBalls;         break;
@@ -721,7 +720,7 @@ void AlaLedRgb::bubbles()
 
 		for (int i=0; i<palette.numColors; i++)
 		{
-			pxPos[i] = 0;
+			pxPos[i] = ((float)random(255))/255;
 			pxSpeed[i] = 0;
 		}
 		lastRefresh = millis();

diff --git a/AlaLedRgb.h → src/AlaLedRgb.h b/AlaLedRgb.h → src/AlaLedRgb.h
@@ -42,8 +42,8 @@ class AlaLedRgb
 	int getRefreshRate();
 
 
-	void setAnimation(int animation, int speed, AlaColor color);
-	void setAnimation(int animation, int speed, AlaPalette palette);
+	void setAnimation(int animation, long speed, AlaColor color);
+	void setAnimation(int animation, long speed, AlaPalette palette);
 	void setAnimation(AlaSeq animSeq[]);
 	bool runAnimation();
 	void nextAnimation();

diff --git a/ExtNeoPixel.cpp → src/ExtNeoPixel.cpp b/ExtNeoPixel.cpp → src/ExtNeoPixel.cpp
diff --git a/ExtNeoPixel.h → src/ExtNeoPixel.h b/ExtNeoPixel.h → src/ExtNeoPixel.h
diff --git a/ExtTlc5940.cpp → src/ExtTlc5940.cpp b/ExtTlc5940.cpp → src/ExtTlc5940.cpp
diff --git a/ExtTlc5940.h → src/ExtTlc5940.h b/ExtTlc5940.h → src/ExtTlc5940.h
diff --git a/ExtTlc5940Config.h → src/ExtTlc5940Config.h b/ExtTlc5940Config.h → src/ExtTlc5940Config.h
diff --git a/pinouts/ATmega_8.h → src/pinouts/ATmega_8.h b/pinouts/ATmega_8.h → src/pinouts/ATmega_8.h
diff --git a/pinouts/ATmega_xx4.h → src/pinouts/ATmega_xx4.h b/pinouts/ATmega_xx4.h → src/pinouts/ATmega_xx4.h
diff --git a/pinouts/ATmega_xx8.h → src/pinouts/ATmega_xx8.h b/pinouts/ATmega_xx8.h → src/pinouts/ATmega_xx8.h
diff --git a/pinouts/Arduino_Mega.h → src/pinouts/Arduino_Mega.h b/pinouts/Arduino_Mega.h → src/pinouts/Arduino_Mega.h
diff --git a/pinouts/Teensy_xxU4.h → src/pinouts/Teensy_xxU4.h b/pinouts/Teensy_xxU4.h → src/pinouts/Teensy_xxU4.h
diff --git a/pinouts/Teensypp_xxx6.h → src/pinouts/Teensypp_xxx6.h b/pinouts/Teensypp_xxx6.h → src/pinouts/Teensypp_xxx6.h
diff --git a/pinouts/chip_includes.h → src/pinouts/chip_includes.h b/pinouts/chip_includes.h → src/pinouts/chip_includes.h