Added more Interface config

Added support for H801 device

Author: rvt

.travis.yml

@@ -30,12 +30,14 @@ install:
     # Download and install recent cmake
     - |
       if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
-        CMAKE_URL="http://www.cmake.org/files/v3.5/cmake-3.5.1-Linux-x86_64.tar.gz"
-        mkdir -p ${DEPS_DIR}/cmake
-        travis_retry wget --no-check-certificate --quiet -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C ${DEPS_DIR}/cmake
+        DEPS_DIR="${TRAVIS_BUILD_DIR}/deps"
+        mkdir -p ${DEPS_DIR} && cd ${DEPS_DIR}
+        CMAKE_URL="http://www.cmake.org/files/v3.5/cmake-3.5.2-Linux-x86_64.tar.gz"
+        mkdir cmake && travis_retry wget --no-check-certificate --quiet -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C cmake
         export PATH=${DEPS_DIR}/cmake/bin:${PATH}
+      else
+          if ! brew ls --version cmake &>/dev/null; then brew install cmake; fi
       fi
-
 script:
     - echo "Run desktop (native) tests on Travis.CI Linux machine"
     - platformio upgrade

README.md

@@ -12,7 +12,7 @@ The initial code came from https://github.com/mertenats/Arilux_AL-LC0X but in th
 
 This firmware has been tested with OpenHAB and just a bit om Home Assistance.
 
-## Features:
+## Features
 
 - Fade from any color to any other color smoothly without apparent brightness changes without special commands
 - ON/OFF states will correctly fade in/out and remember the last color (in EEPROM)
@@ -30,28 +30,34 @@ This firmware has been tested with OpenHAB and just a bit om Home Assistance.
 - Native support for OpenHAB and should work with Home Assistant with MQTT
 - Fading using cie1931 math
 - Color correction using rainbow table for better color reproduction
+- Setup pins from web
 
-### Current effects are:
+### Current effects
 
 - Rainbow: Will keep fading over the rainbow of colors with a given time period
 - Transition: Change from color1 to color2 over a period of time 
 - Flash:  Flash between two colors or between black and the current color
 - Strobe: Strobe between two colors, period can be given
 
-## Todo
-
- - Setup led pins with web interface
- 
-Tested with the [ESP8266 Wi-Fi chip][esp8266] and Wemos devices.
-
 ### Configuration
 
-Configuration is done using the web interface
+Configuration is done using the web interface including LedPWM pins
 
 ## Updating
 
 OTA is enabled on this firmware. Assuming the device is plugged in you should find the device using
 ```platformio device list --mdns --logical | grep arduino```
+look for a device with a name like `RGBW_XXXXXXXX`
+
+```bash
+myMachine:Esp8266Leds rvt$ platformio device list --mdns --logical | grep arduino
+RGBW_00CCAA42._arduino._tcp.local.
+Type: _arduino._tcp.local.
+ARILUX00879231._arduino._tcp.local.
+Type: _arduino._tcp.local.
+ARILUX00AD44B1._arduino._tcp.local.
+Type: _arduino._tcp.local.
+```
 
 ## Control
 
