From 7abbfd7b47359cfb4d34c23b6a4e1f73c08ff393 Mon Sep 17 00:00:00 2001 From: Olivier Date: Tue, 17 Jan 2017 23:23:02 +0100 Subject: [PATCH] Merge Master into Dev (#745) * Fix spi flash error when compiling in Arduino IDE 1.6.6 * Bump minor version * Fixed "invalid suffix on literal" warning * Fix addressing bug in _doSign bitfield * Make sure nodes not supporting signing informs GW A node that does not support signing, still needs to inform the gateway about this to make sure the gateway carries a valid signing requirement table when a node Id that was requiering signing stops doing this. This fixes #286. * Prevent SecureActuator from accepting ACKs as commands As ACKs are not currently signed, allowing ACKs as commands is a considerable security hole for this sketch. This is now resolved. * Backport of bugfix (#259) in repeaters when forwarding signed messages * Bumped version to 1.5.2 * Corrected doSign variable name (was _doSign) * Bumped version to 1.5.3 * Add NULL termination to payloads Messages addressed to "this" node, will have a null char appended to the payload after message verification is done, because some "getters" assume the message being a string. --- README.md | 7 ++----- core/MyHwESP8266.cpp | 2 +- core/Version.h | 2 +- library.json | 2 +- library.properties | 2 +- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index c3d55e4..ee6593b 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,4 @@ -Arduino -======= - -MySensors Arduino Library v2.1.0-beta +MySensors Library v2.1.0 Please visit www.mysensors.org for more information @@ -17,4 +14,4 @@ Current build status of development branch: [![Build Status](https://ci.mysensor Current build status of master branch (nightly build of Arduino IDE): [![Build Status](https://ci.mysensors.org/job/Nightlies/job/MySensorsArduinoNightlyIDE/job/master/badge/icon)](https://ci.mysensors.org/job/Nightlies/job/MySensorsArduinoNightlyIDE/job/master/) -Current build status of development branch (nightly build of Arduino IDE): [![Build Status](https://ci.mysensors.org/job/Nightlies/job/MySensorsArduinoNightlyIDE/job/development/badge/icon)](https://ci.mysensors.org/job/Nightlies/job/MySensorsArduinoNightlyIDE/job/development/) +Current build status of development branch (nightly build of Arduino IDE): [![Build Status](https://ci.mysensors.org/job/Nightlies/job/MySensorsArduinoNightlyIDE/job/development/badge/icon)](https://ci.mysensors.org/job/Nightlies/job/MySensorsArduinoNightlyIDE/job/development/) \ No newline at end of file diff --git a/core/MyHwESP8266.cpp b/core/MyHwESP8266.cpp index b296b97..9cc852a 100644 --- a/core/MyHwESP8266.cpp +++ b/core/MyHwESP8266.cpp @@ -94,7 +94,7 @@ int8_t hwSleep(uint8_t interrupt1, uint8_t mode1, uint8_t interrupt2, uint8_t mo // settings for getVcc() ADC_MODE(ADC_VCC); #else -// [default] settings for analogRead(A0) +// [default] settings for analogRead(A0) ADC_MODE(ADC_TOUT); #endif diff --git a/core/Version.h b/core/Version.h index 0f781ab..5f365ff 100644 --- a/core/Version.h +++ b/core/Version.h @@ -24,6 +24,6 @@ #ifndef Version_h #define Version_h -#define MYSENSORS_LIBRARY_VERSION "2.1.0-beta" +#define MYSENSORS_LIBRARY_VERSION "2.1.0" #endif diff --git a/library.json b/library.json index ac8c2f3..9f5931d 100644 --- a/library.json +++ b/library.json @@ -7,7 +7,7 @@ "type": "git", "url": "https://github.com/mysensors/MySensors.git" }, - "version": "2.1.0-beta", + "version": "2.1.0", "frameworks": "arduino", "platforms": [ "atmelavr", diff --git a/library.properties b/library.properties index f0d927c..9171bac 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=MySensors -version=2.1.0-beta +version=2.1.0 author=The MySensors Team maintainer=The MySensors Team sentence=Home Automation Framework