diff --git a/firmware/config.h b/firmware/config.h index 11997e2..a1763db 100644 --- a/firmware/config.h +++ b/firmware/config.h @@ -5,8 +5,9 @@ #define LOCAL_TIMEZONE_STRING "CET-1CEST-2,M3.5.0/02:00:00,M10.5.0/03:00:00" // Berlin, Germany - https://sites.google.com/a/usapiens.com/opnode/time-zones -//#define DEVELOPMENT -#define light_name "Dimmable Hue Light" // default light name +#define DEVELOPMENT + +#define LIGHT_NAME_STR "Dimmable Hue Light" // default light name #define LIGHTS_COUNT 4 // do not modify because luminie p30 only has 4 channel, never set above 80 @@ -23,4 +24,3 @@ #define TIME_LIGHTENGINE_INTERVAL_MS (1000UL / BRI_MOD_STEPS_PER_SEC) // BRI_MOD_STEPS_PER_SEC steps per second to in-/decrease the brightness #define MY_NTP_SERVER "de.pool.ntp.org" - diff --git "a/firmware/data/config_template.html\r" "b/firmware/data/config_template.html\r" deleted file mode 100644 index ad5e681..0000000 --- "a/firmware/data/config_template.html\r" +++ /dev/null @@ -1,63 +0,0 @@ -
-
-

Config

-
- - -
-
- - -
-
-

Wifi

-
- - -
-
- - -
-
-

Network

-
- -ON -OFF -
-
- - -
-
- - -
-
- - -
-
- - -
-
- -
-
-
diff --git a/firmware/data/index_template_bottom.html b/firmware/data/index_template_bottom.html index 07b4858..cdec3b6 100644 --- a/firmware/data/index_template_bottom.html +++ b/firmware/data/index_template_bottom.html @@ -191,36 +191,36 @@ setInterval(updatePWMValues, 5000); - - - - - - - - diff --git "a/firmware/data/index_template_middle.html\r" "b/firmware/data/index_template_middle.html\r" deleted file mode 100644 index a777c85..0000000 --- "a/firmware/data/index_template_middle.html\r" +++ /dev/null @@ -1,8 +0,0 @@ - - - -
- - - - diff --git "a/firmware/data/index_template_top.html\r" "b/firmware/data/index_template_top.html\r" deleted file mode 100644 index a7eead0..0000000 --- "a/firmware/data/index_template_top.html\r" +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - -Light setup - {{LIGHT_NAME}} - - - - - - - - -
-

{{LIGHT_NAME}}

-
-
- -alert -  -reset -  -reset timing control data -  -update - - -
-
- -
-Main -Config -
-
- -
- -ON -OFF -
- -
-
- - -
-
- - -
-
- - -
- diff --git "a/firmware/data/light_control_template.html\r" "b/firmware/data/light_control_template.html\r" deleted file mode 100644 index 8bc313f..0000000 --- "a/firmware/data/light_control_template.html\r" +++ /dev/null @@ -1,29 +0,0 @@ -

Light {{LIGHT_NUMBER}}

-
- -ON -OFF -
-
- - -  -9 -% -
- - -  - -% - -
diff --git a/firmware/firmware.ino b/firmware/firmware.ino index ba85e9e..9b8256a 100644 --- a/firmware/firmware.ino +++ b/firmware/firmware.ino @@ -11,7 +11,16 @@ #include "config.h" +//********* preprocessor block *********// + +#ifdef DEVELOPMENT +#define LIGHT_NAME "Dimmable Hue Light (DEV)" +#else +#define LIGHT_NAME LIGHT_NAME_STR +#endif + //********* Config block *********// + // blue, warmwhite, purple, white&red&green // blau, schwarz, rot, weiß // ch1, ch2, ch3, ch4 @@ -294,7 +303,7 @@ void setup() WiFi.mode(WIFI_STA); WiFiManager wifiManager; wifiManager.setConfigPortalTimeout(120); - wifiManager.autoConnect(light_name); + wifiManager.autoConnect(LIGHT_NAME); IPAddress myIP = WiFi.localIP(); Serial.print("IP: "); @@ -449,7 +458,7 @@ void init_webserver() char macString[32] = { 0 }; sprintf(macString, "%02X:%02X:%02X:%02X:%02X:%02X", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); DynamicJsonDocument root(1024); - root["name"] = light_name; + root["name"] = LIGHT_NAME; root["lights"] = LIGHTS_COUNT; root["protocol"] = "native_multi"; root["modelid"] = "LWB010"; @@ -717,7 +726,7 @@ String genLightControlHTML() String replacePlaceholder(String http_content) { - http_content.replace("{{LIGHT_NAME}}", (String)light_name); + http_content.replace("{{LIGHT_NAME}}", (String)LIGHT_NAME); http_content.replace("{{LIGHT_COUNT}}", (String)LIGHTS_COUNT); diff --git a/tools/html2string.sh b/tools/html2string.sh index bb59438..73c4797 100755 --- a/tools/html2string.sh +++ b/tools/html2string.sh @@ -1,4 +1,4 @@ #!/bin/bash -cat $1 | sed -e"s/^ *//ig" +cat $1 | sed -e"s/^ *//ig" | sed -e "s/^\/\/.*//ig"