lba.gitea/WLED
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Alexa Brightness Control working + Discovery improved

Browse Source 
Updated binaries
This commit is contained in:
cschwinne 2018-01-09 14:21:37 +01:00
parent e326a2bfe4
commit e11dbefbd8
8 changed files with 41 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
bin/wled05dev_1712200_CRONIXIE_dont_use_for_regular_strip.bin → bin/wled05dev_1801092_CRONIXIE_dont_use_for_regular_strip.bin
View File

Binary file not shown.

BIN
bin/wled05dev_1712200_RGB.bin → bin/wled05dev_1801092_RGB.bin
View File

Binary file not shown.

BIN
bin/wled05dev_1712200_RGBW.bin → bin/wled05dev_1801092_RGBW.bin
View File

Binary file not shown.

6
wled00/data/settings.htm
View File

@ -97,7 +97,7 @@
Alexa invocation name: <input name="AINVN" maxlength="32"><br> Alexa invocation name: <input name="AINVN" maxlength="32"><br>
Send Alexa notifications: <input type="checkbox" name="NSALX"> <br> Send Alexa notifications: <input type="checkbox" name="NSALX"> <br>
<h3>Time (experimental!)</h3> <h3>Time (experimental!)</h3>
NTP was updated but still causes crashes. Requires reboot. <br> Requires reboot. <br>
Get time from NTP server: <input type="checkbox" name="NTPON"> <br> Get time from NTP server: <input type="checkbox" name="NTPON"> <br>
Current local time is <span class="times">unknown</span> <br> Current local time is <span class="times">unknown</span> <br>
<h3>Advanced</h3> <h3>Advanced</h3>
@ -118,8 +118,8 @@
HTTP traffic is not encrypted. An attacker in the same network could intercept form data!<br> HTTP traffic is not encrypted. An attacker in the same network could intercept form data!<br>
<h3>About</h3> <h3>About</h3>
WLED version 0.4p <br> WLED version 0.5dev <br>
(c) 2016-2017 Christian Schwinne <br> (c) 2016-2018 Christian Schwinne <br>
<i>Licensed under the MIT license</i> <br><br> <i>Licensed under the MIT license</i> <br><br>
<i>Uses libraries:</i> <br> <i>Uses libraries:</i> <br>
<i>ESP8266 Arduino Core</i> <br> <i>ESP8266 Arduino Core</i> <br>

6
wled00/htmls01.h
View File

@ -96,7 +96,7 @@ Emulate Alexa device: <input type="checkbox" name="ALEXA"> <br>
Alexa invocation name: <input name="AINVN" maxlength="32"><br> Alexa invocation name: <input name="AINVN" maxlength="32"><br>
Send Alexa notifications: <input type="checkbox" name="NSALX"> <br> Send Alexa notifications: <input type="checkbox" name="NSALX"> <br>
<h3>Time (experimental!)</h3> <h3>Time (experimental!)</h3>
NTP was updated but still causes crashes. Requires reboot. <br> Requires reboot. <br>
Get time from NTP server: <input type="checkbox" name="NTPON"> <br> Get time from NTP server: <input type="checkbox" name="NTPON"> <br>
Current local time is <span class="times">unknown</span> <br> Current local time is <span class="times">unknown</span> <br>
<h3>Advanced</h3> <h3>Advanced</h3>
@ -116,8 +116,8 @@ Factory reset: <input type="checkbox" name="RESET"> <br>
All EEPROM content (settings) will be erased. <br> <br> All EEPROM content (settings) will be erased. <br> <br>
HTTP traffic is not encrypted. An attacker in the same network could intercept form data!<br> HTTP traffic is not encrypted. An attacker in the same network could intercept form data!<br>
<h3>About</h3> <h3>About</h3>
WLED version 0.4p <br> WLED version 0.5dev <br>
(c) 2016-2017 Christian Schwinne <br> (c) 2016-2018 Christian Schwinne <br>
<i>Licensed under the MIT license</i> <br><br> <i>Licensed under the MIT license</i> <br><br>
<i>Uses libraries:</i> <br> <i>Uses libraries:</i> <br>
<i>ESP8266 Arduino Core</i> <br> <i>ESP8266 Arduino Core</i> <br>

4
wled00/wled00.ino
View File

@ -22,7 +22,7 @@
#include "WS2812FX.h" #include "WS2812FX.h"
//version in format yymmddb (b = daily build) //version in format yymmddb (b = daily build)
#define VERSION 1801091 #define VERSION 1801092
//AP and OTA default passwords (change them!) //AP and OTA default passwords (change them!)
String appass = "wled1234"; String appass = "wled1234";
@ -40,7 +40,7 @@ String otapass = "wledota";
//#define USEFS //#define USEFS
//to toggle usb serial debug (un)comment following line //to toggle usb serial debug (un)comment following line
#define DEBUG //#define DEBUG
//Hardware-settings (only changeble via code) //Hardware-settings (only changeble via code)
#define LEDCOUNT 255 //maximum, exact count set-able via settings #define LEDCOUNT 255 //maximum, exact count set-able via settings

