Merge pull request #129 from debsahu/master
* fix httpServer calls in setup * UART method for NeoAnimationFX * added "static" mode (default) to HA's light.yaml * fix #130
This commit is contained in:
commit
7eaf25dd99
3 changed files with 10 additions and 5 deletions
|
@ -80,6 +80,13 @@ NeoAnimationFX<NEOMETHOD> strip(neoStrip);
|
|||
// NEOMETHOD NeoPBBGRB400 uses GRB config 400 KHz (classic 'v1' (not v2) FLORA pixels, WS2811 drivers)
|
||||
// NEOMETHOD NeoPBBRGB800 uses RGB config 800 KHz bitstream (most NeoPixel products w/WS2812 LEDs)
|
||||
// NEOMETHOD NeoPBBRGB400 uses RGB config 400 KHz (classic 'v1' (not v2) FLORA pixels, WS2811 drivers)
|
||||
|
||||
// Uses Pin D4 / GPIO2 (Only pin that is supported, due to hardware limitations)
|
||||
// NEOMETHOD NeoPBBGRBU800 uses GRB config 800 KHz bitstream (most NeoPixel products w/WS2812 LEDs)
|
||||
// NEOMETHOD NeoPBBGRBU400 uses GRB config 400 KHz (classic 'v1' (not v2) FLORA pixels, WS2811 drivers)
|
||||
// NEOMETHOD NeoPBBRGBU800 uses RGB config 800 KHz bitstream (most NeoPixel products w/WS2812 LEDs)
|
||||
// NEOMETHOD NeoPBBRGBU400 uses RGB config 400 KHz (classic 'v1' (not v2) FLORA pixels, WS2811 drivers)
|
||||
|
||||
#endif
|
||||
|
||||
#ifdef USE_WS2812FX
|
||||
|
@ -421,6 +428,7 @@ void setup() {
|
|||
amqttClient.onDisconnect(onMqttDisconnect);
|
||||
amqttClient.onMessage(onMqttMessage);
|
||||
amqttClient.setServer(mqtt_host, String(mqtt_port).toInt());
|
||||
amqttClient.setCredentials(mqtt_user, mqtt_pass);
|
||||
amqttClient.setClientId(mqtt_clientid);
|
||||
|
||||
connectToMqtt();
|
||||
|
@ -798,10 +806,6 @@ void setup() {
|
|||
httpUpdater.setup(&server, "/update");
|
||||
#endif
|
||||
|
||||
#ifdef HTTP_OTA
|
||||
httpUpdater.setup(&server, "/update");
|
||||
#endif
|
||||
|
||||
server.begin();
|
||||
|
||||
// Start MDNS service
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
//#define USE_NEOANIMATIONFX // Uses NeoAnimationFX, PIN is ignored & set to RX/GPIO3, see: https://github.com/debsahu/NeoAnimationFX
|
||||
//#define USE_NEOANIMATIONFX // Uses NeoAnimationFX, PIN is ignored & set to RX/GPIO3 or UART method: D4/GPIO2, see: https://github.com/debsahu/NeoAnimationFX
|
||||
#define USE_WS2812FX // Uses WS2812FX, see: https://github.com/kitesurfer1404/WS2812FX
|
||||
|
||||
// Neopixel
|
||||
|
|
|
@ -7,6 +7,7 @@ light:
|
|||
effect: true
|
||||
effect_list:
|
||||
######
|
||||
- "Static"
|
||||
- "Blink"
|
||||
- "Breath"
|
||||
- "Color Wipe"
|
||||
|
|
Loading…
Reference in a new issue