asaril/McLighting
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #129 from debsahu/master

Browse source 
* 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:
Deb 2018-04-10 20:06:58 -04:00 committed by GitHub
commit 7eaf25dd99
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Arduino/McLighting/McLighting.ino
View file

@ -80,6 +80,13 @@ NeoAnimationFX<NEOMETHOD> strip(neoStrip);
// NEOMETHOD NeoPBBGRB400 uses GRB config 400 KHz (classic 'v1' (not v2) FLORA pixels, WS2811 drivers) // 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 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) // 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 #endif
#ifdef USE_WS2812FX #ifdef USE_WS2812FX
@ -421,6 +428,7 @@ void setup() {
amqttClient.onDisconnect(onMqttDisconnect); amqttClient.onDisconnect(onMqttDisconnect);
amqttClient.onMessage(onMqttMessage); amqttClient.onMessage(onMqttMessage);
amqttClient.setServer(mqtt_host, String(mqtt_port).toInt()); amqttClient.setServer(mqtt_host, String(mqtt_port).toInt());
amqttClient.setCredentials(mqtt_user, mqtt_pass);
amqttClient.setClientId(mqtt_clientid); amqttClient.setClientId(mqtt_clientid);
connectToMqtt(); connectToMqtt();
@ -793,10 +801,6 @@ void setup() {
if(!spiffs_save_state.active()) spiffs_save_state.once(3, tickerSpiffsSaveState); if(!spiffs_save_state.active()) spiffs_save_state.once(3, tickerSpiffsSaveState);
#endif #endif
}); });
#ifdef HTTP_OTA
httpUpdater.setup(&server,"/update");
#endif
#ifdef HTTP_OTA #ifdef HTTP_OTA
httpUpdater.setup(&server, "/update"); httpUpdater.setup(&server, "/update");

2
Arduino/McLighting/definitions.h
View file

@ -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 #define USE_WS2812FX // Uses WS2812FX, see: https://github.com/kitesurfer1404/WS2812FX
// Neopixel // Neopixel

1
clients/HomeAssistant/light.yaml
View file

@ -7,6 +7,7 @@ light:
effect: true effect: true
effect_list: effect_list:
###### ######
- "Static"
- "Blink" - "Blink"
- "Breath" - "Breath"
- "Color Wipe" - "Color Wipe"