From cb5e3172bdbf5e8121284aa203d5f7c694ae0a96 Mon Sep 17 00:00:00 2001
From: Henrik Ekblad <henrik.ekblad@gmail.com>
Date: Mon, 16 Mar 2015 19:39:06 +0100
Subject: [PATCH] Fixed compile problem

---
 libraries/MySensors/MyHw.h          |  2 --
 libraries/MySensors/MyHwATMega328.h | 14 +++++++-------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/libraries/MySensors/MyHw.h b/libraries/MySensors/MyHw.h
index 95cf2a4..b73ec23 100644
--- a/libraries/MySensors/MyHw.h
+++ b/libraries/MySensors/MyHw.h
@@ -3,9 +3,7 @@
 
 #include <stdint.h>
 #include <stddef.h>
-#include "MyConfig.h"
 
-//#include "MySensor.h"
 /**
  * The Hw contains all hardware specific details of the platform
  */
diff --git a/libraries/MySensors/MyHwATMega328.h b/libraries/MySensors/MyHwATMega328.h
index 618a789..5a63faf 100644
--- a/libraries/MySensors/MyHwATMega328.h
+++ b/libraries/MySensors/MyHwATMega328.h
@@ -1,7 +1,8 @@
 #ifndef MyHwATMega328_h
 #define MyHwATMega328_h
 
-#include "MyConfig.h"
+#include "MyHw.h"
+//#include "MyConfig.h"
 #include "MyMessage.h"
 #include <avr/eeprom.h>
 #include <avr/pgmspace.h>
@@ -10,7 +11,6 @@
 #include <avr/interrupt.h>
 #include <avr/wdt.h>
 
-#include "MyHw.h"
 
 #ifdef __cplusplus
 #include <Arduino.h>
@@ -20,12 +20,12 @@
 // Define these as macros to save valuable space
 #define hw_init() Serial.begin(BAUD_RATE)
 #define hw_watchdogReset() wdt_reset()
-#define hw_reboot() wdt_enable(WDTO_15MS); for (;;)
+#define hw_reboot() wdt_enable(WDTO_15MS); while (1)
 #define hw_millis() millis()
-#define hw_readConfig(__pos) eeprom_read_byte((uint8_t*)__pos)
-#define hw_writeConfig(__pos, __value) eeprom_update_byte((uint8_t*)__pos, __value)
-#define hw_readConfigBlock(__buf, __pos, __length) eeprom_read_block(buf, (void*)__pos, __length)
-#define hw_writeConfigBlock(__pos, __buf, __length) eeprom_write_block((void*)__pos, (void*)__buf, __length)
+#define hw_readConfig(__pos) (eeprom_read_byte((uint8_t*)(__pos)))
+#define hw_writeConfig(__pos, __value) (eeprom_update_byte((uint8_t*)(__pos), (__value)))
+#define hw_readConfigBlock(__buf, __pos, __length) (eeprom_read_block((__buf), (void*)(__pos), (__length)))
+#define hw_writeConfigBlock(__pos, __buf, __length) (eeprom_write_block((void*)(__pos), (void*)__buf, (__length)))