From 4d7a33e29d834411a73ba46663a5bc3f3b0b5051 Mon Sep 17 00:00:00 2001 From: RawLiquid Date: Wed, 8 Mar 2017 11:13:58 -0800 Subject: [PATCH 1/3] fixing max_blip check to use defined variable --- examples/demoToy/demoToy.ino | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/demoToy/demoToy.ino b/examples/demoToy/demoToy.ino index f825b44..6a55407 100644 --- a/examples/demoToy/demoToy.ino +++ b/examples/demoToy/demoToy.ino @@ -164,9 +164,9 @@ String buildControl ( void ) { uint16_t blips = mesh.connectionCount() + 1; mesh.debugMsg( APPLICATION, "buildControl(): blips=%d\n", blips); - if ( blips > 3 ) { + if ( blips > MAX_BLIPS ) { mesh.debugMsg( APPLICATION, " blips out of range =%d\n", blips); - blips = 3; + blips = MAX_BLIPS; } StaticJsonBuffer<200> jsonBuffer; From cdb2d3f198b134a208f9fbff5da2b09c92a13861 Mon Sep 17 00:00:00 2001 From: RawLiquid Date: Wed, 8 Mar 2017 11:19:18 -0800 Subject: [PATCH 2/3] bug fixes switched ws open function to use defined string that dynamically fills in the nodes IP. --- examples/demoToy/data/main.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/demoToy/data/main.js b/examples/demoToy/data/main.js index 30ac167..8f59ed9 100644 --- a/examples/demoToy/data/main.js +++ b/examples/demoToy/data/main.js @@ -195,10 +195,10 @@ function checkAlive() { } function startWebSocket() { - //ws = new WebSocket(socketStr); + ws = new WebSocket(socketStr); //ws = new WebSocket('ws://192.168.107.1:2222/'); //ws = new WebSocket('ws://192.168.10.1:2222/'); - ws = new WebSocket('ws://192.168.167.1:2222/'); + // ws = new WebSocket('ws://192.168.167.1:2222/'); ws.onmessage = function (event) {onMessageFunction(event); }; ws.onopen = function (event) {onOpenFunction(event); }; From ec263cd27830320cb31e003f5efe93c99e8691c7 Mon Sep 17 00:00:00 2001 From: RawLiquid Date: Wed, 8 Mar 2017 11:27:32 -0800 Subject: [PATCH 3/3] adding a missing file --- examples/demoToy/data/hsl.png | Bin 0 -> 240 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 examples/demoToy/data/hsl.png diff --git a/examples/demoToy/data/hsl.png b/examples/demoToy/data/hsl.png new file mode 100644 index 0000000000000000000000000000000000000000..d76795213b449851720d077c5be87287cbe61dda GIT binary patch literal 240 zcmeAS@N?(olHy`uVBq!ia0vp^*MXRkgAGXfN?Er9Db50q$YP*8P=fb5qm#z$3ZUR3 zPZ!4!jq_6{9TaL-;Bk@9ofz}`zrB`~sV#?uNSCdF&g|4kqr%&_H5pF{C3saESbP@m z?K8c*+xi}pOG4^>f6uCBKK?%QdX`Mh<8=!<-bP0l+XkK8UAB} literal 0 HcmV?d00001