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

Convert new WS2812FX spped format to McLighting

Browse Source 
Keep McLighting speeds (0-255) unchanged and convert to WS2812FX speeds. (65535-0)
This commit is contained in:
Tobias Blum
2017-12-16 23:43:57 +01:00
parent b726aee15a
commit 2e58d55eec
3 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Arduino/McLighting/McLighting.ino
+2 -2
View File
@@ -166,7 +166,7 @@ void setup() {
// *************************************************************************** // ***************************************************************************
strip.init(); strip.init();
strip.setBrightness(brightness); strip.setBrightness(brightness);
strip.setSpeed(ws2812fx_speed); strip.setSpeed(convertSpeed(ws2812fx_speed));
//strip.setMode(FX_MODE_RAINBOW_CYCLE); //strip.setMode(FX_MODE_RAINBOW_CYCLE);
strip.setColor(main_color.red, main_color.green, main_color.blue); strip.setColor(main_color.red, main_color.green, main_color.blue);
strip.start(); strip.start();
@@ -450,7 +450,7 @@ void setup() {
if (server.arg("d").toInt() >= 0) { if (server.arg("d").toInt() >= 0) {
ws2812fx_speed = server.arg("d").toInt(); ws2812fx_speed = server.arg("d").toInt();
ws2812fx_speed = constrain(ws2812fx_speed, 0, 255); ws2812fx_speed = constrain(ws2812fx_speed, 0, 255);
strip.setSpeed(ws2812fx_speed); strip.setSpeed(convertSpeed(ws2812fx_speed));
} }
getStatusJSON(); getStatusJSON();
Arduino/McLighting/definitions.h
+2 -2
View File
@@ -44,8 +44,8 @@ enum MODE { SET_MODE, HOLD, OFF, ALL, WIPE, RAINBOW, RAINBOWCYCLE, THEATERCHASE,
MODE mode = RAINBOW; // Standard mode that is active when software starts MODE mode = RAINBOW; // Standard mode that is active when software starts
int ws2812fx_speed = 10; // Global variable for storing the delay between color changes --> smaller == faster int ws2812fx_speed = 196; // Global variable for storing the delay between color changes --> smaller == faster
int brightness = 192; // Global variable for storing the brightness (255 == 100%) int brightness = 196; // Global variable for storing the brightness (255 == 100%)
int ws2812fx_mode = 0; // Helper variable to set WS2812FX modes int ws2812fx_mode = 0; // Helper variable to set WS2812FX modes
Arduino/McLighting/request_handlers.h
+17 -4
View File
@@ -14,7 +14,7 @@ void getArgs() {
} }
ws2812fx_speed = constrain(server.arg("s").toInt(), 0, 255); ws2812fx_speed = constrain(server.arg("s").toInt(), 0, 255);
if (server.arg("s") == "") { if (server.arg("s") == "") {
ws2812fx_speed = 128; ws2812fx_speed = 196;
} }
ws2812fx_mode = constrain(server.arg("m").toInt(), 0, strip.getModeCount()-1); ws2812fx_mode = constrain(server.arg("m").toInt(), 0, strip.getModeCount()-1);
@@ -38,6 +38,19 @@ void getArgs() {
} }
long convertSpeed(int mcl_speed) {
long ws2812_speed = mcl_speed * 256;
ws2812_speed = SPEED_MAX - ws2812_speed;
if (ws2812_speed < SPEED_MIN) {
ws2812_speed = SPEED_MIN;
}
if (ws2812_speed > SPEED_MAX) {
ws2812_speed = SPEED_MAX;
}
return ws2812_speed;
}
// *************************************************************************** // ***************************************************************************
// Handler functions for WS and MQTT // Handler functions for WS and MQTT
// *************************************************************************** // ***************************************************************************
@@ -260,7 +273,7 @@ int autoCount = 0;
void autoTick() { void autoTick() {
strip.setColor(autoParams[autoCount][0]); strip.setColor(autoParams[autoCount][0]);
strip.setSpeed((uint8_t)autoParams[autoCount][1]); strip.setSpeed(convertSpeed((uint8_t)autoParams[autoCount][1]));
strip.setMode((uint8_t)autoParams[autoCount][2]); strip.setMode((uint8_t)autoParams[autoCount][2]);
autoTicker.once((float)autoParams[autoCount][3], autoTick); autoTicker.once((float)autoParams[autoCount][3], autoTick);
DBG_OUTPUT_PORT.print("autoTick "); DBG_OUTPUT_PORT.print("autoTick ");
@@ -313,7 +326,7 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t lenght
if (payload[0] == '?') { if (payload[0] == '?') {
uint8_t d = (uint8_t) strtol((const char *) &payload[1], NULL, 10); uint8_t d = (uint8_t) strtol((const char *) &payload[1], NULL, 10);
ws2812fx_speed = constrain(d, 0, 255); ws2812fx_speed = constrain(d, 0, 255);
strip.setSpeed(ws2812fx_speed); strip.setSpeed(convertSpeed(ws2812fx_speed));
DBG_OUTPUT_PORT.printf("WS: Set speed to: [%u]\n", ws2812fx_speed); DBG_OUTPUT_PORT.printf("WS: Set speed to: [%u]\n", ws2812fx_speed);
webSocket.sendTXT(num, "OK"); webSocket.sendTXT(num, "OK");
} }
@@ -428,7 +441,7 @@ void checkForRequests() {
if (payload[0] == '?') { if (payload[0] == '?') {
uint8_t d = (uint8_t) strtol((const char *) &payload[1], NULL, 10); uint8_t d = (uint8_t) strtol((const char *) &payload[1], NULL, 10);
ws2812fx_speed = constrain(d, 0, 255); ws2812fx_speed = constrain(d, 0, 255);
strip.setSpeed(ws2812fx_speed); strip.setSpeed(convertSpeed(ws2812fx_speed));
DBG_OUTPUT_PORT.printf("MQTT: Set speed to [%u]\n", ws2812fx_speed); DBG_OUTPUT_PORT.printf("MQTT: Set speed to [%u]\n", ws2812fx_speed);
mqtt_client.publish(mqtt_outtopic, String(String("OK ") + String((char *)payload)).c_str()); mqtt_client.publish(mqtt_outtopic, String(String("OK ") + String((char *)payload)).c_str());
} }