@@ -86,19 +92,14 @@ enum BootMode {
 };
 ```
 
-#### Bootorder:
+#### Bootorder
 
 - Load default settings
 - Get HSB values from LittleFS
-- Subscribe state topic for two seconds, use any found settings over a period of two seconds
+- Subscribe state topic for two seconds
 - Subscribe to command topic and overwrite any settings found in state over a period of two seconds
 
-Considarations:
-
-- After bootsequence the device will always be on in the last configured color setting
-- If no wifi and/or mqtt server found we load up color from LittleFS 
-- When filesystem is empty we load up a brightness of 50
-- When filesystem has stored brightness of 0 we load up a brightness of minimum 5
+- Based on Bootmode we decide what we do with initial status
 
 #### Control Codes and examples
 
@@ -386,4 +387,3 @@ You Must credit the author and link to this repository if you implement any of h
 [Home Assistant's MQTT discovery functionality]: https://home-assistant.io/docs/mqtt/discovery/
 [MQTT]: http://mqtt.org/
 [Alternative firmware]: https://github.com/mertenats/Arilux_AL-LC0X 
-

generateHtmlArray.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+cd web
+cat *.js | gzip -9 > jscript.js.gz
+xxd --include jscript.js.gz > ../src/jscript.generated.h
+rm jscript.js.gz
+
+for f in *.html
+do
+    cat $f > "${f}.nt"
+    echo -ne "\0" >> "${f}.nt"
+    xxd -i "${f}.nt" > ../src/"${f/\./_}".generated.h
+done
+rm -rf *.nt

lib/eeprom/crceeprom.h

@@ -7,15 +7,15 @@
 ;
 ; Please visit documentation for the other options and examples
 ; https://docs.platformio.org/page/projectconf.html
+
 [platformio]
 
 [common_env_data]
-lib_deps_embedded_external =
-  [email protected]
-  https://github.com/rvt/statemachine
-  https://github.com/rvt/opt-parser
-  ESP_EEPROM
-  https://github.com/tzapu/WiFiManager#0fd0c332229ab82cce060d7318c42def65a549b5
+lib_deps_embedded_external = 
+	[email protected]
+	https://github.com/rvt/statemachine
+	https://github.com/rvt/opt-parser
+	https://github.com/tzapu/WiFiManager#0fd0c332229ab82cce060d7318c42def65a549b5
 
 [env:LC10_OLD]
 platform = espressif8266
@@ -24,63 +24,51 @@ board = esp01_1m
 upload_resetmethod = ck
 upload_protocol = espota
 board_build.flash_mode = dio
-build_flags =
-  -Wl,-Teagle.flash.1m64.ld
-  -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY
-  -DRED_PIN=5
-  -DGREEN_PIN=14
-  -DBLUE_PIN=12
-  -DWHITE1_PIN=13
-  -DRF_PIN=3
-lib_deps =
-    ${common_env_data.lib_deps_embedded_external}
+build_flags = 
+	-Wl,-Teagle.flash.1m64.ld
+	-DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY
+	-DRED_PIN=5
+	-DGREEN_PIN=14
+	-DBLUE_PIN=12
+	-DWHITE1_PIN=13
+	-DRF_PIN=3
+lib_deps = ${common_env_data.lib_deps_embedded_external}
 upload_speed = 115200
 
-; 1) switch GPIO0 to GND
-; 2) Connect USB
-; 3) power
-; 5) flash
-; 6) gpio0 to off
-; 7) remove power
-; 8) remove usb
 [env:LC01_RGB]
 platform = espressif8266
 framework = arduino
 board = esp8285
 upload_resetmethod = nodemcu
 upload_protocol = espota
 board_build.flash_mode = dout
-build_flags =
-  -Wl,-Teagle.flash.1m64.ld
-  -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY
-  -DRED_PIN=12
-  -DGREEN_PIN=5
-  -DBLUE_PIN=13
-  -ARILUX_RED_PWM_RANGE=300
-lib_deps =
-    ${common_env_data.lib_deps_embedded_external}
+build_flags = 
+	-Wl,-Teagle.flash.1m64.ld
+	-DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY
+	-DRED_PIN=12
+	-DGREEN_PIN=5
+	-DBLUE_PIN=13
+	-ARILUX_RED_PWM_RANGE=300
+lib_deps = ${common_env_data.lib_deps_embedded_external}
 upload_speed = 115200
 
-; 12,13,14,15,16
-; 0,1,2,3,4,5
 [env:LC10_new]
 platform = espressif8266
 framework = arduino
 board = esp8285
 upload_resetmethod = nodemcu
 upload_protocol = espota
 board_build.flash_mode = dout
-build_flags =
-  -Wl,-Teagle.flash.1m64.ld
-  -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY
-  -DRF_REMOTE
-  -DRF_PIN=4
-  -DRED_PIN=12
-  -DGREEN_PIN=5
-  -DBLUE_PIN=13
-  -DWHITE1_PIN=15
-lib_deps =
-    ${common_env_data.lib_deps_embedded_external}
+build_flags = 
+	-Wl,-Teagle.flash.1m64.ld
+	-DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY
+	-DRF_REMOTE
+	-DRF_PIN=4
+	-DRED_PIN=12
+	-DGREEN_PIN=5
+	-DBLUE_PIN=13
+	-DWHITE1_PIN=15
+lib_deps = ${common_env_data.lib_deps_embedded_external}
 upload_speed = 115200
 
 [env:LC10_new_RGB_Switched]
@@ -90,34 +78,50 @@ board = esp8285
 upload_resetmethod = nodemcu
 upload_protocol = espota
 board_build.flash_mode = dout
-build_flags =
-  -Wl,-Teagle.flash.1m64.ld
-  -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY
-  -DRF_REMOTE
-  -DRF_PIN=4
-  -DRED_PIN=5
-  -DGREEN_PIN=12
-  -DBLUE_PIN=13
-  -DWHITE1_PIN=15
-  -DUSE_LAST_HSB_STATE_AT_BOOT=1
-lib_deps =
-    ${common_env_data.lib_deps_embedded_external}
+build_flags = 
+	-Wl,-Teagle.flash.1m64.ld
+	-DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY
+	-DRF_REMOTE
+	-DRF_PIN=4
+	-DRED_PIN=5
+	-DGREEN_PIN=12
+	-DBLUE_PIN=13
+	-DWHITE1_PIN=15
+	-DUSE_LAST_HSB_STATE_AT_BOOT=1
+lib_deps = ${common_env_data.lib_deps_embedded_external}
 upload_speed = 115200
 
 [env:wemos]
 platform = espressif8266
 framework = arduino
-board = esp8285
+board = d1_mini
 upload_resetmethod = nodemcu
 #upload_protocol = espota
 board_build.flash_mode = dout
-build_flags =
-  -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY
-  -DRED_PIN=12
-  -DGREEN_PIN=12
-  -DBLUE_PIN=13
-  -DWHITE1_PIN=15
-lib_deps =
-    ${common_env_data.lib_deps_embedded_external}
-#upload_speed = 921600
-#upload_speed = 460800
+#build_type = debug
+build_flags = 
+	-DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY
+	-DRED_PIN=15
+	-DGREEN_PIN=13
+	-DBLUE_PIN=12
+	-DWHITE1_PIN=14
+	-DWHITE2_PIN=4
+lib_deps = ${common_env_data.lib_deps_embedded_external}
+upload_speed = 921600
+
+[env:H801]
+platform = espressif8266
+framework = arduino
+board = d1_mini_lite
+upload_resetmethod = nodemcu
+board_build.flash_mode = dout
+board_build.ldscript = eagle.flash.1m64.ld
+build_flags = 	
+	-DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY
+	-DRED_PIN=15
+	-DGREEN_PIN=13
+	-DBLUE_PIN=12
+	-DWHITE1_PIN=14
+	-DWHITE2_PIN=4
+lib_deps = ${common_env_data.lib_deps_embedded_external}
+upload_speed = 921600

platformio.ini

@@ -0,0 +1,36 @@
+#pragma once
+
+#include <WiFiManager.h>
+
+class IntParameter : public WiFiManagerParameter {
+public:
+    IntParameter(const char *id, const char *placeholder, const char *custom, int labelPlacement)
+        : WiFiManagerParameter("") {
+        init(id, placeholder, "", 1, custom, labelPlacement);
+    }
+
+    long getValue() {
+        return atol(WiFiManagerParameter::getValue());
+    }
+
+    void setValue(long value) {
+        char buffer[10] = "";
+        snprintf(buffer, sizeof(buffer), "%ld", value);
+        WiFiManagerParameter::setValue(buffer, 10);
+    }
+};
+
+class BoolParameter : public WiFiManagerParameter {
+public:
+    BoolParameter(const char *id, const char *placeholder, const char *custom, int labelPlacement)
+        : WiFiManagerParameter("") {
+        init(id, placeholder, "", 1, custom, labelPlacement);
+    }
+
+    bool getValue() {
+        return strcmp(WiFiManagerParameter::getValue(), "1")==0;
+    }
+    void setValue(bool val) {
+        WiFiManagerParameter::setValue(val?"1":"", 2);
+    }
+};