35 Commits

Author SHA1 Message Date
bpohvoodoo 7940e504e4 Update README.md 2020-06-05 18:30:54 +02:00
bpohvoodoo a07a30c483 Merge pull request #81 from FabLab-Luenen/development
Development
2020-04-18 09:14:23 +02:00
bpohvoodoo 52585d8088 Merge branch 'master' into development 2020-04-18 09:14:09 +02:00
bpohvoodoo 048a9380b9 Version Bump to 3.1.1
* bugfixes regarding issue #80
2020-04-18 08:31:59 +02:00
bpohvoodoo ca255317f6 Bump to 3.1.0 2020-03-07 09:42:14 +01:00
bpohvoodoo 0eeec51bb0 Update platformio.ini 2020-01-19 11:14:14 +01:00
bpohvoodoo aa4e7fa5c8 Bump to 2.2.8
* Version Bump to 2.2.8 rgbw 3colors
 * Bugfixes
 * adressed issue #59
2019-12-16 21:11:24 +01:00
bpohvoodoo b3e74ab9b1 Merge pull request #62 from sehraf/patch-1
fix #if block missing the last line
2019-12-16 21:01:23 +01:00
sehraf 99394f8672 fix #if block missing the last line
Causes compiling error when ENABLE_LEGACY_ANIMATIONS is not enabled.
2019-12-16 18:28:21 +01:00
bpohvoodoo 2ab8a2591d Merge pull request #60 from ryancasler/master
Power Supply Update
2019-12-09 08:06:39 +01:00
ryancasler a613b8c978 Power Supply Update
Moved the pin setting for POWER_SUPPLY to definitions.h instead of the main sketch.
2019-12-08 01:00:54 -05:00
bpohvoodoo fa31f97c47 Update README.md 2019-11-17 13:34:22 +01:00
bpohvoodoo 1d2a6f9237 Update README.md 2019-10-25 18:51:56 +02:00
bpohvoodoo 443f266296 Merge pull request #42 from PatrickSp/master
added output to control external power supply
2019-10-09 17:03:34 +02:00
patricksp 589806d0fd added output to control external power supply
If defined, enable output to control external power supply PIN (12 / D6)
2019-10-09 16:30:41 +02:00
bpohvoodoo f1d638c064 Updated Icons added sources of index.htm and edit.htm 2019-09-23 15:38:40 +02:00
bpohvoodoo 191251f71b Bugfix
* adressed issue: #32 (again)
 * adressed issue: #36
