Compare commits

..

No commits in common. "6b6a1e1658b2f40777d109984a0d62a00420a918" and "5d1ea14e2e96f8e05d983e1335792280665f857a" have entirely different histories.

10 changed files with 10 additions and 15 deletions

Binary file not shown.

Before

(image error) Size: 2 MiB

After

(image error) Size: 2 MiB

View file

@ -1,6 +1,4 @@
#define VERSION_STR "2.0.0"
#define USE_STATIC_IP //! uncomment to enable Static IP Adress
#define SERIAL_BAUD_RATE 115200
@ -9,8 +7,7 @@
#define DEVELOPMENT
#define LIGHT_NAME "Lumini/Lominie Pixie30/P30 light control" // default light name
#define LIGHT_NAME_DEV_POSTFIX " (DEV)"
#define LIGHT_NAME_STR "Lumini/Lominie Pixie30/P30 light control" // default light name
#define LIGHTS_COUNT 4 // do not modify because luminie p30 only has 4 channel, never set above 80

View file

@ -25,6 +25,5 @@
</script>
</div>
</fieldset>
<p>{{VERSION_STR}}</p>
</body>
</html>

View file

@ -14,7 +14,7 @@
</head>
<body>
<fieldset>
<h3>{{LIGHT_NAME}}{{LIGHT_NAME_DEV_POSTFIX}}</h3>
<h3>{{LIGHT_NAME}}</h3>
<div class="toast"></div>
<div class="pure-form pure-form-aligned">
<div class="pure-controls">

View file

@ -13,6 +13,12 @@
//********* preprocessor block *********//
#ifdef DEVELOPMENT
#define LIGHT_NAME "Lumini/Lominie Pixie30/P30 light control (DEV)"
#else
#define LIGHT_NAME LIGHT_NAME_STR
#endif
//********* Config block *********//
// blue, warmwhite, purple, white&red&green
@ -33,7 +39,7 @@ IPAddress dns (192, 168, 0, 1);
//********************************//
#define LIGHT_VERSION 2.1 // diyHue light version
#define LIGHT_VERSION 2.1
#define LAST_STATE_STARTUP_LIGHT_LAST_STATE 0
#define LAST_STATE_STARTUP_LIGHT_ON_STATE 1

View file

@ -28,6 +28,5 @@
</div>
</fieldset>
<p>{{VERSION_STR}}</p>
</body>
</html>

View file

@ -14,7 +14,7 @@
</head>
<body>
<fieldset>
<h3>{{LIGHT_NAME}}{{LIGHT_NAME_DEV_POSTFIX}}</h3>
<h3>{{LIGHT_NAME}}</h3>
<div class="toast"></div>
<div class="pure-form pure-form-aligned">
<div class="pure-controls">

View file

@ -534,13 +534,7 @@ String genLightControlHTML()
String replacePlaceholder(String http_content)
{
http_content.replace("{{VERSION_STR}}", (String)VERSION_STR);
http_content.replace("{{LIGHT_NAME}}", (String)LIGHT_NAME);
#ifdef DEVELOPMENT
http_content.replace("{{LIGHT_NAME_DEV_POSTFIX}}", (String)LIGHT_NAME_DEV_POSTFIX);
#else
http_content.replace("{{LIGHT_NAME_DEV_POSTFIX}}", (String)"&nbsp;");
#endif
http_content.replace("{{LIGHT_COUNT}}", (String)LIGHTS_COUNT);