Martin Kojtal / cc3000_hostdriver_mbedsocket Featured

cc3000 hostdriver with the mbed socket interface

Dependents:   cc3000_hello_world_demo cc3000_simple_socket_demo cc3000_ntp_demo cc3000_ping_demo ... more

Files at this revision

API Documentation at this revision

Revision 26:456f73ed2a75, committed 2013-10-04

Comitter:
SolderSplashLabs
Date:
Fri Oct 04 07:04:20 2013 +0000
Parent:
25:4d4072a9cc12
Parent:
22:d23c59fec0dc
Child:
27:5118ab0f6aa4
Commit message:
Commit to merge branches

Changed in this revision

cc3000.cpp Show annotated file Show diff for this revision Revisions of this file
cc3000.h Show annotated file Show diff for this revision Revisions of this file
cc3000_event.cpp Show annotated file Show diff for this revision Revisions of this file
cc3000_hci.cpp Show annotated file Show diff for this revision Revisions of this file 
--- 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 {