2019-09-13 19:09:09 +02:00
bpohvoodoo 6867d1021b Update README.md 2019-09-11 09:10:03 +02:00
bpohvoodoo 7fa5cd847c Merge pull request #35 from FabLab-Luenen/development
Update to 2.2.6
2019-09-10 17:24:55 +02:00
bpohvoodoo e5c0e8de97 Merge pull request #29 from FabLab-Luenen/development
Version 2.2.5
2019-09-08 21:00:13 +02:00
bpohvoodoo 3000a9e98d Merge pull request #24 from FabLab-Luenen/development
Bugfixes
2019-05-19 16:10:57 +02:00
bpohvoodoo ae21907558 Merge pull request #23 from FabLab-Luenen/development
Development
2019-04-28 10:55:10 +02:00
bpohvoodoo 0927c4ff5e Merge pull request #19 from FabLab-Luenen/development
added custom effect to MQTT
2019-03-31 14:31:57 +02:00
bpohvoodoo cb2cb3db9b Merge pull request #18 from FabLab-Luenen/development
Fixed Typo
2019-03-27 17:28:44 +01:00
bpohvoodoo fcc1f49cf0 Update README.md 2019-03-27 16:51:35 +01:00
bpohvoodoo 2d17b93f29 Merge pull request #17 from FabLab-Luenen/development
Bugfixes
2019-03-26 16:43:22 +01:00
bpohvoodoo a596203a6b Merge pull request #15 from FabLab-Luenen/development
Optimized saving config
2019-03-21 22:29:54 +01:00
bpohvoodoo d7d35fa401 Merge pull request #14 from FabLab-Luenen/development
Improvements of code
2019-03-21 20:44:18 +01:00
bpohvoodoo bfe5cea7b4 Merge pull request #13 from FabLab-Luenen/development
Update request_handlers.h
2019-03-20 22:00:27 +01:00
bpohvoodoo 7b5c3b7dd5 Merge pull request #12 from FabLab-Luenen/development
Merge
2019-03-20 20:57:33 +01:00
bpohvoodoo 9d7c7bd981 Merge pull request #11 from debsahu/master
Update platformio.ini
2019-03-20 20:51:15 +01:00
Debashish Sahu 82e1063801 Update platformio.ini
- Add FastLED
2019-03-20 13:18:09 -04:00
Debashish Sahu dc076f96cb Update platformio.ini 2019-03-20 13:06:03 -04:00
bpohvoodoo 7c0bc690e8 Merge pull request #10 from FabLab-Luenen/development
changed defaults
2019-03-20 17:18:40 +01:00
bpohvoodoo 006a66bed4 Merge pull request #9 from FabLab-Luenen/development
Development -> Master
2019-03-20 17:12:39 +01:00
7 changed files with 257 additions and 249 deletions
+1 -1
View File
@@ -747,7 +747,7 @@ void loop() {
#endif #endif
#if defined(ENABLE_HOMEASSISTANT) #if defined(ENABLE_HOMEASSISTANT)
if(ha_send_data.active()) ha_send_data.detach(); if(ha_send_data.active()) ha_send_data.detach();
ha_send_data.once(5, tickerSendState); ha_send_data.once(DELAY_MQTT_HA_MESSAGE, tickerSendState);
#endif #endif
#endif #endif
} }
+3 -3
View File
@@ -20,7 +20,7 @@ char HOSTNAME[65] = "McLightingRGBW"; // Friedly hostname is configurable just
//#define ENABLE_MQTT_INCLUDE_IP // uncomment/comment to add the IP-adress to the MQTT message //#define ENABLE_MQTT_INCLUDE_IP // uncomment/comment to add the IP-adress to the MQTT message
#define ENABLE_HOMEASSISTANT // If defined, enable Homeassistant integration, ENABLE_MQTT must be active #define ENABLE_HOMEASSISTANT // If defined, enable Homeassistant integration, ENABLE_MQTT must be active
#define MQTT_HOME_ASSISTANT_SUPPORT // If defined, use AMQTT and select Tools -> IwIP Variant -> Higher Bandwidth #define MQTT_HOME_ASSISTANT_SUPPORT // If defined, use AMQTT and select Tools -> IwIP Variant -> Higher Bandwidth
//#define DISABLE_MQTT_OUT_ON_MQTT_IN // If defined, McLighting will not send back MQTT-out on MQTT-in regarding issue #67, does not change anything at the moment #define DELAY_MQTT_HA_MESSAGE 5 // HA Status is send after DELAY_MQTT_HA_MESSAGE seconds, to save bandwith
//#define ENABLE_BUTTON 14 // If defined, enable button handling code, see: https://github.com/toblum/McLighting/wiki/Button-control, the value defines the input pin (14 / D5) for switching the LED strip on / off, connect this PIN to ground to trigger button. //#define ENABLE_BUTTON 14 // If defined, enable button handling code, see: https://github.com/toblum/McLighting/wiki/Button-control, the value defines the input pin (14 / D5) for switching the LED strip on / off, connect this PIN to ground to trigger button.
//#define ENABLE_BUTTON_GY33 12 // If defined, enable button handling code for GY-33 color sensor to scan color. The value defines the input pin (12 / D6) for read color data with RGB sensor, connect this PIN to ground to trigger button. //#define ENABLE_BUTTON_GY33 12 // If defined, enable button handling code for GY-33 color sensor to scan color. The value defines the input pin (12 / D6) for read color data with RGB sensor, connect this PIN to ground to trigger button.
@@ -178,10 +178,10 @@ struct {
uint8_t pin = 3; uint8_t pin = 3;
#endif #endif
#if USE_WS2812FX_DMA == 1 #if USE_WS2812FX_DMA == 1
uint8_t pin = 2; uint8_t pin = 1;
#endif #endif
#if USE_WS2812FX_DMA == 2 #if USE_WS2812FX_DMA == 2
uint8_t pin = 1; uint8_t pin = 2;
#endif #endif
#else #else
uint8_t pin = LED_PIN; uint8_t pin = LED_PIN;
+8 -4
View File
@@ -743,11 +743,15 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t lenght
root["effect"] = strip->getModeName(strip->getMode()); root["effect"] = strip->getModeName(strip->getMode());
} }
#endif #endif
char buffer[measureJson(root) + 1]; uint16_t msg_len = measureJson(root) + 1;
char buffer[msg_len];
serializeJson(root, buffer, sizeof(buffer)); serializeJson(root, buffer, sizeof(buffer));
jsonBuffer.clear(); jsonBuffer.clear();
#if ENABLE_MQTT == 0 #if ENABLE_MQTT == 0
mqtt_client->publish(mqtt_ha_state_out, buffer, true); //mqtt_client->publish(mqtt_ha_state_out, buffer, true);
mqtt_client->beginPublish(mqtt_ha_state_out, msg_len-1, true);
mqtt_client->write((const uint8_t*)buffer, msg_len-1);
mqtt_client->endPublish();
DBG_OUTPUT_PORT.printf("MQTT: Send [%s]: %s\r\n", mqtt_ha_state_out, buffer); DBG_OUTPUT_PORT.printf("MQTT: Send [%s]: %s\r\n", mqtt_ha_state_out, buffer);
#endif #endif
#if ENABLE_MQTT == 1 #if ENABLE_MQTT == 1
@@ -901,7 +905,7 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t lenght
return; return;
} }
if(ha_send_data.active()) ha_send_data.detach(); if(ha_send_data.active()) ha_send_data.detach();
ha_send_data.once(5, tickerSendState); ha_send_data.once(DELAY_MQTT_HA_MESSAGE, tickerSendState);
} else if (strcmp(topic, mqtt_intopic) == 0) { } else if (strcmp(topic, mqtt_intopic) == 0) {
#endif #endif
@@ -936,7 +940,7 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t lenght
#if defined(ENABLE_HOMEASSISTANT) #if defined(ENABLE_HOMEASSISTANT)
ha_send_data.detach(); ha_send_data.detach();
mqtt_client->subscribe(mqtt_ha_state_in, qossub); mqtt_client->subscribe(mqtt_ha_state_in, qossub);
ha_send_data.once(5, tickerSendState); ha_send_data.once(DELAY_MQTT_HA_MESSAGE, tickerSendState);
#if defined(MQTT_HOME_ASSISTANT_SUPPORT) #if defined(MQTT_HOME_ASSISTANT_SUPPORT)
const size_t bufferSize = JSON_ARRAY_SIZE(strip->getModeCount()+ 4) + JSON_OBJECT_SIZE(11) + 1500; const size_t bufferSize = JSON_ARRAY_SIZE(strip->getModeCount()+ 4) + JSON_OBJECT_SIZE(11) + 1500;
DynamicJsonDocument jsonBuffer(bufferSize); DynamicJsonDocument jsonBuffer(bufferSize);
+1 -1
View File
@@ -1 +1 @@
#define SKETCH_VERSION "3.1.0" #define SKETCH_VERSION "3.1.1"
+4
View File
@@ -257,4 +257,8 @@
* Version Bump to 3.1.0 * Version Bump to 3.1.0
* bugfixes * bugfixes
* E1.31 is now working for multi segments * E1.31 is now working for multi segments
*
* 18 April 2020
* Version Bump to 3.1.1
* bugfixes regarding issue #80
*/ */
+5 -5
View File
@@ -37,17 +37,17 @@ This project uses libraries and code by different authors:
- [WS2812FX](https://github.com/kitesurfer1404/WS2812FX) by kitesurfer1404 (tested with version 1.2.1) - [WS2812FX](https://github.com/kitesurfer1404/WS2812FX) by kitesurfer1404 (tested with version 1.2.1)
- [WebSockets](https://github.com/Links2004/arduinoWebSockets) by Links2004 (tested with version 2.1.4) - [WebSockets](https://github.com/Links2004/arduinoWebSockets) by Links2004 (tested with version 2.2.0)
- [Adafruit NeoPixel](https://github.com/adafruit/Adafruit_NeoPixel) by adafruit (tested with 1.2.5) - [Adafruit NeoPixel](https://github.com/adafruit/Adafruit_NeoPixel) by adafruit (tested with 1.4.0)
- Optional: [PubSubClient](https://github.com/knolleary/pubsubclient/) by knolleary (tested with 2.7.0) - Optional: [PubSubClient](https://github.com/knolleary/pubsubclient/) by knolleary (tested with 2.8.0)
_Only when you have activated MQTT in definitions.h._ _Only when you have activated MQTT in definitions.h._
- Optional: [Brzo I2C](https://github.com/pasko-zh/brzo_i2c/) by pazko-zh (tested with 1.3.3) - Optional: [Brzo I2C](https://github.com/pasko-zh/brzo_i2c/) by pazko-zh (tested with 1.3.3)
_Only when you have activated GY33 in definitions.h._ _Only when you have activated GY33 in definitions.h._
- Optional: [FastLed](https://github.com/FastLED/FastLED/) by FastLED (tested with 1.3.3) - Optional: [FastLed](https://github.com/FastLED/FastLED/) by FastLED (tested with 3.3.3)
_Only when you have activated custom animations (Fire2012) in definitions.h._ _Only when you have activated custom animations (Fire2012) in definitions.h._
The sketch also uses the following built-in library: The sketch also uses the following built-in library:
@@ -66,7 +66,7 @@ I hope I didn't miss any sources and mentioned every author. In case I forgot so
## Todos ## Todos
- [ ] Redesign of Code and bump to V3 - [x] Redesign of Code and bump to V3
- [ ] Customer profile to define segments of (in)active areas on the strip [Issue](https://github.com/toblum/McLighting/issues/37) - [ ] Customer profile to define segments of (in)active areas on the strip [Issue](https://github.com/toblum/McLighting/issues/37)
- [ ] Additional clients - [ ] Additional clients
- [x] If no wifi, at least enable button mode. - [x] If no wifi, at least enable button mode.