Expanded the cli functions and added test program for it.

4 files changed, 152 insertions, 57 deletions

diff --git a/firmware/drivers/cli.c b/firmware/drivers/cli.c
index 33c350e..db8695f 100644
--- a/firmware/drivers/cli.c
+++ b/firmware/drivers/cli.c
@@ -33,20 +33,32 @@
 
 void cli_init()
 {
-  UARTInit(0, 115200);	/* baud rate setting */
+  uart_init(0, 115200);
 }
 
+void cli_write(const char *buf, unsigned int size)
+{
+  uart_send(0, buf, size);
+}
+
+int cli_read(char *buf, unsigned int size)
+{
+  uart_receive(0, buf, size);
+  return 0;
+}
+
+/*
 static int cli_strlen(char *p0)
 {
   char *p = p0;
   while(*p) p++;
-  return p0 - p;
+  return p - p0;
 }
-
+*/
 static inline void cli_write_int(int i)
 {
 	if(i < 0) {
-		UARTSend(0, "-", 1);
+		uart_send(0, "-", 1);
 		i *= -1;
 	}
 
@@ -60,7 +72,7 @@ static inline void cli_write_int(int i)
 		tvaersum += res;
 		if(tvaersum || pos == 1) {
 			buf[0] = res + '0';
-			UARTSend(0, buf, 1);
+			cli_write(buf, 1);
 		}
 		pos /= 10;
 	}
@@ -82,44 +94,46 @@ static int cli_write_format(const char *fmt, va_list ap)
 	const char *p = fmt;
 	while(*p) {
 		if(*p != '%') {
-			buf[0] = *p;
-
-      UARTSend(0, buf, 1);
+      buf[0] = *p;
+      cli_write(buf, 1);
+      if(*p == '\n') cli_write("\r", 1); // also write carrige return.
 		} else {
 			p++;
 			if(!*p) {
 				return 1; // Error: Invalid format string
 			}
-			if(*p == '\n') UARTSend(0, "\n\r", 2);
-			if(*p == '%') UARTSend(0, "%", 1);
+			if(*p == '%') cli_write("%", 1);
 			if(*p == 'd') cli_write_int(va_arg(ap, int));
 			if(*p == 'c') {
 				buf[0] = va_arg(ap, int);
-        UARTSend(0, buf, 1);
+        cli_write(buf, 1);
 			}
 			if(*p == 'x') {
 				char *c = va_arg(ap, char *);
 				size_t sz = va_arg(ap, int);
 				while(sz) {
-          UARTSend(0, cli_to_hex(*c), 2);
+          cli_write(cli_to_hex(*c), 2);
 					c++; sz--;
 				}
 			}
 			if(*p == 's') {
 				char *str = va_arg(ap, char *);
-        UARTSend(0, str, cli_strlen(str));
+        while(*str) {
+          cli_write(str, 1);
+          str++;
+        }
 			}
 		}
 		p++;
 	}
 
 	// If last character wasn't a newline, print one.
-	if(p > fmt && *(p - 1) != '\n') UARTSend(0, "\n\r", 2);
+	//if(p > fmt && *(p - 1) != '\n') cli_write("\n\r", 2);
 
 	return 0;
 }
 
-int cli_write(const char *fmt, ...)
+int cli_printf(const char *fmt, ...)
 {
   va_list ap;
 	va_start(ap, fmt);
@@ -128,3 +142,45 @@ int cli_write(const char *fmt, ...)
 
 	return 0;
 }
