Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Kingart curtain switch UI support #2250

Merged
merged 15 commits into from
May 17, 2020
Merged

Kingart curtain switch UI support #2250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
f1cc8a8
Completed kingart curtain switch support:
echauvet May 12, 2020
42f9818
Checked commit before PR. Added html gulp static files generated.
echauvet May 13, 2020
56888b1
Corrected a code refactor error which make the MQTT messages not hand…
echauvet May 13, 2020
2b3f1de
Use the maximum compression for gzip. A byte is a byte :)
echauvet May 14, 2020
d1f7d1f
Update code/espurna/curtain_kingart.cpp
echauvet May 14, 2020
0384e7d
Variable name prefix update
echauvet May 14, 2020
142c892
Added Scheduler new type : curtain
echauvet May 15, 2020
435f1c5
Add curtain schedule support and correct the 12h bug when adding a sl…
echauvet May 15, 2020
e29b673
Code cleaning.
echauvet May 15, 2020
f907661
I let do better by the specialists
echauvet May 15, 2020
5b3fcab
Curtain init statues
echauvet May 15, 2020
683ce9f
Coding style corrections
echauvet May 16, 2020
d950c81
Removed debug stuff from now - will be back later with the right way
echauvet May 16, 2020
976e014
rebuild webui
mcspr May 17, 2020
3f16e5f
revert 435f1c5e03ac8ff3e5591795e67c00aef55dc956 schHour default, rebu…
mcspr May 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions code/espurna/board.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,9 @@ PROGMEM const char espurna_webui[] =
#if WEBUI_IMAGE == WEBUI_IMAGE_THERMOSTAT
"THERMOSTAT"
#endif
#if WEBUI_IMAGE == WEBUI_IMAGE_CURTAIN
"CURTAIN"
#endif
#if WEBUI_IMAGE == WEBUI_IMAGE_FULL
"FULL"
#endif
Expand Down
2 changes: 2 additions & 0 deletions code/espurna/config/hardware.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4595,6 +4595,8 @@
#define MANUFACTURER "KINGART"
#define DEVICE "CURTAIN_SWITCH"

#define CURTAIN_SUPPORT 1

// LEDs
#define LED1_PIN 13
#define LED1_PIN_INVERSE 1
Expand Down
1 change: 1 addition & 0 deletions code/espurna/config/types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@

#define SCHEDULER_TYPE_SWITCH 1
#define SCHEDULER_TYPE_DIM 2
#define SCHEDULER_TYPE_CURTAIN 3

// -----------------------------------------------------------------------------
// IR
Expand Down
10 changes: 10 additions & 0 deletions code/espurna/config/webui.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#define WEBUI_IMAGE_RFM69 8
#define WEBUI_IMAGE_LIGHTFOX 16
#define WEBUI_IMAGE_THERMOSTAT 32
#define WEBUI_IMAGE_CURTAIN 64
#define WEBUI_IMAGE_FULL 15

#if LIGHT_PROVIDER != LIGHT_PROVIDER_NONE
Expand Down Expand Up @@ -65,6 +66,15 @@
#endif
#endif

#if CURTAIN_SUPPORT == 1
#ifndef WEBUI_IMAGE
#define WEBUI_IMAGE WEBUI_IMAGE_CURTAIN
#else
#undef WEBUI_IMAGE
#define WEBUI_IMAGE WEBUI_IMAGE_FULL
#endif
#endif

#ifndef WEBUI_IMAGE
#define WEBUI_IMAGE WEBUI_IMAGE_SMALL
#endif
Expand Down
Loading