Merge branch 'master' into development

Conflicts: libraries/MySensors/utility/RFM69.h
2015-09-05 22:58:56 +02:00
parent 3ec2e48167 8f5da83c68
commit d4df198250
23 changed files with 834 additions and 159 deletions
@@ -26,6 +26,9 @@
 // to see what is actually is happening when developing
 #define DEBUG

+// Disable this line, If you are using TX(1), RX(0) as normal I/O pin
+#define ENABLED_SERIAL
+
 // Serial output baud rate (for debug prints and serial gateway)
 #define BAUD_RATE 115200