Merge pull request #8 from mysensors/RF24-fixes

Rf24 fixes - code looks good!
This commit is contained in:
Bruce Lacey
2014-03-25 16:22:51 -07:00
2 changed files with 18 additions and 18 deletions
+17 -17
View File
@@ -242,26 +242,26 @@ boolean Sensor::sendWrite(uint8_t dest, message_s message, int length) {
ok = false;
}
}
// Check payload size and content
if ( !timeout && RF24::getDynamicPayloadSize()==sizeof(uint8_t)) {
uint8_t idest;
RF24::read( &idest, sizeof(uint8_t));
if (dest != idest) {
debug(PSTR("Ack: received ack from the wrong sensor\n"));
ok = false;
}
} else {
ok = false;
debug(PSTR("Ack: received non ack msg.\n"));
// Check payload size and content
if (!timeout) {
// Check payload size and content
if (RF24::getDynamicPayloadSize()==sizeof(uint8_t)) {
uint8_t idest;
RF24::read( &idest, sizeof(uint8_t));
if (dest != idest) {
debug(PSTR("Ack: received ack from the wrong sensor\n"));
ok = false;
} else {
debug(PSTR("Ack: received OK\n"));
}
} else {
ok = false;
debug(PSTR("Ack: received none ack msg.\n"));
}
}
//--------------------
}
if (ok) {
debug(PSTR("Sent successfully\n"));
} else {
debug(PSTR("Send failed.\n"));
}
return ok;
}
+1 -1
View File
@@ -136,7 +136,7 @@ uint8_t RF24::read_payload(void* buf, uint8_t len)
while ( blank_len-- )
SPI.transfer(0xff);
csn(HIGH);
ce(HIGH); //? ADDED IN
return status;
}