+
+int cli_readline(char *cmd, unsigned int size)
+{
+  char buf[2] = { };
+  unsigned int cmdpos = 0;
+  int parsing = 1;
+  while(parsing &&
+        cmdpos < (size - 1)) // Make sure we have room for the terminating zero.
+    {
+    cli_read(buf, 1); // read one byte
+
+    switch(*buf) {
+    case '\n':
+    case '\r':
+      parsing = 0; // break out of parse loop.
+      break;
+
+    case '\b': // backspace
+      if(cmdpos) {
+        cmdpos--;
+        cli_write("\b \b", 3); // erase last written character from echo.
+        continue;
+      }
+      break;
+
+    case 27: // ignore 'ESC' sent on arrow keys.
+      // NOTE: Sequence ESC, '[', 'D' is left arrow.
+      //       Sequence ESC, '[', 'C' is right arrow.
+      continue;
+
+    default:
+      cmd[cmdpos++] = *buf;
+      break;
+    }
+
+    // Echo
+    cli_write(buf, 1); // write one byte
+  }
+  cmd[cmdpos++] = '\0';
+
+  return cmdpos;
+}
diff --git a/firmware/drivers/cli.h b/firmware/drivers/cli.h
index ecc373b..2605715 100644
--- a/firmware/drivers/cli.h
+++ b/firmware/drivers/cli.h
@@ -28,6 +28,12 @@
 #define __PEDAL2METAL_CLI_H__
 
 void cli_init();
-int cli_write(const char *fmt, ...);
+
+void cli_write(const char *buffer, unsigned int size);
+int cli_read(char *buffer, unsigned int size);
+
+int cli_printf(const char *fmt, ...);
+
+int cli_readline(char *buf, unsigned int maxsize);
 
 #endif/*__PEDAL2METAL_CLI_H__*/
diff --git a/firmware/drivers/uart.c b/firmware/drivers/uart.c
index 28a6e00..1e7960b 100644
--- a/firmware/drivers/uart.c
+++ b/firmware/drivers/uart.c
@@ -17,11 +17,33 @@
  * notification. NXP Semiconductors also make no representation or

  * warranty that such application will be suitable for the specified

  * use without further testing or modification.

-****************************************************************************/

-#include <LPC17xx.h>

-#include <stdint.h>//"type.h"

+ ****************************************************************************/

 #include "uart.h"

 

+#include <LPC17xx.h>

+#include <stdint.h>

+

+#define IER_RBR		0x01

+#define IER_THRE	0x02

+#define IER_RLS		0x04

+

+#define IIR_PEND	0x01

+#define IIR_RLS		0x03

+#define IIR_RDA		0x02

+#define IIR_CTI		0x06

+#define IIR_THRE	0x01

+

+#define LSR_RDR		0x01

+#define LSR_OE		0x02

+#define LSR_PE		0x04

+#define LSR_FE		0x08

+#define LSR_BI		0x10

+#define LSR_THRE	0x20

+#define LSR_TEMT	0x40

+#define LSR_RXFE	0x80

+

+#define BUFSIZE		0x40

+

 #define TRUE 1

 #define FALSE 0

 

@@ -40,11 +62,13 @@ volatile uint8_t UART0TxEmpty = 1, UART1TxEmpty = 1;
 **						VIC table

 ** 

 *****************************************************************************/

-uint32_t UARTInit( uint32_t PortNum, uint32_t baudrate )

