From b72ac4b2776f7234207eabc626311688c0de7c20 Mon Sep 17 00:00:00 2001
From: Henrik Ekblad <henrik.ekblad@gmail.com>
Date: Fri, 20 Mar 2015 19:45:26 +0100
Subject: [PATCH] Fix crash when debug enabled.

---
 libraries/MySensors/MyConfig.h      | 6 ++----
 libraries/MySensors/MyHw.h          | 1 +
 libraries/MySensors/MyHwATMega328.h | 2 +-
 libraries/MySensors/MySensor.h      | 7 +++++++
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/libraries/MySensors/MyConfig.h b/libraries/MySensors/MyConfig.h
index 61351af..a4f8a53 100644
--- a/libraries/MySensors/MyConfig.h
+++ b/libraries/MySensors/MyConfig.h
@@ -9,15 +9,13 @@
 // Serial output baud rate
 #define BAUD_RATE 115200
 
-// Set the hardware driver to use (initialized by MySensor-class)
-#include "MyHwATMega328.h"
-typedef MyHwATMega328 MyHwDriver;
+
 
 /**********************************
 *  Message Signing Settings
 ***********************************/
 // Disable to completly disable signing functionality in library
-#define MY_SIGNING_FEATURE
+//#define MY_SIGNING_FEATURE
 
 // Define a suitable timeout for a signature verification session
 // Consider the turnaround from a nonce being generated to a signed message being received
diff --git a/libraries/MySensors/MyHw.h b/libraries/MySensors/MyHw.h
index b73ec23..14857c6 100644
--- a/libraries/MySensors/MyHw.h
+++ b/libraries/MySensors/MyHw.h
@@ -3,6 +3,7 @@
 
 #include <stdint.h>
 #include <stddef.h>
+#include "MyConfig.h"
 
 /**
  * The Hw contains all hardware specific details of the platform
diff --git a/libraries/MySensors/MyHwATMega328.h b/libraries/MySensors/MyHwATMega328.h
index 5a63faf..684ef59 100644
--- a/libraries/MySensors/MyHwATMega328.h
+++ b/libraries/MySensors/MyHwATMega328.h
@@ -2,7 +2,7 @@
 #define MyHwATMega328_h
 
 #include "MyHw.h"
-//#include "MyConfig.h"
+#include "MyConfig.h"
 #include "MyMessage.h"
 #include <avr/eeprom.h>
 #include <avr/pgmspace.h>
diff --git a/libraries/MySensors/MySensor.h b/libraries/MySensors/MySensor.h
index 0d43da3..df297cf 100644
--- a/libraries/MySensors/MySensor.h
+++ b/libraries/MySensors/MySensor.h
@@ -27,6 +27,13 @@
 #include <stdarg.h>
 
 
+// Set the hardware driver to use (initialized by MySensor-class)
+#if defined __AVR_ATmega328P__
+#include "MyHwATMega328.h"
+typedef MyHwATMega328 MyHwDriver;
+#endif
+
+
 #ifdef DEBUG
 #define debug(x,...) hw.debugPrint(isGateway, x, ##__VA_ARGS__)
 #else