fruchti/colorchord
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/cnlohr/colorchord

Browse source
This commit is contained in:
cnlohr 2017-05-23 22:55:54 -04:00
parent 96e12af024 992de7ba14
commit 093633044d
9 changed files with 30 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
colorchord2/Makefile
View file

@ -13,7 +13,7 @@ RAWDRAWLIBS:=-lX11 -lm -lpthread -lXinerama -lXext
LDLIBS:=-lpthread -lasound -lm -lpulse-simple -lpulse 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 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 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

5
colorchord2/main.c
View file

@ -50,6 +50,7 @@ int set_screeny = 480; REGISTER_PARAM( set_screeny, PAINT );
char sound_source[16]; REGISTER_PARAM( sound_source, PABUFFER ); char sound_source[16]; REGISTER_PARAM( sound_source, PABUFFER );
int cpu_autolimit = 1; REGISTER_PARAM( cpu_autolimit, PAINT ); int cpu_autolimit = 1; REGISTER_PARAM( cpu_autolimit, PAINT );
int sample_channel = -1;REGISTER_PARAM( sample_channel, PAINT ); int sample_channel = -1;REGISTER_PARAM( sample_channel, PAINT );
int showfps = 0; REGISTER_PARAM( showfps, PAINT );
struct NoteFinder * nf; struct NoteFinder * nf;
@ -421,9 +422,9 @@ int main(int argc, char ** argv)
frames++; frames++;
ThisTime = OGGetAbsoluteTime(); ThisTime = OGGetAbsoluteTime();
if( ThisTime > LastFPSTime + 1 ) if( ThisTime > LastFPSTime + 1 && showfps )
{ {
// printf( "FPS: %d\n", frames ); printf( "FPS: %d\n", frames );
lastfps = frames; lastfps = frames;
frames = 0; frames = 0;
LastFPSTime+=1; LastFPSTime+=1;

2
colorchord2/netlight.conf
View file

@ -12,7 +12,7 @@ steady_bright = 0
#dft_q = 20.0000 #dft_q = 20.0000
#dft_speedup = 1000.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 #alsa_output.pci-0000_00_1f.3.analog-stereo.monitor
skipfirst = 1 skipfirst = 1
firstval = 0 firstval = 0

4
colorchord2/netlight_esp8266.conf
View file

@ -12,7 +12,9 @@ steady_bright = 0
#dft_q = 20.0000 #dft_q = 20.0000
#dft_speedup = 1000.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 #alsa_output.pci-0000_00_1f.3.analog-stereo.monitor
skipfirst = 1 skipfirst = 1

5
colorchord2/usb_line.conf
View file

@ -1,10 +1,11 @@
outdrivers = DisplayUSB2812, OutputLinear outdrivers = DisplayUSB2812, OutputLinear
headless = 1 headless = 1
cpu_autolimit = 1
leds = 27 leds = 27
shape_cutoff = 0.03 shape_cutoff = 0.03
satamp = 3.000 satamp = 5.000
amppow = 2.5 amppow = 3.5
distpow = 1.500 distpow = 1.500
ledoutamp = 1 ledoutamp = 1

1
embedded8266/user.cfg
View file

@ -13,6 +13,7 @@ PAGE_OFFSET = 65536 # 1048576
#SDK_DEFAULT = $(HOME)/esp8266/esp-open-sdk #SDK_DEFAULT = $(HOME)/esp8266/esp-open-sdk
ESP_GCC_VERS = 4.8.5 ESP_GCC_VERS = 4.8.5
SDK = $(HOME)/esp8266/esp_iot_sdk_v1.5.2 SDK = $(HOME)/esp8266/esp_iot_sdk_v1.5.2
PAGE_SCRIPTS = main.js
FWBURNFLAGS = -b 1000000 FWBURNFLAGS = -b 1000000

3
embedded8266/web/page/index.html
View file

@ -2,9 +2,6 @@
<!-- Copyright (C) 2015 <>< Charles Lohr, see LICENSE file for more info. --> <!-- Copyright (C) 2015 <>< Charles Lohr, see LICENSE file for more info. -->
<head> <head>
<title>{{PAGE_TITLE}}</title> <title>{{PAGE_TITLE}}</title>
<script language="javascript" type="text/javascript" src={{PAGE_JQUERYFL}}></script>
<script language="javascript" type="text/javascript" src=menuinterface.js></script>
<script language="javascript" type="text/javascript" src=main.js></script>
{{PAGE_SCRIPT}} {{PAGE_SCRIPT}}
<meta charset="UTF-8"> <meta charset="UTF-8">
<style> <style>

24
embedded8266/web/page/main.js
View file

@ -2,7 +2,7 @@
// //
//This particular file may be licensed under the MIT/x11, New BSD or ColorChord Licenses. //This particular file may be licensed under the MIT/x11, New BSD or ColorChord Licenses.
globalParams = {}; var globalParams = {};
function mainticker() function mainticker()
@ -84,12 +84,12 @@ function ReceiveParameters(req,data) {
is_oscilloscope_running = false; var is_oscilloscope_running = false;
pause_oscilloscope = false; var pause_oscilloscope = false;
function KickOscilloscope() function KickOscilloscope()
{ {
$( "#OScopePauseButton" ).css( "background-color", (is_oscilloscope_running&&pause_oscilloscope)?"green":"red" ); $( "#OScopePauseButton" ).css( "background-color", (is_oscilloscope_running&&!pause_oscilloscope)?"green":"red" );
if( !pause_oscilloscope) if( !pause_oscilloscope)
OScopeDataTicker(); OScopeDataTicker();
} }
@ -153,7 +153,7 @@ function OScopeDataTicker()
} }
else else
{ {
is_oscilloscope_running = 0; is_oscilloscope_running = false;
} }
$( "#OScopePauseButton" ).css( "background-color", (is_oscilloscope_running&&!pause_oscilloscope)?"green":"red" ); $( "#OScopePauseButton" ).css( "background-color", (is_oscilloscope_running&&!pause_oscilloscope)?"green":"red" );
} }
@ -166,8 +166,8 @@ function OScopeDataTicker()
is_dft_running = false; var is_dft_running = false;
pause_dft = false; var pause_dft = false;
function KickDFT() function KickDFT()
{ {
@ -244,8 +244,8 @@ function DFTDataTicker()
is_leds_running = false; var is_leds_running = false;
pause_led = false; var pause_led = false;
function KickLEDs() function KickLEDs()
{ {
@ -321,14 +321,14 @@ function LEDDataTicker()
is_notes_running = false; var is_notes_running = false;
pause_notes = false; var pause_notes = false;
function KickNotes() function KickNotes()
{ {
$( "#NotesPauseButton" ).css( "background-color", (is_notes_running&&!pause_notes)?"green":"red" ); $( "#NotesPauseButton" ).css( "background-color", (is_notes_running&&!pause_notes)?"green":"red" );
if( !is_notes_running && !pause_notes ) if(!pause_notes )
NotesTicker(); NotesTicker();
} }

12
embedded8266/web/page/menuinterface.js
View file

@ -47,7 +47,7 @@ function QueueOperation( command, callback )
function init() function init()
{ {
GPIOlines = ''; var GPIOlines = '';
for(var i=0; i<16; ++i) for(var i=0; i<16; ++i)
GPIOlines += "<td align=center>"+ i GPIOlines += "<td align=center>"+ i
+ "<input type=button id=ButtonGPIO"+ i +" value=0 onclick=\"TwiddleGPIO("+ i +");\">" + "<input type=button id=ButtonGPIO"+ i +" value=0 onclick=\"TwiddleGPIO("+ i +");\">"
@ -118,7 +118,7 @@ function init()
$("#custom_command_response").val( "" ); $("#custom_command_response").val( "" );
//Preclude drag and drop on rest of document in event user misses firmware boxes. //Preclude drag and drop on rest of document in event user misses firmware boxes.
donothing = function(e) {e.stopPropagation();e.preventDefault();}; var donothing = function(e) {e.stopPropagation();e.preventDefault();};
$(document).on('drop', donothing ); $(document).on('drop', donothing );
$(document).on('dragover', donothing ); $(document).on('dragover', donothing );
$(document).on('dragenter', donothing ); $(document).on('dragenter', donothing );
@ -318,9 +318,9 @@ function MakeDragDrop( divname, callback )
/////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
///Below here are mostly just events... ///Below here are mostly just events...
did_wifi_get_config = false; var did_wifi_get_config = false;
is_data_ticker_running = false; var is_data_ticker_running = false;
is_waiting_on_stations = false; var is_waiting_on_stations = false;
function ScanForWifi() function ScanForWifi()
{ {
@ -425,7 +425,7 @@ function WifiDataTicker()
innerhtml += "</TABLE>"; innerhtml += "</TABLE>";
document.getElementById("WifiStations").innerHTML = innerhtml; document.getElementById("WifiStations").innerHTML = innerhtml;
} ); } );
setTimeout( WifiDataTicker, 500 ); setTimeout( WifiDataTicker, 12000 );
} }
else else
{ {