wn/rgbled
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add colorPattern config option, use mqtt boilerplate with watchdog

Browse Source
This commit is contained in:
Wolfgang Hottgenroth 2020-07-26 17:59:08 +02:00
parent 068095ad6f
commit a373ebbbfc
Signed by: wn
GPG Key ID: B586EAFCDF2F65F4
3 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/esp8266mqttboilerplate

@ -1 +1 @@
Subproject commit 50a1c84f307f227524d5fadbb81346ae52fa13aa
Subproject commit eb6a11bf7da707071eae730975d7b35024db58cc

4
sketch/ConfigDataStructure.py
View File

@ -11,8 +11,10 @@ configItems = [
{"label":"MQTT Topic Color Command", "key":"mqttTopicColorCommand", "type":"C", "length":64, "default":"IoT/RgbLed1/ColorCommand"},
{"label":"MQTT Topic Command", "key":"mqttTopicCommand", "type":"C", "length":64, "default":"IoT/RgbLed1/Command"},
{"label":"MQTT DebugTopic", "key":"mqttDebugTopic", "type":"C", "length":64, "default":"IoT/RgbLed1/Debug"},
{"label":"MQTT WatchdogTopic", "key":"mqttWatchdogTopic", "type":"C", "length":64, "default":"IoT/Watchdog"},
{"label":"Color pattern (rgb=0, grb=1", "key":"colorPattern", "type":"I", "default":0},
{"label":"DebugMode", "key":"debugMode", "type":"I", "default":0}
]
magic = 3235774470
magic = 3235774471
appName = "ESP8266 based RGB-LED-Light"

21
sketch/application.cpp
View File

@ -43,7 +43,7 @@ typedef struct {
// Adafruit_NeoPixel pixels(NUM_OF_LEDs, PIXEL_PIN, NEO_RGB + NEO_KHZ400);
Adafruit_NeoPixel pixels(NUM_OF_LEDs, PIXEL_PIN, NEO_GRB + NEO_KHZ800);
Adafruit_NeoPixel pixels(NUM_OF_LEDs, PIXEL_PIN, NEO_RGB + NEO_KHZ800);
#endif
bool show = false;
@ -102,7 +102,23 @@ void subscribeApplication() {
static void setColor(int16_t ledNumber, uint8_t red, uint8_t green, uint8_t blue) {
static void setColor(int16_t ledNumber, uint8_t x, uint8_t y, uint8_t z) {
uint8_t red, green, blue;
switch (configBlock.colorPattern) {
case 1:
red = y;
green = x;
blue = z;
break;
case 0:
default:
red = x;
green = y;
blue = z;
break;
}
if (ledNumber == -1) {
for (uint16_t i = 0; i < NUM_OF_LEDs; i++) {
#ifdef WS2811
@ -188,6 +204,7 @@ void callbackApplication(char *topic, uint8_t tokenCnt, char **tokens) {
void setupApplication() {
mqttSetup();
#ifdef WS2811
FastLED.addLeds<NEOPIXEL, PIXEL_PIN>(leds, NUM_OF_LEDs);
#endif