Update revision to use TI's mqtt and Freertos.
Dependencies: mbed client server
Fork of cc3100_Test_mqtt_CM3 by
Diff: main.cpp
- Revision:
- 3:a8c249046181
- Parent:
- 0:dbe5e7db3c45
--- a/main.cpp Sat Jun 06 14:06:49 2015 +0000 +++ b/main.cpp Thu Sep 03 14:02:37 2015 +0000 @@ -45,10 +45,10 @@ #include "myBoardInit.h" /* Free-RTOS includes */ -#include "FreeRTOS.h" -#include "task.h" -#include "semphr.h" -#include "portmacro.h" +//#include "FreeRTOS.h" +//#include "task.h" +//#include "semphr.h" +//#include "portmacro.h" #include "osi.h" @@ -91,16 +91,18 @@ Serial pc(SERIAL_TX, SERIAL_RX); cc3100 _cc3100(PA_9, PC_7, PB_6, SPI(PA_7, PA_6, PA_5));//nucleoF103 irq, nHib, cs, mosi, miso, sck #elif (THIS_BOARD == Seeed_Arch_Max) -Serial pc(USBTX, USBRX); - DigitalOut led1(LED1); - DigitalOut led2(LED2); - InterruptIn button1(PC_13); -cc3100 _cc3100(PE_5, PE_4, PE_6, SPI(PB_5, PB_4, PB_3));//Seeed_Arch_Max irq, nHib, cs, mosi, miso, sck +/* Off board leds */ + DigitalOut led1(PB_15); + DigitalOut led2(PB_14); +cc3100 _cc3100(PC_13, PC_6, PE_5, PE_4, PE_6, SPI(PB_5, PB_4, PB_3));//Seeed_Arch_Max irq, nHib, cs, mosi, miso, sck //SDFileSystem sd(PE_2, PD_11, SPI(PC_3, PC_2, PB_10), "sd", SDFileSystem::SWITCH_NEG_NC, 25000000); #elif (THIS_BOARD == LPCXpresso4337) /* LPCXpresso4337 not working due to mbed lib */ -//Serial pc(UART0_TX, UART0_RX); -cc3100 _cc3100(P2_2, P3_5, P1_2, SPI(P1_4, P1_3, PF_4));//LPCXpresso4337 irq, nHib, cs, mosi, miso, sck +Serial pc(UART0_TX, UART0_RX); + DigitalOut led1(LED1); + DigitalOut led2(LED2); + DigitalOut led3(LED3); +cc3100 _cc3100(P2_12, P2_9, P2_2, P3_5, P1_2, SPI(P1_4, P1_3, PF_4));//LPCXpresso4337 irq, nHib, cs, mosi, miso, sck #else #endif @@ -219,6 +221,10 @@ led2 = 1; led3 = 0; led4 = 0; +#elif (THIS_BOARD == LPCXpresso4337) + led1 = 0; + led2 = 0; + led3 = 0; #else led1 = 0; led2 = 0; @@ -786,11 +792,15 @@ int rv = 0; // SCB->SHCSR |= 0x00070000;//Enable fault handler. // pc.baud(115200); + initLEDs(); CLI_Configure(); + + + printf(" \r\nSystemCoreClock = %dMHz\r\n ", SystemCoreClock /1000000); memset(print_buf, 0x00, PRINT_BUF_LEN); - sprintf((char*) print_buf, " \r\nSystemCoreClock = %dMHz\r\n ", SystemCoreClock /1000000); + sprintf((char*) print_buf, " \r\nSystemCoreClock = %dMHz\r\n ", SystemCoreClock /1000000); rv = Uart_Write((uint8_t *) print_buf); if(rv < 0){ while(1){