alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'version/v5.0.0' into 'master'

Browse Source 
version: starting v5.0.0 development

See merge request espressif/esp-idf!15580
This commit is contained in:
Anton Maklakov 2021-10-21 03:37:51 +00:00
commit a047b15314
5 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
components/esp_common/include/esp_idf_version.h
View File

@ -1,16 +1,8 @@
// Copyright 2019 Espressif Systems (Shanghai) PTE 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.
/*
* SPDX-FileCopyrightText: 2019-2021 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
#pragma once
@ -19,9 +11,9 @@ extern "C" {
#endif
/** Major version number (X.x.x) */
#define ESP_IDF_VERSION_MAJOR 4
#define ESP_IDF_VERSION_MAJOR 5
/** Minor version number (x.X.x) */
#define ESP_IDF_VERSION_MINOR 4
#define ESP_IDF_VERSION_MINOR 0
/** Patch version number (x.x.X) */
#define ESP_IDF_VERSION_PATCH 0

2
examples/peripherals/i2s/i2s_es8311/main/idf_component.yml
View File

@ -6,7 +6,7 @@ dependencies:
espressif/es8311: "==0.0.2-alpha"
## Required IDF version
idf:
version: "^4.4"
version: "^5.0"
# # Put list of dependencies here
# # For components maintained by Espressif:
# component:

4
make/version.mk
View File

@ -1,3 +1,3 @@
IDF_VERSION_MAJOR := 4
IDF_VERSION_MINOR := 4
IDF_VERSION_MAJOR := 5
IDF_VERSION_MINOR := 0
IDF_VERSION_PATCH := 0

1
tools/ci/check_copyright_ignore.txt
View File

@ -738,7 +738,6 @@ components/esp_common/include/esp_bit_defs.h
components/esp_common/include/esp_check.h
components/esp_common/include/esp_compiler.h
components/esp_common/include/esp_err.h
components/esp_common/include/esp_idf_version.h
components/esp_common/include/esp_types.h
components/esp_common/src/esp_err_to_name.c
components/esp_common/test/test_attr.c

4
tools/cmake/version.cmake
View File

@ -1,5 +1,5 @@
set(IDF_VERSION_MAJOR 4)
set(IDF_VERSION_MINOR 4)
set(IDF_VERSION_MAJOR 5)
set(IDF_VERSION_MINOR 0)
set(IDF_VERSION_PATCH 0)
set(ENV{IDF_VERSION} "${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}.${IDF_VERSION_PATCH}")