MySmartHome/MySensors
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Uniquifying LIBRARY_VERSION

Browse Source 
Making MYSENSORS_LIBRARY_VERSION for
purposes of being more unique and
preventing conflict with other libraries
that chose the same
LIBRARY_VERSION like PID_v1 a fairly
common arduino library.  Of note, I
have also raised the issue
with that library as well
This commit is contained in:
Josh Cox
2016-07-04 22:24:40 -05:00
parent 2279dc11a0
commit 255040749c
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/MySensors/core/MyGatewayTransport.cpp
+1 -1
View File
@@ -40,7 +40,7 @@ inline void gatewayTransportProcess() {
if (mGetCommand(_msg) == C_INTERNAL) {
if (_msg.type == I_VERSION) {
// Request for version. Create the response
gatewayTransportSend(buildGw(_msg, I_VERSION).set(LIBRARY_VERSION));
gatewayTransportSend(buildGw(_msg, I_VERSION).set(MYSENSORS_LIBRARY_VERSION));
#ifdef MY_INCLUSION_MODE_FEATURE
} else if (_msg.type == I_INCLUSION_MODE) {
// Request to change inclusion mode
libraries/MySensors/core/MySensorsCore.cpp
+2 -2
View File
@@ -73,7 +73,7 @@ void _begin() {
if (before)
before();
debug(PSTR("Starting " MY_NODE_TYPE " (" MY_CAPABILITIES ", " LIBRARY_VERSION ")\n"));
debug(PSTR("Starting " MY_NODE_TYPE " (" MY_CAPABILITIES ", " MYSENSORS_LIBRARY_VERSION ")\n"));
#if defined(MY_LEDS_BLINKING_FEATURE)
ledsInit();
@@ -278,7 +278,7 @@ void sendHeartbeat(void) {
}
void present(uint8_t childSensorId, uint8_t sensorType, const char *description, bool enableAck) {
_sendRoute(build(_msgTmp, _nc.nodeId, GATEWAY_ADDRESS, childSensorId, C_PRESENTATION, sensorType, enableAck).set(childSensorId==NODE_SENSOR_ID?LIBRARY_VERSION:description));
_sendRoute(build(_msgTmp, _nc.nodeId, GATEWAY_ADDRESS, childSensorId, C_PRESENTATION, sensorType, enableAck).set(childSensorId==NODE_SENSOR_ID?MYSENSORS_LIBRARY_VERSION:description));
}
void sendSketchInfo(const char *name, const char *version, bool enableAck) {
libraries/MySensors/core/Version.h
+2 -2
View File
@@ -1,11 +1,11 @@
/***
* This file defines the Sensor library version number
* This file defines the Sensor library version number
* Normally, contributors should not modify this directly
* as it is managed by the MySensors Bot.
*/
#ifndef Version_h
#define Version_h
#define LIBRARY_VERSION "2.0.0-beta"
#define MYSENSORS_LIBRARY_VERSION "2.0.0-beta"
#endif