Added lock status variable, removed some compiler warnings.

This commit is contained in:
Henrik Ekblad
2014-02-17 17:36:06 +01:00
parent 6af26e664c
commit d563bf3a1a
3 changed files with 4 additions and 7 deletions
+1 -3
View File
@@ -432,7 +432,7 @@ message_s Sensor::getMessage() {
boolean Sensor::readMessage() {
uint8_t len = RF24::getDynamicPayloadSize();
boolean done = RF24::read(&msg, len);
RF24::read(&msg, len);
if (!(msg.header.messageType==M_INTERNAL && msg.header.type == I_PING_ACK)) {
RF24::stopListening();
@@ -441,11 +441,9 @@ boolean Sensor::readMessage() {
RF24::startListening();
RF24::closeReadingPipe(WRITE_PIPE); // Stop listening to write-pipe after transmit
}
uint8_t cb = msg.header.crc;
uint8_t valid = validate(len-sizeof(header_s));
boolean ok = valid == VALIDATE_OK;
// Make sure string gets terminated ok for full sized messages.
msg.data[len - sizeof(header_s) ] = '\0';
debug(PSTR("Rx: fr=%d,to=%d,la=%d,ci=%d,mt=%d,t=%d,cr=%d(%s): %s\n"),