Merge development

2016-11-24 21:01:08 +01:00
parent 37b7885c7e 410fe2df95
commit aff8deb8bf
29 changed files with 422 additions and 186 deletions
@@ -513,13 +513,6 @@
 	#else
 		#define MY_RF24_CS_PIN 10
 	#endif
-#endif
- /**
- * @def MY_RF24_IRQ_PIN
- * @brief Default RF24 IRQ pin setting. Override in sketch if needed.
- */
-#ifndef MY_RF24_IRQ_PIN
-#define MY_RF24_IRQ_PIN RF24_IRQ_PIN
 #endif

 /**
@@ -956,7 +949,6 @@
 #define MY_PARENT_NODE_IS_STATIC
 #define MY_REGISTRATION_CONTROLLER
 #define MY_TRANSPORT_UPLINK_CHECK_DISABLED
-#define MY_TRANSPORT_RELAXED
 #define MY_DEBUG_VERBOSE_RF24
 #define MY_TRANSPORT_SANITY_CHECK
 #define MY_RF24_IRQ_PIN