Added support for 1 Mbps serial data transfers

Switchable at compile time. Default is standard 115200 bps baud rate.

Author: ccattuto

firmware/nRF51/core/openbeacon/inc/uart.h

@@ -27,12 +27,17 @@
 
 #ifndef CONFIG_UART_BUFFER
 #define CONFIG_UART_BUFFER 128
-#endif/*CONFIG_UART_BUFFER*/
+#endif
 
-#ifdef  CONFIG_UART_BAUDRATE
+#ifndef CONFIG_UART_FORCE_POWERED
+#define CONFIG_UART_FORCE_POWERED 0
+#endif
+
+#ifdef CONFIG_UART_BAUDRATE
 extern void uart_init(void);
+extern int uart_enable(int enable);
 extern BOOL uart_tx(uint8_t data);
 extern int uart_rx(void);
-#endif/*CONFIG_UART_BAUDRATE*/
+#endif
 
-#endif/*__UART_H__*/
+#endif /*__UART_H__*/

firmware/nRF51/core/openbeacon/src/uart.c

@@ -80,7 +80,15 @@ void uart_init(void)
 	NRF_UART0->EVENTS_RXDRDY = 0;
 #else
 	NRF_UART0->ENABLE = 0;
-#endif/*CONFIG_UART_RXD_PIN*/
+#endif /*CONFIG_UART_RXD_PIN*/
+}
+
+inline int uart_enable(int enable)
+{
+#if CONFIG_UART_FORCE_POWERED
+	NRF_UART0->ENABLE = (enable) ? (NRF_UART0->ENABLE = UART_ENABLE_ENABLE_Enabled << UART_ENABLE_ENABLE_Pos) : 0;
+#endif
+	return enable;
 }
 
 #ifdef  CONFIG_UART_TXD_PIN
@@ -132,7 +140,9 @@ void UART0_IRQ_Handler(void)
 		if(!g_uart_buffer_count)
 		{
 			NRF_UART0->TASKS_STOPTX = 1;
+#if !CONFIG_UART_FORCE_POWERED
 			NRF_UART0->ENABLE = 0;
+#endif
 		}
 		else
 		{

firmware/nRF51/tag-proximity/inc/config.h

@@ -46,14 +46,25 @@
 /* double blink on invalid epoch time */
 #define CONFIG_EPOCH_INVALID_BLINK  1
 
+/* fast 1 Mbps UART data transfer vs standard 115200 bps speed */
+#define CONFIG_UART_FAST	0
+
+
 /* every CONFIG_PROX_SPACING-RANDOM(2^CONFIG_PROX_SPACING_RNG_BITS)
  * listen for CONFIG_PROX_LISTEN - all based on LF_FREQUENCY ticks */
 #define CONFIG_PROX_SPACING_RNG_BITS 9
 #define CONFIG_PROX_SPACING MILLISECONDS(25)
 #define CONFIG_PROX_LISTEN_RATIO 10
 #define CONFIG_PROX_LISTEN MILLISECONDS(5)
 
+#if CONFIG_UART_FAST
+#define CONFIG_UART_BAUDRATE UART_BAUDRATE_BAUDRATE_Baud1M
+#define CONFIG_UART_BUFFER	1024
+#define CONFIG_UART_FORCE_POWERED 1
+#else
 #define CONFIG_UART_BAUDRATE UART_BAUDRATE_BAUDRATE_Baud115200
+#endif
+
 #define CONFIG_UART_TXD_PIN  9
 #ifdef  CONFIG_UART_RX
 #define CONFIG_UART_RXD_PIN  8

firmware/nRF51/tag-proximity/src/main.c

@@ -121,6 +121,7 @@ void main_entry(void)
 
 	/* initialize UART */
 	uart_init();
+	uart_enable(1);
 
 	/* start timer */
 	timer_init();
@@ -146,6 +147,8 @@ void main_entry(void)
 		CONFIG_TRACKER_CHANNEL);
 	radio_init(tag_id);
 
+	uart_enable(0);
+
 	/* enter main loop */
 	blink_fast(5);
 
@@ -175,8 +178,10 @@ void main_entry(void)
 				blink_fast(10);
 
 				/* dump log data & status to serial */
+				uart_enable(1);
 				flash_log_dump();
 				flash_log_status();
+				uart_enable(0);
 #endif /* CONFIG_FLASH_LOGGING */
 			} else if (keypress_duration > 500)
 			{
@@ -190,7 +195,9 @@ void main_entry(void)
 #endif /* CONFIG_FLASH_LOGGING */
 
 				blink_fast(hibernate ? 3 : 6);
+				uart_enable(1);
 				debug_printf("\n\rhibernate -> %i", hibernate);
+				uart_enable(0);
 			}
 		}