mirror of
https://github.com/wled/WLED.git
synced 2025-07-16 23:36:35 +00:00
Merge branch '0_15' into bus-config
This commit is contained in:
Blaz Kristan
commit
f12de61d7f
@ -1,459 +1,459 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "wled.h"
|
#include "wled.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Usermod that implements BobLight "ambilight" protocol
|
* Usermod that implements BobLight "ambilight" protocol
|
||||||
*
|
*
|
||||||
* See the accompanying README.md file for more info.
|
* See the accompanying README.md file for more info.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef BOB_PORT
|
#ifndef BOB_PORT
|
||||||
#define BOB_PORT 19333 // Default boblightd port
|
#define BOB_PORT 19333 // Default boblightd port
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
class BobLightUsermod : public Usermod {
|
class BobLightUsermod : public Usermod {
|
||||||
typedef struct _LIGHT {
|
typedef struct _LIGHT {
|
||||||
char lightname[5];
|
char lightname[5];
|
||||||
float hscan[2];
|
float hscan[2];
|
||||||
float vscan[2];
|
float vscan[2];
|
||||||
} light_t;
|
} light_t;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
unsigned long lastTime = 0;
|
unsigned long lastTime = 0;
|
||||||
bool enabled = false;
|
bool enabled = false;
|
||||||
bool initDone = false;
|
bool initDone = false;
|
||||||
|
|
||||||
light_t *lights = nullptr;
|
light_t *lights = nullptr;
|
||||||
uint16_t numLights = 0; // 16 + 9 + 16 + 9
|
uint16_t numLights = 0; // 16 + 9 + 16 + 9
|
||||||
uint16_t top, bottom, left, right; // will be filled in readFromConfig()
|
uint16_t top, bottom, left, right; // will be filled in readFromConfig()
|
||||||
uint16_t pct;
|
uint16_t pct;
|
||||||
|
|
||||||
WiFiClient bobClient;
|
WiFiClient bobClient;
|
||||||
WiFiServer *bob;
|
WiFiServer *bob;
|
||||||
uint16_t bobPort = BOB_PORT;
|
uint16_t bobPort = BOB_PORT;
|
||||||
|
|
||||||
static const char _name[];
|
static const char _name[];
|
||||||
static const char _enabled[];
|
static const char _enabled[];
|
||||||
|
|
||||||
/*
|
/*
|
||||||
# boblight
|
# boblight
|
||||||
# Copyright (C) Bob 2009
|
# Copyright (C) Bob 2009
|
||||||
#
|
#
|
||||||
# makeboblight.sh created by Adam Boeglin <adamrb@gmail.com>
|
# makeboblight.sh created by Adam Boeglin <adamrb@gmail.com>
|
||||||
#
|
#
|
||||||
# boblight is free software: you can redistribute it and/or modify it
|
# boblight is free software: you can redistribute it and/or modify it
|
||||||
# under the terms of the GNU General Public License as published by the
|
# under the terms of the GNU General Public License as published by the
|
||||||
# Free Software Foundation, either version 3 of the License, or
|
# Free Software Foundation, either version 3 of the License, or
|
||||||
# (at your option) any later version.
|
# (at your option) any later version.
|
||||||
#
|
#
|
||||||
# boblight is distributed in the hope that it will be useful, but
|
# boblight is distributed in the hope that it will be useful, but
|
||||||
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||||
# See the GNU General Public License for more details.
|
# See the GNU General Public License for more details.
|
||||||
#
|
#
|
||||||
# You should have received a copy of the GNU General Public License along
|
# You should have received a copy of the GNU General Public License along
|
||||||
# with this program. If not, see <http://www.gnu.org/licenses/>.
|
# with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// fills the lights[] array with position & depth of scan for each LED
|
// fills the lights[] array with position & depth of scan for each LED
|
||||||
void fillBobLights(int bottom, int left, int top, int right, float pct_scan) {
|
void fillBobLights(int bottom, int left, int top, int right, float pct_scan) {
|
||||||
|
|
||||||
int lightcount = 0;
|
int lightcount = 0;
|
||||||
int total = top+left+right+bottom;
|
int total = top+left+right+bottom;
|
||||||
int bcount;
|
int bcount;
|
||||||
|
|
||||||
if (total > strip.getLengthTotal()) {
|
if (total > strip.getLengthTotal()) {
|
||||||
DEBUG_PRINTLN(F("BobLight: Too many lights."));
|
DEBUG_PRINTLN(F("BobLight: Too many lights."));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// start left part of bottom strip (clockwise direction, 1st half)
|
// start left part of bottom strip (clockwise direction, 1st half)
|
||||||
if (bottom > 0) {
|
if (bottom > 0) {
|
||||||
bcount = 1;
|
bcount = 1;
|
||||||
float brange = 100.0/bottom;
|
float brange = 100.0/bottom;
|
||||||
float bcurrent = 50.0;
|
float bcurrent = 50.0;
|
||||||
if (bottom < top) {
|
if (bottom < top) {
|
||||||
int diff = top - bottom;
|
int diff = top - bottom;
|
||||||
brange = 100.0/top;
|
brange = 100.0/top;
|
||||||
bcurrent -= (diff/2)*brange;
|
bcurrent -= (diff/2)*brange;
|
||||||
}
|
}
|
||||||
while (bcount <= bottom/2) {
|
while (bcount <= bottom/2) {
|
||||||
float btop = bcurrent - brange;
|
float btop = bcurrent - brange;
|
||||||
String name = "b"+String(bcount);
|
String name = "b"+String(bcount);
|
||||||
strncpy(lights[lightcount].lightname, name.c_str(), 4);
|
strncpy(lights[lightcount].lightname, name.c_str(), 4);
|
||||||
lights[lightcount].hscan[0] = btop;
|
lights[lightcount].hscan[0] = btop;
|
||||||
lights[lightcount].hscan[1] = bcurrent;
|
lights[lightcount].hscan[1] = bcurrent;
|
||||||
lights[lightcount].vscan[0] = 100 - pct_scan;
|
lights[lightcount].vscan[0] = 100 - pct_scan;
|
||||||
lights[lightcount].vscan[1] = 100;
|
lights[lightcount].vscan[1] = 100;
|
||||||
lightcount+=1;
|
lightcount+=1;
|
||||||
bcurrent = btop;
|
bcurrent = btop;
|
||||||
bcount+=1;
|
bcount+=1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// left side
|
// left side
|
||||||
if (left > 0) {
|
if (left > 0) {
|
||||||
int lcount = 1;
|
int lcount = 1;
|
||||||
float lrange = 100.0/left;
|
float lrange = 100.0/left;
|
||||||
float lcurrent = 100.0;
|
float lcurrent = 100.0;
|
||||||
while (lcount <= left) {
|
while (lcount <= left) {
|
||||||
float ltop = lcurrent - lrange;
|
float ltop = lcurrent - lrange;
|
||||||
String name = "l"+String(lcount);
|
String name = "l"+String(lcount);
|
||||||
strncpy(lights[lightcount].lightname, name.c_str(), 4);
|
strncpy(lights[lightcount].lightname, name.c_str(), 4);
|
||||||
lights[lightcount].hscan[0] = 0;
|
lights[lightcount].hscan[0] = 0;
|
||||||
lights[lightcount].hscan[1] = pct_scan;
|
lights[lightcount].hscan[1] = pct_scan;
|
||||||
lights[lightcount].vscan[0] = ltop;
|
lights[lightcount].vscan[0] = ltop;
|
||||||
lights[lightcount].vscan[1] = lcurrent;
|
lights[lightcount].vscan[1] = lcurrent;
|
||||||
lightcount+=1;
|
lightcount+=1;
|
||||||
lcurrent = ltop;
|
lcurrent = ltop;
|
||||||
lcount+=1;
|
lcount+=1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// top side
|
// top side
|
||||||
if (top > 0) {
|
if (top > 0) {
|
||||||
int tcount = 1;
|
int tcount = 1;
|
||||||
float trange = 100.0/top;
|
float trange = 100.0/top;
|
||||||
float tcurrent = 0;
|
float tcurrent = 0;
|
||||||
while (tcount <= top) {
|
while (tcount <= top) {
|
||||||
float ttop = tcurrent + trange;
|
float ttop = tcurrent + trange;
|
||||||
String name = "t"+String(tcount);
|
String name = "t"+String(tcount);
|
||||||
strncpy(lights[lightcount].lightname, name.c_str(), 4);
|
strncpy(lights[lightcount].lightname, name.c_str(), 4);
|
||||||
lights[lightcount].hscan[0] = tcurrent;
|
lights[lightcount].hscan[0] = tcurrent;
|
||||||
lights[lightcount].hscan[1] = ttop;
|
lights[lightcount].hscan[1] = ttop;
|
||||||
lights[lightcount].vscan[0] = 0;
|
lights[lightcount].vscan[0] = 0;
|
||||||
lights[lightcount].vscan[1] = pct_scan;
|
lights[lightcount].vscan[1] = pct_scan;
|
||||||
lightcount+=1;
|
lightcount+=1;
|
||||||
tcurrent = ttop;
|
tcurrent = ttop;
|
||||||
tcount+=1;
|
tcount+=1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// right side
|
// right side
|
||||||
if (right > 0) {
|
if (right > 0) {
|
||||||
int rcount = 1;
|
int rcount = 1;
|
||||||
float rrange = 100.0/right;
|
float rrange = 100.0/right;
|
||||||
float rcurrent = 0;
|
float rcurrent = 0;
|
||||||
while (rcount <= right) {
|
while (rcount <= right) {
|
||||||
float rtop = rcurrent + rrange;
|
float rtop = rcurrent + rrange;
|
||||||
String name = "r"+String(rcount);
|
String name = "r"+String(rcount);
|
||||||
strncpy(lights[lightcount].lightname, name.c_str(), 4);
|
strncpy(lights[lightcount].lightname, name.c_str(), 4);
|
||||||
lights[lightcount].hscan[0] = 100-pct_scan;
|
lights[lightcount].hscan[0] = 100-pct_scan;
|
||||||
lights[lightcount].hscan[1] = 100;
|
lights[lightcount].hscan[1] = 100;
|
||||||
lights[lightcount].vscan[0] = rcurrent;
|
lights[lightcount].vscan[0] = rcurrent;
|
||||||
lights[lightcount].vscan[1] = rtop;
|
lights[lightcount].vscan[1] = rtop;
|
||||||
lightcount+=1;
|
lightcount+=1;
|
||||||
rcurrent = rtop;
|
rcurrent = rtop;
|
||||||
rcount+=1;
|
rcount+=1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// right side of bottom strip (2nd half)
|
// right side of bottom strip (2nd half)
|
||||||
if (bottom > 0) {
|
if (bottom > 0) {
|
||||||
float brange = 100.0/bottom;
|
float brange = 100.0/bottom;
|
||||||
float bcurrent = 100;
|
float bcurrent = 100;
|
||||||
if (bottom < top) {
|
if (bottom < top) {
|
||||||
brange = 100.0/top;
|
brange = 100.0/top;
|
||||||
}
|
}
|
||||||
while (bcount <= bottom) {
|
while (bcount <= bottom) {
|
||||||
float btop = bcurrent - brange;
|
float btop = bcurrent - brange;
|
||||||
String name = "b"+String(bcount);
|
String name = "b"+String(bcount);
|
||||||
strncpy(lights[lightcount].lightname, name.c_str(), 4);
|
strncpy(lights[lightcount].lightname, name.c_str(), 4);
|
||||||
lights[lightcount].hscan[0] = btop;
|
lights[lightcount].hscan[0] = btop;
|
||||||
lights[lightcount].hscan[1] = bcurrent;
|
lights[lightcount].hscan[1] = bcurrent;
|
||||||
lights[lightcount].vscan[0] = 100 - pct_scan;
|
lights[lightcount].vscan[0] = 100 - pct_scan;
|
||||||
lights[lightcount].vscan[1] = 100;
|
lights[lightcount].vscan[1] = 100;
|
||||||
lightcount+=1;
|
lightcount+=1;
|
||||||
bcurrent = btop;
|
bcurrent = btop;
|
||||||
bcount+=1;
|
bcount+=1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
numLights = lightcount;
|
numLights = lightcount;
|
||||||
|
|
||||||
#if WLED_DEBUG
|
#if WLED_DEBUG
|
||||||
DEBUG_PRINTLN(F("Fill light data: "));
|
DEBUG_PRINTLN(F("Fill light data: "));
|
||||||
DEBUG_PRINTF_P(PSTR(" lights %d\n"), numLights);
|
DEBUG_PRINTF_P(PSTR(" lights %d\n"), numLights);
|
||||||
for (int i=0; i<numLights; i++) {
|
for (int i=0; i<numLights; i++) {
|
||||||
DEBUG_PRINTF_P(PSTR(" light %s scan %2.1f %2.1f %2.1f %2.1f\n"), lights[i].lightname, lights[i].vscan[0], lights[i].vscan[1], lights[i].hscan[0], lights[i].hscan[1]);
|
DEBUG_PRINTF_P(PSTR(" light %s scan %2.1f %2.1f %2.1f %2.1f\n"), lights[i].lightname, lights[i].vscan[0], lights[i].vscan[1], lights[i].hscan[0], lights[i].hscan[1]);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void BobSync() { yield(); } // allow other tasks, should also be used to force pixel redraw (not with WLED)
|
void BobSync() { yield(); } // allow other tasks, should also be used to force pixel redraw (not with WLED)
|
||||||
void BobClear() { for (size_t i=0; i<numLights; i++) setRealtimePixel(i, 0, 0, 0, 0); }
|
void BobClear() { for (size_t i=0; i<numLights; i++) setRealtimePixel(i, 0, 0, 0, 0); }
|
||||||
void pollBob();
|
void pollBob();
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
void setup() override {
|
void setup() override {
|
||||||
uint16_t totalLights = bottom + left + top + right;
|
uint16_t totalLights = bottom + left + top + right;
|
||||||
if ( totalLights > strip.getLengthTotal() ) {
|
if ( totalLights > strip.getLengthTotal() ) {
|
||||||
DEBUG_PRINTLN(F("BobLight: Too many lights."));
|
DEBUG_PRINTLN(F("BobLight: Too many lights."));
|
||||||
DEBUG_PRINTF_P(PSTR("%d+%d+%d+%d>%d\n"), bottom, left, top, right, strip.getLengthTotal());
|
DEBUG_PRINTF_P(PSTR("%d+%d+%d+%d>%d\n"), bottom, left, top, right, strip.getLengthTotal());
|
||||||
totalLights = strip.getLengthTotal();
|
totalLights = strip.getLengthTotal();
|
||||||
top = bottom = (uint16_t) roundf((float)totalLights * 16.0f / 50.0f);
|
top = bottom = (uint16_t) roundf((float)totalLights * 16.0f / 50.0f);
|
||||||
left = right = (uint16_t) roundf((float)totalLights * 9.0f / 50.0f);
|
left = right = (uint16_t) roundf((float)totalLights * 9.0f / 50.0f);
|
||||||
}
|
}
|
||||||
lights = new light_t[totalLights];
|
lights = new light_t[totalLights];
|
||||||
if (lights) fillBobLights(bottom, left, top, right, float(pct)); // will fill numLights
|
if (lights) fillBobLights(bottom, left, top, right, float(pct)); // will fill numLights
|
||||||
else enable(false);
|
else enable(false);
|
||||||
initDone = true;
|
initDone = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void connected() override {
|
void connected() override {
|
||||||
// we can only start server when WiFi is connected
|
// we can only start server when WiFi is connected
|
||||||
if (!bob) bob = new WiFiServer(bobPort, 1);
|
if (!bob) bob = new WiFiServer(bobPort, 1);
|
||||||
bob->begin();
|
bob->begin();
|
||||||
bob->setNoDelay(true);
|
bob->setNoDelay(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
void loop() override {
|
void loop() override {
|
||||||
if (!enabled || strip.isUpdating()) return;
|
if (!enabled || strip.isUpdating()) return;
|
||||||
if (millis() - lastTime > 10) {
|
if (millis() - lastTime > 10) {
|
||||||
lastTime = millis();
|
lastTime = millis();
|
||||||
pollBob();
|
pollBob();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void enable(bool en) { enabled = en; }
|
void enable(bool en) { enabled = en; }
|
||||||
|
|
||||||
#ifndef WLED_DISABLE_MQTT
|
#ifndef WLED_DISABLE_MQTT
|
||||||
/**
|
/**
|
||||||
* handling of MQTT message
|
* handling of MQTT message
|
||||||
* topic only contains stripped topic (part after /wled/MAC)
|
* topic only contains stripped topic (part after /wled/MAC)
|
||||||
* topic should look like: /swipe with amessage of [up|down]
|
* topic should look like: /swipe with amessage of [up|down]
|
||||||
*/
|
*/
|
||||||
bool onMqttMessage(char* topic, char* payload) override {
|
bool onMqttMessage(char* topic, char* payload) override {
|
||||||
//if (strlen(topic) == 6 && strncmp_P(topic, PSTR("/subtopic"), 6) == 0) {
|
//if (strlen(topic) == 6 && strncmp_P(topic, PSTR("/subtopic"), 6) == 0) {
|
||||||
// String action = payload;
|
// String action = payload;
|
||||||
// if (action == "on") {
|
// if (action == "on") {
|
||||||
// enable(true);
|
// enable(true);
|
||||||
// return true;
|
// return true;
|
||||||
// } else if (action == "off") {
|
// } else if (action == "off") {
|
||||||
// enable(false);
|
// enable(false);
|
||||||
// return true;
|
// return true;
|
||||||
// }
|
// }
|
||||||
//}
|
//}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* subscribe to MQTT topic for controlling usermod
|
* subscribe to MQTT topic for controlling usermod
|
||||||
*/
|
*/
|
||||||
void onMqttConnect(bool sessionPresent) override {
|
void onMqttConnect(bool sessionPresent) override {
|
||||||
//char subuf[64];
|
//char subuf[64];
|
||||||
//if (mqttDeviceTopic[0] != 0) {
|
//if (mqttDeviceTopic[0] != 0) {
|
||||||
// strcpy(subuf, mqttDeviceTopic);
|
// strcpy(subuf, mqttDeviceTopic);
|
||||||
// strcat_P(subuf, PSTR("/subtopic"));
|
// strcat_P(subuf, PSTR("/subtopic"));
|
||||||
// mqtt->subscribe(subuf, 0);
|
// mqtt->subscribe(subuf, 0);
|
||||||
//}
|
//}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void addToJsonInfo(JsonObject& root) override
|
void addToJsonInfo(JsonObject& root) override
|
||||||
{
|
{
|
||||||
JsonObject user = root["u"];
|
JsonObject user = root["u"];
|
||||||
if (user.isNull()) user = root.createNestedObject("u");
|
if (user.isNull()) user = root.createNestedObject("u");
|
||||||
|
|
||||||
JsonArray infoArr = user.createNestedArray(FPSTR(_name));
|
JsonArray infoArr = user.createNestedArray(FPSTR(_name));
|
||||||
String uiDomString = F("<button class=\"btn btn-xs\" onclick=\"requestJson({");
|
String uiDomString = F("<button class=\"btn btn-xs\" onclick=\"requestJson({");
|
||||||
uiDomString += FPSTR(_name);
|
uiDomString += FPSTR(_name);
|
||||||
uiDomString += F(":{");
|
uiDomString += F(":{");
|
||||||
uiDomString += FPSTR(_enabled);
|
uiDomString += FPSTR(_enabled);
|
||||||
uiDomString += enabled ? F(":false}});\">") : F(":true}});\">");
|
uiDomString += enabled ? F(":false}});\">") : F(":true}});\">");
|
||||||
uiDomString += F("<i class=\"icons ");
|
uiDomString += F("<i class=\"icons ");
|
||||||
uiDomString += enabled ? "on" : "off";
|
uiDomString += enabled ? "on" : "off";
|
||||||
uiDomString += F("\"></i></button>");
|
uiDomString += F("\"></i></button>");
|
||||||
infoArr.add(uiDomString);
|
infoArr.add(uiDomString);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* addToJsonState() can be used to add custom entries to the /json/state part of the JSON API (state object).
|
* addToJsonState() can be used to add custom entries to the /json/state part of the JSON API (state object).
|
||||||
* Values in the state object may be modified by connected clients
|
* Values in the state object may be modified by connected clients
|
||||||
*/
|
*/
|
||||||
void addToJsonState(JsonObject& root) override
|
void addToJsonState(JsonObject& root) override
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* readFromJsonState() can be used to receive data clients send to the /json/state part of the JSON API (state object).
|
* readFromJsonState() can be used to receive data clients send to the /json/state part of the JSON API (state object).
|
||||||
* Values in the state object may be modified by connected clients
|
* Values in the state object may be modified by connected clients
|
||||||
*/
|
*/
|
||||||
void readFromJsonState(JsonObject& root) override {
|
void readFromJsonState(JsonObject& root) override {
|
||||||
if (!initDone) return; // prevent crash on boot applyPreset()
|
if (!initDone) return; // prevent crash on boot applyPreset()
|
||||||
bool en = enabled;
|
bool en = enabled;
|
||||||
JsonObject um = root[FPSTR(_name)];
|
JsonObject um = root[FPSTR(_name)];
|
||||||
if (!um.isNull()) {
|
if (!um.isNull()) {
|
||||||
if (um[FPSTR(_enabled)].is<bool>()) {
|
if (um[FPSTR(_enabled)].is<bool>()) {
|
||||||
en = um[FPSTR(_enabled)].as<bool>();
|
en = um[FPSTR(_enabled)].as<bool>();
|
||||||
} else {
|
} else {
|
||||||
String str = um[FPSTR(_enabled)]; // checkbox -> off or on
|
String str = um[FPSTR(_enabled)]; // checkbox -> off or on
|
||||||
en = (bool)(str!="off"); // off is guaranteed to be present
|
en = (bool)(str!="off"); // off is guaranteed to be present
|
||||||
}
|
}
|
||||||
if (en != enabled && lights) {
|
if (en != enabled && lights) {
|
||||||
enable(en);
|
enable(en);
|
||||||
if (!enabled && bob && bob->hasClient()) {
|
if (!enabled && bob && bob->hasClient()) {
|
||||||
if (bobClient) bobClient.stop();
|
if (bobClient) bobClient.stop();
|
||||||
bobClient = bob->available();
|
bobClient = bob->available();
|
||||||
BobClear();
|
BobClear();
|
||||||
exitRealtime();
|
exitRealtime();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void appendConfigData() override {
|
void appendConfigData() override {
|
||||||
//oappend(SET_F("dd=addDropdown('usermod','selectfield');"));
|
//oappend(SET_F("dd=addDropdown('usermod','selectfield');"));
|
||||||
//oappend(SET_F("addOption(dd,'1st value',0);"));
|
//oappend(SET_F("addOption(dd,'1st value',0);"));
|
||||||
//oappend(SET_F("addOption(dd,'2nd value',1);"));
|
//oappend(SET_F("addOption(dd,'2nd value',1);"));
|
||||||
oappend(SET_F("addInfo('BobLight:top',1,'LEDs');")); // 0 is field type, 1 is actual field
|
oappend(SET_F("addInfo('BobLight:top',1,'LEDs');")); // 0 is field type, 1 is actual field
|
||||||
oappend(SET_F("addInfo('BobLight:bottom',1,'LEDs');")); // 0 is field type, 1 is actual field
|
oappend(SET_F("addInfo('BobLight:bottom',1,'LEDs');")); // 0 is field type, 1 is actual field
|
||||||
oappend(SET_F("addInfo('BobLight:left',1,'LEDs');")); // 0 is field type, 1 is actual field
|
oappend(SET_F("addInfo('BobLight:left',1,'LEDs');")); // 0 is field type, 1 is actual field
|
||||||
oappend(SET_F("addInfo('BobLight:right',1,'LEDs');")); // 0 is field type, 1 is actual field
|
oappend(SET_F("addInfo('BobLight:right',1,'LEDs');")); // 0 is field type, 1 is actual field
|
||||||
oappend(SET_F("addInfo('BobLight:pct',1,'Depth of scan [%]');")); // 0 is field type, 1 is actual field
|
oappend(SET_F("addInfo('BobLight:pct',1,'Depth of scan [%]');")); // 0 is field type, 1 is actual field
|
||||||
}
|
}
|
||||||
|
|
||||||
void addToConfig(JsonObject& root) override {
|
void addToConfig(JsonObject& root) override {
|
||||||
JsonObject umData = root.createNestedObject(FPSTR(_name));
|
JsonObject umData = root.createNestedObject(FPSTR(_name));
|
||||||
umData[FPSTR(_enabled)] = enabled;
|
umData[FPSTR(_enabled)] = enabled;
|
||||||
umData[ "port" ] = bobPort;
|
umData[ "port" ] = bobPort;
|
||||||
umData[F("top")] = top;
|
umData[F("top")] = top;
|
||||||
umData[F("bottom")] = bottom;
|
umData[F("bottom")] = bottom;
|
||||||
umData[F("left")] = left;
|
umData[F("left")] = left;
|
||||||
umData[F("right")] = right;
|
umData[F("right")] = right;
|
||||||
umData[F("pct")] = pct;
|
umData[F("pct")] = pct;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool readFromConfig(JsonObject& root) override {
|
bool readFromConfig(JsonObject& root) override {
|
||||||
JsonObject umData = root[FPSTR(_name)];
|
JsonObject umData = root[FPSTR(_name)];
|
||||||
bool configComplete = !umData.isNull();
|
bool configComplete = !umData.isNull();
|
||||||
|
|
||||||
bool en = enabled;
|
bool en = enabled;
|
||||||
configComplete &= getJsonValue(umData[FPSTR(_enabled)], en);
|
configComplete &= getJsonValue(umData[FPSTR(_enabled)], en);
|
||||||
enable(en);
|
enable(en);
|
||||||
|
|
||||||
configComplete &= getJsonValue(umData[ "port" ], bobPort);
|
configComplete &= getJsonValue(umData[ "port" ], bobPort);
|
||||||
configComplete &= getJsonValue(umData[F("bottom")], bottom, 16);
|
configComplete &= getJsonValue(umData[F("bottom")], bottom, 16);
|
||||||
configComplete &= getJsonValue(umData[F("top")], top, 16);
|
configComplete &= getJsonValue(umData[F("top")], top, 16);
|
||||||
configComplete &= getJsonValue(umData[F("left")], left, 9);
|
configComplete &= getJsonValue(umData[F("left")], left, 9);
|
||||||
configComplete &= getJsonValue(umData[F("right")], right, 9);
|
configComplete &= getJsonValue(umData[F("right")], right, 9);
|
||||||
configComplete &= getJsonValue(umData[F("pct")], pct, 5); // Depth of scan [%]
|
configComplete &= getJsonValue(umData[F("pct")], pct, 5); // Depth of scan [%]
|
||||||
pct = MIN(50,MAX(1,pct));
|
pct = MIN(50,MAX(1,pct));
|
||||||
|
|
||||||
uint16_t totalLights = bottom + left + top + right;
|
uint16_t totalLights = bottom + left + top + right;
|
||||||
if (initDone && numLights != totalLights) {
|
if (initDone && numLights != totalLights) {
|
||||||
if (lights) delete[] lights;
|
if (lights) delete[] lights;
|
||||||
setup();
|
setup();
|
||||||
}
|
}
|
||||||
return configComplete;
|
return configComplete;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* handleOverlayDraw() is called just before every show() (LED strip update frame) after effects have set the colors.
|
* handleOverlayDraw() is called just before every show() (LED strip update frame) after effects have set the colors.
|
||||||
* Use this to blank out some LEDs or set them to a different color regardless of the set effect mode.
|
* Use this to blank out some LEDs or set them to a different color regardless of the set effect mode.
|
||||||
* Commonly used for custom clocks (Cronixie, 7 segment)
|
* Commonly used for custom clocks (Cronixie, 7 segment)
|
||||||
*/
|
*/
|
||||||
void handleOverlayDraw() override {
|
void handleOverlayDraw() override {
|
||||||
//strip.setPixelColor(0, RGBW32(0,0,0,0)) // set the first pixel to black
|
//strip.setPixelColor(0, RGBW32(0,0,0,0)) // set the first pixel to black
|
||||||
}
|
}
|
||||||
|
|
||||||
uint16_t getId() override { return USERMOD_ID_BOBLIGHT; }
|
uint16_t getId() override { return USERMOD_ID_BOBLIGHT; }
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
// strings to reduce flash memory usage (used more than twice)
|
// strings to reduce flash memory usage (used more than twice)
|
||||||
const char BobLightUsermod::_name[] PROGMEM = "BobLight";
|
const char BobLightUsermod::_name[] PROGMEM = "BobLight";
|
||||||
const char BobLightUsermod::_enabled[] PROGMEM = "enabled";
|
const char BobLightUsermod::_enabled[] PROGMEM = "enabled";
|
||||||
|
|
||||||
// main boblight handling (definition here prevents inlining)
|
// main boblight handling (definition here prevents inlining)
|
||||||
void BobLightUsermod::pollBob() {
|
void BobLightUsermod::pollBob() {
|
||||||
|
|
||||||
//check if there are any new clients
|
//check if there are any new clients
|
||||||
if (bob && bob->hasClient()) {
|
if (bob && bob->hasClient()) {
|
||||||
//find free/disconnected spot
|
//find free/disconnected spot
|
||||||
if (!bobClient || !bobClient.connected()) {
|
if (!bobClient || !bobClient.connected()) {
|
||||||
if (bobClient) bobClient.stop();
|
if (bobClient) bobClient.stop();
|
||||||
bobClient = bob->available();
|
bobClient = bob->available();
|
||||||
DEBUG_PRINTLN(F("Boblight: Client connected."));
|
DEBUG_PRINTLN(F("Boblight: Client connected."));
|
||||||
}
|
}
|
||||||
//no free/disconnected spot so reject
|
//no free/disconnected spot so reject
|
||||||
WiFiClient bobClientTmp = bob->available();
|
WiFiClient bobClientTmp = bob->available();
|
||||||
bobClientTmp.stop();
|
bobClientTmp.stop();
|
||||||
BobClear();
|
BobClear();
|
||||||
exitRealtime();
|
exitRealtime();
|
||||||
}
|
}
|
||||||
|
|
||||||
//check clients for data
|
//check clients for data
|
||||||
if (bobClient && bobClient.connected()) {
|
if (bobClient && bobClient.connected()) {
|
||||||
realtimeLock(realtimeTimeoutMs); // lock strip as we have a client connected
|
realtimeLock(realtimeTimeoutMs); // lock strip as we have a client connected
|
||||||
|
|
||||||
//get data from the client
|
//get data from the client
|
||||||
while (bobClient.available()) {
|
while (bobClient.available()) {
|
||||||
String input = bobClient.readStringUntil('\n');
|
String input = bobClient.readStringUntil('\n');
|
||||||
// DEBUG_PRINT(F("Client: ")); DEBUG_PRINTLN(input); // may be to stressful on Serial
|
// DEBUG_PRINT(F("Client: ")); DEBUG_PRINTLN(input); // may be to stressful on Serial
|
||||||
if (input.startsWith(F("hello"))) {
|
if (input.startsWith(F("hello"))) {
|
||||||
DEBUG_PRINTLN(F("hello"));
|
DEBUG_PRINTLN(F("hello"));
|
||||||
bobClient.print(F("hello\n"));
|
bobClient.print(F("hello\n"));
|
||||||
} else if (input.startsWith(F("ping"))) {
|
} else if (input.startsWith(F("ping"))) {
|
||||||
DEBUG_PRINTLN(F("ping 1"));
|
DEBUG_PRINTLN(F("ping 1"));
|
||||||
bobClient.print(F("ping 1\n"));
|
bobClient.print(F("ping 1\n"));
|
||||||
} else if (input.startsWith(F("get version"))) {
|
} else if (input.startsWith(F("get version"))) {
|
||||||
DEBUG_PRINTLN(F("version 5"));
|
DEBUG_PRINTLN(F("version 5"));
|
||||||
bobClient.print(F("version 5\n"));
|
bobClient.print(F("version 5\n"));
|
||||||
} else if (input.startsWith(F("get lights"))) {
|
} else if (input.startsWith(F("get lights"))) {
|
||||||
char tmp[64];
|
char tmp[64];
|
||||||
String answer = "";
|
String answer = "";
|
||||||
sprintf_P(tmp, PSTR("lights %d\n"), numLights);
|
sprintf_P(tmp, PSTR("lights %d\n"), numLights);
|
||||||
DEBUG_PRINT(tmp);
|
DEBUG_PRINT(tmp);
|
||||||
answer.concat(tmp);
|
answer.concat(tmp);
|
||||||
for (int i=0; i<numLights; i++) {
|
for (int i=0; i<numLights; i++) {
|
||||||
sprintf_P(tmp, PSTR("light %s scan %2.1f %2.1f %2.1f %2.1f\n"), lights[i].lightname, lights[i].vscan[0], lights[i].vscan[1], lights[i].hscan[0], lights[i].hscan[1]);
|
sprintf_P(tmp, PSTR("light %s scan %2.1f %2.1f %2.1f %2.1f\n"), lights[i].lightname, lights[i].vscan[0], lights[i].vscan[1], lights[i].hscan[0], lights[i].hscan[1]);
|
||||||
DEBUG_PRINT(tmp);
|
DEBUG_PRINT(tmp);
|
||||||
answer.concat(tmp);
|
answer.concat(tmp);
|
||||||
}
|
}
|
||||||
bobClient.print(answer);
|
bobClient.print(answer);
|
||||||
} else if (input.startsWith(F("set priority"))) {
|
} else if (input.startsWith(F("set priority"))) {
|
||||||
DEBUG_PRINTLN(F("set priority not implemented"));
|
DEBUG_PRINTLN(F("set priority not implemented"));
|
||||||
// not implemented
|
// not implemented
|
||||||
} else if (input.startsWith(F("set light "))) { // <id> <cmd in rgb, speed, interpolation> <value> ...
|
} else if (input.startsWith(F("set light "))) { // <id> <cmd in rgb, speed, interpolation> <value> ...
|
||||||
input.remove(0,10);
|
input.remove(0,10);
|
||||||
String tmp = input.substring(0,input.indexOf(' '));
|
String tmp = input.substring(0,input.indexOf(' '));
|
||||||
|
|
||||||
int light_id = -1;
|
int light_id = -1;
|
||||||
for (uint16_t i=0; i<numLights; i++) {
|
for (uint16_t i=0; i<numLights; i++) {
|
||||||
if (strncmp(lights[i].lightname, tmp.c_str(), 4) == 0) {
|
if (strncmp(lights[i].lightname, tmp.c_str(), 4) == 0) {
|
||||||
light_id = i;
|
light_id = i;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (light_id == -1) return;
|
if (light_id == -1) return;
|
||||||
|
|
||||||
input.remove(0,input.indexOf(' ')+1);
|
input.remove(0,input.indexOf(' ')+1);
|
||||||
if (input.startsWith(F("rgb "))) {
|
if (input.startsWith(F("rgb "))) {
|
||||||
input.remove(0,4);
|
input.remove(0,4);
|
||||||
tmp = input.substring(0,input.indexOf(' '));
|
tmp = input.substring(0,input.indexOf(' '));
|
||||||
uint8_t red = (uint8_t)(255.0f*tmp.toFloat());
|
uint8_t red = (uint8_t)(255.0f*tmp.toFloat());
|
||||||
input.remove(0,input.indexOf(' ')+1); // remove first float value
|
input.remove(0,input.indexOf(' ')+1); // remove first float value
|
||||||
tmp = input.substring(0,input.indexOf(' '));
|
tmp = input.substring(0,input.indexOf(' '));
|
||||||
uint8_t green = (uint8_t)(255.0f*tmp.toFloat());
|
uint8_t green = (uint8_t)(255.0f*tmp.toFloat());
|
||||||
input.remove(0,input.indexOf(' ')+1); // remove second float value
|
input.remove(0,input.indexOf(' ')+1); // remove second float value
|
||||||
tmp = input.substring(0,input.indexOf(' '));
|
tmp = input.substring(0,input.indexOf(' '));
|
||||||
uint8_t blue = (uint8_t)(255.0f*tmp.toFloat());
|
uint8_t blue = (uint8_t)(255.0f*tmp.toFloat());
|
||||||
|
|
||||||
//strip.setPixelColor(light_id, RGBW32(red, green, blue, 0));
|
//strip.setPixelColor(light_id, RGBW32(red, green, blue, 0));
|
||||||
setRealtimePixel(light_id, red, green, blue, 0);
|
setRealtimePixel(light_id, red, green, blue, 0);
|
||||||
} // currently no support for interpolation or speed, we just ignore this
|
} // currently no support for interpolation or speed, we just ignore this
|
||||||
} else if (input.startsWith("sync")) {
|
} else if (input.startsWith("sync")) {
|
||||||
BobSync();
|
BobSync();
|
||||||
} else {
|
} else {
|
||||||
// Client sent gibberish
|
// Client sent gibberish
|
||||||
DEBUG_PRINTLN(F("Client sent gibberish."));
|
DEBUG_PRINTLN(F("Client sent gibberish."));
|
||||||
bobClient.stop();
|
bobClient.stop();
|
||||||
bobClient = bob->available();
|
bobClient = bob->available();
|
||||||
BobClear();
|
BobClear();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -264,7 +264,7 @@ void WLED::loop()
|
|||||||
if (loopMillis > maxLoopMillis) maxLoopMillis = loopMillis;
|
if (loopMillis > maxLoopMillis) maxLoopMillis = loopMillis;
|
||||||
if (millis() - debugTime > 29999) {
|
if (millis() - debugTime > 29999) {
|
||||||
DEBUG_PRINTLN(F("---DEBUG INFO---"));
|
DEBUG_PRINTLN(F("---DEBUG INFO---"));
|
||||||
DEBUG_PRINTF_P(PSTR("Runtime: %u\n"), millis());
|
DEBUG_PRINTF_P(PSTR("Runtime: %lu\n"), millis());
|
||||||
DEBUG_PRINTF_P(PSTR("Unix time: %u,%03u\n"), toki.getTime().sec, toki.getTime().ms);
|
DEBUG_PRINTF_P(PSTR("Unix time: %u,%03u\n"), toki.getTime().sec, toki.getTime().ms);
|
||||||
DEBUG_PRINTF_P(PSTR("Free heap: %u\n"), ESP.getFreeHeap());
|
DEBUG_PRINTF_P(PSTR("Free heap: %u\n"), ESP.getFreeHeap());
|
||||||
#if defined(ARDUINO_ARCH_ESP32)
|
#if defined(ARDUINO_ARCH_ESP32)
|
||||||
@ -283,14 +283,14 @@ void WLED::loop()
|
|||||||
wifiStateChangedTime = millis();
|
wifiStateChangedTime = millis();
|
||||||
}
|
}
|
||||||
lastWifiState = WiFi.status();
|
lastWifiState = WiFi.status();
|
||||||
DEBUG_PRINTF_P(PSTR("State time: %u\n"), wifiStateChangedTime);
|
DEBUG_PRINTF_P(PSTR("State time: %lu\n"), wifiStateChangedTime);
|
||||||
DEBUG_PRINTF_P(PSTR("NTP last sync: %u\n"), ntpLastSyncTime);
|
DEBUG_PRINTF_P(PSTR("NTP last sync: %lu\n"), ntpLastSyncTime);
|
||||||
DEBUG_PRINTF_P(PSTR("Client IP: %u.%u.%u.%u\n"), Network.localIP()[0], Network.localIP()[1], Network.localIP()[2], Network.localIP()[3]);
|
DEBUG_PRINTF_P(PSTR("Client IP: %u.%u.%u.%u\n"), Network.localIP()[0], Network.localIP()[1], Network.localIP()[2], Network.localIP()[3]);
|
||||||
if (loops > 0) { // avoid division by zero
|
if (loops > 0) { // avoid division by zero
|
||||||
DEBUG_PRINTF_P(PSTR("Loops/sec: %u\n"), loops / 30);
|
DEBUG_PRINTF_P(PSTR("Loops/sec: %u\n"), loops / 30);
|
||||||
DEBUG_PRINTF_P(PSTR("Loop time[ms]: %u/%u\n"), avgLoopMillis/loops, maxLoopMillis);
|
DEBUG_PRINTF_P(PSTR("Loop time[ms]: %u/%lu\n"), avgLoopMillis/loops, maxLoopMillis);
|
||||||
DEBUG_PRINTF_P(PSTR("UM time[ms]: %u/%u\n"), avgUsermodMillis/loops, maxUsermodMillis);
|
DEBUG_PRINTF_P(PSTR("UM time[ms]: %u/%lu\n"), avgUsermodMillis/loops, maxUsermodMillis);
|
||||||
DEBUG_PRINTF_P(PSTR("Strip time[ms]:%u/%u\n"), avgStripMillis/loops, maxStripMillis);
|
DEBUG_PRINTF_P(PSTR("Strip time[ms]:%u/%lu\n"), avgStripMillis/loops, maxStripMillis);
|
||||||
}
|
}
|
||||||
strip.printSize();
|
strip.printSize();
|
||||||
loops = 0;
|
loops = 0;
|
||||||
@ -368,11 +368,8 @@ void WLED::setup()
|
|||||||
DEBUG_PRINTLN(F("arduino-esp32 v1.0.x\n")); // we can't say in more detail.
|
DEBUG_PRINTLN(F("arduino-esp32 v1.0.x\n")); // we can't say in more detail.
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
DEBUG_PRINTF_P(PSTR("CPU: "), ESP.getChipModel());
|
DEBUG_PRINTF_P(PSTR("CPU: %s rev.%d, %d core(s), %d MHz.\n"), ESP.getChipModel(), (int)ESP.getChipRevision(), ESP.getChipCores(), ESP.getCpuFreqMHz());
|
||||||
DEBUG_PRINTF_P(PSTR(" rev."), ESP.getChipRevision());
|
DEBUG_PRINTF_P(PSTR("FLASH: %d MB, Mode %d "), (ESP.getFlashChipSize()/1024)/1024, (int)ESP.getFlashChipMode());
|
||||||
DEBUG_PRINTF_P(PSTR(", %d core(s)"), ESP.getChipCores());
|
|
||||||
DEBUG_PRINTF_P(PSTR(", %d MHz.\n"), ESP.getCpuFreqMHz());
|
|
||||||
DEBUG_PRINTF_P(PSTR("FLASH: %dMB, Mode %d "), (ESP.getFlashChipSize()/1024)/1024, ESP.getFlashChipMode());
|
|
||||||
#ifdef WLED_DEBUG
|
#ifdef WLED_DEBUG
|
||||||
switch (ESP.getFlashChipMode()) {
|
switch (ESP.getFlashChipMode()) {
|
||||||
// missing: Octal modes
|
// missing: Octal modes
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user