From 201164f6ca1df30fcdf25314b4371db37e290066 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=B8rch?= <thomas@bowmo.dk>
Date: Sat, 3 Oct 2015 10:38:25 +0200
Subject: [PATCH] Removed warnings, when MY_OTA_FIRMWARE_FEATURE is enabled

---
 libraries/MySensors/MySensor.cpp |  2 +-
 libraries/MySensors/MySensor.h   | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/libraries/MySensors/MySensor.cpp b/libraries/MySensors/MySensor.cpp
index 36ae4f6..4174c4c 100644
--- a/libraries/MySensors/MySensor.cpp
+++ b/libraries/MySensors/MySensor.cpp
@@ -773,7 +773,7 @@ boolean MySensor::process() {
 							debug(PSTR("fw checksum ok\n"));
 							// All seems ok, write size and signature to flash (DualOptiboot will pick this up and flash it)	
 							uint16_t fwsize = FIRMWARE_BLOCK_SIZE * fc.blocks;
-							uint8_t OTAbuffer[10] = {'F','L','X','I','M','G',':',(fwsize >> 8),fwsize,':'};
+							uint8_t OTAbuffer[10] = {'F','L','X','I','M','G',':',(uint8_t)(fwsize >> 8),(uint8_t)(fwsize & 0xff),':'};
 							flash.writeBytes(0, OTAbuffer, 10);
 							// Write the new firmware config to eeprom
 							hw_writeConfigBlock((void*)&fc, (void*)EEPROM_FIRMWARE_TYPE_ADDRESS, sizeof(NodeFirmwareConfig));
diff --git a/libraries/MySensors/MySensor.h b/libraries/MySensors/MySensor.h
index 77be1bd..e022867 100644
--- a/libraries/MySensors/MySensor.h
+++ b/libraries/MySensors/MySensor.h
@@ -334,14 +334,6 @@ class MySensor
   protected:
 	NodeConfig nc; // Essential settings for node to work
 	ControllerConfig cc; // Configuration coming from controller
-#ifdef MY_OTA_FIRMWARE_FEATURE
-	NodeFirmwareConfig fc;
-	bool fwUpdateOngoing;
-	unsigned long fwLastRequestTime;
-	uint16_t fwBlock;
-	uint8_t fwRetry;
-	SPIFlash flash;
-#endif
 
 	bool repeaterMode;
 	bool autoFindParent;
@@ -369,6 +361,14 @@ class MySensor
 	uint16_t doSign[16]; // Bitfield indicating which sensors require signed communication
 	MyMessage msgSign;  // Buffer for message to sign.
 	MySigning& signer;
+#endif
+#ifdef MY_OTA_FIRMWARE_FEATURE
+	NodeFirmwareConfig fc;
+	bool fwUpdateOngoing;
+	unsigned long fwLastRequestTime;
+	uint16_t fwBlock;
+	uint8_t fwRetry;
+	SPIFlash flash;
 #endif
 	MyHw& hw;