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

Changed order.

Browse Source
This commit is contained in:
Henrik Ekblad
2014-03-22 16:08:19 +01:00
parent 893fbc6457
commit 0da770a374
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/MySensors/Sensor.cpp
+3 -3
View File
@@ -226,9 +226,9 @@ boolean Sensor::sendWrite(uint8_t dest, message_s message, int length) {
// int retry = WRITE_RETRY; // int retry = WRITE_RETRY;
RF24::stopListening(); RF24::stopListening();
RF24::openWritingPipe(TO_ADDR(dest)); RF24::openWritingPipe(TO_ADDR(dest));
RF24::startWrite(&message, min(MAX_MESSAGE_LENGTH, sizeof(message.header) + length), broadcast); RF24::write(&message, min(MAX_MESSAGE_LENGTH, sizeof(message.header) + length), broadcast);
RF24::startListening();
RF24::closeReadingPipe(WRITE_PIPE); // Stop listening to write-pipe after transmit RF24::closeReadingPipe(WRITE_PIPE); // Stop listening to write-pipe after transmit
RF24::startListening();
if (!broadcast) { if (!broadcast) {
// ---------------- WAIT FOR ACK ------------------ // ---------------- WAIT FOR ACK ------------------
@@ -459,8 +459,8 @@ boolean Sensor::readMessage() {
RF24::stopListening(); RF24::stopListening();
RF24::openWritingPipe(TO_ADDR(msg.header.last)); RF24::openWritingPipe(TO_ADDR(msg.header.last));
RF24::write(&radioId, sizeof(uint8_t)); RF24::write(&radioId, sizeof(uint8_t));
RF24::startListening();
RF24::closeReadingPipe(WRITE_PIPE); // Stop listening to write-pipe after transmit RF24::closeReadingPipe(WRITE_PIPE); // Stop listening to write-pipe after transmit
RF24::startListening();
debug(PSTR("Sent ack msg to %d\n"), msg.header.last); debug(PSTR("Sent ack msg to %d\n"), msg.header.last);
} }
uint8_t valid = validate(len-sizeof(header_s)); uint8_t valid = validate(len-sizeof(header_s));