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

Update user_setups

Browse Source
This commit is contained in:
fvanroie 2020-11-24 18:45:02 +01:00
parent b83951c058
commit ae060eb2b4
9 changed files with 35 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/hasp.cpp
View File

@ -327,16 +327,25 @@ void haspSetup()
break; break;
#endif #endif
/*
* LV_THEME_MATERIAL_FLAG_LIGHT: light theme
* LV_THEME_MATERIAL_FLAG_DARK: dark theme
* LV_THEME_MATERIAL_FLAG_NO_TRANSITION: disable transitions (state change animations)
* LV_THEME_MATERIAL_FLAG_NO_FOCUS: disable indication of focused state)
* */
#if LV_USE_THEME_MATERIAL == 1 #if LV_USE_THEME_MATERIAL == 1
case 4: case 4:
th = lv_theme_material_init(LV_COLOR_PURPLE, LV_COLOR_ORANGE, th = lv_theme_material_init(LV_COLOR_PURPLE, LV_COLOR_ORANGE,
LV_THEME_MATERIAL_FLAG_LIGHT + LV_THEME_MATERIAL_FLAG_NO_FOCUS, haspFonts[0], LV_THEME_MATERIAL_FLAG_LIGHT + LV_THEME_MATERIAL_FLAG_NO_FOCUS +
haspFonts[1], haspFonts[2], haspFonts[3]); LV_THEME_MATERIAL_FLAG_NO_TRANSITION,
haspFonts[0], haspFonts[1], haspFonts[2], haspFonts[3]);
break; break;
case 9: case 9:
th = lv_theme_material_init(LV_COLOR_PURPLE, LV_COLOR_ORANGE, th = lv_theme_material_init(LV_COLOR_PURPLE, LV_COLOR_ORANGE,
LV_THEME_MATERIAL_FLAG_DARK + LV_THEME_MATERIAL_FLAG_NO_FOCUS, haspFonts[0], LV_THEME_MATERIAL_FLAG_DARK + LV_THEME_MATERIAL_FLAG_NO_FOCUS +
haspFonts[1], haspFonts[2], haspFonts[3]); LV_THEME_MATERIAL_FLAG_NO_TRANSITION,
haspFonts[0], haspFonts[1], haspFonts[2], haspFonts[3]);
break; break;
#endif #endif
@ -358,6 +367,7 @@ void haspSetup()
haspFonts[1], haspFonts[2], haspFonts[3]); haspFonts[1], haspFonts[2], haspFonts[3]);
break; break;
#endif #endif
#if(LV_USE_THEME_HASP == 1) #if(LV_USE_THEME_HASP == 1)
case 8: case 8:
th = lv_theme_hasp_init(lv_color_hsv_to_rgb(haspThemeHue, 100, 100), th = lv_theme_hasp_init(lv_color_hsv_to_rgb(haspThemeHue, 100, 100),

20
src/main.cpp
View File

@ -27,13 +27,13 @@ void setup()
eepromSetup(); // Don't start at boot, only at write eepromSetup(); // Don't start at boot, only at write
#endif #endif
// #if HASP_USE_SPIFFS > 0 || HASP_USE_LITTLEFS > 0 // #if HASP_USE_SPIFFS > 0 || HASP_USE_LITTLEFS > 0
// filesystemSetup(); // FS mount is done in configSetup() // filesystemSetup(); // FS mount is done in configSetup()
// #endif // #endif
// #if HASP_USE_SDCARD > 0 // #if HASP_USE_SDCARD > 0
// sdcardSetup(); // sdcardSetup();
// #endif // #endif
/**************************** /****************************
* Read & Apply User Configuration * Read & Apply User Configuration
@ -171,7 +171,7 @@ void loop()
#endif #endif
#if HASP_USE_MQTT > 0 #if HASP_USE_MQTT > 0
mqttEvery5Seconds(isConnected); mqttEvery5Seconds(isConnected);
#endif #endif
} }
@ -184,5 +184,9 @@ void loop()
mainLastLoopTime += 1000; mainLastLoopTime += 1000;
} }
delay(3); #ifdef ARDUINO_ARCH_ESP8266
delay(2);
#else
delay(6);
#endif
} }

4
user_setups/esp32/d1-mini-esp32_ili9341.ini
View File

@ -2,10 +2,10 @@
; D1 Mini ESP32 with Lolin TFT 2.4" ; ; D1 Mini ESP32 with Lolin TFT 2.4" ;
; - D1-mini-esp32 board ; ; - D1-mini-esp32 board ;
; - ili9341 TFT ; ; - ili9341 TFT ;
; - xpt2606 touch controller ; ; - xpt2046 touch controller ;
;***************************************************; ;***************************************************;
[env:d1-mini-esp32_ili9341.ini] [env:d1-mini-esp32_ili9341]
platform = espressif32@^2.0.0 platform = espressif32@^2.0.0
board = wemos_d1_mini32 board = wemos_d1_mini32
;upload_port = COM5 ; To change the port, use platform_override.ini ;upload_port = COM5 ; To change the port, use platform_override.ini

2
user_setups/esp32/esp32-dev_ili9488.ini
View File

@ -1,7 +1,7 @@
;***************************************************; ;***************************************************;
; Generic ESP32 build with ; ; Generic ESP32 build with ;
; - ili9488 TFT SPI 4-WIRE ; ; - ili9488 TFT SPI 4-WIRE ;
; - xpt2606 touch controller ; ; - xpt2046 touch controller ;
;***************************************************; ;***************************************************;
[env:esp32dev-ili9488] [env:esp32dev-ili9488]

2
user_setups/esp32/esp32cam_st7796.ini
View File

@ -2,7 +2,7 @@
; ESP32 build with ; ; ESP32 build with ;
; - ESP32Cam board ; ; - ESP32Cam board ;
; - st7796 TFT ; ; - st7796 TFT ;
; - xpt2606 touch controller ; ; - xpt2046 touch controller ;
;***************************************************; ;***************************************************;
[env:esp32cam-st7796] [env:esp32cam-st7796]

2
user_setups/esp32/lolin-d32-pro_ili9341.ini
View File

@ -2,7 +2,7 @@
; Lolin D32 Pro with Lolin TFT 2.4" ; ; Lolin D32 Pro with Lolin TFT 2.4" ;
; - lolin_d32_pro board ; ; - lolin_d32_pro board ;
; - ili9341 TFT ; ; - ili9341 TFT ;
; - xpt2606 touch controller ; ; - xpt2046 touch controller ;
;***************************************************; ;***************************************************;
; !! This board already defines TFT_CS, TFT_DC and TFT_RST !! ; !! This board already defines TFT_CS, TFT_DC and TFT_RST !!

2
user_setups/esp32/nodemcu-32s_st7796.ini
View File

@ -2,7 +2,7 @@
; NodeMCU32S with build with ; ; NodeMCU32S with build with ;
; - st7796 TFT ; ; - st7796 TFT ;
; - MHS-4" RPI Display-B ; ; - MHS-4" RPI Display-B ;
; - xpt2606 touch controller ; ; - xpt2046 touch controller ;
;***************************************************; ;***************************************************;
[env:nodemcu32s-raspi] [env:nodemcu32s-raspi]

2
user_setups/esp32/ttgo-esp32-poe_ili9341.ini
View File

@ -3,7 +3,7 @@
; - T-Internet-Poe ESP32-WROOM ; ; - T-Internet-Poe ESP32-WROOM ;
; - LAN8720A with POE ; ; - LAN8720A with POE ;
; - ili9341 TFT ; ; - ili9341 TFT ;
; - xpt2606 touch controller ; ; - xpt2046 touch controller ;
;***************************************************; ;***************************************************;
[env:ttgo_esp32_poe-lolintft24] [env:ttgo_esp32_poe-lolintft24]

4
user_setups/esp8266/d1-mini-esp8266_ili9341.ini
View File

@ -2,10 +2,10 @@
; D1 Mini ESP8266 with Lolin TFT 2.4" ; ; D1 Mini ESP8266 with Lolin TFT 2.4" ;
; - D1-mini board ; ; - D1-mini board ;
; - ili9341 TFT ; ; - ili9341 TFT ;
; - xpt2606 touch controller ; ; - xpt2046 touch controller ;
;***************************************************; ;***************************************************;
[env:d1-mini-esp8266_ili9341.ini] [env:d1-mini-esp8266_ili9341]
platform = espressif8266@^2.6.2 platform = espressif8266@^2.6.2
board = d1_mini board = d1_mini
;upload_port = COM7 ; To change the port, use platform_override.ini ;upload_port = COM7 ; To change the port, use platform_override.ini