Merge commit '646af4b318711d5662981127b0ec70d3939b0219' into development

This commit is contained in:
John Wellbelove 2019-09-23 19:46:14 +01:00
commit c9665e89ec
3 changed files with 12 additions and 19 deletions

View File

@ -39,12 +39,12 @@ SOFTWARE.
#define ETL_VERSION_MAJOR 14
#define ETL_VERSION_MINOR 31
#define ETL_VERSION_PATCH 0
#define ETL_VERSION_PATCH 1
#define ETL_VERSION ETL_STRINGIFY(ETL_VERSION_MAJOR) ETL_STRINGIFY(ETL_VERSION_MINOR) ETL_STRINGIFY(ETL_VERSION_PATCH)
#define ETL_VERSION_W ETL_WIDE_STRING(ETL_CONCAT(ETL_CONCAT(ETL_VERSION_MAJOR, ETL_VERSION_MINOR), ETL_VERSION_PATCH))
#define ETL_VERSION_U16 ETL_U16_STRING(ETL_CONCAT(ETL_CONCAT(ETL_VERSION_MAJOR, ETL_VERSION_MINOR), ETL_VERSION_PATCH))
#define ETL_VERSION_U32 ETL_U32_STRING(ETL_CONCAT(ETL_CONCAT(ETL_VERSION_MAJOR, ETL_VERSION_MINOR), ETL_VERSION_PATCH))
#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)
#define ETL_VERSION_U16 ETL_STRINGIFY(ETL_VERSION_MAJOR) u"." ETL_STRINGIFY(ETL_VERSION_MINOR) u"." ETL_STRINGIFY(ETL_VERSION_PATCH)
#define ETL_VERSION_U32 ETL_STRINGIFY(ETL_VERSION_MAJOR) U"." ETL_STRINGIFY(ETL_VERSION_MINOR) U"." ETL_STRINGIFY(ETL_VERSION_PATCH)
#define ETL_VERSION_VALUE ((ETL_VERSION_MAJOR * 10000) + (ETL_VERSION_MINOR * 100) + ETL_VERSION_PATCH)
#endif

View File

@ -7,19 +7,8 @@
},
"homepage": "https://www.etlcpp.com/",
"license": "MIT",
"description": "A C++ template library tailored for embedded systems.
"description": "A C++ template library tailored for embedded systems.",
"repository": "https://github.com/ETLCPP/etl.git",
"platforms": [
"espressif8266",
"espressif32"
],
"frameworks": "arduino",
"build": {
"flags": [
"-I include"
],
"srcFilter": [
"-<test/*>"
]
}
"platforms": "*",
"frameworks": "*"
}

View File

@ -1,3 +1,7 @@
===============================================================================
14.31.1
Fix error in PIO json
===============================================================================
14.31.0
Removed C timer library