Switch to CC3200 SDK 1.2.0

PUBLISHED_FROM=857459178e3af50fa6626379d1f71a725cd3b68b

examples/CC3200/Makefile.build

@@ -78,11 +78,12 @@ $(FW_ZIP): $(FW_ELF) $(FW_BIN) $(SLFS_FILES)
 
 FREERTOS_SRCS = timers.c list.c queue.c tasks.c port.c heap_3.c osi_freertos.c
 DRIVER_SRCS = cpu.c gpio.c gpio_if.c i2c.c i2c_if.c interrupt.c pin.c prcm.c spi.c uart.c udma.c utils.c
-SL_SRCS = socket.c wlan.c driver.c device.c netapp.c netcfg.c cc_pal.c fs.c
+SL_SRCS = socket.c wlan.c driver.c device.c netapp.c netcfg.c network_common.c cc_pal.c fs.c
 SDK_SRCS = startup_gcc.c $(FREERTOS_SRCS) $(DRIVER_SRCS) $(SL_SRCS)
 IPATH += $(SDK_PATH) $(SDK_PATH)/inc $(SDK_PATH)/driverlib \
          $(SDK_PATH)/example/common $(SDK_PATH)/oslib \
          $(SDK_PATH)/simplelink $(SDK_PATH)/simplelink/include \
+         $(SDK_PATH)/simplelink_extlib/provisioninglib \
          $(SDK_PATH)/third_party/FreeRTOS/source \
          $(SDK_PATH)/third_party/FreeRTOS/source/include \
          $(SDK_PATH)/third_party/FreeRTOS/source/portable/GCC/ARM_CM4
@@ -103,4 +104,5 @@ ENTRY_$(PROG) = ResetISR
 # Disable certain warnings on SDK sources, we have no control over them anyway.
 
 SDK_OBJS = $(addprefix $(OBJDIR)/,$(patsubst %.c,%.o,$(SDK_SRCS)))
-$(SDK_OBJS): CFLAGS += -Wno-missing-braces -Wno-strict-aliasing -Wno-parentheses -Wno-unused-variable
+$(SDK_OBJS): CFLAGS += -include mongoose.h -Wno-missing-braces -Wno-strict-aliasing -Wno-parentheses -Wno-unused-variable
+$(BUILD_DIR)/cc_pal.o: CFLAGS += -Wno-error

examples/CC3200/main.c

@@ -25,6 +25,7 @@
 #include "gpio_if.h"
 #include "i2c_if.h"
 
+#include "mongoose.h"
 #include "simplelink.h"
 #include "device.h"
 
@@ -226,3 +227,8 @@ void SimpleLinkHttpServerCallback(SlHttpServerEvent_t *e,
 
 void SimpleLinkSockEventHandler(SlSockEvent_t *e) {
 }
+
+void SimpleLinkGeneralEventHandler(SlDeviceEvent_t *e) {
+  LOG(LL_INFO, ("status %d sender %d", e->EventData.deviceEvent.status,
+                e->EventData.deviceEvent.sender));
+}

examples/CC3200/mg_task.c

@@ -1,7 +1,5 @@
 #include "mg_task.h"
 
-#include <oslib/osi.h>
-
 enum mg_q_msg_type {
   MG_Q_MSG_CB,
 };
@@ -13,11 +11,11 @@ struct mg_q_msg {
 static OsiMsgQ_t s_mg_q;
 static void mg_task(void *arg);
 
-bool mg_start_task(int priority, int stask_size, mg_init_cb mg_init) {
+bool mg_start_task(int priority, int stack_size, mg_init_cb mg_init) {
   if (osi_MsgQCreate(&s_mg_q, "MG", sizeof(struct mg_q_msg), 16) != OSI_OK) {
     return false;
   }
-  if (osi_TaskCreate(mg_task, (const signed char *) "MG", stask_size,
+  if (osi_TaskCreate(mg_task, (const signed char *) "MG", stack_size,
                      (void *) mg_init, priority, NULL) != OSI_OK) {
     return false;
   }

examples/CC3200/mg_task.h

@@ -7,11 +7,13 @@
 #define CS_MONGOOSE_EXAMPLES_CC3200_MG_TASK_H_
 
 #include <stdbool.h>
+#include <stdlib.h>
 
+#include <oslib/osi.h>
 #include "mongoose.h"
 
 typedef void (*mg_init_cb)(struct mg_mgr *mgr);
-bool mg_start_task(int priority, int stask_size, mg_init_cb mg_init);
+bool mg_start_task(int priority, int stack_size, mg_init_cb mg_init);
 
 void mg_run_in_task(void (*cb)(struct mg_mgr *mgr, void *arg), void *cb_arg);
 

examples/CC3200/sdk.version

@@ -1 +1 @@
-docker.cesanta.com:5000/cc3200-build:1.1.0-r7
+docker.cesanta.com:5000/cc3200-build:1.2.0-r1

examples/CC3200/wifi.c

@@ -1,12 +1,11 @@
 #include "wifi.h"
 
+#include "mongoose.h"
 #include "simplelink.h"
 #include "wlan.h"
 
 #include "gpio_if.h"
 
-#include "mongoose.h"
-
 void SimpleLinkWlanEventHandler(SlWlanEvent_t *e) {
   switch (e->Event) {
     case SL_WLAN_CONNECT_EVENT: