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

Merge pull request #8 from mysensors/RF24-fixes

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