klaute/lumini_p30_control
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Added version info to the web interface, and the DEV string will only appear on development versions now.

Browse source
This commit is contained in:
Kai Lauterbach 2023-05-19 10:51:26 +02:00
parent 6763bda9fb
commit 74a7a1e3a3
10 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
firmware/20230519_firmware.ino.bin
View file

Binary file not shown.

BIN
firmware/20230519_firmware.spiffs.bin
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2 MiB

After

Width:  |  Height:  |  Size: 2 MiB

BIN
firmware/20230519_firmware_dev.ino.bin
View file

Binary file not shown.

5
firmware/config.h
View file

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

1
firmware/data/index_template_bottom.html
View file

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

2
firmware/data/index_template_top.html
View file

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

8
firmware/firmware.ino
View file

@ -13,12 +13,6 @@
//********* 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
@ -39,7 +33,7 @@ IPAddress dns (192, 168, 0, 1);
//********************************//
#define LIGHT_VERSION 2.1
#define LIGHT_VERSION 2.1 // diyHue light version
#define LAST_STATE_STARTUP_LIGHT_LAST_STATE 0
#define LAST_STATE_STARTUP_LIGHT_ON_STATE 1

1
firmware/html/index_template_bottom.html
View file

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

2
firmware/html/index_template_top.html
View file

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

6
firmware/webserver.ino
View file

@ -534,7 +534,13 @@ 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);