espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-06 06:04:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'contrib/github_pr_8900' into 'master'

Browse Source 
hello_world_main : fix incorrect printf format (GitHub PR)

Closes IDFGH-7312

See merge request espressif/esp-idf!17998
This commit is contained in:
morris
2022-05-06 21:22:51 +08:00
parent 06e071ba4b a01820c583
commit 1f922f2124
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
examples/get-started/hello_world/main/hello_world_main.c
View File

@@ -1,11 +1,9 @@
/* Hello World Example /*
* SPDX-FileCopyrightText: 2010-2022 Espressif Systems (Shanghai) CO LTD
This example code is in the Public Domain (or CC0 licensed, at your option.) *
* SPDX-License-Identifier: CC0-1.0
Unless required by applicable law or agreed to in writing, this
software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
CONDITIONS OF ANY KIND, either express or implied.
*/ */
#include <stdio.h> #include <stdio.h>
#include "sdkconfig.h" #include "sdkconfig.h"
#include "freertos/FreeRTOS.h" #include "freertos/FreeRTOS.h"
@@ -28,7 +26,7 @@ void app_main(void)
printf("silicon revision %d, ", chip_info.revision); printf("silicon revision %d, ", chip_info.revision);
printf("%dMB %s flash\n", spi_flash_get_chip_size() / (1024 * 1024), printf("%uMB %s flash\n", spi_flash_get_chip_size() / (1024 * 1024),
(chip_info.features & CHIP_FEATURE_EMB_FLASH) ? "embedded" : "external"); (chip_info.features & CHIP_FEATURE_EMB_FLASH) ? "embedded" : "external");
printf("Minimum free heap size: %d bytes\n", esp_get_minimum_free_heap_size()); printf("Minimum free heap size: %d bytes\n", esp_get_minimum_free_heap_size());

1
tools/ci/check_copyright_ignore.txt
View File

@@ -2031,7 +2031,6 @@ examples/ethernet/iperf/main/ethernet_example_main.c
examples/get-started/blink/example_test.py examples/get-started/blink/example_test.py
examples/get-started/blink/main/blink_example_main.c examples/get-started/blink/main/blink_example_main.c
examples/get-started/hello_world/example_test.py examples/get-started/hello_world/example_test.py
examples/get-started/hello_world/main/hello_world_main.c
examples/get-started/sample_project/main/main.c examples/get-started/sample_project/main/main.c
examples/mesh/internal_communication/main/include/mesh_light.h examples/mesh/internal_communication/main/include/mesh_light.h
examples/mesh/internal_communication/main/mesh_light.c examples/mesh/internal_communication/main/mesh_light.c