diff --git a/ARM/NXP/LPC11xx/EHAL/.cproject b/ARM/NXP/LPC11xx/EHAL/.cproject index a8106a8e..59f6d4bc 100755 --- a/ARM/NXP/LPC11xx/EHAL/.cproject +++ b/ARM/NXP/LPC11xx/EHAL/.cproject @@ -20,7 +20,7 @@ - + @@ -93,6 +94,7 @@ @@ -118,7 +120,7 @@ - + @@ -157,7 +159,7 @@ @@ -217,6 +220,7 @@ diff --git a/ARM/NXP/LPC11xx/EHAL/.project b/ARM/NXP/LPC11xx/EHAL/.project index 251cb18b..55673c64 100755 --- a/ARM/NXP/LPC11xx/EHAL/.project +++ b/ARM/NXP/LPC11xx/EHAL/.project @@ -665,11 +665,6 @@ 1 PARENT-4-PROJECT_LOC/src/miscdev/ledmxfont.c - - src/sensors/a_adxl362.cpp - 1 - PARENT-4-PROJECT_LOC/src/sensors/a_adxl362.cpp - src/sensors/ag_bmi160.cpp 1 diff --git a/ARM/NXP/LPC11xx/EHAL/src/uart_lpc11uxx.c b/ARM/NXP/LPC11xx/EHAL/src/uart_lpc11uxx.c index a2364eed..5608e84e 100755 --- a/ARM/NXP/LPC11xx/EHAL/src/uart_lpc11uxx.c +++ b/ARM/NXP/LPC11xx/EHAL/src/uart_lpc11uxx.c @@ -222,8 +222,8 @@ bool UARTInit(UARTDEV *pDev, const UARTCFG *pCfg) } // Configure I/O pins - IOPINCFG *pincfg = (IOPINCFG*)pCfg->pIoMap; - IOPinCfg(pincfg, pCfg->IoMapLen); + IOPINCFG *pincfg = (IOPINCFG*)pCfg->pIOPinMap; + IOPinCfg(pincfg, pCfg->NbIOPins); reg->TER = 0; // Disable Tx diff --git a/ARM/NXP/LPC11xx/exemples/Blinky/.cproject b/ARM/NXP/LPC11xx/exemples/Blinky/.cproject new file mode 100755 index 00000000..05f345c4 --- /dev/null +++ b/ARM/NXP/LPC11xx/exemples/Blinky/.cproject @@ -0,0 +1,469 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ARM/NXP/LPC11xx/exemples/Blinky/.gitignore b/ARM/NXP/LPC11xx/exemples/Blinky/.gitignore new file mode 100755 index 00000000..65d351dc --- /dev/null +++ b/ARM/NXP/LPC11xx/exemples/Blinky/.gitignore @@ -0,0 +1,4 @@ +/Debug +/Release +/Debug S110 +/RTX_Debug/ diff --git a/ARM/NXP/LPC11xx/exemples/Blinky/.project b/ARM/NXP/LPC11xx/exemples/Blinky/.project new file mode 100755 index 00000000..e145d56a --- /dev/null +++ b/ARM/NXP/LPC11xx/exemples/Blinky/.project @@ -0,0 +1,27 @@ + + + Blinky + + + CMSIS + + + + org.eclipse.cdt.managedbuilder.core.genmakebuilder + clean,full,incremental, + + + + + org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder + full,incremental, + + + + + + org.eclipse.cdt.core.cnature + org.eclipse.cdt.managedbuilder.core.managedBuildNature + org.eclipse.cdt.managedbuilder.core.ScannerConfigNature + + diff --git a/ARM/NXP/LPC11xx/exemples/Blinky/src/main.c b/ARM/NXP/LPC11xx/exemples/Blinky/src/main.c new file mode 100755 index 00000000..212b8aaf --- /dev/null +++ b/ARM/NXP/LPC11xx/exemples/Blinky/src/main.c @@ -0,0 +1,46 @@ +#include +#include +#include + +#include "idelay.h" +#include "coredev/iopincfg.h" +#include "iopinctrl.h" + +#define SWCLK_TCK_PORT 0 +#define SWCLK_TCK_PIN 14 +#define SWCLK_TCK_PINOP 1 + +int main(void) +{ + + IOPinConfig(SWCLK_TCK_PORT, SWCLK_TCK_PIN, SWCLK_TCK_PINOP, IOPINDIR_OUTPUT, IOPINRES_NONE, IOPINTYPE_NORMAL); + + while (1) + { + LPC_GPIO->SET[SWCLK_TCK_PORT] = (1 << SWCLK_TCK_PIN); + nsDelay(300); + LPC_GPIO->CLR[SWCLK_TCK_PORT] = (1 << SWCLK_TCK_PIN); + } +/* + IOPinConfig(0, BLUEIO_LED_BLUE_PIN, 0, IOPINDIR_OUTPUT, IOPINRES_NONE, IOPINTYPE_NORMAL); + IOPinSet(0, BLUEIO_LED_BLUE_PIN); + IOPinConfig(BLUEIO_LED_GREEN_PORT, 17, 0, IOPINDIR_OUTPUT, IOPINRES_NONE, IOPINTYPE_NORMAL); + IOPinSet(BLUEIO_LED_GREEN_PORT, 17);//BLUEIO_LED_GREEN_PIN); + IOPinConfig(0, BLUEIO_LED_RED_PIN, 0, IOPINDIR_OUTPUT, IOPINRES_NONE, IOPINTYPE_NORMAL); + IOPinSet(0, BLUEIO_LED_RED_PIN); + + while(true) + { + IOPinClear(0, BLUEIO_LED_BLUE_PIN); + usDelay(1000000); + IOPinSet(0, BLUEIO_LED_BLUE_PIN); + IOPinClear(BLUEIO_LED_GREEN_PORT, 17);//BLUEIO_LED_GREEN_PIN); + usDelay(1000000); + IOPinSet(BLUEIO_LED_GREEN_PORT, 17);//BLUEIO_LED_GREEN_PIN); + IOPinClear(0, BLUEIO_LED_RED_PIN); + usDelay(1000000); + IOPinSet(0, BLUEIO_LED_RED_PIN); + usDelay(1000000); + } + */ +} diff --git a/ARM/NXP/LPC11xx/exemples/UartDemo/.gitignore b/ARM/NXP/LPC11xx/exemples/UartDemo/.gitignore old mode 100644 new mode 100755 index 9f963cf1..65d351dc --- a/ARM/NXP/LPC11xx/exemples/UartDemo/.gitignore +++ b/ARM/NXP/LPC11xx/exemples/UartDemo/.gitignore @@ -1 +1,4 @@ -/Release/ +/Debug +/Release +/Debug S110 +/RTX_Debug/ diff --git a/ARM/NXP/LPC11xx/exemples/UartDemo/src/main.cpp b/ARM/NXP/LPC11xx/exemples/UartDemo/src/main.cpp index 2e706d9e..3cabf623 100755 --- a/ARM/NXP/LPC11xx/exemples/UartDemo/src/main.cpp +++ b/ARM/NXP/LPC11xx/exemples/UartDemo/src/main.cpp @@ -33,14 +33,23 @@ static const IOPINCFG s_UartPins[] = { static const int s_NbUartPins = sizeof(s_UartPins) / sizeof(IOPINCFG); const UARTCFG g_UartCfg = { - 0, - s_UartPins, - s_NbUartPins, - 115200, - 8, - UART_PARITY_NONE, - 1, // Stop bit - UART_FLWCTRL_NONE, + .DevNo = 0, + .pIOPinMap = s_UartPins, + .NbIOPins = sizeof(s_UartPins) / sizeof(IOPINCFG), + .Rate = 115200, + .DataBits = 8, + .Parity = UART_PARITY_NONE, + .StopBits = 1, // Stop bit + .FlowControl = UART_FLWCTRL_NONE, + .bIntMode = true, + .IntPrio = 6, + .EvtCallback = NULL, + .bFifoBlocking = true, + .RxMemSize = 0, + .pRxMem = NULL, + .TxMemSize = 0, + .pTxMem = NULL, + .bDMAMode = false, }; // UART device instance @@ -66,8 +75,7 @@ void HardwareInit() #pragma GCC diagnostic ignored "-Wmissing-declarations" #pragma GCC diagnostic ignored "-Wreturn-type" */ -int -main (int argc, char* argv[]) +int main (int argc, char* argv[]) { uint32_t len = 10; uint8_t buffer[100]; diff --git a/ARM/NXP/LPC17xx/CMSIS/.gitignore b/ARM/NXP/LPC17xx/CMSIS/.gitignore index ac01e665..50d3cd11 100644 --- a/ARM/NXP/LPC17xx/CMSIS/.gitignore +++ b/ARM/NXP/LPC17xx/CMSIS/.gitignore @@ -1,2 +1,4 @@ /Debug/ /Release/ +/.settings/ + diff --git a/ARM/NXP/LPC17xx/EHAL/.gitignore b/ARM/NXP/LPC17xx/EHAL/.gitignore index ac01e665..50d3cd11 100644 --- a/ARM/NXP/LPC17xx/EHAL/.gitignore +++ b/ARM/NXP/LPC17xx/EHAL/.gitignore @@ -1,2 +1,4 @@ /Debug/ /Release/ +/.settings/ + diff --git a/ARM/NXP/LPC17xx/EHAL/src/uart_lpc17xx.c b/ARM/NXP/LPC17xx/EHAL/src/uart_lpc17xx.c index 9d3468cc..359b5db6 100755 --- a/ARM/NXP/LPC17xx/EHAL/src/uart_lpc17xx.c +++ b/ARM/NXP/LPC17xx/EHAL/src/uart_lpc17xx.c @@ -92,7 +92,7 @@ bool LpcUARTInit(UARTDEV *pDev, const UARTCFG *pCfg) if (pCfg == NULL) return false; - if (pCfg->pIoMap == NULL || pCfg->IoMapLen == 0) + if (pCfg->pIOPinMap == NULL || pCfg->NbIOPins == 0) return false; switch (pCfg->DevNo) @@ -127,9 +127,9 @@ bool LpcUARTInit(UARTDEV *pDev, const UARTCFG *pCfg) // Configure I/O pins int idx = 0; - IOPINCFG *pincfg = (IOPINCFG *)pCfg->pIoMap; + IOPINCFG *pincfg = (IOPINCFG *)pCfg->pIOPinMap; - IOPinCfg(pincfg, pCfg->IoMapLen); + IOPinCfg(pincfg, pCfg->NbIOPins); reg->TER = 0; // Disable Tx reg->IER = 0; // Disable all interrupts diff --git a/ARM/NXP/LPC17xx/exemples/Blinky/.cproject b/ARM/NXP/LPC17xx/exemples/Blinky/.cproject index daf4dc00..1a8cf8aa 100644 --- a/ARM/NXP/LPC17xx/exemples/Blinky/.cproject +++ b/ARM/NXP/LPC17xx/exemples/Blinky/.cproject @@ -14,7 +14,7 @@ - + - +