add colorPattern config option, use mqtt boilerplate with watchdog
This commit is contained in:
parent
068095ad6f
commit
a373ebbbfc
@ -1 +1 @@
|
||||
Subproject commit 50a1c84f307f227524d5fadbb81346ae52fa13aa
|
||||
Subproject commit eb6a11bf7da707071eae730975d7b35024db58cc
|
@ -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"
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user