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

Merge pull request #38 from opus506/master

Browse source 
bbkiwi's suggested updates work great.
This commit is contained in:
CNLohr 2017-04-05 16:23:51 -04:00 committed by GitHub
parent b45c24eda1 c5e33589b9
commit be144a0a8f
4 changed files with 18 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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();
} }

10
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()
{ {