+uint32_t uart_init( uint32_t PortNum, uint32_t baudrate )

 {

   uint32_t Fdiv;

   uint32_t pclkdiv, pclk;

 

+	SystemCoreClockUpdate();

+

 	uint32_t SystemFrequency = SystemCoreClock;

 

   if ( PortNum == 0 )

@@ -77,7 +101,7 @@ uint32_t UARTInit( uint32_t PortNum, uint32_t baudrate )
     LPC_UART0->DLM = Fdiv / 256;							

     LPC_UART0->DLL = Fdiv % 256;

 		LPC_UART0->LCR = 0x03;		/* DLAB = 0 */

-    LPC_UART0->FCR = 0x07;		/* Enable and reset TX and RX FIFO. */

+    LPC_UART0->FCR = 0b111;		/* Enable and reset TX and RX FIFO. */

 

 		//   	NVIC_EnableIRQ(UART0_IRQn);

 

@@ -135,31 +159,60 @@ uint32_t UARTInit( uint32_t PortNum, uint32_t baudrate )
 ** Returned value:		None

 ** 

 *****************************************************************************/

-void UARTSend( uint32_t portNum, char *BufferPtr, uint32_t Length )

+void uart_send( uint32_t portNum, const char *BufferPtr, uint32_t Length )

 {

-  if ( portNum == 0 )

-  {

-    while ( Length != 0 )

+	//unsigned int *U0LSR = (unsigned int *)0x4000C014;	

+

+  if(portNum == 0) {

+    while(Length != 0) {

+			/* THRE status, contain valid data */

+			//while ( !(UART0TxEmpty & 0x01) );

+			//			while(((*U0LSR) & 0b100000) != 0);

+			while((LPC_UART0->LSR & 0b100000) == 0);

+

+			LPC_UART0->THR = *BufferPtr;

+			UART0TxEmpty = 0;	/* not empty in the THR until it shifts out */

+			BufferPtr++;

+			Length--;

+		}

+  } else {

+		while ( Length != 0 )

     {

 	  /* THRE status, contain valid data */

-	  //while ( !(UART0TxEmpty & 0x01) );	

-	  LPC_UART0->THR = *BufferPtr;

-	  UART0TxEmpty = 0;	/* not empty in the THR until it shifts out */

+	  while ( !(UART1TxEmpty & 0x01) );	

+	  LPC_UART1->THR = *BufferPtr;

+	  UART1TxEmpty = 0;	/* not empty in the THR until it shifts out */

 	  BufferPtr++;

 	  Length--;

-	}

+    }

   }

-  else

-  {

-	while ( Length != 0 )

+  return;

+}

+

+void uart_receive(uint32_t portNum, char *BufferPtr, uint32_t Length)

+{

+  if(portNum == 0) {

+    while(Length != 0) {

+			/* THRE status, contain valid data */

+			//while ( !(UART0TxEmpty & 0x01) );

+			//			while(((*U0LSR) & 0b100000) != 0);

+			while((LPC_UART0->LSR & 0b1) == 0);

+

+			*BufferPtr = LPC_UART0->RBR;

+			BufferPtr++;

+			Length--;

+		}

+  } else {

+		/*

+		while ( Length != 0 )

     {

-	  /* THRE status, contain valid data */

 	  while ( !(UART1TxEmpty & 0x01) );	

 	  LPC_UART1->THR = *BufferPtr;

-	  UART1TxEmpty = 0;	/* not empty in the THR until it shifts out */

+	  UART1TxEmpty = 0;	// not empty in the THR until it shifts out

 	  BufferPtr++;

 	  Length--;

     }

+		*/

   }

   return;

 }

diff --git a/firmware/drivers/uart.h b/firmware/drivers/uart.h
index 24b8259..46e59fb 100644
--- a/firmware/drivers/uart.h
+++ b/firmware/drivers/uart.h
@@ -22,29 +22,9 @@
 

 #include <stdint.h>

 

-#define IER_RBR		0x01

-#define IER_THRE	0x02

-#define IER_RLS		0x04

-

-#define IIR_PEND	0x01

-#define IIR_RLS		0x03

-#define IIR_RDA		0x02

-#define IIR_CTI		0x06

-#define IIR_THRE	0x01

-

-#define LSR_RDR		0x01

-#define LSR_OE		0x02

-#define LSR_PE		0x04

-#define LSR_FE		0x08

-#define LSR_BI		0x10

-#define LSR_THRE	0x20

-#define LSR_TEMT	0x40

-#define LSR_RXFE	0x80

-

-#define BUFSIZE		0x40

-

-uint32_t UARTInit( uint32_t portNum, uint32_t Baudrate );

-void UARTSend(uint32_t portNum,  char *BufferPtr, uint32_t Length );

+uint32_t uart_init(uint32_t portNum, uint32_t baudrate);

+void uart_send(uint32_t portNum, const char *BufferPtr, uint32_t Length);

+void uart_receive(uint32_t portNum, char *BufferPtr, uint32_t Length);

 

 #endif /* end __UART_H */

 /*****************************************************************************