mirror of
https://github.com/espressif/esp-idf.git
synced 2024-09-20 00:36:01 -04:00
Merge branch 'contrib/github_pr_8900' into 'master'
hello_world_main : fix incorrect printf format (GitHub PR) Closes IDFGH-7312 See merge request espressif/esp-idf!17998
This commit is contained in:
commit
1f922f2124
@ -1,11 +1,9 @@
|
|||||||
/* Hello World Example
|
/*
|
||||||
|
* SPDX-FileCopyrightText: 2010-2022 Espressif Systems (Shanghai) CO LTD
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: CC0-1.0
|
||||||
|
*/
|
||||||
|
|
||||||
This example code is in the Public Domain (or CC0 licensed, at your option.)
|
|
||||||
|
|
||||||
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"
|
||||||
@ -21,15 +19,15 @@ void app_main(void)
|
|||||||
esp_chip_info_t chip_info;
|
esp_chip_info_t chip_info;
|
||||||
esp_chip_info(&chip_info);
|
esp_chip_info(&chip_info);
|
||||||
printf("This is %s chip with %d CPU core(s), WiFi%s%s, ",
|
printf("This is %s chip with %d CPU core(s), WiFi%s%s, ",
|
||||||
CONFIG_IDF_TARGET,
|
CONFIG_IDF_TARGET,
|
||||||
chip_info.cores,
|
chip_info.cores,
|
||||||
(chip_info.features & CHIP_FEATURE_BT) ? "/BT" : "",
|
(chip_info.features & CHIP_FEATURE_BT) ? "/BT" : "",
|
||||||
(chip_info.features & CHIP_FEATURE_BLE) ? "/BLE" : "");
|
(chip_info.features & CHIP_FEATURE_BLE) ? "/BLE" : "");
|
||||||
|
|
||||||
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());
|
||||||
|
|
||||||
|
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user