Diff: RF24Network_config.h

Revision:

4:75c5aa56411f

Parent:

3:dfc8da7ac18c

Child:

5:b1110d26a900

--- a/RF24Network_config.h	Thu Nov 05 05:54:47 2015 +0000
+++ b/RF24Network_config.h	Thu Apr 21 03:43:13 2016 +0000
@@ -7,98 +7,91 @@
  version 2 as published by the Free Software Foundation.
  */
  
- /*
+/*
  * Mbed support added by Akash Vibhute <akash.roboticist@gmail.com>
  * Porting completed on Nov/05/2015
  *
- * Updated with TMRh20's RF24 library on Nov/04/2015 from https://github.com/TMRh20
+ * Updated 1: Synced with TMRh20's RF24 library on Nov/04/2015 from https://github.com/TMRh20
+ * Updated 2: Synced with TMRh20's RF24 library on Apr/18/2015 from https://github.com/TMRh20
  *
  */
-
+ 
 #ifndef __RF24NETWORK_CONFIG_H__
 #define __RF24NETWORK_CONFIG_H__
 
-#include "mbed.h"
-#include <stdint.h>
-#include <stdio.h>
-#include <string.h>
-#define _BV(x) (1<<(x))
+    /********** USER CONFIG **************/
+
+    //#define DUAL_HEAD_RADIO
+    //#define ENABLE_SLEEP_MODE  //AVR only
+    #define RF24NetworkMulticast
+
+    /** \def
+	 * Saves memory by disabling fragmentation
+	 */
+    //#define DISABLE_FRAGMENTATION 
+
+    /** System defines */
+
+    /** The size of the main buffer. This is the user-cache, where incoming data is stored.
+     * Data is stored using Frames: Header (8-bytes) + Frame_Size (2-bytes) + Data (?-bytes)
+     * 
+     * @note The MAX_PAYLOAD_SIZE is (MAIN_BUFFER_SIZE - 10), and the result must be divisible by 24.
+     */
+    #define MAIN_BUFFER_SIZE 144 + 10
+
+    /** Maximum size of fragmented network frames and fragmentation cache. This MUST BE divisible by 24.
+    * @note: Must be a multiple of 24.
+    * @note: If used with RF24Ethernet, this value is used to set the buffer sizes.
+    */
+    #define MAX_PAYLOAD_SIZE  MAIN_BUFFER_SIZE-10
+
+    /** Disable user payloads. Saves memory when used with RF24Ethernet or software that uses external data.*/
+    //#define DISABLE_USER_PAYLOADS 
+
+    /** Enable tracking of success and failures for all transmissions, routed and user initiated */
+    //#define ENABLE_NETWORK_STATS
+    
+    /** Enable dynamic payloads - If using different types of NRF24L01 modules, some may be incompatible when using this feature **/
+    #define ENABLE_DYNAMIC_PAYLOADS
 
-#include <stddef.h>
+    /** Debug Options */
+    //#define SERIAL_DEBUG
+    //#define SERIAL_DEBUG_MINIMAL
+    //#define SERIAL_DEBUG_ROUTING
+    //#define SERIAL_DEBUG_FRAGMENTATION
+    //#define SERIAL_DEBUG_FRAGMENTATION_L2
+    /*************************************/
+
+#endif //RF24_NETWORK_CONFIG_H
+
+#include <RF24_config.h>
+
+#define sprintf_P sprintf
+  
+    #if defined (SERIAL_DEBUG_MINIMAL)
+      #define IF_SERIAL_DEBUG_MINIMAL(x) ({x;})
+    #else
+      #define IF_SERIAL_DEBUG_MINIMAL(x)
+    #endif
+  
+    #if defined (SERIAL_DEBUG_FRAGMENTATION)
+      #define IF_SERIAL_DEBUG_FRAGMENTATION(x) ({x;})
+    #else
+      #define IF_SERIAL_DEBUG_FRAGMENTATION(x)
+    #endif
+
+    #if defined (SERIAL_DEBUG_FRAGMENTATION_L2)
+      #define IF_SERIAL_DEBUG_FRAGMENTATION_L2(x) ({x;})
+    #else
+      #define IF_SERIAL_DEBUG_FRAGMENTATION_L2(x)
+    #endif
+  
+    #if defined (SERIAL_DEBUG_ROUTING)
+      #define IF_SERIAL_DEBUG_ROUTING(x) ({x;})
+    #else
+      #define IF_SERIAL_DEBUG_ROUTING(x)
+    #endif
 
 
-//#define DUAL_HEAD_RADIO
-//#define ENABLE_SLEEP_MODE  //AVR only
-#define RF24NetworkMulticast
-
-/** \def
- * Saves memory by disabling fragmentation
- */
-//#define DISABLE_FRAGMENTATION
-
-/** System defines */
-
-/** The size of the main buffer. This is the user-cache, where incoming data is stored.
- * Data is stored using Frames: Header (8-bytes) + Frame_Size (2-bytes) + Data (?-bytes)
- *
- * @note The MAX_PAYLOAD_SIZE is (MAIN_BUFFER_SIZE - 10), and the result must be divisible by 24.
- */
-#define MAIN_BUFFER_SIZE 144 + 10
-
-/** Maximum size of fragmented network frames and fragmentation cache. This MUST BE divisible by 24.
-* @note: Must be a multiple of 24.
-* @note: If used with RF24Ethernet, this value is used to set the buffer sizes.
-*/
-#define MAX_PAYLOAD_SIZE  MAIN_BUFFER_SIZE-10
-
-/** Disable user payloads. Saves memory when used with RF24Ethernet or software that uses external data.*/
-//#define DISABLE_USER_PAYLOADS
-
-/** Enable tracking of success and failures for all transmissions, routed and user initiated */
-//#define ENABLE_NETWORK_STATS
-
-/** Enable dynamic payloads - If using different types of NRF24L01 modules, some may be incompatible when using this feature **/
-#define ENABLE_DYNAMIC_PAYLOADS
-
-/** Debug Options */
-//#define SERIAL_DEBUG
-//#define SERIAL_DEBUG_MINIMAL
-//#define SERIAL_DEBUG_ROUTING
-//#define SERIAL_DEBUG_FRAGMENTATION
-//#define SERIAL_DEBUG_FRAGMENTATION_L2
-/*************************************/
 
 
-#ifndef rf24_max
-#define rf24_max(a,b) (a>b?a:b)
-#endif
-#ifndef rf24_min
-#define rf24_min(a,b) (a<b?a:b)
-#endif
-
-
-#if defined (SERIAL_DEBUG_MINIMAL)
-#define IF_SERIAL_DEBUG_MINIMAL(x) ({x;})
-#else
-#define IF_SERIAL_DEBUG_MINIMAL(x)
-#endif
-
-#if defined (SERIAL_DEBUG_FRAGMENTATION)
-#define IF_SERIAL_DEBUG_FRAGMENTATION(x) ({x;})
-#else
-#define IF_SERIAL_DEBUG_FRAGMENTATION(x)
-#endif
-
-#if defined (SERIAL_DEBUG_FRAGMENTATION_L2)
-#define IF_SERIAL_DEBUG_FRAGMENTATION_L2(x) ({x;})
-#else
-#define IF_SERIAL_DEBUG_FRAGMENTATION_L2(x)
-#endif
-
-#if defined (SERIAL_DEBUG_ROUTING)
-#define IF_SERIAL_DEBUG_ROUTING(x) ({x;})
-#else
-#define IF_SERIAL_DEBUG_ROUTING(x)
-#endif
-#endif // RF24_NETWORK_CONFIG_H
-