Update user_setups

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

View File

@ -327,16 +327,25 @@ void haspSetup()
break;
#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
case 4:
th = lv_theme_material_init(LV_COLOR_PURPLE, LV_COLOR_ORANGE,
LV_THEME_MATERIAL_FLAG_LIGHT + LV_THEME_MATERIAL_FLAG_NO_FOCUS, haspFonts[0],
haspFonts[1], haspFonts[2], haspFonts[3]);
LV_THEME_MATERIAL_FLAG_LIGHT + LV_THEME_MATERIAL_FLAG_NO_FOCUS +
LV_THEME_MATERIAL_FLAG_NO_TRANSITION,
haspFonts[0], haspFonts[1], haspFonts[2], haspFonts[3]);
break;
case 9:
th = lv_theme_material_init(LV_COLOR_PURPLE, LV_COLOR_ORANGE,
LV_THEME_MATERIAL_FLAG_DARK + LV_THEME_MATERIAL_FLAG_NO_FOCUS, haspFonts[0],
haspFonts[1], haspFonts[2], haspFonts[3]);
LV_THEME_MATERIAL_FLAG_DARK + LV_THEME_MATERIAL_FLAG_NO_FOCUS +
LV_THEME_MATERIAL_FLAG_NO_TRANSITION,
haspFonts[0], haspFonts[1], haspFonts[2], haspFonts[3]);
break;
#endif
@ -358,6 +367,7 @@ void haspSetup()
haspFonts[1], haspFonts[2], haspFonts[3]);
break;
#endif
#if(LV_USE_THEME_HASP == 1)
case 8:
th = lv_theme_hasp_init(lv_color_hsv_to_rgb(haspThemeHue, 100, 100),

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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