From 68e7bd6bb6a42dc6e775600f0c9095443bbc7e5e Mon Sep 17 00:00:00 2001 From: cnlohr Date: Sat, 8 Aug 2015 21:18:30 -0400 Subject: [PATCH] Fix build for CC2 --- colorchord2/Makefile | 6 +++--- colorchord2/ccconfig.h | 7 +++++++ colorchord2/prominance.conf | 22 ++++++++++++++++++++++ 3 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 colorchord2/ccconfig.h create mode 100644 colorchord2/prominance.conf diff --git a/colorchord2/Makefile b/colorchord2/Makefile index d74a544..683c2f0 100644 --- a/colorchord2/Makefile +++ b/colorchord2/Makefile @@ -13,13 +13,13 @@ RAWDRAWLIBS:=-lX11 -lm -lpthread -lXinerama -lXext LDLIBS:=-lpthread -lasound -lm -lpulse-simple -lpulse -CFLAGS:=-g -Os -flto -Wall -ffast-math -Iembeddedcommon +CFLAGS:=-g -Os -flto -Wall -ffast-math -I../embeddedcommon -I. EXTRALIBS:=-lusb-1.0 -colorchord : os_generic.o main.o dft.o decompose.o filter.o color.o sort.o notefinder.o util.o outdrivers.o $(RAWDRAW) $(SOUND) $(OUTS) parameters.o chash.o hook.o embeddedcommon/DFT32.o +colorchord : os_generic.o main.o dft.o decompose.o filter.o color.o sort.o notefinder.o util.o outdrivers.o $(RAWDRAW) $(SOUND) $(OUTS) parameters.o chash.o hook.o ../embeddedcommon/DFT32.o gcc -o $@ $^ $(CFLAGS) $(LDLIBS) $(EXTRALIBS) $(RAWDRAWLIBS) -colorchord.exe : os_generic.c main.c dft.c decompose.c filter.c color.c sort.c notefinder.c util.c outdrivers.c DrawFunctions.c parameters.c chash.c WinDriver.c sound.c sound_null.c sound_win.c OutputVoronoi.c DisplayArray.c OutputLinear.c DisplayPie.c DisplayNetwork.c hook.c RecorderPlugin.c embeddedcommon/DFT32.c +colorchord.exe : os_generic.c main.c dft.c decompose.c filter.c color.c sort.c notefinder.c util.c outdrivers.c DrawFunctions.c parameters.c chash.c WinDriver.c sound.c sound_null.c sound_win.c OutputVoronoi.c DisplayArray.c OutputLinear.c DisplayPie.c DisplayNetwork.c hook.c RecorderPlugin.c ../embeddedcommon/DFT32.c $(WINGCC) $(WINGCCFLAGS) -o $@ $^ $(WINLDFLAGS) diff --git a/colorchord2/ccconfig.h b/colorchord2/ccconfig.h new file mode 100644 index 0000000..d0c3c12 --- /dev/null +++ b/colorchord2/ccconfig.h @@ -0,0 +1,7 @@ +#ifndef _CCCONFIG_H +#define _CCCONFIG_H + +//This file is really only used on colorchord embedded, this is a stub. + +#endif + diff --git a/colorchord2/prominance.conf b/colorchord2/prominance.conf new file mode 100644 index 0000000..69383e0 --- /dev/null +++ b/colorchord2/prominance.conf @@ -0,0 +1,22 @@ +outdrivers = OutputLinear, DisplayArray + +byte_offset = 32 +ledoutamp = 1.0 +leds = 2 +lightx = 2 +lighty = 1 +light_siding = 1.6 + + +note_attach_amp_iir = .3000 +note_attach_amp_iir2 = .1500 +note_attach_freq_iir = 0.3000 +steady_bright = 0 + +skipfirst = 1 +firstval = 0 +port = 7777 +address = 192.168.0.245 + + +