simongehrig/McLighting
1
0
Fork 0
Code Issues 3 Pull Requests Projects Releases Wiki Activity

Merge pull request #29 from FabLab-Luenen/development

Browse Source 
Version 2.2.5
This commit is contained in:
bpohvoodoo
2019-09-08 21:00:13 +02:00
committed by GitHub
parent 3000a9e98d 75b19fd09d
commit e5c0e8de97
7 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+4 -1
View File
@@ -9,4 +9,7 @@ lib/readme.txt
.clang_complete .clang_complete
.gcc-flags.json .gcc-flags.json
.vscode/* .vscode/*
.pio/*
*.bin
Arduino/McLighting/McLighting.ino
+1 -1
View File
@@ -167,7 +167,7 @@ WS2812FX * strip = NULL;
void DMA_Show(void) { void DMA_Show(void) {
if(dma->IsReadyToUpdate()) { if(dma->IsReadyToUpdate()) {
memcpy(dma->getPixels(), strip->getPixels(), dma->getPixelsSize()); memcpy(dma->getPixels(), strip->getPixels(), dma->getPixelsSize());
dma->Update(); dma->Update(false);
} }
} }
#endif #endif
Arduino/McLighting/definitions.h
+1
View File
@@ -1,4 +1,5 @@
#define USE_WS2812FX_DMA 0 // 0 = Used PIN is ignored & set to RX/GPIO3; 1 = Used PIN is ignored & set to D4/GPIO2; 2 = Uses PIN is ignored & set to TX/GPIO1; Uses WS2812FX, see: https://github.com/kitesurfer1404/WS2812FX #define USE_WS2812FX_DMA 0 // 0 = Used PIN is ignored & set to RX/GPIO3; 1 = Used PIN is ignored & set to D4/GPIO2; 2 = Uses PIN is ignored & set to TX/GPIO1; Uses WS2812FX, see: https://github.com/kitesurfer1404/WS2812FX
// or comment it out
#if defined(USE_WS2812FX_DMA) #if defined(USE_WS2812FX_DMA)
#define MAXLEDS 384 // due to memory limit of esp8266 at the moment only 384 leds are supported in DMA Mode. More can crash if mqtt is used. #define MAXLEDS 384 // due to memory limit of esp8266 at the moment only 384 leds are supported in DMA Mode. More can crash if mqtt is used.
#else #else
Arduino/McLighting/request_handlers.h
+3 -3
View File
@@ -59,7 +59,7 @@ void convertColors() {
void getArgs() { void getArgs() {
if (mode == SET_ALL || mode == SET_MODE || mode == SET_COLOR) { if (mode == SET_ALL || mode == SET_COLOR) {
if (server.arg("rgb") != "") { if (server.arg("rgb") != "") {
uint32_t rgb = (uint32_t) strtoul(server.arg("rgb").c_str(), NULL, 16); uint32_t rgb = (uint32_t) strtoul(server.arg("rgb").c_str(), NULL, 16);
main_color.white = ((rgb >> 24) & 0xFF); main_color.white = ((rgb >> 24) & 0xFF);
@@ -134,7 +134,7 @@ void getArgs() {
xtra_color.white = constrain(xtra_color.white, 0, 255); xtra_color.white = constrain(xtra_color.white, 0, 255);
convertColors(); convertColors();
} }
if (mode == SET_ALL || mode == SET_MODE || mode == SET_SPEED || mode == TV) { if (mode == SET_ALL || mode == SET_SPEED || mode == TV) {
if ((server.arg("s") != "") && (server.arg("s").toInt() >= 0) && (server.arg("s").toInt() <= 255)) { if ((server.arg("s") != "") && (server.arg("s").toInt() >= 0) && (server.arg("s").toInt() <= 255)) {
ws2812fx_speed = constrain(server.arg("s").toInt(), 0, 255); ws2812fx_speed = constrain(server.arg("s").toInt(), 0, 255);
} }
@@ -144,7 +144,7 @@ void getArgs() {
ws2812fx_mode = constrain(server.arg("m").toInt(), 0, strip->getModeCount() - 1); ws2812fx_mode = constrain(server.arg("m").toInt(), 0, strip->getModeCount() - 1);
} }
} }
if (mode == SET_ALL || mode == SET_MODE || mode == SET_BRIGHTNESS || mode == AUTO || mode == TV || mode == E131) { if (mode == SET_ALL || mode == SET_BRIGHTNESS || mode == AUTO || mode == TV || mode == E131) {
if ((server.arg("c") != "") && (server.arg("c").toInt() >= 0) && (server.arg("c").toInt() <= 100)) { if ((server.arg("c") != "") && (server.arg("c").toInt() >= 0) && (server.arg("c").toInt() <= 100)) {
brightness = constrain((int) server.arg("c").toInt() * 2.55, 0, 255); brightness = constrain((int) server.arg("c").toInt() * 2.55, 0, 255);
} else if ((server.arg("p") != "") && (server.arg("p").toInt() >= 0) && (server.arg("p").toInt() <= 255)) { } else if ((server.arg("p") != "") && (server.arg("p").toInt() >= 0) && (server.arg("p").toInt() <= 255)) {
Arduino/McLighting/version.h
+1 -1
View File
@@ -1 +1 @@
#define SKETCH_VERSION "2.2.4.RU1.rgbw.3c" #define SKETCH_VERSION "2.2.5.RU1.rgbw.3c"
Arduino/McLighting/version_info.ino
+7 -1
View File
@@ -150,6 +150,12 @@
* 26 Mar 2019 * 26 Mar 2019
* Bugfixes * Bugfixes
* *
* 19 May 2010 * 19 May 2019
* Bugfixes regarding MQTT Hostname * Bugfixes regarding MQTT Hostname
*
* 08 September 2019
* Version Bump to 2.2.5 rgbw 3colors
* adressed issue: #27
* adressed issue: #28 (see new REST-API documentation)
*
*/ */
platformio.ini
+4 -2
View File
@@ -11,7 +11,7 @@
[platformio] [platformio]
src_dir = ./Arduino/McLighting/ src_dir = ./Arduino/McLighting/
data_dir = ./Arduino/McLighting/data/ data_dir = ./Arduino/McLighting/data/
env_default = nodemcuv2 default_envs = nodemcuv2
description = The ESP8266 based multi-client lighting gadget description = The ESP8266 based multi-client lighting gadget
[common] [common]
@@ -32,11 +32,13 @@ arduino_core_2_4_0 = espressif8266@1.6.0
arduino_core_2_4_1 = espressif8266@1.7.3 arduino_core_2_4_1 = espressif8266@1.7.3
arduino_core_2_4_2 = espressif8266@1.8.0 arduino_core_2_4_2 = espressif8266@1.8.0
arduino_core_2_5_0 = espressif8266@2.0.4 arduino_core_2_5_0 = espressif8266@2.0.4
arduino_core_2_5_1 = espressif8266@2.1.1
arduino_core_2_5_2 = espressif8266@2.2.0
arduino_core_stage = https://github.com/platformio/platform-espressif8266.git#feature/stage arduino_core_stage = https://github.com/platformio/platform-espressif8266.git#feature/stage
framework = arduino framework = arduino
;platform = ${common.arduino_core_2_4_2} ;platform = ${common.arduino_core_2_4_2}
platform = ${common.arduino_core_2_5_0} platform = ${common.arduino_core_2_5_2}
build_flags = build_flags =
-DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH
-DMQTT_MAX_PACKET_SIZE=512 ; PubSubClient Specific flags -DMQTT_MAX_PACKET_SIZE=512 ; PubSubClient Specific flags