From 606897dce92872cfdd613f3e742b4d3f37ae6865 Mon Sep 17 00:00:00 2001 From: cnlohr Date: Sun, 12 Feb 2017 14:35:12 -0500 Subject: [PATCH] Update lights --- colorchord2/DisplayUSB2812.c | 5 ++++- colorchord2/default.conf | 2 +- colorchord2/netlight.conf | 4 +++- colorchord2/usb_line.conf | 19 +++++++++++++++++++ 4 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 colorchord2/usb_line.conf diff --git a/colorchord2/DisplayUSB2812.c b/colorchord2/DisplayUSB2812.c index 1c8cf3e..bc6dab3 100644 --- a/colorchord2/DisplayUSB2812.c +++ b/colorchord2/DisplayUSB2812.c @@ -32,6 +32,9 @@ static void * LEDOutThread( void * v ) struct LEDOutDriver * led = (struct LEDOutDriver*)v; while(1) { + 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, @@ -40,7 +43,7 @@ static void * LEDOutThread( void * v ) 0x0100, //wValue 0x0000, //wIndex led->last_leds, - (led->total_leds*3)+1, + total_bytes, 1000 ); if( r < 0 ) { diff --git a/colorchord2/default.conf b/colorchord2/default.conf index 0e121b5..09038f0 100644 --- a/colorchord2/default.conf +++ b/colorchord2/default.conf @@ -21,7 +21,7 @@ samplerate = 44100 wininput = 0 #Compiled version will default this. -#sound_source = PULSE +#sound_source = ALSA #-1 indicates left and right, 0 left, 1 right. sample_channel = -1 diff --git a/colorchord2/netlight.conf b/colorchord2/netlight.conf index 5a01ad6..ea006f2 100644 --- a/colorchord2/netlight.conf +++ b/colorchord2/netlight.conf @@ -12,10 +12,12 @@ steady_bright = 0 #dft_q = 20.0000 #dft_speedup = 1000.0000 -sourcename = alsa_output.pci-0000_00_1f.3.analog-stereo.monitor +sourcename = alsa_output.pci-0000_00_1b.0.analog-stereo.monitor +#alsa_output.pci-0000_00_1f.3.analog-stereo.monitor skipfirst = 1 firstval = 0 port = 7777 +#address = 192.168.4.1 address = 192.168.0.245 slope=.10 diff --git a/colorchord2/usb_line.conf b/colorchord2/usb_line.conf new file mode 100644 index 0000000..904330f --- /dev/null +++ b/colorchord2/usb_line.conf @@ -0,0 +1,19 @@ +outdrivers = DisplayUSB2812, OutputLinear + +leds = 27 +shape_cutoff = 0.03 +satamp = 2.000 +amppow = 2.5 +distpow = 1.500 +ledoutamp = .4 + +sourcename = alsa_output.pci-0000_00_1b.0.analog-stereo.monitor +#alsa_output.pci-0000_00_1f.3.analog-stereo.monitor + +note_attach_amp_iir = .3000 +note_attach_amp_iir2 = .1500 +note_attach_freq_iir = 0.3000 +steady_bright = 0 + +skipfirst = 1 +firstval = 0