blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-03-31 03:41:07 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'update/version_4_2_2' into 'release/v4.2'

Browse Source 
Update version to 4.2.2

See merge request espressif/esp-idf!13984
This commit is contained in:
Angus Gratton 2021-06-18 05:23:04 +00:00
commit 2d72e916ac
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,7 @@ extern "C" {
/** Minor version number (x.X.x) */ /** Minor version number (x.X.x) */
#define ESP_IDF_VERSION_MINOR 2 #define ESP_IDF_VERSION_MINOR 2
/** Patch version number (x.x.X) */ /** Patch version number (x.x.X) */
#define ESP_IDF_VERSION_PATCH 1 #define ESP_IDF_VERSION_PATCH 2
/** /**
* Macro to convert IDF version number into an integer * Macro to convert IDF version number into an integer

2
make/version.mk
View File

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

2
tools/cmake/version.cmake
View File

@ -1,3 +1,3 @@
set(IDF_VERSION_MAJOR 4) set(IDF_VERSION_MAJOR 4)
set(IDF_VERSION_MINOR 2) set(IDF_VERSION_MINOR 2)
set(IDF_VERSION_PATCH 1) set(IDF_VERSION_PATCH 2)