From a4769abeee9822f06ba65695e65a3a0dc6ceca33 Mon Sep 17 00:00:00 2001 From: cnlohr Date: Wed, 15 Feb 2017 21:53:05 -0500 Subject: [PATCH] Update USB, etc. Add line for showing FPs. --- colorchord2/main.c | 5 +++-- colorchord2/netlight.conf | 2 +- colorchord2/netlight_esp8266.conf | 4 +++- colorchord2/usb_line.conf | 5 +++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/colorchord2/main.c b/colorchord2/main.c index 306a8ab..5d782ac 100644 --- a/colorchord2/main.c +++ b/colorchord2/main.c @@ -50,6 +50,7 @@ int set_screeny = 480; REGISTER_PARAM( set_screeny, PAINT ); char sound_source[16]; REGISTER_PARAM( sound_source, PABUFFER ); int cpu_autolimit = 1; REGISTER_PARAM( cpu_autolimit, PAINT ); int sample_channel = -1;REGISTER_PARAM( sample_channel, PAINT ); +int showfps = 0; REGISTER_PARAM( showfps, PAINT ); struct NoteFinder * nf; @@ -421,9 +422,9 @@ int main(int argc, char ** argv) frames++; ThisTime = OGGetAbsoluteTime(); - if( ThisTime > LastFPSTime + 1 ) + if( ThisTime > LastFPSTime + 1 && showfps ) { -// printf( "FPS: %d\n", frames ); + printf( "FPS: %d\n", frames ); lastfps = frames; frames = 0; LastFPSTime+=1; diff --git a/colorchord2/netlight.conf b/colorchord2/netlight.conf index ea006f2..c426aad 100644 --- a/colorchord2/netlight.conf +++ b/colorchord2/netlight.conf @@ -12,7 +12,7 @@ steady_bright = 0 #dft_q = 20.0000 #dft_speedup = 1000.0000 -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 skipfirst = 1 firstval = 0 diff --git a/colorchord2/netlight_esp8266.conf b/colorchord2/netlight_esp8266.conf index a46a834..e48f8eb 100644 --- a/colorchord2/netlight_esp8266.conf +++ b/colorchord2/netlight_esp8266.conf @@ -12,7 +12,9 @@ steady_bright = 0 #dft_q = 20.0000 #dft_speedup = 1000.0000 -sourcename = alsa_output.pci-0000_00_1b.0.analog-stereo.monitor + +sourcename = alsa_output.pci-0000_01_00.1.hdmi-stereo-extra1.monitor +#sourcename = alsa_output.pci-0000_00_1b.0.analog-stereo.monitor #alsa_output.pci-0000_00_1f.3.analog-stereo.monitor skipfirst = 1 diff --git a/colorchord2/usb_line.conf b/colorchord2/usb_line.conf index 1b2956a..603a3a5 100644 --- a/colorchord2/usb_line.conf +++ b/colorchord2/usb_line.conf @@ -1,10 +1,11 @@ outdrivers = DisplayUSB2812, OutputLinear headless = 1 +cpu_autolimit = 1 leds = 27 shape_cutoff = 0.03 -satamp = 3.000 -amppow = 2.5 +satamp = 5.000 +amppow = 3.5 distpow = 1.500 ledoutamp = 1