From d563bf3a1aed8eda1524ab328799520ed07124fa Mon Sep 17 00:00:00 2001
From: Henrik Ekblad <henrik.ekblad@gmail.com>
Date: Mon, 17 Feb 2014 17:36:06 +0100
Subject: [PATCH] Added lock status variable, removed some compiler warnings.

---
 libraries/MySensors/Relay.cpp  | 5 ++---
 libraries/MySensors/Sensor.cpp | 4 +---
 libraries/MySensors/Sensor.h   | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/libraries/MySensors/Relay.cpp b/libraries/MySensors/Relay.cpp
index ad33cc6..1a90860 100644
--- a/libraries/MySensors/Relay.cpp
+++ b/libraries/MySensors/Relay.cpp
@@ -18,9 +18,8 @@ Relay::Relay(uint8_t _cepin, uint8_t _cspin) : Sensor(_cepin, _cspin) {
 
 void Relay::begin(uint8_t _radioId) {
 	Sensor::begin(_radioId);
-
 	// Read routing table from EEPROM
-	for (int i=0;i<sizeof(childNodeTable);i++) {
+	for (unsigned int i=0;i<sizeof(childNodeTable);i++) {
 		childNodeTable[i] = EEPROM.read(EEPROM_ROUTES_ADDRESS+i);
 	}
 }
@@ -235,7 +234,7 @@ uint8_t Relay::getChildRoute(uint8_t childId) {
 
 void Relay::clearChildRoutes() {
 	debug(PSTR("Clear child routing data\n"));
-	for (int i=0;i< sizeof(childNodeTable); i++) {
+	for (unsigned int i=0;i< sizeof(childNodeTable); i++) {
 		removeChildRoute(i);
 	}
 	sendInternal(I_CHILDREN, "");
diff --git a/libraries/MySensors/Sensor.cpp b/libraries/MySensors/Sensor.cpp
index e9b5541..56ac8be 100644
--- a/libraries/MySensors/Sensor.cpp
+++ b/libraries/MySensors/Sensor.cpp
@@ -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"),
diff --git a/libraries/MySensors/Sensor.h b/libraries/MySensors/Sensor.h
index 8743015..f92d26d 100644
--- a/libraries/MySensors/Sensor.h
+++ b/libraries/MySensors/Sensor.h
@@ -73,7 +73,7 @@ typedef enum {
 	V_RAINRATE, V_WIND, V_GUST, V_DIRECTION, V_UV, V_WEIGHT, V_DISTANCE,
 	V_IMPEDANCE, V_ARMED, V_TRIPPED, V_WATT, V_KWH, V_SCENE_ON, V_SCENE_OFF,
 	V_HEATER, V_HEATER_SW, V_LIGHT_LEVEL, V_VAR1, V_VAR2, V_VAR3, V_VAR4, V_VAR5,
-	V_UP, V_DOWN, V_STOP, V_IR_SEND, V_IR_RECEIVE, V_FLOW, V_VOLUME
+	V_UP, V_DOWN, V_STOP, V_IR_SEND, V_IR_RECEIVE, V_FLOW, V_VOLUME, V_LOCK_STATUS
 } variableType;
 
 // Internal messages