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 27:5118ab0f6aa4, committed 2013-10-04

Comitter:
SolderSplashLabs
Date:
Fri Oct 04 07:06:29 2013 +0000
Parent:
26:456f73ed2a75
Child:
28:8c7cc1c76ff8
Commit message:
Removed conflict

Changed in this revision

cc3000.h Show annotated file Show diff for this revision Revisions of this file 
--- a/cc3000.h	Fri Oct 04 07:04:20 2013 +0000
+++ b/cc3000.h	Fri Oct 04 07:06:29 2013 +0000
@@ -115,11 +115,7 @@
     #endif
     
 #else
-<<<<<<< local
     #define DBG_CC(x, ...)
-=======
-    #define DBG_HCI_CMD(x, ...)
->>>>>>> other
 #endif
 
 namespace mbed_cc3000 {