fixed issue #4

fixed issue #4
implemented Custom Mode in UI
This commit is contained in:
bpohvoodoo
2019-03-19 20:21:57 +01:00
parent 92b3959a6a
commit 0776e8f5f4
9 changed files with 4957 additions and 1651 deletions
+1 -2
View File
@@ -9,7 +9,7 @@
//#define LED_TYPE_WS2811 // Uncomment, if LED type uses 400 KHz (classic 'v1' (not v2) FLORA pixels, WS2811 drivers)
#define LED_BUILTIN 2 // ESP-12F has the built in LED on GPIO2, see https://github.com/esp8266/Arduino/issues/2192
char HOSTNAME[65] = "McLightingRGBW_02"; // Friedly hostname is configurable just for the start
char HOSTNAME[65] = "McLightingRGBW"; // Friedly hostname is configurable just for the start
#define ENABLE_OTA 1 // If defined, enable Arduino OTA code. If set to 0 enable Arduino OTA code, if set to 1 enable ESP8266HTTPUpdateServer OTA code.
#define ENABLE_MQTT 1 // If defined use MQTT OR AMQTT, if set to 0 enable MQTT client code, see: https://github.com/toblum/McLighting/wiki/MQTT-API, if set to 1, enable Async MQTT code, see: https://github.com/marvinroger/async-mqtt-client
@@ -37,7 +37,6 @@ char HOSTNAME[65] = "McLightingRGBW_02"; // Friedly hostname is configurable
#if defined(ENABLE_REMOTE)
int selected_color = 1;
int chng = 1;
uint64_t last_remote_cmd;
enum RMT_BTN {ON_OFF, MODE_UP, MODE_DOWN, RED_UP, RED_DOWN, GREEN_UP, GREEN_DOWN, BLUE_UP, BLUE_DOWN, WHITE_UP, WHITE_DOWN, BRIGHTNESS_UP, BRIGHTNESS_DOWN, SPEED_UP, SPEED_DOWN, COL_M, COL_B, COL_X, AUTOMODE, CUST_1, CUST_2, CUST_3, CUST_4, CUST_5, REPEATCMD, BTN_CNT};
// Change your IR Commands here. You can see them in console, after you pressed a button on the remote
File diff suppressed because it is too large Load Diff
+7 -2
View File
@@ -522,6 +522,9 @@ void handleSetWS2812FXMode(uint8_t * mypayload) {
mode = E131;
}
#endif
if (strcmp((char *) &mypayload[1], "custom") == 0) {
mode = CUSTOM;
}
}
}
@@ -611,6 +614,9 @@ String listModesJSON() {
objecte131["mode"] = "e131";
objecte131["name"] = "E131";
#endif
JsonObject objectcustom = root.createNestedObject();
objectcustom["mode"] = "custom";
objectcustom["name"] = "CUSTOM WS";
for (uint8_t i = 0; i < strip->getModeCount(); i++) {
JsonObject object = root.createNestedObject();
object["mode"] = i;
@@ -1787,6 +1793,7 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t lenght
// Request handler for IR remote support
// ***************************************************************************
void handleRemote() {
int chng = 1;
if (irrecv.decode(&results)) {
DBG_OUTPUT_PORT.print("IR Code: 0x");
DBG_OUTPUT_PORT.print(uint64ToString(results.value, HEX));
@@ -1794,8 +1801,6 @@ void handleRemote() {
if (results.value == rmt_commands[REPEATCMD]) { //Repeat
results.value = last_remote_cmd;
chng = 5;
} else {
chng = 1;
}
if (results.value == rmt_commands[ON_OFF]) { // ON/OFF TOGGLE
last_remote_cmd = 0;
+4
View File
@@ -132,4 +132,8 @@
*
* 18 Mar 2019
* adressed issue: #6 (possibly affects R[r_start][r_end][hexrgb] [...]; +[numled][hexrgb]+[numled][hexrgb]+[numled][hexrgb] !<numled><hexrgb>)
*
*19 Mar 2019
* included custom mode in UI
* adressed issue #4
*/