From 90c104f605b23e249b49ff1048b093e5be75825f Mon Sep 17 00:00:00 2001 From: Fuji Pebri Date: Sat, 3 Aug 2019 14:32:49 +0700 Subject: [PATCH] change for esplay_micro --- main/main.c | 9 ++--- sdkconfig | 102 +++++++++------------------------------------------- 2 files changed, 22 insertions(+), 89 deletions(-) diff --git a/main/main.c b/main/main.c index a2e03f8..967c44f 100644 --- a/main/main.c +++ b/main/main.c @@ -64,7 +64,7 @@ char* VERSION = NULL; void indicate_error() { - + } static void pset(UG_S16 x, UG_S16 y, UG_COLOR color) @@ -255,7 +255,7 @@ void boot_application() } backlight_deinit(); - + // reboot esp_restart(); } @@ -917,7 +917,7 @@ void flash_firmware(const char* fullPath) static void ui_draw_title() { - const char* TITLE = "ESPLAY 2.0"; + const char* TITLE = "ESPLAY MICRO BOOTLOADER"; UG_FillFrame(0, 0, 319, 239, C_WHITE); @@ -1210,7 +1210,7 @@ static void menu_main() void app_main(void) { - const char* VER_PREFIX = "Ver: "; + const char* VER_PREFIX = "Ver: "; size_t ver_size = strlen(VER_PREFIX) + strlen(COMPILEDATE) + 1 + strlen(GITREV) + 1; VERSION = malloc(ver_size); if (!VERSION) abort(); @@ -1228,6 +1228,7 @@ void app_main(void) display_init(); + display_show_splash(); display_clear(0xffff); UG_Init(&gui, pset, 320, 240); diff --git a/sdkconfig b/sdkconfig index bc22b4c..f816fec 100644 --- a/sdkconfig +++ b/sdkconfig @@ -23,18 +23,16 @@ CONFIG_LOG_BOOTLOADER_LEVEL=3 CONFIG_BOOTLOADER_SPI_WP_PIN=7 CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V=y CONFIG_BOOTLOADER_FACTORY_RESET=y -CONFIG_BOOTLOADER_NUM_PIN_FACTORY_RESET=33 +CONFIG_BOOTLOADER_NUM_PIN_FACTORY_RESET=35 CONFIG_BOOTLOADER_OTA_DATA_ERASE=y CONFIG_BOOTLOADER_DATA_FACTORY_RESET="nvs" CONFIG_BOOTLOADER_APP_TEST=y -CONFIG_BOOTLOADER_NUM_PIN_APP_TEST=32 +CONFIG_BOOTLOADER_NUM_PIN_APP_TEST=0 CONFIG_BOOTLOADER_HOLD_TIME_GPIO=2 -CONFIG_BOOTLOADER_WDT_ENABLE= # # Security features # -CONFIG_SECURE_SIGNED_APPS_NO_SECURE_BOOT= CONFIG_SECURE_BOOT_ENABLED= CONFIG_FLASH_ENCRYPTION_ENABLED= @@ -48,6 +46,14 @@ CONFIG_USE_LVGL_LIBRARY= # CONFIG_SDIO_DAT2_DISABLED=y +# +# Hardware configuration +# +CONFIG_ESPLAY20_HW= +CONFIG_ESPLAY_MICRO_HW=y +CONFIG_HW_CUSTOM= +CONFIG_HW_LCD_TYPE=0 + # # Serial flasher config # @@ -109,8 +115,8 @@ CONFIG_PARTITION_TABLE_MD5= # CONFIG_OPTIMIZATION_LEVEL_DEBUG= CONFIG_OPTIMIZATION_LEVEL_RELEASE=y -CONFIG_OPTIMIZATION_ASSERTIONS_ENABLED=y -CONFIG_OPTIMIZATION_ASSERTIONS_SILENT= +CONFIG_OPTIMIZATION_ASSERTIONS_ENABLED= +CONFIG_OPTIMIZATION_ASSERTIONS_SILENT=y CONFIG_OPTIMIZATION_ASSERTIONS_DISABLED= CONFIG_CXX_EXCEPTIONS= CONFIG_STACK_CHECK_NONE=y @@ -119,7 +125,6 @@ CONFIG_STACK_CHECK_STRONG= CONFIG_STACK_CHECK_ALL= CONFIG_STACK_CHECK= CONFIG_WARN_WRITE_STRINGS= -CONFIG_DISABLE_GCC8_WARNINGS= # # Component config @@ -138,9 +143,6 @@ CONFIG_AWS_IOT_SDK= # Bluetooth # CONFIG_BT_ENABLED= -CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN_EFF=0 -CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN_EFF=0 -CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN_EFF=0 CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE=0 CONFIG_BT_RESERVE_DRAM=0 @@ -155,12 +157,10 @@ CONFIG_ADC_FORCE_XPD_FSM= CONFIG_ADC2_DISABLE_DAC=y # -# SPI configuration +# SPI master configuration # CONFIG_SPI_MASTER_IN_IRAM= CONFIG_SPI_MASTER_ISR_IN_IRAM= -CONFIG_SPI_SLAVE_IN_IRAM= -CONFIG_SPI_SLAVE_ISR_IN_IRAM= # # ESP32-specific @@ -220,15 +220,12 @@ CONFIG_BROWNOUT_DET_LVL_SEL_5= CONFIG_BROWNOUT_DET_LVL_SEL_6= CONFIG_BROWNOUT_DET_LVL_SEL_7= CONFIG_BROWNOUT_DET_LVL=0 -CONFIG_REDUCE_PHY_TX_POWER=y CONFIG_ESP32_TIME_SYSCALL_USE_RTC_FRC1=y CONFIG_ESP32_TIME_SYSCALL_USE_RTC= CONFIG_ESP32_TIME_SYSCALL_USE_FRC1= CONFIG_ESP32_TIME_SYSCALL_USE_NONE= CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_RC=y CONFIG_ESP32_RTC_CLOCK_SOURCE_EXTERNAL_CRYSTAL= -CONFIG_ESP32_RTC_CLOCK_SOURCE_EXTERNAL_OSC= -CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_8MD256= CONFIG_ESP32_RTC_CLK_CAL_CYCLES=1024 CONFIG_ESP32_DEEP_SLEEP_WAKEUP_DELAY=2000 CONFIG_ESP32_XTAL_FREQ_40=y @@ -258,7 +255,6 @@ CONFIG_ESP32_WIFI_RX_BA_WIN=6 CONFIG_ESP32_WIFI_NVS_ENABLED=y CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_0=y CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_1= -CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN=752 # # PHY @@ -280,31 +276,18 @@ CONFIG_ADC_CAL_EFUSE_TP_ENABLE=y CONFIG_ADC_CAL_EFUSE_VREF_ENABLE=y CONFIG_ADC_CAL_LUT_ENABLE=y -# -# Event Loop Library -# -CONFIG_EVENT_LOOP_PROFILING= - # # ESP HTTP client # CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=y -# -# HTTP Server -# -CONFIG_HTTPD_MAX_REQ_HDR_LEN=512 -CONFIG_HTTPD_MAX_URI_LEN=512 - # # Ethernet # CONFIG_DMA_RX_BUF_NUM=10 CONFIG_DMA_TX_BUF_NUM=10 CONFIG_EMAC_L2_TO_L3_RX_BUF_MODE= -CONFIG_EMAC_CHECK_LINK_PERIOD_MS=2000 CONFIG_EMAC_TASK_PRIORITY=20 -CONFIG_EMAC_TASK_STACK_SIZE=3072 # # FAT Filesystem support @@ -343,27 +326,10 @@ CONFIG_FATFS_FS_LOCK=0 CONFIG_FATFS_TIMEOUT_MS=10000 CONFIG_FATFS_PER_FILE_CACHE=y -# -# Modbus configuration -# -CONFIG_MB_QUEUE_LENGTH=20 -CONFIG_MB_SERIAL_TASK_STACK_SIZE=2048 -CONFIG_MB_SERIAL_BUF_SIZE=256 -CONFIG_MB_SERIAL_TASK_PRIO=10 -CONFIG_MB_CONTROLLER_SLAVE_ID_SUPPORT= -CONFIG_MB_CONTROLLER_NOTIFY_TIMEOUT=20 -CONFIG_MB_CONTROLLER_NOTIFY_QUEUE_SIZE=20 -CONFIG_MB_CONTROLLER_STACK_SIZE=4096 -CONFIG_MB_EVENT_QUEUE_TIMEOUT=20 -CONFIG_MB_TIMER_PORT_ENABLED=y -CONFIG_MB_TIMER_GROUP=0 -CONFIG_MB_TIMER_INDEX=0 - # # FreeRTOS # CONFIG_FREERTOS_UNICORE= -CONFIG_FREERTOS_NO_AFFINITY=0x7FFFFFFF CONFIG_FREERTOS_CORETIMER_0=y CONFIG_FREERTOS_CORETIMER_1= CONFIG_FREERTOS_HZ=100 @@ -407,12 +373,12 @@ CONFIG_LIBSODIUM_USE_MBEDTLS_SHA=y # Log output # CONFIG_LOG_DEFAULT_LEVEL_NONE= -CONFIG_LOG_DEFAULT_LEVEL_ERROR= +CONFIG_LOG_DEFAULT_LEVEL_ERROR=y CONFIG_LOG_DEFAULT_LEVEL_WARN= -CONFIG_LOG_DEFAULT_LEVEL_INFO=y +CONFIG_LOG_DEFAULT_LEVEL_INFO= CONFIG_LOG_DEFAULT_LEVEL_DEBUG= CONFIG_LOG_DEFAULT_LEVEL_VERBOSE= -CONFIG_LOG_DEFAULT_LEVEL=3 +CONFIG_LOG_DEFAULT_LEVEL=1 CONFIG_LOG_COLORS=y # @@ -430,11 +396,8 @@ CONFIG_LWIP_IP_FRAG= CONFIG_LWIP_IP_REASSEMBLY= CONFIG_LWIP_STATS= CONFIG_LWIP_ETHARP_TRUST_IP_MAC=y -CONFIG_ESP_GRATUITOUS_ARP=y -CONFIG_GARP_TMR_INTERVAL=60 CONFIG_TCPIP_RECVMBOX_SIZE=32 CONFIG_LWIP_DHCP_DOES_ARP_CHECK=y -CONFIG_LWIP_DHCP_RESTORE_LAST_IP= # # DHCP server @@ -469,10 +432,6 @@ CONFIG_TCP_OVERSIZE_DISABLE= CONFIG_LWIP_MAX_UDP_PCBS=16 CONFIG_UDP_RECVMBOX_SIZE=6 CONFIG_TCPIP_TASK_STACK_SIZE=2048 -CONFIG_TCPIP_TASK_AFFINITY_NO_AFFINITY=y -CONFIG_TCPIP_TASK_AFFINITY_CPU0= -CONFIG_TCPIP_TASK_AFFINITY_CPU1= -CONFIG_TCPIP_TASK_AFFINITY=0x7FFFFFFF CONFIG_PPP_SUPPORT= # @@ -489,11 +448,7 @@ CONFIG_LWIP_MAX_RAW_PCBS=16 # # mbedTLS # -CONFIG_MBEDTLS_INTERNAL_MEM_ALLOC=y -CONFIG_MBEDTLS_DEFAULT_MEM_ALLOC= -CONFIG_MBEDTLS_CUSTOM_MEM_ALLOC= CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=16384 -CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN= CONFIG_MBEDTLS_DEBUG= CONFIG_MBEDTLS_HARDWARE_AES=y CONFIG_MBEDTLS_HARDWARE_MPI= @@ -567,26 +522,6 @@ CONFIG_MBEDTLS_ECP_DP_BP512R1_ENABLED=y CONFIG_MBEDTLS_ECP_DP_CURVE25519_ENABLED=y CONFIG_MBEDTLS_ECP_NIST_OPTIM=y -# -# mDNS -# -CONFIG_MDNS_MAX_SERVICES=10 - -# -# ESP-MQTT Configurations -# -CONFIG_MQTT_PROTOCOL_311=y -CONFIG_MQTT_TRANSPORT_SSL=y -CONFIG_MQTT_TRANSPORT_WEBSOCKET=y -CONFIG_MQTT_TRANSPORT_WEBSOCKET_SECURE=y -CONFIG_MQTT_USE_CUSTOM_CONFIG= -CONFIG_MQTT_TASK_CORE_SELECTION_ENABLED= -CONFIG_MQTT_CUSTOM_OUTBOX= - -# -# NVS -# - # # OpenSSL # @@ -599,7 +534,6 @@ CONFIG_OPENSSL_ASSERT_EXIT= # CONFIG_ESP32_PTHREAD_TASK_PRIO_DEFAULT=5 CONFIG_ESP32_PTHREAD_TASK_STACK_SIZE_DEFAULT=3072 -CONFIG_PTHREAD_STACK_MIN=768 # # SPI Flash driver @@ -643,16 +577,14 @@ CONFIG_SPIFFS_CHECK_DBG= CONFIG_SPIFFS_TEST_VISUALISATION= # -# TCP/IP Adapter +# tcpip adapter # CONFIG_IP_LOST_TIMER_INTERVAL=120 -CONFIG_TCPIP_LWIP=y # # Virtual file system # CONFIG_SUPPRESS_SELECT_DEBUG_OUTPUT=y -CONFIG_SUPPORT_TERMIOS=y # # Wear Levelling