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

Rename PING to the more suitable FIND_PARENT

Browse Source
This commit is contained in:
Henrik Ekblad
2014-08-13 20:02:10 +02:00
parent 61122532ad
commit 9f48f091e3
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/MySensors/MyMessage.h
+7 -3
View File
@@ -44,7 +44,7 @@ typedef enum {
// Type of internal messages (for internal messages) // Type of internal messages (for internal messages)
typedef enum { typedef enum {
I_BATTERY_LEVEL, I_TIME, I_VERSION, I_ID_REQUEST, I_ID_RESPONSE, I_BATTERY_LEVEL, I_TIME, I_VERSION, I_ID_REQUEST, I_ID_RESPONSE,
I_INCLUSION_MODE, I_CONFIG, I_PING, I_PING_ACK, I_INCLUSION_MODE, I_CONFIG, I_FIND_PARENT, I_FIND_PARENT_RESPONSE,
I_LOG_MESSAGE, I_CHILDREN, I_SKETCH_NAME, I_SKETCH_VERSION, I_LOG_MESSAGE, I_CHILDREN, I_SKETCH_NAME, I_SKETCH_VERSION,
I_REBOOT I_REBOOT
} internal; } internal;
@@ -185,17 +185,21 @@ struct
// Each message can transfer a payload. We add one extra byte for string // Each message can transfer a payload. We add one extra byte for string
// terminator \0 to be "printable" this is not transferred OTA // terminator \0 to be "printable" this is not transferred OTA
// This union is used to simplify the construction of the binary transferred int/long values. // This union is used to simplify the construction of the binary data types transferred.
union { union {
uint8_t bValue; uint8_t bValue;
unsigned long ulValue; unsigned long ulValue;
long lValue; long lValue;
unsigned int uiValue; unsigned int uiValue;
int iValue; int iValue;
struct { struct { // Float messages
float fValue; float fValue;
uint8_t fPrecision; // Number of decimals when serializing uint8_t fPrecision; // Number of decimals when serializing
}; };
struct { // Presentation messages
uint8_t version; // Library version
uint8_t sensorType; // Sensor type hint for controller, see table above
};
char data[MAX_PAYLOAD + 1]; char data[MAX_PAYLOAD + 1];
} __attribute__((packed)); } __attribute__((packed));
#ifdef __cplusplus #ifdef __cplusplus
libraries/MySensors/MySensor.cpp
+6 -6
View File
@@ -112,7 +112,7 @@ void MySensor::setupRadio(rf24_pa_dbm_e paLevel, uint8_t channel, rf24_datarate_
RF24::setCRCLength(RF24_CRC_16); RF24::setCRCLength(RF24_CRC_16);
RF24::enableDynamicPayloads(); RF24::enableDynamicPayloads();
// All nodes listen to broadcast pipe (for PING-ACK messages) // All nodes listen to broadcast pipe (for FIND_PARENT_RESPONSE messages)
RF24::openReadingPipe(BROADCAST_PIPE, TO_ADDR(BROADCAST_ADDRESS)); RF24::openReadingPipe(BROADCAST_PIPE, TO_ADDR(BROADCAST_ADDRESS));
} }
@@ -145,7 +145,7 @@ void MySensor::findParentNode() {
nc.distance = 255; nc.distance = 255;
// Send ping message to BROADCAST_ADDRESS (to which all relaying nodes and gateway listens and should reply to) // Send ping message to BROADCAST_ADDRESS (to which all relaying nodes and gateway listens and should reply to)
build(msg, nc.nodeId, BROADCAST_ADDRESS, NODE_SENSOR_ID, C_INTERNAL, I_PING, false).set(""); build(msg, nc.nodeId, BROADCAST_ADDRESS, NODE_SENSOR_ID, C_INTERNAL, I_FIND_PARENT, false).set("");
sendWrite(BROADCAST_ADDRESS, msg, true); sendWrite(BROADCAST_ADDRESS, msg, true);
// Wait for ping response. // Wait for ping response.
@@ -285,12 +285,12 @@ boolean MySensor::process() {
uint8_t last = msg.last; uint8_t last = msg.last;
uint8_t destination = msg.destination; uint8_t destination = msg.destination;
if (repeaterMode && command == C_INTERNAL && type == I_PING) { if (repeaterMode && command == C_INTERNAL && type == I_FIND_PARENT) {
// Relaying nodes should always answer ping messages // Relaying nodes should always answer ping messages
// Wait a random delay of 0-2 seconds to minimize collision // Wait a random delay of 0-2 seconds to minimize collision
// between ping ack messages from other relaying nodes // between ping ack messages from other relaying nodes
delay(millis() & 0x3ff); delay(millis() & 0x3ff);
sendWrite(sender, build(msg, nc.nodeId, sender, NODE_SENSOR_ID, C_INTERNAL, I_PING_ACK, false).set(nc.distance), true); sendWrite(sender, build(msg, nc.nodeId, sender, NODE_SENSOR_ID, C_INTERNAL, I_FIND_PARENT_RESPONSE, false).set(nc.distance), true);
return false; return false;
} else if (destination == nc.nodeId) { } else if (destination == nc.nodeId) {
// Check if sender requests an ack back. // Check if sender requests an ack back.
@@ -311,8 +311,8 @@ boolean MySensor::process() {
} }
if (command == C_INTERNAL) { if (command == C_INTERNAL) {
if (type == I_PING_ACK && !isGateway) { if (type == I_FIND_PARENT_RESPONSE && !isGateway) {
// We've received a reply to a PING message. Check if the distance is // We've received a reply to a FIND_PARENT message. Check if the distance is
// shorter than we already have. // shorter than we already have.
uint8_t distance = msg.getByte(); uint8_t distance = msg.getByte();
if (distance<nc.distance-1) { if (distance<nc.distance-1) {