From 2ad5d71649af19df2e2e50062035e0ecb67cc914 Mon Sep 17 00:00:00 2001 From: cnlohr Date: Sun, 12 Feb 2017 15:39:28 -0500 Subject: [PATCH] Add notes about reading from correct monitor, don't spew data at the screen. --- colorchord2/DisplayUSB2812.c | 1 - colorchord2/Makefile | 2 +- colorchord2/default.conf | 2 +- colorchord2/usb_line.conf | 11 ++++++++--- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/colorchord2/DisplayUSB2812.c b/colorchord2/DisplayUSB2812.c index bc6dab3..08c09b7 100644 --- a/colorchord2/DisplayUSB2812.c +++ b/colorchord2/DisplayUSB2812.c @@ -34,7 +34,6 @@ static void * LEDOutThread( void * v ) { int total_bytes = (led->total_leds*3)+1; total_bytes = ((total_bytes-1)&0xffc0) + 0x40; //Round up. - printf( "TL: %d\n", total_bytes ); if( led->readyFlag ) { int r = libusb_control_transfer( led->devh, diff --git a/colorchord2/Makefile b/colorchord2/Makefile index 4919f93..d806d8f 100644 --- a/colorchord2/Makefile +++ b/colorchord2/Makefile @@ -6,7 +6,7 @@ SOUND:=sound.o sound_alsa.o sound_pulse.o sound_null.o OUTS := OutputVoronoi.o DisplayArray.o OutputLinear.o DisplayPie.o DisplayNetwork.o DisplayUSB2812.o DisplayDMX.o OutputProminent.o RecorderPlugin.o OutputCells.o WINGCC:= i686-w64-mingw32-gcc -WINGCCFLAGS:= -g -DICACHE_FLASH_ATTR= -I../embeddedcommon -I. -O0 #-O2 -Wl,--relax -Wl,--gc-sections -ffunction-sections -fdata-sections +WINGCCFLAGS:= -g -DICACHE_FLASH_ATTR= -I../embeddedcommon -I. -O1 #-O2 -Wl,--relax -Wl,--gc-sections -ffunction-sections -fdata-sections WINLDFLAGS:=-lwinmm -lgdi32 -lws2_32 RAWDRAWLIBS:=-lX11 -lm -lpthread -lXinerama -lXext diff --git a/colorchord2/default.conf b/colorchord2/default.conf index 09038f0..6bc9161 100644 --- a/colorchord2/default.conf +++ b/colorchord2/default.conf @@ -30,7 +30,7 @@ sourcename = default #default # alsa_output.pci-0000_00_1b.0.analog-stereo.monitor #alsa_output.pci-0000_00_1f.3.analog-stereo.monitor << New laptop -#use pactl list | grep pci- +#use pactl list | grep pci- | grep monitor ################################## # General ColorChord properties. # diff --git a/colorchord2/usb_line.conf b/colorchord2/usb_line.conf index 904330f..1b2956a 100644 --- a/colorchord2/usb_line.conf +++ b/colorchord2/usb_line.conf @@ -1,13 +1,14 @@ outdrivers = DisplayUSB2812, OutputLinear +headless = 1 leds = 27 shape_cutoff = 0.03 -satamp = 2.000 +satamp = 3.000 amppow = 2.5 distpow = 1.500 -ledoutamp = .4 +ledoutamp = 1 -sourcename = alsa_output.pci-0000_00_1b.0.analog-stereo.monitor +sourcename = alsa_output.pci-0000_01_00.1.hdmi-stereo-extra1.monitor #alsa_output.pci-0000_00_1f.3.analog-stereo.monitor note_attach_amp_iir = .3000 @@ -17,3 +18,7 @@ steady_bright = 0 skipfirst = 1 firstval = 0 + +octaves = 5 +#base_hz = 110 +base_hz = 55