Mirrors/MySensors
2
0
Fork 0
mirror of https://github.com/mysensors/MySensors.git synced 2026-02-20 01:21:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add progmem support for String messages (#875)

Browse Source 
added variant of MyMessage::set and sendSketchInfo that accept a
string that's stored in PROGMEM.

This avoids the need to (temporarily) store strings in memory to get
them into a message.
This commit is contained in:
Rainer Clasen
2017-06-21 23:41:48 +02:00
committed by Olivier
parent e5221689af
commit ff0953dd05
4 changed files with 40 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/MyMessage.cpp
View File

@@ -249,6 +249,23 @@ MyMessage& MyMessage::set(const char* value)
return *this;
}
#if !defined(__linux__)
MyMessage& MyMessage::set(const __FlashStringHelper* value)
{
uint8_t length = value == NULL ? 0
: min(strlen_P(reinterpret_cast<const char *>(value)), (size_t)MAX_PAYLOAD);
miSetLength(length);
miSetPayloadType(P_STRING);
if (length) {
strncpy_P(data, reinterpret_cast<const char *>(value), length);
}
// null terminate string
data[length] = 0;
return *this;
}
#endif
MyMessage& MyMessage::set(bool value)
{
miSetLength(1);

3
core/MyMessage.h
View File

@@ -325,6 +325,9 @@ public:
// Setters for payload
MyMessage& set(void* payload, uint8_t length);
MyMessage& set(const char* value);
#if !defined(__linux__)
MyMessage& set(const __FlashStringHelper* value);
#endif
MyMessage& set(float value, uint8_t decimals);
MyMessage& set(bool value);
MyMessage& set(uint8_t value);

18
core/MySensorsCore.cpp
View File

@@ -358,6 +358,22 @@ bool sendSketchInfo(const char *name, const char *version, const bool ack)
return result;
}
#if !defined(__linux__)
bool sendSketchInfo(const __FlashStringHelper *name, const __FlashStringHelper *version, const bool ack)
{
bool result = true;
if (name) {
result &= _sendRoute(build(_msgTmp, GATEWAY_ADDRESS, NODE_SENSOR_ID, C_INTERNAL, I_SKETCH_NAME,
ack).set(name));
}
if (version) {
result &= _sendRoute(build(_msgTmp, GATEWAY_ADDRESS, NODE_SENSOR_ID, C_INTERNAL, I_SKETCH_VERSION,
ack).set(version));
}
return result;
}
#endif
bool request(const uint8_t childSensorId, const uint8_t variableType, const uint8_t destination)
{
return _sendRoute(build(_msgTmp, destination, childSensorId, C_REQ, variableType).set(""));
@@ -700,4 +716,4 @@ void _checkNodeLock(void)
}
#if DOXYGEN
#endif
#endif

3
core/MySensorsCore.h
View File

@@ -145,6 +145,9 @@ bool present(const uint8_t sensorId, const uint8_t sensorType, const char *descr
* @return true Returns true if message reached the first stop on its way to destination.
*/
bool sendSketchInfo(const char *name, const char *version, const bool ack = false);
#if !defined(__linux__)
bool sendSketchInfo(const __FlashStringHelper *name, const __FlashStringHelper *version, const bool ack = false);
#endif
/**
* Sends a message to gateway or one of the other nodes in the radio network