diff --git a/.gitlab/tools/build_apps.py b/.gitlab/tools/build_apps.py index 0da0875..8edac7a 100644 --- a/.gitlab/tools/build_apps.py +++ b/.gitlab/tools/build_apps.py @@ -21,17 +21,14 @@ PROJECT_ROOT = Path(__file__).parent.parent.parent.absolute() APPS_BUILD_PER_JOB = 30 IGNORE_WARNINGS = [ - r'memory region \`iram_loader_seg\' not declared', - r'redeclaration of memory region \`iram_loader_seg\'', r'1/2 app partitions are too small', - r'The current IDF version does not support using the gptimer API', - r'DeprecationWarning: pkg_resources is deprecated as an API', - r'\'ADC_ATTEN_DB_11\' is deprecated', - r'warning: unknown kconfig symbol*', - r'warning High Performance Mode \(QSPI Flash > 80MHz\) is optional feature that depends on flash model. Read Docs First!', - r'warning HPM-DC, which helps to run some flash > 80MHz by adjusting dummy cycles, is no longer enabled by default.', - r'warning To enable this feature, your bootloader needs to have the support for it \(by explicitly selecting BOOTLOADER_FLASH_DC_AWARE\)', - r'warning If your bootloader does not support it, select SPI_FLASH_HPM_DC_DISABLE to suppress the warning. READ DOCS FIRST!', + r'cc1plus: warning: command-line option \'-Wno-incompatible-pointer-types\' is valid for C/ObjC but not for C\+\+', + r'DeprecationWarning: pkg_resources is deprecated as an API. See https://setuptools.pypa.io/en/latest/pkg_resources.html', + r'The smallest app partition is nearly full', + r'managed_components/lvgl__lvgl/src/extra/libs/png/lv_png.c', + r'managed_components/lvgl__lvgl/src/extra/libs/png/lv_png.c', + r'warning: \'ADC_ATTEN_DB_11\' is deprecated', + r'warning: unused variable \'ret\'', ] def _get_idf_version(): @@ -63,10 +60,9 @@ def get_cmake_apps( build_log_filename='build_log.txt', size_json_filename='size.json', check_warnings=True, - preserve=True, default_build_targets=default_build_targets, manifest_files=[ - str(Path(PROJECT_ROOT) /'.build-rules.yml'), + str(Path(PROJECT_ROOT)/'.build-rules.yml'), ], ) return apps @@ -75,7 +71,6 @@ def get_cmake_apps( def main(args): # type: (argparse.Namespace) -> None default_build_targets = args.default_build_targets.split(',') if args.default_build_targets else None apps = get_cmake_apps(args.paths, args.target, args.config, default_build_targets) - if args.find: if args.output: os.makedirs(os.path.dirname(os.path.realpath(args.output)), exist_ok=True) @@ -108,6 +103,7 @@ def main(args): # type: (argparse.Namespace) -> None keep_going=True, ignore_warning_strs=IGNORE_WARNINGS, copy_sdkconfig=True, + no_preserve=False, ) sys.exit(ret_code) @@ -126,7 +122,7 @@ def main(args): # type: (argparse.Namespace) -> None ) parser.add_argument( '--config', - default=['sdkconfig.defaults=defaults', 'sdkconfig.ci.*=', '=defaults'], + default=['sdkconfig.ci=default', 'sdkconfig.ci.*=', '=default'], action='append', help='Adds configurations (sdkconfig file names) to build. This can either be ' 'FILENAME[=NAME] or FILEPATTERN. FILENAME is the name of the sdkconfig file, ' diff --git a/CHANGELOG.md b/CHANGELOG.md index 616d00e..1ec2e72 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ * feat(phone): cancel navigation bar and enable gesture-based navigation by default * feat(phone): add stylesheet 320x480, 800x1280, 1280x800 * feat(squareline): add ui_comp +* feat(examples): update bsp of esp_brookesia_phone_p4_function_ev_board ### Bugfixes: diff --git a/examples/esp_idf/esp_brookesia_phone_p4_function_ev_board/main/idf_component.yml b/examples/esp_idf/esp_brookesia_phone_p4_function_ev_board/main/idf_component.yml index 23f0fd1..aeb1803 100644 --- a/examples/esp_idf/esp_brookesia_phone_p4_function_ev_board/main/idf_component.yml +++ b/examples/esp_idf/esp_brookesia_phone_p4_function_ev_board/main/idf_component.yml @@ -2,7 +2,7 @@ dependencies: ## Required IDF version idf: ">=5.3" - espressif/esp32_p4_function_ev_board: "^3" + espressif/esp32_p4_function_ev_board: "^4" espressif/esp-brookesia: version: "*" override_path: "../../../../../esp-brookesia" diff --git a/examples/esp_idf/esp_brookesia_phone_p4_function_ev_board/main/main.cpp b/examples/esp_idf/esp_brookesia_phone_p4_function_ev_board/main/main.cpp index 3d1191e..1b94e3a 100644 --- a/examples/esp_idf/esp_brookesia_phone_p4_function_ev_board/main/main.cpp +++ b/examples/esp_idf/esp_brookesia_phone_p4_function_ev_board/main/main.cpp @@ -27,8 +27,11 @@ extern "C" void app_main(void) bsp_display_cfg_t cfg = { .lvgl_port_cfg = ESP_LVGL_PORT_INIT_CONFIG(), .buffer_size = BSP_LCD_H_RES * BSP_LCD_V_RES, + .double_buffer = BSP_LCD_DRAW_BUFF_DOUBLE, .flags = { + .buff_dma = false, .buff_spiram = true, + .sw_rotate = false, } }; lv_disp_t *disp = bsp_display_start_with_config(&cfg); @@ -46,11 +49,15 @@ extern "C" void app_main(void) ESP_BROOKESIA_CHECK_NULL_EXIT(phone, "Create phone failed"); /* Try using a stylesheet that corresponds to the resolution */ + ESP_Brookesia_PhoneStylesheet_t *phone_stylesheet = nullptr; if ((BSP_LCD_H_RES == 1024) && (BSP_LCD_V_RES == 600)) { - ESP_LOGI(TAG, "Using external stylesheet"); - ESP_Brookesia_PhoneStylesheet_t *phone_stylesheet = new ESP_Brookesia_PhoneStylesheet_t ESP_BROOKESIA_PHONE_1024_600_DARK_STYLESHEET(); + phone_stylesheet = new ESP_Brookesia_PhoneStylesheet_t ESP_BROOKESIA_PHONE_1024_600_DARK_STYLESHEET(); ESP_BROOKESIA_CHECK_NULL_EXIT(phone_stylesheet, "Create phone stylesheet failed"); - + } else if ((BSP_LCD_H_RES == 800) && (BSP_LCD_V_RES == 1280)) { + phone_stylesheet = new ESP_Brookesia_PhoneStylesheet_t ESP_BROOKESIA_PHONE_800_1280_DARK_STYLESHEET(); + ESP_BROOKESIA_CHECK_NULL_EXIT(phone_stylesheet, "Create phone stylesheet failed"); + } + if (phone_stylesheet != nullptr) { ESP_LOGI(TAG, "Using stylesheet (%s)", phone_stylesheet->core.name); ESP_BROOKESIA_CHECK_FALSE_EXIT(phone->addStylesheet(phone_stylesheet), "Add phone stylesheet failed"); ESP_BROOKESIA_CHECK_FALSE_EXIT(phone->activateStylesheet(phone_stylesheet), "Activate phone stylesheet failed");