diff --git a/LICENSE b/LICENSE index 23b7afa..242bf4e 100644 --- a/LICENSE +++ b/LICENSE @@ -11,7 +11,8 @@ modification, are permitted provided that the following conditions are met: this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -* The third clause of this license has been voluentarily lifted by its author. +* Any devices that implement ColorChord, or significant subportions have some + indication on device or associated materials includes mention of ColorChord. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE diff --git a/README.md b/README.md index 7e28ea2..728dc46 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Chromatic Sound to Light Conversion System. It's really that simple. Unlike so Background ---------- -Developed over many years, ColorChord 2 is now getting close to alpha stages. ColorChord 2 uses the same principles as ColorChord 1. A brief writeup on that can be seen here: http://cnlohr.blogspot.com/2010/11/colorchord-sound-lighting.html +Developed over many years, ColorChord 2 is now at the alpha stages. ColorChord 2 uses the same principles as ColorChord 1. A brief writeup on that can be seen here: http://cnlohr.blogspot.com/2010/11/colorchord-sound-lighting.html The major differences in ColorChord 2 is the major rewrite to move everything back to the CPU and a multitude of algorithmic optimizations to make it possible to run on something other than the brand newest of systems. @@ -25,7 +25,7 @@ Currently, ColorChord 2 is designed to run on Linux or Windows. It's not partic ColorChord: Embedded -------------------- -There is work on an embedded version of ColorChord, which avoids floating point operations anywhere in the output pipeline. Though I have made efforts to port it to AVRs, it doesn't seem feasable to operate on AVRs in the normal sense, so I have retargeted my efforts to 32-bit systems. +There is work on an embedded version of ColorChord, which avoids floating point operations anywhere in the output pipeline. Though I have made efforts to port it to AVRs, it doesn't seem feasable to operate on AVRs without some shifty tricks which I'd like to avoid, so I have retargeted my efforts to 32-bit systems, such as the STM32F303, STM32F407, and the (somehow) the ESP8266. ColorChord Embedded uses a different codebase, located in the (embeddedcommon)[embeddedcommon/README.md] and distributed among the various embedded* folders. Building and Using diff --git a/embeddedcommon/DFT32.h b/embeddedcommon/DFT32.h index ebc52e9..99d6e30 100644 --- a/embeddedcommon/DFT32.h +++ b/embeddedcommon/DFT32.h @@ -20,13 +20,9 @@ #define FIXBPERO 24 #endif -#ifndef FIXBINS +//Don't configure this. #define FIXBINS (FIXBPERO*OCTAVES) -#endif - -#ifndef BINCYCLE #define BINCYCLE (1<