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

Compare commits

base: klaute:6b6a1e1658b2f40777d109984a0d62a00420a918
Branches Tags
klaute:main
klaute:develop
..
compare: klaute:5d1ea14e2e96f8e05d983e1335792280665f857a
Branches Tags
klaute:develop
klaute:main

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

10 changed files with 10 additions and 15 deletions
Show stats Expand all files Collapse all files

BIN
firmware/20230519_firmware.ino.bin → firmware/20230515_firmware.ino.bin
View file

Binary file not shown.

BIN
firmware/20230519_firmware_dev.ino.bin → firmware/20230515_firmware_dev.ino.bin
View file

Binary file not shown.

BIN
firmware/20230519_firmware.spiffs.bin → firmware/20230516_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

5
firmware/config.h
View file

@ -1,6 +1,4 @@
#define VERSION_STR "2.0.0"
#define USE_STATIC_IP //! uncomment to enable Static IP Adress #define USE_STATIC_IP //! uncomment to enable Static IP Adress
#define SERIAL_BAUD_RATE 115200 #define SERIAL_BAUD_RATE 115200
@ -9,8 +7,7 @@
#define DEVELOPMENT #define DEVELOPMENT
#define LIGHT_NAME "Lumini/Lominie Pixie30/P30 light control" // default light name #define LIGHT_NAME_STR "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 #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,6 +25,5 @@
</script> </script>
</div> </div>
</fieldset> </fieldset>
<p>{{VERSION_STR}}</p>
</body> </body>
</html> </html>

2
firmware/data/index_template_top.html
View file

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

8
firmware/firmware.ino
View file

@ -13,6 +13,12 @@
//********* preprocessor block *********// //********* preprocessor block *********//
#ifdef DEVELOPMENT
#define LIGHT_NAME "Lumini/Lominie Pixie30/P30 light control (DEV)"
#else
#define LIGHT_NAME LIGHT_NAME_STR
#endif
//********* Config block *********// //********* Config block *********//
// blue, warmwhite, purple, white&red&green // 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_LAST_STATE 0
#define LAST_STATE_STARTUP_LIGHT_ON_STATE 1 #define LAST_STATE_STARTUP_LIGHT_ON_STATE 1

1
firmware/html/index_template_bottom.html
View file

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

2
firmware/html/index_template_top.html
View file

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

6
firmware/webserver.ino
View file

@ -534,13 +534,7 @@ String genLightControlHTML()
String replacePlaceholder(String http_content) String replacePlaceholder(String http_content)
{ {
http_content.replace("{{VERSION_STR}}", (String)VERSION_STR);
http_content.replace("{{LIGHT_NAME}}", (String)LIGHT_NAME); 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); http_content.replace("{{LIGHT_COUNT}}", (String)LIGHTS_COUNT);