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

Ok, had to introduce a small delay on the ack-sensing side to let ack-recieving side have to to switch to listening mode.

Browse Source
This commit is contained in:
Henrik Ekblad
2014-03-22 14:31:01 +01:00
parent f44098259d
commit 893fbc6457
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/MySensors/Sensor.cpp
+9 -8
View File
@@ -226,20 +226,19 @@ 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));
ok = RF24::write(&message, min(MAX_MESSAGE_LENGTH, sizeof(message.header) + length), broadcast); RF24::startWrite(&message, min(MAX_MESSAGE_LENGTH, sizeof(message.header) + length), broadcast);
debug(PSTR("Sensor::sendWrite() - return value = %s\n"), ok ? "true" : "false" );
RF24::startListening(); RF24::startListening();
RF24::closeReadingPipe(WRITE_PIPE); // Stop listening to write-pipe after transmit RF24::closeReadingPipe(WRITE_PIPE); // Stop listening to write-pipe after transmit
if (!broadcast && (radioId == GATEWAY_ADDRESS)) { if (!broadcast) {
// ---------------- WAIT FOR ACK ------------------ // ---------------- WAIT FOR ACK ------------------
unsigned long startedWaiting = millis(); unsigned long startedWaiting = millis();
bool timeout = false; bool timeout = false;
// Wait max 100 ms // Wait for ack message maximum 50 ms
while ( !RF24::available() && !timeout ) { while ( !RF24::available() && !timeout ) {
if (millis() - startedWaiting > 100 ) { if (millis() - startedWaiting > ACK_MAX_WAIT ) {
timeout = true; timeout = true;
debug(PSTR("Transmit: timeout\n")); debug(PSTR("Ack: receive timeout\n"));
ok = false; ok = false;
} }
} }
@@ -248,12 +247,12 @@ boolean Sensor::sendWrite(uint8_t dest, message_s message, int length) {
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("Transmit: size problem\n")); debug(PSTR("Ack: received ack from the wrong sensor\n"));
ok = false; ok = false;
} }
} else { } else {
ok = false; ok = false;
debug(PSTR("Transmit: general fail\n")); debug(PSTR("Ack: received non ack msg.\n"));
} }
//-------------------- //--------------------
} }
@@ -456,11 +455,13 @@ boolean Sensor::readMessage() {
RF24::read(&msg, len); RF24::read(&msg, len);
if (!(msg.header.messageType==M_INTERNAL && msg.header.type == I_PING_ACK)) { if (!(msg.header.messageType==M_INTERNAL && msg.header.type == I_PING_ACK)) {
delay(ACK_SEND_DELAY); // Small delay here to let other side switch to reading mode
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::startListening();
RF24::closeReadingPipe(WRITE_PIPE); // Stop listening to write-pipe after transmit RF24::closeReadingPipe(WRITE_PIPE); // Stop listening to write-pipe after transmit
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));
boolean ok = valid == VALIDATE_OK; boolean ok = valid == VALIDATE_OK;
libraries/MySensors/Sensor.h
+2
View File
@@ -50,6 +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 ACK_MAX_WAIT 50
#define ACK_SEND_DELAY 5
#define WRITE_RETRY 5 #define WRITE_RETRY 5
#define FIND_RELAY_RETRIES 20 #define FIND_RELAY_RETRIES 20