small fixes

DKrepsky · Jul 9, 2015 · 61e9de4 · 61e9de4
1 parent d2fa2b5
commit 61e9de4
Show file tree

Hide file tree

Showing 29 changed files with 1,280 additions and 26 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # CHANGES
 
+### 07/2015 - 1.0.2
+
+- Fix utils delay in driver lib.
+- Updated README.md.
+- Added Service Pack 1.0.0.10.0 to "other" folder.
+- Updated USAGE.md.
+- Fixed root Makefile.
+
 ### 07/2015 - 1.0.1
 - Updated SDK to original version 1.1.0.
 - Fixed a bug in cc_timer.c (line 690). A memset was used to clear a struct but the size passed was of a pointer.

diff --git a/Makefile b/Makefile
@@ -10,30 +10,22 @@ SMTP = src/netapps/smtp/client
 TFTP = src/netapps/tftp/client
 XMPP = src/netapps/xmpp/client
 
+ifeq ("${target}", "NONOS")
+	SDK_TARGETS = $(SIMPLELINK) $(MIDDLEWARE) 
+else
+	ifeq ("${target}", "TINY")
+		SDK_TARGETS = $(SIMPLELINK)
+	else
+	SDK_TARGETS = $(DRIVERLIB) $(SIMPLELINK) $(OSLIB) $(MIDDLEWARE) $(WEBCLIENT) $(WEBSERVER) $(JSON) $(MQTT) $(SMTP) $(TFTP) $(XMPP)
+	endif
+endif
 
-SDK_TARGETS = $(DRIVERLIB) $(SIMPLELINK) $(OSLIB) $(MIDDLEWARE) $(WEBCLIENT) $(WEBSERVER) $(JSON) $(MQTT) $(SMTP) $(TFTP) $(XMPP)
-SDK_TARGETS_NONOS = $(SIMPLELINK) $(MIDDLEWARE) 
-SDK_TARGETS_TINY = $(SIMPLELINK)
+.PHONY: all clean $(SDK_TARGETS)
 
+all: $(SDK_TARGETS)
 
-.PHONY: all
-all: os nonos tiny
-
-os: $(SDK_TARGETS)
-
-nonos: $(SDK_TARGETS_NONOS)
-
-tiny: $(SDK_TARGETS_TINY)
-
-.PHONY: $(SDK_TARGETS)
 $(SDK_TARGETS):
