wait for response fixed

harvey637 · Feb 3, 2017 · b39eee7 · b39eee7
1 parent 6551bb1
commit b39eee7
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/Device.h b/Device.h
@@ -222,7 +222,7 @@ class Device {
  result = radio->write(msg,msg.burstRequired());
  if( result == true && msg.ackRequired() == true && to.valid() == true ) {
  Message response;
- if( waitResponse(msg,response,30) ) { // 300ms
+ if( (result=waitResponse(msg,response,30)) ) { // 300ms
  #ifdef USE_AES
  if( response.isChallengeAes() == true ) {
  AesChallengeMsg& cm = response.aesChallenge();
@@ -382,10 +382,13 @@ class Device {
 
  bool waitResponse(const Message& msg,Message& response,uint8_t timeout) {
  do {
- if( radio->read(response) > 0 &&
- msg.count() == response.count() &&
- msg.to() == response.from() ) {
- return true;
+ uint8_t num = radio->read(response);
+ if( num > 0 ) {
+// response.dump();
+ if( msg.count() == response.count() &&
+ msg.to() == response.from() ) {
+ return true;
+ }
  }
  _delay_ms(10); // wait 10ms
  timeout--;