Update version

This commit is contained in:
fvanroie 2020-03-25 23:00:42 +01:00
parent d5b50be5ed
commit 9a36764411
3 changed files with 29 additions and 38 deletions

View File

@ -2,8 +2,8 @@
#define HASP_CONF_H #define HASP_CONF_H
#define HASP_VERSION_MAJOR 0 #define HASP_VERSION_MAJOR 0
#define HASP_VERSION_MINOR 0 #define HASP_VERSION_MINOR 1
#define HASP_VERSION_REVISION 11 #define HASP_VERSION_REVISION 0
#define HASP_USE_APP 1 #define HASP_USE_APP 1

View File

@ -77,10 +77,10 @@ typedef int16_t lv_coord_t;
#if LV_MEM_CUSTOM == 0 #if LV_MEM_CUSTOM == 0
/* Size of the memory used by `lv_mem_alloc` in bytes (>= 2kB)*/ /* Size of the memory used by `lv_mem_alloc` in bytes (>= 2kB)*/
#ifdef ESP8266 #ifdef ESP8266
# define LV_MEM_SIZE (12U * 1024U) // 4KB # define LV_MEM_SIZE (25 * 512U) // 12.5KB
#endif #endif
#ifndef LV_MEM_SIZE #ifndef LV_MEM_SIZE
# define LV_MEM_SIZE (48 * 1024U) // 40KB # define LV_MEM_SIZE (48 * 1024U) // 48KB
#endif #endif
/* Complier prefix for a big array declaration */ /* Complier prefix for a big array declaration */
@ -272,7 +272,7 @@ typedef void* lv_indev_drv_user_data_t; /*Type of user data in the in
/* 1: Print the log with 'printf'; /* 1: Print the log with 'printf';
* 0: user need to register a callback with `lv_log_register_print_cb`*/ * 0: user need to register a callback with `lv_log_register_print_cb`*/
# define LV_LOG_PRINTF 1 # define LV_LOG_PRINTF 0
#endif /*LV_USE_LOG*/ #endif /*LV_USE_LOG*/
/*================= /*=================

View File

@ -24,8 +24,8 @@ default_envs =
;nodemcu32s-raspi ;nodemcu32s-raspi
; -- Location of the configuration files ; -- Location of the configuration files
include_dir = ;include_dir =
include ;include
;lv_lib_zifont ;lv_lib_zifont
;lvgl ;lvgl
;png_decoder ;png_decoder
@ -58,7 +58,7 @@ lib_deps =
build_flags = build_flags =
;-Os ; Code Size Optimization ;-Os ; Code Size Optimization
;-Og ; Code Debug Optimization ;-Og ; Code Debug Optimization
-w ; Suppress warnings ;-w ; Suppress warnings
-D LV_CONF_INCLUDE_SIMPLE -D LV_CONF_INCLUDE_SIMPLE
-D SPIFFS_TEMPORAL_FD_CACHE ; speedup opening recent files -D SPIFFS_TEMPORAL_FD_CACHE ; speedup opening recent files
-D ARDUINOJSON_DECODE_UNICODE=1 ; for utf-8 symbols -D ARDUINOJSON_DECODE_UNICODE=1 ; for utf-8 symbols
@ -99,9 +99,9 @@ hspi32 =
; -- Configuration parameters for standard displays ; -- Configuration parameters for standard displays
[lcd] [lcd]
tft_rotation = 0 ; default rotation tft_rotation = 0 ; default rotation
tft_width = 240 ; default width tft_width = 240 ; default width
tft_height = 320 ; default height tft_height = 320 ; default height
lolin24 = lolin24 =
-D ILI9341_DRIVER=1 -D ILI9341_DRIVER=1
-D TFT_WIDTH=240 -D TFT_WIDTH=240
@ -151,10 +151,10 @@ build_flags =
; -- TFT_eSPI build options ------------------------ ; -- TFT_eSPI build options ------------------------
${lcd.lolin24} ${lcd.lolin24}
${pins.vspi32} ${pins.vspi32}
-D TFT_CS=5
-D TFT_BCKL=21
-D TFT_DC=2 -D TFT_DC=2
-D TFT_CS=5
-D TFT_RST=4 -D TFT_RST=4
-D TFT_BCKL=20
-D TOUCH_CS=21 -D TOUCH_CS=21
; -- Debugging options ----------------------------- ; -- Debugging options -----------------------------
; -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG ; -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG
@ -258,27 +258,19 @@ board_build.partitions = default.csv
build_flags = build_flags =
${flags.esp32_flags} ${flags.esp32_flags}
; -- TFT_eSPI build options ------------------------ ; -- TFT_eSPI build options ------------------------
-D TFT_ROTATION=${lcd.TFT_ROTATION} ${lcd.lolin24}
-D TFT_WIDTH=${lcd.TFT_WIDTH}
-D TFT_HEIGHT=${lcd.TFT_HEIGHT}
-D USER_SETUP_LOADED
-D ILI9341_DRIVER
${pins.vspi32} ${pins.vspi32}
-D TFT_DC=5 -D TFT_DC=5
-D TFT_CS=26 -D TFT_CS=26
-D TFT_BCKL=21
-D TFT_RST=-1 ;RST -D TFT_RST=-1 ;RST
-D TFT_BCKL=21
-D TOUCH_CS=17 ;(can also be 22 or 16) -D TOUCH_CS=17 ;(can also be 22 or 16)
-D SPI_FREQUENCY=40000000
-D SPI_TOUCH_FREQUENCY=2500000
-D SPI_READ_FREQUENCY=20000000
-D SUPPORT_TRANSACTIONS
;*************************************************** ;***************************************************
; Lolin D32 Pro with Lolin TFT 2.4" ; Lolin D32 Pro with Lolin TFT 2.4"
;*************************************************** ;***************************************************
; This board already defines TFT_CS, TFT_DC and TFT_RST ; !! This board already defines TFT_CS, TFT_DC and TFT_RST !!
[env:lolind32pro-lolintft24] [env:lolind32pro-lolintft24]
platform = espressif32 platform = espressif32
board = lolin_d32_pro board = lolin_d32_pro
@ -291,11 +283,11 @@ build_flags =
; -- TFT_eSPI build options ------------------------ ; -- TFT_eSPI build options ------------------------
${lcd.lolin24} ${lcd.lolin24}
${pins.vspi32} ${pins.vspi32}
-D TFT_DC=5 ;-D TFT_DC=5 ; Defined by board, don't redefine
-D TFT_CS=26 ;-D TFT_CS=26 ; Defined by board, don't redefine
;-D TFT_RST=-1 ; Defined by board, don't redefine
-D TFT_BCKL=21 -D TFT_BCKL=21
-D TFT_RST=-1 ;RST -D TOUCH_CS=17 ;(can also be 22 or 16)
-D TOUCH_CS=17 ;(can also be 22 or 16)
;*************************************************** ;***************************************************
@ -317,15 +309,14 @@ build_flags =
${flags.esp8266_flags} ${flags.esp8266_flags}
; -- TFT_eSPI build options ------------------------ ; -- TFT_eSPI build options ------------------------
${lcd.lolin24} ${lcd.lolin24}
;-D TFT_MISO=12 ;D6 Default HSPI
;-D TFT_MISO=12 ;D6 ;-D TFT_MOSI=13 ;D7 Default HSPI
;-D TFT_MOSI=13 ;D7 ;-D TFT_SCLK=14 ;D5 Default HSPI
;-D TFT_SCLK=14 ;D5 -D TFT_DC=15 ;D8
-D TFT_DC=15 ;D8 -D TFT_CS=16 ;D0
-D TFT_CS=16 ;D0 -D TFT_BCKL=2 ;D4 (can also be D1 or D2)
-D TFT_BCKL=2 ;D4 (can also be D1 or D2) -D TOUCH_CS=0 ;D3 (can also be D1 or D2)
-D TOUCH_CS=0 ;D3 (can also be D1 or D2) -D TFT_RST=-1 ;RST
-D TFT_RST=-1 ;RST
;*************************************************** ;***************************************************