jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-28 05:36:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add startDim

Browse Source
This commit is contained in:
fvanroie 2020-02-23 14:53:21 +01:00
parent 63ba046946
commit 852f242406
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/hasp.cpp
View File

@ -26,6 +26,7 @@
#include "hasp_log.h"
#include "hasp_debug.h"
#include "hasp_config.h"
#include "hasp_dispatch.h"
#include "hasp_mqtt.h"
#include "hasp_wifi.h"
#include "hasp_gui.h"
@ -38,6 +39,7 @@
* DEFINES
*********************/
uint8_t haspStartDim = 100;
uint8_t haspStartPage = 0;
uint8_t haspThemeId = 0;
uint16_t haspThemeHue = 200;
@ -672,6 +674,11 @@ static int16_t get_obj(uint8_t pageid, uint8_t objid, lv_obj_t * obj)
* Connection lost GUI
*/
void haspWakeUp()
{
lv_disp_trig_activity(NULL);
}
void haspDisconnect()
{
/* Create a dark plain style for a message box's background (modal)*/
@ -953,6 +960,7 @@ void haspSetup(JsonObject settings)
haspDisconnect();
haspLoadPage(haspPagesPath);
haspSetPage(haspStartPage);
guiSetDim(haspStartDim);
// lv_obj_t * img_bin_t = lv_img_create(pages[current_page], NULL); /*Crate an image object*/
// lv_img_set_src(img_bin_t, "F:/dogsmall(1).bin"); /*Set the created file as image (a red rose)*/
@ -1526,6 +1534,7 @@ void haspLoadPage(String pages)
bool haspGetConfig(const JsonObject & settings)
{
settings[FPSTR(F_CONFIG_STARTPAGE)] = haspStartPage;
settings[FPSTR(F_CONFIG_STARTDIM)] = haspStartDim;
settings[FPSTR(F_CONFIG_THEME)] = haspThemeId;
settings[FPSTR(F_CONFIG_HUE)] = haspThemeHue;
settings[FPSTR(F_CONFIG_ZIFONT)] = haspZiFontPath;
@ -1558,6 +1567,11 @@ bool haspSetConfig(const JsonObject & settings)
haspStartPage = settings[FPSTR(F_CONFIG_STARTPAGE)].as<uint8_t>();
}
if(!settings[FPSTR(F_CONFIG_STARTDIM)].isNull()) {
changed |= haspStartDim != settings[FPSTR(F_CONFIG_STARTDIM)].as<uint8_t>();
haspStartDim = settings[FPSTR(F_CONFIG_STARTDIM)].as<uint8_t>();
}
if(!settings[FPSTR(F_CONFIG_THEME)].isNull()) {
changed |= haspThemeId != settings[FPSTR(F_CONFIG_THEME)].as<uint8_t>();
haspThemeId = settings[FPSTR(F_CONFIG_THEME)].as<uint8_t>();

1
src/hasp_config.h
View File

@ -5,6 +5,7 @@
/* json keys used in the configfile */
const char F_CONFIG_STARTPAGE[] PROGMEM = "startpage";
const char F_CONFIG_STARTDIM[] PROGMEM = "startdim";
const char F_CONFIG_THEME[] PROGMEM = "theme";
const char F_CONFIG_HUE[] PROGMEM = "hue";
const char F_CONFIG_ZIFONT[] PROGMEM = "font";