Diff: cc3000.h

Revision:

26:456f73ed2a75

Parent:

25:4d4072a9cc12

Parent:

22:d23c59fec0dc

Child:

27:5118ab0f6aa4

--- a/cc3000.h	Thu Oct 03 21:03:34 2013 +0000
+++ b/cc3000.h	Fri Oct 04 07:04:20 2013 +0000
@@ -53,17 +53,20 @@
 
 /** Enable debug messages, comment out the ones you don't want
  */
- 
+
 // Debug - Socket interface messages
 #define CC3000_DEBUG_SOCKET
+
 // Debug - HCI TX messages
 #define CC3000_DEBUG_HCI_TX
+
 // Debug - HCI Rx messages
 #define CC3000_DEBUG_HCI_RX
+
 // Debug - General Debug
 #define CC3000_DEBUG
 
-// Add color to the debug messages, requires a VT100 terminal like putty, comment out to remove
+// Add colour to the debug messages, requires a VT100 terminal like putty, comment out to remove
 #define VT100_COLOUR
 
 #ifdef CC3000_DEBUG_SOCKET
@@ -112,7 +115,11 @@
     #endif
     
 #else
+<<<<<<< local
     #define DBG_CC(x, ...)
+=======
+    #define DBG_HCI_CMD(x, ...)
+>>>>>>> other
 #endif
 
 namespace mbed_cc3000 {