Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/hotfix/quick_fixes' into develop…
Browse files Browse the repository at this point in the history
…ment
  • Loading branch information
jwellbelove committed Sep 24, 2019
2 parents 32b5932 + f49c07b commit 57779e4
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
2 changes: 1 addition & 1 deletion include/etl/version.h
Expand Up @@ -39,7 +39,7 @@ SOFTWARE.

#define ETL_VERSION_MAJOR 14
#define ETL_VERSION_MINOR 31
#define ETL_VERSION_PATCH 1
#define ETL_VERSION_PATCH 2

This comment has been minimized.

Copy link
@puzrin

puzrin Sep 25, 2019

Contributor

Missed version update in files library.properties and library.json :). Crawler will not fetch this update.

Everything else ok. https://github.com/puzrin/etl_check/blob/master/platformio.ini#L25 - this demo takes code from your master now, and it works.


#define ETL_VERSION ETL_STRINGIFY(ETL_VERSION_MAJOR) "." ETL_STRINGIFY(ETL_VERSION_MINOR) "." ETL_STRINGIFY(ETL_VERSION_PATCH)
#define ETL_VERSION_W ETL_STRINGIFY(ETL_VERSION_MAJOR) L"." ETL_STRINGIFY(ETL_VERSION_MINOR) L"." ETL_STRINGIFY(ETL_VERSION_PATCH)
Expand Down
10 changes: 8 additions & 2 deletions library.json
Expand Up @@ -3,12 +3,18 @@
"version": "14.31.1",
"authors": {
"name": "John Wellbelove",
"email": "<john.wellbelove@etlcpp.com>"
"email": "<john.wellbelove@etlcpp.com>"
},
"homepage": "https://www.etlcpp.com/",
"license": "MIT",
"description": "A C++ template library tailored for embedded systems.",
"repository": "https://github.com/ETLCPP/etl.git",
"repository": {
"type": "git",
"url": "https://github.com/ETLCPP/etl.git"
},
"build": {
"includeDir": "include"
},
"platforms": "*",
"frameworks": "*"
}
4 changes: 4 additions & 0 deletions support/Release notes.txt
@@ -1,3 +1,7 @@
===============================================================================
14.31.2
More PIO json tweaks

===============================================================================
14.31.1
Fix error in PIO json
Expand Down

0 comments on commit 57779e4

Please sign in to comment.