-	@$(MAKE) -C $@
-
-$(SDK_TARGETS_NONOS):
-	@$(MAKE) -C $@ target=NONOS
-
-$(SDK_TARGETS_TINY):
-	@$(MAKE) -C $@ target=TINY;
+	cd $@ && $(MAKE)
 
 clean: 
 	rm -rf lib/*
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ The intention is to provide a way to develop in this platform while TI doesn't
 release an official SDK for linux.
 Currently, it works with Ubuntu (tested with version 14.10) and Slackware.
 
-The TI SDK version used for this rework is the 1.0.0 and the original can be
+The TI SDK version used for this rework is the 1.1.0 and the original can be
 found at : http://www.ti.com/tool/cc3200sdk.
 
 For instructions on how to use it, please see USAGE.md file.

diff --git a/USAGE.md b/USAGE.md
@@ -1,9 +1,23 @@
 # USAGE
 
-For now, just clone this repository to the same directory of eclipse and try to
+### Pre-requisites
+- Eclipse CDT (https://eclipse.org/cdt/)
+- GNU ARM Eclipse Plug-ins (http://sourceforge.net/projects/gnuarmeclipse/)
+- udev rules to get hardware access.
+- COM port client (minicom, putty, etc.).
+- OpenOCD (latest version). (sudo apt-get install openocd)
+
+For detailed instructions on how to setup the development environment please read one of the following tutorials:
+- https://gist.github.com/dariuskl/086823c781bfb61af361
+- http://www.achanceofbrainshowers.com/blog/tech/2014/8/19/cc3200-development-under-linux/
+
+
+### Using the SDK
+
+For now, just clone this repository into the same directory of eclipse (say /opt/cc3200) and try to
 import a demo as a template.
 
-If the sdk isn't in the same directory of eclipse, set the "linked resources" 
-and "build variables" CC3200SDK variable to the current sdk path.
+If the sdk isn't in the same directory of eclipse, set the CC3200SDK variable for "linked resources" 
+and "build variables", in project->preferences, to the current sdk path.
 
 
diff --git a/lib/libdriver.a b/lib/libdriver.a
diff --git a/lib/libemail.a b/lib/libemail.a
diff --git a/lib/libjson.a b/lib/libjson.a
diff --git a/lib/libmiddleware.a b/lib/libmiddleware.a
diff --git a/lib/libmiddleware_nonos.a b/lib/libmiddleware_nonos.a
diff --git a/lib/libmqtt.a b/lib/libmqtt.a
diff --git a/lib/libosi.a b/lib/libosi.a
diff --git a/lib/libsimplelink.a b/lib/libsimplelink.a
diff --git a/lib/libsimplelink_nonos.a b/lib/libsimplelink_nonos.a
diff --git a/lib/libsimplelink_nonos_tiny.a b/lib/libsimplelink_nonos_tiny.a
diff --git a/lib/libtftp.a b/lib/libtftp.a
diff --git a/lib/libwebclient.a b/lib/libwebclient.a
diff --git a/lib/libwebserver.a b/lib/libwebserver.a
diff --git a/lib/libxmpp.a b/lib/libxmpp.a
diff --git a/other/Service Pack 1.0.0.10.0/host_programming/host_programming_1.0.0.10.0.h b/other/Service Pack 1.0.0.10.0/host_programming/host_programming_1.0.0.10.0.h
diff --git a/other/Service Pack 1.0.0.10.0/host_programming/host_programming_1.0.0.10.0_signed.h b/other/Service Pack 1.0.0.10.0/host_programming/host_programming_1.0.0.10.0_signed.h
@@ -0,0 +1,54 @@
+/*
+ * File: ota\ota_1.0.0.10.0.ucf.signed.bin
+ *
+ * Size: 256 bytes
+ *
+ * Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *  Redistributions of source code must retain the above copyright
+ *  notice, this list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the
+ *  distribution.
+ *
+ *  Neither the name of Texas Instruments Incorporated nor the names of
+ *  its contributors may be used to endorse or promote products derived
+ *  from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+
+const unsigned char servicePackImageSig[256] = { 0x13,0xa6,0x89,0x25,0x74,0xf1,0xd8,0x9f,0x6d,0x7e,0x9d,0xe,0x7e,0xd4,0x3e,0x2b,
+0x45,0x2,0xe,0xe7,0xfa,0x8d,0xbc,0xe6,0x5c,0x13,0x42,0x27,0x6d,0x86,0xeb,0x55,
+0xe4,0x90,0x5e,0x39,0xb7,0x8e,0xb2,0x8,0x5b,0xa8,0xe7,0x31,0xa,0x2,0x4f,0xc5,
+0x9b,0x91,0xa6,0xae,0xac,0x66,0x79,0xc6,0x3b,0xe1,0x51,0xde,0x5e,0x12,0x8,0xac,
+0xf2,0x7e,0xbf,0xe0,0x60,0xd1,0x3,0x6e,0x51,0xcb,0x82,0xe3,0xbf,0x23,0xa2,0x9f,
+0xfb,0xfe,0x10,0xbd,0x8d,0x57,0xa6,0xe,0x7c,0xba,0xf3,0x34,0xf1,0x91,0xbc,0x1e,
+0x96,0x10,0x80,0xfd,0xb5,0x6c,0xa2,0x81,0x36,0x11,0xe,0x30,0x45,0x9b,0x47,0x42,
+0x5,0xda,0x5a,0x25,0x63,0x8c,0x6b,0x3c,0x62,0xa5,0x43,0xdf,0x9,0x3a,0x6a,0xae,
+0xb0,0x59,0x16,0x4,0xaa,0x4f,0x31,0x4b,0x48,0xae,0xf8,0xa8,0x5f,0x9a,0x74,0xc5,
+0xfa,0xa1,0x60,0x60,0x8c,0xb8,0x38,0xc9,0xec,0x44,0x5d,0xd8,0x7d,0xd6,0x2b,0x6b,
+0xd0,0xf9,0x4d,0x3e,0xde,0x76,0xa3,0x2b,0xb8,0x2f,0xa8,0x20,0x96,0x8d,0xc8,0xef,
+0x4e,0xa9,0x26,0xdf,0xce,0xa5,0xf7,0xa6,0x1a,0x2f,0x4e,0x21,0xde,0x70,0xc7,0x62,
+0xd0,0x2b,0xb5,0x4e,0x4e,0x4d,0xe1,0xb8,0x85,0xa4,0x1f,0xd3,0x8c,0xc,0x2c,0xcf,
+0xb7,0xd0,0x1,0x72,0x36,0x69,0x1c,0x99,0x4d,0x7a,0x9e,0x11,0x61,0xda,0x14,0x80,
+0xfe,0xf1,0xf7,0xc6,0xb2,0xd2,0x33,0x78,0xf5,0xab,0x38,0xba,0xa,0x7,0xe1,0x31,
+0x97,0x45,0x2d,0xde,0x78,0x91,0x3e,0x3e,0xe2,0xf3,0xf,0x5,0xe2,0xea,0x32,0xb4 };
diff --git a/other/Service Pack 1.0.0.10.0/license.pdf b/other/Service Pack 1.0.0.10.0/license.pdf