diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 444ec2a..29ca99c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,10 +32,6 @@ build_demo_cmake: - idf.py fullclean - idf.py build - cd ../ - - cd freetype - - idf.py fullclean - - idf.py build - - cd ../ - cd image_display - idf.py fullclean - idf.py build diff --git a/examples/freetype/CMakeLists.txt b/examples/freetype/CMakeLists.txt deleted file mode 100644 index 537d5da..0000000 --- a/examples/freetype/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -cmake_minimum_required(VERSION 3.5) - -include($ENV{IDF_PATH}/tools/cmake/project.cmake) - -set(EXTRA_COMPONENT_DIRS ../../components) - -add_compile_options(-fdiagnostics-color=always) - -project(freetype) diff --git a/examples/freetype/README.md b/examples/freetype/README.md deleted file mode 100644 index 7afca17..0000000 --- a/examples/freetype/README.md +++ /dev/null @@ -1,52 +0,0 @@ -# Hello World Example - -Starts a FreeRTOS task to print "Hello World". - -(See the README.md file in the upper level 'examples' directory for more information about examples.) - -## How to use example - -Follow detailed instructions provided specifically for this example. - -Select the instructions depending on Espressif chip installed on your development board: - -- [ESP32 Getting Started Guide](https://docs.espressif.com/projects/esp-idf/en/stable/get-started/index.html) -- [ESP32-S2 Getting Started Guide](https://docs.espressif.com/projects/esp-idf/en/latest/esp32s2/get-started/index.html) - - -## Example folder contents - -The project **hello_world** contains one source file in C language [hello_world_main.c](main/hello_world_main.c). The file is located in folder [main](main). - -ESP-IDF projects are built using CMake. The project build configuration is contained in `CMakeLists.txt` files that provide set of directives and instructions describing the project's source files and targets (executable, library, or both). - -Below is short explanation of remaining files in the project folder. - -``` -├── CMakeLists.txt -├── example_test.py Python script used for automated example testing -├── main -│   ├── CMakeLists.txt -│   ├── component.mk Component make file -│   └── hello_world_main.c -├── Makefile Makefile used by legacy GNU Make -└── README.md This is the file you are currently reading -``` - -For more information on structure and contents of ESP-IDF projects, please refer to Section [Build System](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-guides/build-system.html) of the ESP-IDF Programming Guide. - -## Troubleshooting - -* Program upload failure - - * Hardware connection is not correct: run `idf.py -p PORT monitor`, and reboot your board to see if there are any output logs. - * The baud rate for downloading is too high: lower your baud rate in the `menuconfig` menu, and try again. - -## Technical support and feedback - -Please use the following feedback channels: - -* For technical queries, go to the [esp32.com](https://esp32.com/) forum -* For a feature request or bug report, create a [GitHub issue](https://github.com/espressif/esp-idf/issues) - -We will get back to you as soon as possible. diff --git a/examples/freetype/main/CMakeLists.txt b/examples/freetype/main/CMakeLists.txt deleted file mode 100644 index 7e372dd..0000000 --- a/examples/freetype/main/CMakeLists.txt +++ /dev/null @@ -1,28 +0,0 @@ -idf_component_register( - SRCS - "freetype_example.c" - INCLUDE_DIRS - "lib/freetype/include") - -# Build static library, do not build test executables -option(BUILD_SHARED_LIBS OFF) -option(BUILD_TESTING OFF) -option(SKIP_INSTALL_ALL ON) - -# Unfortunately the library performs install and export. Would -# have been nice if devs made that an option like BUILD_SHARED_LIBS -# and BUILD_TESTING. Override install() and export() to do nothing -# instead. -function(install) -endfunction() - -function(export) -endfunction() - -# Import freetype targets -add_subdirectory(lib) - -# Link freetype to main component -target_link_libraries(${COMPONENT_LIB} PUBLIC freetype) - -spiffs_create_partition_image(storage ../spiffs FLASH_IN_PROJECT) diff --git a/examples/freetype/main/freetype_example.c b/examples/freetype/main/freetype_example.c deleted file mode 100644 index ae234c9..0000000 --- a/examples/freetype/main/freetype_example.c +++ /dev/null @@ -1,130 +0,0 @@ -/** - * @file freetype_example.c - * @brief Display fonts with FreeType - * @version 0.1 - * @date 2021-10-21 - * - * @copyright Copyright 2021 Espressif Systems (Shanghai) Co. Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include -#include "bsp_board.h" -#include "bsp_lcd.h" -#include "bsp_storage.h" -#include "bsp_tp.h" -#include "freertos/FreeRTOS.h" -#include "freertos/task.h" -#include "lv_demo.h" -#include "lv_port.h" -#include "lv_port_fs.h" -#include "lvgl.h" -#include "lv_freetype.h" - -static void font_preview(void); - -void app_main(void) -{ - ESP_ERROR_CHECK(bsp_board_init()); - ESP_ERROR_CHECK(bsp_spiffs_init_default()); - - ESP_ERROR_CHECK(bsp_lcd_init()); - ESP_ERROR_CHECK(bsp_tp_init()); - ESP_ERROR_CHECK(lv_port_init()); - ESP_ERROR_CHECK(lv_port_fs_init()); - lv_freetype_init(32, 1, 0); - - font_preview(); - - while (vTaskDelay(1), true) { - lv_task_handler(); - } -} - -static lv_style_t style; -static lv_ft_info_t info = { - .name = NULL, - .font = NULL, - .weight = 28, - .style = FT_FONT_STYLE_NORMAL, -}; - -static void btn_event_cb(lv_event_t *event) -{ - lv_obj_t *label = (lv_obj_t *) event->user_data; - const char *file_name = lv_list_get_btn_text(lv_obj_get_parent(event->target), event->target); - char *file_name_with_path = (char *) heap_caps_malloc(256, MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT); - - if (NULL != file_name_with_path) { - /* Get full file name with mount point and folder path */ - strcpy(file_name_with_path, "/spiffs/fonts/"); - strcat(file_name_with_path, file_name); - - /* Set font name and size */ - if (NULL != info.font) { - lv_ft_font_destroy(info.font); - } - info.name = file_name_with_path; - lv_ft_font_init(&info); - - /*Create style with the new font*/ - lv_style_init(&style); - lv_style_set_text_font(&style, info.font); - lv_style_set_text_color(&style, lv_color_black()); - - /*Create a label with the new style*/ - lv_obj_add_style(label, &style, LV_STATE_DEFAULT); - lv_label_set_text(label, - "你好,世界!\n" - "Hello World!"); - - /* Align object */ - lv_obj_align(label, LV_ALIGN_CENTER, lv_obj_get_width(lv_scr_act()) / 5, 0); - - /* Don't forget to free allocated memory */ - free(file_name_with_path); - } -} - -static void font_preview(void) -{ - lv_obj_clear_flag(lv_scr_act(), LV_OBJ_FLAG_SCROLLABLE); - - /* Create a list to show font file(s) */ - lv_obj_t *list = lv_list_create(lv_scr_act()); - lv_obj_set_size(list, 150, 220); - lv_obj_set_style_border_width(list, 0, LV_STATE_DEFAULT); - lv_obj_align(list, LV_ALIGN_LEFT_MID, -15, 0); - - lv_obj_t *label = lv_label_create(lv_scr_act()); - lv_label_set_text(label, "Select font to display"); - lv_obj_align(label, LV_ALIGN_CENTER, lv_obj_get_width(lv_scr_act()) / 5, 0); - - /* Get file name in storage */ - DIR *p_dir_stream = opendir("/spiffs/fonts"); - struct dirent *p_dirent = NULL; - - /* Scan files in storage */ - while (true) { - p_dirent = readdir(p_dir_stream); - if (NULL != p_dirent) { - lv_obj_t *btn = lv_list_add_btn(list, NULL, p_dirent->d_name); - lv_obj_add_event_cb(btn, btn_event_cb, LV_EVENT_CLICKED, (void *) label); - } else { - closedir(p_dir_stream); - break; - } - } -} diff --git a/examples/freetype/main/lib/CMakeLists.txt b/examples/freetype/main/lib/CMakeLists.txt deleted file mode 100644 index 9f5bc70..0000000 --- a/examples/freetype/main/lib/CMakeLists.txt +++ /dev/null @@ -1,343 +0,0 @@ -# CMakeLists.txt -# -# Copyright (C) 2013-2021 by -# David Turner, Robert Wilhelm, and Werner Lemberg. -# -# Written originally by John Cary -# -# This file is part of the FreeType project, and may only be used, modified, -# and distributed under the terms of the FreeType project license, -# LICENSE.TXT. By continuing to use, modify, or distribute this file you -# indicate that you have read the license and understand and accept it -# fully. -# -# FreeType explicitly marks the API to be exported and relies on the compiler -# to hide all other symbols. CMake supports a C_VISBILITY_PRESET property -# starting with 2.8.12. -cmake_minimum_required(VERSION 2.8.12) - -if (NOT CMAKE_VERSION VERSION_LESS 3.3) - # Allow symbol visibility settings also on static libraries. CMake < 3.3 - # only sets the property on a shared library build. - cmake_policy(SET CMP0063 NEW) - - # Support new IN_LIST if() operator. - cmake_policy(SET CMP0057 NEW) -endif () - -include(CheckIncludeFile) - -project(freetype C) - -set(VERSION_MAJOR "2") -set(VERSION_MINOR "11") -set(VERSION_PATCH "0") - -# Generate LIBRARY_VERSION and LIBRARY_SOVERSION. -set(LIBTOOL_REGEX "version_info='([0-9]+):([0-9]+):([0-9]+)'") -file(STRINGS "${PROJECT_SOURCE_DIR}/freetype/builds/unix/configure.raw" - VERSION_INFO - REGEX ${LIBTOOL_REGEX}) -string(REGEX REPLACE - ${LIBTOOL_REGEX} "\\1" - LIBTOOL_CURRENT "${VERSION_INFO}") -string(REGEX REPLACE - ${LIBTOOL_REGEX} "\\2" - LIBTOOL_REVISION "${VERSION_INFO}") -string(REGEX REPLACE - ${LIBTOOL_REGEX} "\\3" - LIBTOOL_AGE "${VERSION_INFO}") - -# This is what libtool does internally on Unix platforms. -math(EXPR LIBRARY_SOVERSION "${LIBTOOL_CURRENT} - ${LIBTOOL_AGE}") -set(LIBRARY_VERSION "${LIBRARY_SOVERSION}.${LIBTOOL_AGE}.${LIBTOOL_REVISION}") - -# Disallow in-source builds -if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}/freetype") - message(FATAL_ERROR - "In-source builds are not permitted! Make a separate folder for" - " building, e.g.,\n" - " cmake -E make_directory build\n" - " cmake -E chdir build cmake ..\n" - "Before that, remove the files created by this failed run with\n" - " cmake -E remove CMakeCache.txt\n" - " cmake -E remove_directory CMakeFiles") -endif () - - -# Add local cmake modules -list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/freetype/builds/cmake) - - -# Create the configuration file -if (UNIX) - check_include_file("unistd.h" HAVE_UNISTD_H) - check_include_file("fcntl.h" HAVE_FCNTL_H) - - file(READ "${PROJECT_SOURCE_DIR}/freetype/builds/unix/ftconfig.h.in" - FTCONFIG_H) - if (HAVE_UNISTD_H) - string(REGEX REPLACE - "#undef +(HAVE_UNISTD_H)" "#define \\1 1" - FTCONFIG_H "${FTCONFIG_H}") - endif () - if (HAVE_FCNTL_H) - string(REGEX REPLACE - "#undef +(HAVE_FCNTL_H)" "#define \\1 1" - FTCONFIG_H "${FTCONFIG_H}") - endif () -else () - file(READ "${PROJECT_SOURCE_DIR}/freetype/include/freetype/config/ftconfig.h" - FTCONFIG_H) -endif () - -set(FTCONFIG_H_NAME "${PROJECT_SOURCE_DIR}/freetype/include/freetype/config/ftconfig.h") -if (EXISTS "${FTCONFIG_H_NAME}") - file(READ "${FTCONFIG_H_NAME}" ORIGINAL_FTCONFIG_H) -else () - set(ORIGINAL_FTCONFIG_H "") -endif () -if (NOT (ORIGINAL_FTCONFIG_H STREQUAL FTCONFIG_H)) - file(WRITE "${FTCONFIG_H_NAME}" "${FTCONFIG_H}") -endif () - - -# Create the options file -file(READ "${PROJECT_SOURCE_DIR}/freetype/include/freetype/config/ftoption.h" - FTOPTION_H) - -set(FTOPTION_H_NAME "${PROJECT_BINARY_DIR}/include/freetype/config/ftoption.h") -if (EXISTS "${FTOPTION_H_NAME}") - file(READ "${FTOPTION_H_NAME}" ORIGINAL_FTOPTION_H) -else () - set(ORIGINAL_FTOPTION_H "") -endif () -if (NOT (ORIGINAL_FTOPTION_H STREQUAL FTOPTION_H)) - file(WRITE "${FTOPTION_H_NAME}" "${FTOPTION_H}") -endif () - -file(GLOB PUBLIC_HEADERS "include/ft2build.h" "include/freetype/*.h") -file(GLOB PUBLIC_CONFIG_HEADERS "include/freetype/config/*.h") -file(GLOB PRIVATE_HEADERS "include/freetype/internal/*.h") - -set(BASE_SRCS - freetype/src/autofit/autofit.c - freetype/src/base/ftbase.c - freetype/src/base/ftbbox.c - freetype/src/base/ftbdf.c - freetype/src/base/ftbitmap.c - freetype/src/base/ftcid.c - freetype/src/base/ftfstype.c - freetype/src/base/ftgasp.c - freetype/src/base/ftglyph.c - freetype/src/base/ftgxval.c - freetype/src/base/ftinit.c - freetype/src/base/ftmm.c - freetype/src/base/ftotval.c - freetype/src/base/ftpatent.c - freetype/src/base/ftpfr.c - freetype/src/base/ftstroke.c - freetype/src/base/ftsynth.c - freetype/src/base/fttype1.c - freetype/src/base/ftwinfnt.c - freetype/src/bdf/bdf.c - freetype/src/bzip2/ftbzip2.c - freetype/src/cache/ftcache.c - freetype/src/cff/cff.c - freetype/src/cid/type1cid.c - freetype/src/gzip/ftgzip.c - freetype/src/lzw/ftlzw.c - freetype/src/pcf/pcf.c - freetype/src/pfr/pfr.c - freetype/src/psaux/psaux.c - freetype/src/pshinter/pshinter.c - freetype/src/psnames/psnames.c - freetype/src/raster/raster.c - freetype/src/sdf/sdf.c - freetype/src/sfnt/sfnt.c - freetype/src/smooth/smooth.c - freetype/src/truetype/truetype.c - freetype/src/type1/type1.c - freetype/src/type42/type42.c - freetype/src/winfonts/winfnt.c -) - -if (UNIX) - list(APPEND BASE_SRCS "freetype/builds/unix/ftsystem.c") -elseif (WIN32) - list(APPEND BASE_SRCS "freetype/builds/windows/ftsystem.c") -else () - list(APPEND BASE_SRCS "freetype/src/base/ftsystem.c") -endif () - -if (WIN32) - enable_language(RC) - list(APPEND BASE_SRCS freetype/builds/windows/ftdebug.c - freetype/src/base/ftver.rc) -elseif (WINCE) - list(APPEND BASE_SRCS freetype/builds/wince/ftdebug.c) -else () - list(APPEND BASE_SRCS freetype/src/base/ftdebug.c) -endif () - -if (NOT DISABLE_FORCE_DEBUG_POSTFIX) - set(CMAKE_DEBUG_POSTFIX d) -endif () - - -add_library(freetype - ${PUBLIC_HEADERS} - ${PUBLIC_CONFIG_HEADERS} - ${PRIVATE_HEADERS} - ${BASE_SRCS} -) - -set_target_properties( - freetype PROPERTIES - C_VISIBILITY_PRESET hidden) - -target_compile_definitions( - freetype PRIVATE FT2_BUILD_LIBRARY) - -if (WIN32) - target_compile_definitions( - freetype PRIVATE _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_WARNINGS) - if (BUILD_SHARED_LIBS) - target_compile_definitions( - freetype PRIVATE DLL_EXPORT) - endif () -endif () - -if (BUILD_SHARED_LIBS) - set_target_properties(freetype PROPERTIES - VERSION ${LIBRARY_VERSION} - SOVERSION ${LIBRARY_SOVERSION}) -endif () - -# Pick up ftconfig.h and ftoption.h generated above, first. -target_include_directories( - freetype - PUBLIC - $ - $ - $ - PRIVATE - ${CMAKE_CURRENT_BINARY_DIR}/include - ${CMAKE_CURRENT_SOURCE_DIR}/include - - # Make available for builds/unix/ftsystem.c. - ${CMAKE_CURRENT_BINARY_DIR}/include/freetype/config -) - -set(PKG_CONFIG_REQUIRED_PRIVATE "") -set(PKG_CONFIG_LIBS_PRIVATE "") - -# Installation -include(GNUInstallDirs) - -if (NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL) - install( - # Note the trailing slash in the argument to `DIRECTORY'! - DIRECTORY ${PROJECT_SOURCE_DIR}/freetype/include/ - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/freetype2 - COMPONENT headers - PATTERN "internal" EXCLUDE - PATTERN "ftconfig.h" EXCLUDE - PATTERN "ftoption.h" EXCLUDE) - install( - FILES ${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h - ${PROJECT_BINARY_DIR}/include/freetype/config/ftoption.h - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/freetype2/freetype/config - COMPONENT headers) -endif () - -if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL) - # Generate the pkg-config file - file(READ "${PROJECT_SOURCE_DIR}/freetype/builds/unix/freetype2.in" FREETYPE2_PC_IN) - - string(REPLACE ";" ", " PKG_CONFIG_REQUIRED_PRIVATE "${PKG_CONFIG_REQUIRED_PRIVATE}") - - string(REPLACE "%prefix%" ${CMAKE_INSTALL_PREFIX} - FREETYPE2_PC_IN ${FREETYPE2_PC_IN}) - string(REPLACE "%exec_prefix%" "\${prefix}" - FREETYPE2_PC_IN ${FREETYPE2_PC_IN}) - string(REPLACE "%libdir%" "\${prefix}/${CMAKE_INSTALL_LIBDIR}" - FREETYPE2_PC_IN ${FREETYPE2_PC_IN}) - string(REPLACE "%includedir%" "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}" - FREETYPE2_PC_IN ${FREETYPE2_PC_IN}) - string(REPLACE "%ft_version%" "${LIBTOOL_CURRENT}.${LIBTOOL_REVISION}.${LIBTOOL_AGE}" - FREETYPE2_PC_IN ${FREETYPE2_PC_IN}) - string(REPLACE "%REQUIRES_PRIVATE%" "${PKG_CONFIG_REQUIRED_PRIVATE}" - FREETYPE2_PC_IN ${FREETYPE2_PC_IN}) - string(REPLACE "%LIBS_PRIVATE%" "${PKG_CONFIG_LIBS_PRIVATE}" - FREETYPE2_PC_IN ${FREETYPE2_PC_IN}) - - set(FREETYPE2_PC_IN_NAME "${PROJECT_BINARY_DIR}/freetype2.pc") - if (EXISTS "${FREETYPE2_PC_IN_NAME}") - file(READ "${FREETYPE2_PC_IN_NAME}" ORIGINAL_FREETYPE2_PC_IN) - else () - set(ORIGINAL_FREETYPE2_PC_IN "") - endif () - if (NOT (ORIGINAL_FREETYPE2_PC_IN STREQUAL FREETYPE2_PC_IN)) - file(WRITE "${FREETYPE2_PC_IN_NAME}" ${FREETYPE2_PC_IN}) - endif () - - install( - FILES ${PROJECT_BINARY_DIR}/freetype2.pc - DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig - COMPONENT pkgconfig) - - include(CMakePackageConfigHelpers) - write_basic_package_version_file( - ${PROJECT_BINARY_DIR}/freetype-config-version.cmake - VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH} - COMPATIBILITY SameMajorVersion) - - install( - TARGETS freetype - EXPORT freetype-targets - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - FRAMEWORK DESTINATION Library/Frameworks - COMPONENT libraries) - install( - EXPORT freetype-targets - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/freetype - FILE freetype-config.cmake - COMPONENT headers) - install( - FILES ${PROJECT_BINARY_DIR}/freetype-config-version.cmake - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/freetype - COMPONENT headers) -endif () - - -# Packaging -set(CPACK_PACKAGE_NAME ${CMAKE_PROJECT_NAME}) -set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "The FreeType font rendering library.") -set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/freetype/README") -set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/freetype/LICENSE.TXT") - -set(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR}) -set(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR}) -set(CPACK_PACKAGE_VERSION_PATCH ${VERSION_PATCH}) -set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") - -if (WIN32) - set(CPACK_GENERATOR ZIP) -else () - set(CPACK_GENERATOR TGZ) -endif () - -set(CPACK_COMPONENT_LIBRARIES_DISPLAY_NAME "Libraries") -set(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "C/C++ Headers") -set(CPACK_COMPONENT_LIBRARIES_DESCRIPTION - "Library used to build programs which use FreeType") -set(CPACK_COMPONENT_HEADERS_DESCRIPTION - "C/C++ header files for use with FreeType") -set(CPACK_COMPONENT_HEADERS_DEPENDS libraries) -set(CPACK_COMPONENT_LIBRARIES_GROUP "Development") -set(CPACK_COMPONENT_HEADERS_GROUP "Development") - -include(CPack) diff --git a/examples/freetype/main/lib/freetype b/examples/freetype/main/lib/freetype deleted file mode 160000 index fde91ab..0000000 --- a/examples/freetype/main/lib/freetype +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fde91ab8f19d1f789720afc67e0414a0244490d3 diff --git a/examples/freetype/partitions.csv b/examples/freetype/partitions.csv deleted file mode 100644 index 5654ee6..0000000 --- a/examples/freetype/partitions.csv +++ /dev/null @@ -1,6 +0,0 @@ -# Name, Type, SubType, Offset, Size, Flags -# Note: if you have increased the bootloader size, make sure to update the offsets to avoid overlap -nvs, data, nvs, 0x9000, 0x6000, -phy_init, data, phy, , 0x1000, -factory, app, factory, , 2048k, -storage, data, spiffs, , 8704k, diff --git a/examples/freetype/sdkconfig.defaults b/examples/freetype/sdkconfig.defaults deleted file mode 100644 index 6ab6169..0000000 --- a/examples/freetype/sdkconfig.defaults +++ /dev/null @@ -1,22 +0,0 @@ -CONFIG_IDF_TARGET="esp32s3" -CONFIG_ESPTOOLPY_FLASHMODE_QIO=y -CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y -CONFIG_PARTITION_TABLE_CUSTOM=y -CONFIG_ALL_DISABLE=y -CONFIG_MODEL_IN_SDCARD=y -# CONFIG_USE_WAKENET is not set -# CONFIG_USE_MULTINET is not set -CONFIG_LV_COLOR_16_SWAP=y -# CONFIG_LV_USE_PERF_MONITOR is not set -CONFIG_LV_FONT_USE_FREETYPE=y -CONFIG_ESP32S3_DEFAULT_CPU_FREQ_240=y -CONFIG_ESP32S3_INSTRUCTION_CACHE_32KB=y -CONFIG_ESP32S3_DATA_CACHE_64KB=y -CONFIG_ESP32S3_DATA_CACHE_LINE_64B=y -CONFIG_ESP32S3_SPIRAM_SUPPORT=y -CONFIG_SPIRAM_MODE_OCT=y -CONFIG_SPIRAM_SPEED_80M=y -CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y -CONFIG_ESP_MAIN_TASK_STACK_SIZE=32768 -CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG=y -CONFIG_FATFS_LFN_STACK=y diff --git a/examples/freetype/spiffs/fonts/STHupo.ttf b/examples/freetype/spiffs/fonts/STHupo.ttf deleted file mode 100644 index d1104b9..0000000 Binary files a/examples/freetype/spiffs/fonts/STHupo.ttf and /dev/null differ diff --git a/examples/freetype/spiffs/fonts/STXinwei.ttf b/examples/freetype/spiffs/fonts/STXinwei.ttf deleted file mode 100644 index afe13f4..0000000 Binary files a/examples/freetype/spiffs/fonts/STXinwei.ttf and /dev/null differ