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

Renamed defines.

Browse Source
This commit is contained in:
Henrik Ekblad
2014-05-01 16:50:50 +02:00
parent a4aabb99fb
commit 18848a25a6
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/MySensors/Sensor.cpp
+2 -2
View File
@@ -122,7 +122,7 @@ void Sensor::findRelay() {
distance = 255; distance = 255;
uint8_t oldRelayId = relayId; uint8_t oldRelayId = relayId;
uint8_t retries=0; uint8_t retries=0;
while (distance == 255 && retries<3) { while (distance == 255 && retries<FIND_RELAY_RETRIES) {
// Send ping message to BROADCAST_ADDRESS (to which all nodes listens and should reply to) // Send ping message to BROADCAST_ADDRESS (to which all nodes listens and should reply to)
buildMsg(radioId, BROADCAST_ADDRESS, NODE_CHILD_ID, M_INTERNAL, I_PING, "", 0, false); buildMsg(radioId, BROADCAST_ADDRESS, NODE_CHILD_ID, M_INTERNAL, I_PING, "", 0, false);
sendWrite(BROADCAST_ADDRESS, msg, 0); sendWrite(BROADCAST_ADDRESS, msg, 0);
@@ -206,7 +206,7 @@ boolean Sensor::send(message_s message, int length) {
if (!ok && radioId != GATEWAY_ADDRESS) { if (!ok && radioId != GATEWAY_ADDRESS) {
// Failure when sending to relay node. The relay node might be down and we // Failure when sending to relay node. The relay node might be down and we
// need to find another route to gateway. Max 20 retries before giving up. // need to find another route to gateway. Max 20 retries before giving up.
if (failedTransmissions > FIND_RELAY_RETRIES) { if (failedTransmissions > FIND_RELAY_AFTER_FAILED_TRANSMISSIONS) {
findRelay(); findRelay();
} }
failedTransmissions++; failedTransmissions++;
libraries/MySensors/Sensor.h
+2 -1
View File
@@ -50,7 +50,8 @@
#define CURRENT_NODE_PIPE ((uint8_t)1) #define CURRENT_NODE_PIPE ((uint8_t)1)
#define BROADCAST_PIPE ((uint8_t)2) #define BROADCAST_PIPE ((uint8_t)2)
#define FIND_RELAY_RETRIES 3 #define FIND_RELAY_RETRIES 2
#define FIND_RELAY_AFTER_FAILED_TRANSMISSIONS 20
#define MAX_MESSAGE_LENGTH 32 #define MAX_MESSAGE_LENGTH 32