diff --git a/colorchord2/Makefile b/colorchord2/Makefile index d806d8f..e1c9ad3 100644 --- a/colorchord2/Makefile +++ b/colorchord2/Makefile @@ -13,7 +13,7 @@ RAWDRAWLIBS:=-lX11 -lm -lpthread -lXinerama -lXext LDLIBS:=-lpthread -lasound -lm -lpulse-simple -lpulse -CFLAGS:=-g -O0 -flto -Wall -ffast-math -I../embeddedcommon -I. -DICACHE_FLASH_ATTR= +CFLAGS:=-g -Os -flto -Wall -ffast-math -I../embeddedcommon -I. -DICACHE_FLASH_ATTR= EXTRALIBS:=-lusb-1.0 colorchord : os_generic.o main.o dft.o decompose.o filter.o color.o notefinder.o util.o outdrivers.o $(RAWDRAW) $(SOUND) $(OUTS) parameters.o chash.o hook.o ../embeddedcommon/DFT32.o configs.o 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 diff --git a/embedded8266/user.cfg b/embedded8266/user.cfg index de96cba..5945534 100644 --- a/embedded8266/user.cfg +++ b/embedded8266/user.cfg @@ -13,6 +13,7 @@ PAGE_OFFSET = 65536 # 1048576 #SDK_DEFAULT = $(HOME)/esp8266/esp-open-sdk ESP_GCC_VERS = 4.8.5 SDK = $(HOME)/esp8266/esp_iot_sdk_v1.5.2 +PAGE_SCRIPTS = main.js FWBURNFLAGS = -b 1000000 diff --git a/embedded8266/web/page/index.html b/embedded8266/web/page/index.html index f5e4a03..9ae2d90 100644 --- a/embedded8266/web/page/index.html +++ b/embedded8266/web/page/index.html @@ -2,9 +2,6 @@ {{PAGE_TITLE}} - - - {{PAGE_SCRIPT}}