Updated file headers.

Author: jasoncoon

AudioLogic.h

@@ -1,24 +1,19 @@
 /*
  * Torch: https://github.com/evilgeniuslabs/torch
- * Copyright (c) 2015 Jason Coon
+ * Copyright (C) 2015 Jason Coon
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #define MSGEQ7_STROBE_PIN 2
@@ -37,9 +32,8 @@ int peaksRight[bandCount];
 static const uint8_t peakDecay = (1024 / MATRIX_HEIGHT) / 4;
 bool drawPeaks = true;
 
-int noiseCorrection[bandCount * 2] = {
-  -40, -40, -40, -40, -40, -40, -40, 
-  -40, -40, -40, -40, -40, -40, -40, 
+int noiseCorrection[bandCount] = {
+  -55, -50, -45, -55, -40, -55, -50,
 };
 
 uint8_t bandOffset = 3;
@@ -68,24 +62,24 @@ void readAudio() {
 
   for (uint8_t band = 0; band < bandCount; band++) {
     digitalWrite(MSGEQ7_STROBE_PIN, LOW);
-    delayMicroseconds(20);
+    delayMicroseconds(30);
 
     levelLeft = analogRead(MSGEQ7_LEFT_PIN);
     levelRight = analogRead(MSGEQ7_RIGHT_PIN);
     digitalWrite(MSGEQ7_STROBE_PIN, HIGH);
 
     levelLeft += noiseCorrection[band];
-    levelRight += noiseCorrection[band + bandCount];
+    levelRight += noiseCorrection[band];
 
     if(levelLeft < 0) levelLeft = 0;
-    if(levelLeft > 1024) levelLeft = 1024;
-    
+    if(levelLeft > 1023) levelLeft = 1023;
+
     if(levelRight < 0) levelRight = 0;
-    if(levelRight > 1024) levelRight = 1024;
-    
+    if(levelRight > 1023) levelRight = 1023;
+
     levelsLeft[band] = levelLeft;
     levelsRight[band] = levelRight;
-    
+
     if (levelLeft >= peaksLeft[band]) {
       peaksLeft[band] = levelLeft;
     }
@@ -103,4 +97,3 @@ void readAudio() {
     }
   }
 }
-

AudioPatterns.h

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
+ 
 uint16_t analyzerColumns() {
   fill_solid(leds, NUM_LEDS, CRGB::Black);
 
@@ -28,41 +28,41 @@ uint16_t analyzerColumns() {
       levelRight = peaksRight[bandIndex];
     }
 
-    CRGB colorLeft = ColorFromPalette(palette, levelLeft / levelsPerHue);
-    CRGB colorRight = ColorFromPalette(palette, levelRight / levelsPerHue);
+    CRGB colorLeft = ColorFromPalette(palette, levelLeft / levelsPerHue); // CRGB colorLeft = ColorFromPalette(palette, bandIndex * (256 / bandCount));
+//    CRGB colorRight = ColorFromPalette(palette, levelRight / levelsPerHue);
 
     uint8_t x = bandIndex + bandOffset;
     if (x >= MATRIX_WIDTH)
       x -= MATRIX_WIDTH;
 
     drawFastVLine(x, (MATRIX_HEIGHT - 1) - levelLeft / levelsPerVerticalPixel, MATRIX_HEIGHT - 1, colorLeft);
-    drawFastVLine(x + bandCount, (MATRIX_HEIGHT - 1) - levelRight / levelsPerVerticalPixel, MATRIX_HEIGHT - 1, colorRight);
+//    drawFastVLine(x + bandCount, (MATRIX_HEIGHT - 1) - levelRight / levelsPerVerticalPixel, MATRIX_HEIGHT - 1, colorRight);
   }
 
-  return 0;
+  return 1;
 }
 
 uint16_t analyzerPixels() {
   fill_solid(leds, NUM_LEDS, CRGB::Black);
 
   for (uint8_t bandIndex = 0; bandIndex < bandCount; bandIndex++) {
     int levelLeft = levelsLeft[bandIndex];
-    int levelRight = levelsRight[bandIndex];
+//    int levelRight = levelsRight[bandIndex];
 
     if (drawPeaks) {
       levelLeft = peaksLeft[bandIndex];
-      levelRight = peaksRight[bandIndex];
+//      levelRight = peaksRight[bandIndex];
     }
 
     CRGB colorLeft = ColorFromPalette(palette, levelLeft / levelsPerHue);
-    CRGB colorRight = ColorFromPalette(palette, levelRight / levelsPerHue);
+//    CRGB colorRight = ColorFromPalette(palette, levelRight / levelsPerHue);
 
     uint8_t x = bandIndex + bandOffset;
     if (x >= MATRIX_WIDTH)
       x -= MATRIX_WIDTH;
 
     leds[XY(x, (MATRIX_HEIGHT - 1) - levelLeft / levelsPerVerticalPixel)] = colorLeft;
-    leds[XY(x + bandCount, (MATRIX_HEIGHT - 1) - levelLeft / levelsPerVerticalPixel)] = colorRight;
+//    leds[XY(x + bandCount, (MATRIX_HEIGHT - 1) - levelLeft / levelsPerVerticalPixel)] = colorRight;
   }
 
   return 0;
@@ -73,34 +73,34 @@ uint16_t fallingSpectrogram() {
 
   for (uint8_t bandIndex = 0; bandIndex < bandCount; bandIndex++) {
     int levelLeft = levelsLeft[bandIndex];
-    int levelRight = levelsRight[bandIndex];
+//    int levelRight = levelsRight[bandIndex];
 
     if (drawPeaks) {
       levelLeft = peaksLeft[bandIndex];
-      levelRight = peaksRight[bandIndex];
+//      levelRight = peaksRight[bandIndex];
     }
 
     if (levelLeft <= 8) levelLeft = 0;
-    if (levelRight <= 8) levelRight = 0;
+//    if (levelRight <= 8) levelRight = 0;
 
     CRGB colorLeft = ColorFromPalette(palette, levelLeft / levelsPerHue);
-    CRGB colorRight = ColorFromPalette(palette, levelRight / levelsPerHue);
+//    CRGB colorRight = ColorFromPalette(palette, levelRight / levelsPerHue);
 
     if (currentPaletteIndex < 2) { // invert the first two palettes
       colorLeft = ColorFromPalette(palette, 205 - (levelLeft / 4 - 205));
-      colorRight = ColorFromPalette(palette, 205 - (levelLeft / 4 - 205));
+//      colorRight = ColorFromPalette(palette, 205 - (levelLeft / 4 - 205));
     }
     else {
       colorLeft = ColorFromPalette(palette, levelLeft / 4);
-      colorRight = ColorFromPalette(palette, levelRight / 4);
+//      colorRight = ColorFromPalette(palette, levelRight / 4);
     }
 
     uint8_t x = bandIndex + bandOffset;
     if (x >= MATRIX_WIDTH)
       x -= MATRIX_WIDTH;
 
     leds[XY(x, 0)] = colorLeft;
-    leds[XY(x + bandCount, 0)] = colorRight;
+//    leds[XY(x + bandCount, 0)] = colorRight;
   }
 
   return 0;
@@ -115,10 +115,15 @@ uint16_t audioNoise() {
   noisescale = 30;
   colorLoop = 0;
 
-//  if(peaksLeft[0] > 896)
-  noisespeedy = peaksLeft[0] / 64;
-//  if(peaksRight[0] > 896)
-  noisespeedz = peaksRight[0] / 256;
+  static int lastPeak = 0;
+  
+  if(peaksLeft[0] >= lastPeak) {
+    noisespeedy = peaksLeft[0] / 32;
+  }
+
+  noisespeedz = peaksLeft[0] / 128;
+  
+  lastPeak = peaksLeft[0];
 
   fillnoise8();
 

Commands.h

@@ -1,30 +1,21 @@
 /*
-* Aurora: https://github.com/pixelmatix/aurora
-*
-* Copyright (c) 2014 Jason Coon
-*
-* Portions of this code are adapted from Craig Lindley's LightAppliance:
-* https://github.com/CraigLindley/LightAppliance
-* Copyright (c) 2014 Craig A. Lindley
-*
-* Permission is hereby granted, free of charge, to any person obtaining a copy of
-* this software and associated documentation files (the "Software"), to deal in
-* the Software without restriction, including without limitation the rights to
-* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-* the Software, and to permit persons to whom the Software is furnished to do so,
-* subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included in all
-* copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-* FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
+ * Torch
+ * Copyright (C) 2015 Jason Coon
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+ 
 #ifndef IrCodes_H
 #define IrCodes_H
 

Drawing.h

@@ -1,3 +1,21 @@
+/*
+ * Torch
+ * Copyright (C) 2015 Jason Coon
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+ 
 void drawCircle(int16_t x0, int16_t y0, uint16_t radius, const CRGB& color)
 {
   int a = radius, b = 0;

Effects.h

@@ -1,3 +1,21 @@
+/*
+ * Torch
+ * Copyright (C) 2015 Jason Coon
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+ 
 // give it a linear tail to the right
 void streamRight(byte scale, int fromX = 0, int toX = MATRIX_WIDTH, int fromY = 0, int toY = MATRIX_HEIGHT)
 {

GradientPalettes.h

@@ -1,3 +1,14 @@
+// ColorWavesWithPalettes
+// Animated shifting color waves, with several cross-fading color palettes.
+// by Mark Kriegsman, August 2015
+//
+// Color palettes courtesy of cpt-city and its contributors:
+//   http://soliton.vm.bytemark.co.uk/pub/cpt-city/
+//
+// Color palettes converted for FastLED using "PaletteKnife" v1:
+//   http://fastled.io/tools/paletteknife/
+//
+
 // Gradient Color Palette definitions for 33 different cpt-city color palettes.
 //    956 bytes of PROGMEM for all of the palettes together,
 //   +618 bytes of PROGMEM for gradient palette code (AVR).

Noise.h

@@ -1,3 +1,21 @@
+/*
+ * Torch
+ * Copyright (C) 2015 Jason Coon
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #define MAX_DIMENSION ((MATRIX_WIDTH > MATRIX_HEIGHT) ? MATRIX_WIDTH : MATRIX_HEIGHT)
 
 // The 16 bit version of our coordinates
@@ -9,9 +27,9 @@ static uint16_t noisez;
 // use the z-axis for "time".  speed determines how fast time moves forward.  Try
 // 1 for a very slow moving effect, or 60 for something that ends up looking like
 // water.
-uint16_t noisespeedx = 1;
-uint16_t noisespeedy = 1;
-uint16_t noisespeedz = 1;
+uint32_t noisespeedx = 1;
+uint32_t noisespeedy = 1;
+uint32_t noisespeedz = 1;
 
 // Scale determines how far apart the pixels in our noise matrix are.  Try
 // changing these values around to see how it affects the motion of the display.  The

Pulse.h

@@ -1,4 +1,20 @@
-// Portions of this code are adapted from "NoiseSmearing" by Stefan Petrick: https://gist.github.com/StefanPetrick/9ee2f677dbff64e3ba7a
+/*
+ * Torch
+ * Copyright (C) 2015 Jason Coon
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 uint16_t pulse() {
 //  palette = RainbowColors_p;