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

A-lurkers changes that attempt to resolve the presentation message sending failures. Creating an experimentation branch for joint investigation.

Browse Source
This commit is contained in:
Bruce Lacey
2014-03-21 22:22:44 -07:00
parent ef5f00e7ef
commit f44098259d
2 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/MySensors/Sensor.cpp
+6 -2
View File
@@ -226,11 +226,12 @@ boolean Sensor::sendWrite(uint8_t dest, message_s message, int length) {
// int retry = WRITE_RETRY;
RF24::stopListening();
RF24::openWritingPipe(TO_ADDR(dest));
RF24::write(&message, min(MAX_MESSAGE_LENGTH, sizeof(message.header) + length), broadcast);
ok = RF24::write(&message, min(MAX_MESSAGE_LENGTH, sizeof(message.header) + length), broadcast);
debug(PSTR("Sensor::sendWrite() - return value = %s\n"), ok ? "true" : "false" );
RF24::startListening();
RF24::closeReadingPipe(WRITE_PIPE); // Stop listening to write-pipe after transmit
if (!broadcast) {
if (!broadcast && (radioId == GATEWAY_ADDRESS)) {
// ---------------- WAIT FOR ACK ------------------
unsigned long startedWaiting = millis();
bool timeout = false;
@@ -238,6 +239,7 @@ boolean Sensor::sendWrite(uint8_t dest, message_s message, int length) {
while ( !RF24::available() && !timeout ) {
if (millis() - startedWaiting > 100 ) {
timeout = true;
debug(PSTR("Transmit: timeout\n"));
ok = false;
}
}
@@ -246,10 +248,12 @@ boolean Sensor::sendWrite(uint8_t dest, message_s message, int length) {
uint8_t idest;
RF24::read( &idest, sizeof(uint8_t));
if (dest != idest) {
debug(PSTR("Transmit: size problem\n"));
ok = false;
}
} else {
ok = false;
debug(PSTR("Transmit: general fail\n"));
}
//--------------------
}