5
wled00/wled05_init.ino
View File

@ -164,14 +164,13 @@ void wledInit()
server.send(404, "text/plain", "FileNotFound"); server.send(404, "text/plain", "FileNotFound");
} }
}); });
alexaInit(); //init Alexa hue emulation
if (alexaEnabled) alexaInit();
server.begin(); server.begin();
DEBUG_PRINTLN("HTTP server started"); DEBUG_PRINTLN("HTTP server started");
// Add service to MDNS // Add service to MDNS
MDNS.addService("http", "tcp", 80); MDNS.addService("http", "tcp", 80);
//Init alexa service
alexaInit();
// Initialize NeoPixel Strip // Initialize NeoPixel Strip
strip.init(); strip.init();

58
wled00/wled12_alexa.ino
View File

@ -1,6 +1,10 @@
void alexaOn(); /*
void alexaOff(); * Alexa Voice On/Off/Brightness Control. Emulates a Philips Hue bridge to Alexa.
void alexaDim(); *
* This was put together from these two excellent projects:
* https://github.com/kakopappa/arduino-esp8266-alexa-wemo-switch
* https://github.com/probonopd/ESP8266HueEmulator
*/
void alexaInit() void alexaInit()
{ {
@ -31,7 +35,7 @@ void handleAlexa()
if(request.indexOf("M-SEARCH") >= 0) { if(request.indexOf("M-SEARCH") >= 0) {
if(request.indexOf("upnp:rootdevice") > 0) { if(request.indexOf("upnp:rootdevice") > 0) {
Serial.println("Responding search req..."); DEBUG_PRINTLN("Responding search req...");
respondToSearch(); respondToSearch();
} }
} }
@ -54,8 +58,8 @@ void alexaOn()
server.send(200, "text/xml", body.c_str()); server.send(200, "text/xml", body.c_str());
Serial.print("Sending :"); DEBUG_PRINT("Sending :");
Serial.println(body); DEBUG_PRINTLN(body);
} }
void alexaOff() void alexaOff()
@ -72,8 +76,8 @@ void alexaOff()
server.send(200, "application/json", body.c_str()); server.send(200, "application/json", body.c_str());
Serial.print("Sending:"); DEBUG_PRINT("Sending:");
Serial.println(body); DEBUG_PRINTLN(body);
} }
void alexaDim(uint8_t briL) void alexaDim(uint8_t briL)
@ -94,11 +98,11 @@ void prepareIds() {
} }
void respondToSearch() { void respondToSearch() {
Serial.println(""); DEBUG_PRINTLN("");
Serial.print("Send resp to "); DEBUG_PRINT("Send resp to ");
Serial.println(UDP.remoteIP()); DEBUG_PRINTLN(UDP.remoteIP());
Serial.print("Port : "); DEBUG_PRINT("Port : ");
Serial.println(UDP.remotePort()); DEBUG_PRINTLN(UDP.remotePort());
IPAddress localIP = WiFi.localIP(); IPAddress localIP = WiFi.localIP();
char s[16]; char s[16];
@ -119,13 +123,13 @@ void respondToSearch() {
UDP.write(response.c_str()); UDP.write(response.c_str());
UDP.endPacket(); UDP.endPacket();
Serial.println("Response sent!"); DEBUG_PRINTLN("Response sent!");
} }
void alexaInitPages() { void alexaInitPages() {
server.on("/description.xml", HTTP_GET, [](){ server.on("/description.xml", HTTP_GET, [](){
Serial.println(" # Responding to description.xml ... #\n"); DEBUG_PRINTLN(" # Responding to description.xml ... #\n");
IPAddress localIP = WiFi.localIP(); IPAddress localIP = WiFi.localIP();
char s[16]; char s[16];
@ -168,25 +172,25 @@ void alexaInitPages() {
server.send(200, "text/xml", setup_xml.c_str()); server.send(200, "text/xml", setup_xml.c_str());
Serial.print("Sending :"); DEBUG_PRINT("Sending :");
Serial.println(setup_xml); DEBUG_PRINTLN(setup_xml);
}); });
// openHAB support // openHAB support
server.on("/on.html", HTTP_GET, [](){ server.on("/on.html", HTTP_GET, [](){
Serial.println("on req"); DEBUG_PRINTLN("on req");
server.send(200, "text/plain", "turned on"); server.send(200, "text/plain", "turned on");
alexaOn(); alexaOn();
}); });
server.on("/off.html", HTTP_GET, [](){ server.on("/off.html", HTTP_GET, [](){
Serial.println("off req"); DEBUG_PRINTLN("off req");
server.send(200, "text/plain", "turned off"); server.send(200, "text/plain", "turned off");
alexaOff(); alexaOff();
}); });
server.on("/status.html", HTTP_GET, [](){ server.on("/status.html", HTTP_GET, [](){
Serial.println("Got status request"); DEBUG_PRINTLN("Got status request");
String statrespone = "0"; String statrespone = "0";
if (bri > 0) { if (bri > 0) {
@ -236,17 +240,17 @@ boolean handleAlexaApiCall(String req, String body) //basic implementation of Ph
return true; return true;
} }
if (req.indexOf("lights/2") > 0) //client wants pointless light info /*if (req.indexOf("lights/2") > 0) //client wants pointless light info
{ {
DEBUG_PRINTLN("l2"); DEBUG_PRINTLN("l2");
server.send(200, "application/json", "{\"manufacturername\":\"OpenSource\",\"modelid\":\"LST001\",\"name\":\""+ alexaInvocationName +"\",\"state\":{\"on\":"+ boolString(bri) +",\"hue\":0,\"bri\":"+ briForHue(bri) +",\"sat\":0,\"xy\":[0.00000,0.00000],\"ct\":500,\"alert\":\"none\",\"effect\":\"none\",\"colormode\":\"hs\",\"reachable\":true},\"swversion\":\"0.1\",\"type\":\"Extended color light\",\"uniqueid\":\"3\"}"); server.send(200, "application/json", "{\"manufacturername\":\"OpenSource\",\"modelid\":\"LST001\",\"name\":\""+ alexaInvocationName +"\",\"state\":{\"on\":"+ boolString(bri) +",\"hue\":0,\"bri\":"+ briForHue(bri) +",\"sat\":0,\"xy\":[0.00000,0.00000],\"ct\":500,\"alert\":\"none\",\"effect\":\"none\",\"colormode\":\"hs\",\"reachable\":true},\"swversion\":\"0.1\",\"type\":\"Extended color light\",\"uniqueid\":\"3\"}");
return true; return true;
} }*/
if (req.indexOf("lights") > 0) //client wants all lights if (req.indexOf("lights") > 0) //client wants all lights
{ {
DEBUG_PRINTLN("lAll"); DEBUG_PRINTLN("lAll");
server.send(200, "application/json", "{\"1\":{\"type\":\"Extended color light\",\"manufacturername\":\"OpenSource\",\"swversion\":\"0.1\",\"name\":\""+ alexaInvocationName +"\",\"uniqueid\":\""+ WiFi.macAddress() +"-1\",\"modelid\":\"LST001\",\"state\":{\"on\":"+ boolString(bri) +",\"bri\":"+ briForHue(bri) +",\"xy\":[0.00000,0.00000],\"colormode\":\"hs\",\"effect\":\"none\",\"ct\":500,\"hue\":0,\"sat\":0,\"alert\":\"none\",\"reachable\":true}},\"1\":{\"type\":\"Extended color light\",\"manufacturername\":\"OpenSource\",\"swversion\":\"0.1\",\"name\":\""+ alexaInvocationName +"\",\"uniqueid\":\""+ WiFi.macAddress() +"-2\",\"modelid\":\"LST001\",\"state\":{\"on\":"+ boolString(bri) +",\"bri\":"+ briForHue(bri) +",\"xy\":[0.00000,0.00000],\"colormode\":\"hs\",\"effect\":\"none\",\"ct\":500,\"hue\":0,\"sat\":0,\"alert\":\"none\",\"reachable\":true}}}"); server.send(200, "application/json", "{\"1\":{\"type\":\"Extended color light\",\"manufacturername\":\"OpenSource\",\"swversion\":\"0.1\",\"name\":\""+ alexaInvocationName +"\",\"uniqueid\":\""+ WiFi.macAddress() +"-2\",\"modelid\":\"LST001\",\"state\":{\"on\":"+ boolString(bri) +",\"bri\":"+ briForHue(bri) +",\"xy\":[0.00000,0.00000],\"colormode\":\"hs\",\"effect\":\"none\",\"ct\":500,\"hue\":0,\"sat\":0,\"alert\":\"none\",\"reachable\":true}}}"); //,\"1\":{\"type\":\"Extended color light\",\"manufacturername\":\"OpenSource\",\"swversion\":\"0.1\",\"name\":\""+ alexaInvocationName +"\",\"uniqueid\":\""+ WiFi.macAddress() +"-2\",\"modelid\":\"LST001\",\"state\":{\"on\":"+ boolString(bri) +",\"bri\":"+ briForHue(bri) +",\"xy\":[0.00000,0.00000],\"colormode\":\"hs\",\"effect\":\"none\",\"ct\":500,\"hue\":0,\"sat\":0,\"alert\":\"none\",\"reachable\":true}}}");
return true; return true;
} }
@ -259,15 +263,15 @@ boolean handleAlexaApiCall(String req, String body) //basic implementation of Ph
boolean connectUDP(){ boolean connectUDP(){
boolean state = false; boolean state = false;
Serial.println(""); DEBUG_PRINTLN("");
Serial.println("Con UDP"); DEBUG_PRINTLN("Con UDP");
if(UDP.beginMulticast(WiFi.localIP(), ipMulti, portMulti)) { if(UDP.beginMulticast(WiFi.localIP(), ipMulti, portMulti)) {
Serial.println("Con success"); DEBUG_PRINTLN("Con success");
state = true; state = true;
} }
else{ else{
Serial.println("Con failed"); DEBUG_PRINTLN("Con failed");
} }
return state; return state;