From b8bb6e8a14c73ab9353e3f83514587d04014e828 Mon Sep 17 00:00:00 2001 From: debsahu Date: Mon, 9 Apr 2018 20:51:18 -0400 Subject: [PATCH 1/4] httpUpdater.setup defined twice merging error? --- Arduino/McLighting/McLighting.ino | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Arduino/McLighting/McLighting.ino b/Arduino/McLighting/McLighting.ino index b4142a2..80dfbed 100644 --- a/Arduino/McLighting/McLighting.ino +++ b/Arduino/McLighting/McLighting.ino @@ -793,10 +793,6 @@ void setup() { if(!spiffs_save_state.active()) spiffs_save_state.once(3, tickerSpiffsSaveState); #endif }); - - #ifdef HTTP_OTA - httpUpdater.setup(&server,"/update"); - #endif #ifdef HTTP_OTA httpUpdater.setup(&server, "/update"); From 1560ac87048a3a107e9d5357f7aa751422813b3d Mon Sep 17 00:00:00 2001 From: debsahu Date: Tue, 10 Apr 2018 01:06:47 -0400 Subject: [PATCH 2/4] UART method as an option --- Arduino/McLighting/McLighting.ino | 7 +++++++ Arduino/McLighting/definitions.h | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Arduino/McLighting/McLighting.ino b/Arduino/McLighting/McLighting.ino index 80dfbed..c55896c 100644 --- a/Arduino/McLighting/McLighting.ino +++ b/Arduino/McLighting/McLighting.ino @@ -80,6 +80,13 @@ NeoAnimationFX 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 diff --git a/Arduino/McLighting/definitions.h b/Arduino/McLighting/definitions.h index 975d027..90e2044 100644 --- a/Arduino/McLighting/definitions.h +++ b/Arduino/McLighting/definitions.h @@ -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 From 88d299f430de5b36f3a4f00d30ef862b7fe1e4eb Mon Sep 17 00:00:00 2001 From: debsahu Date: Tue, 10 Apr 2018 11:36:56 -0400 Subject: [PATCH 3/4] Default mode is "static" --- clients/HomeAssistant/light.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/clients/HomeAssistant/light.yaml b/clients/HomeAssistant/light.yaml index dc43d4f..91c201f 100644 --- a/clients/HomeAssistant/light.yaml +++ b/clients/HomeAssistant/light.yaml @@ -7,6 +7,7 @@ light: effect: true effect_list: ###### + - "Static" - "Blink" - "Breath" - "Color Wipe" From f3b6abb52b954b53da98ad186d0b8a9d20d5dac9 Mon Sep 17 00:00:00 2001 From: debsahu Date: Tue, 10 Apr 2018 15:36:41 -0400 Subject: [PATCH 4/4] fix amqtt credentials --- Arduino/McLighting/McLighting.ino | 1 + 1 file changed, 1 insertion(+) diff --git a/Arduino/McLighting/McLighting.ino b/Arduino/McLighting/McLighting.ino index c55896c..87d8f7e 100644 --- a/Arduino/McLighting/McLighting.ino +++ b/Arduino/McLighting/McLighting.ino @@ -428,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();