From d1b88d2fec6f694b3b805082fa24a635c06c5d63 Mon Sep 17 00:00:00 2001
From: Edward Longman <el7g15@soton.ac.uk>
Date: Fri, 5 Jul 2019 19:45:45 +0100
Subject: [PATCH] Add the UART library to normal compile so that it includes
the ISR add some basic UART output
---
source/CMakeLists.txt | 5 ++++-
source/test/min2.c | 20 +++++++++++++++++---
2 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index ff3c0bc..cf6bca5 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -20,7 +20,10 @@ link_directories(
add_executable(${PROJECT_NAME}_min test/min.c lib/hal_mcu/hal_mcu.c)
target_link_libraries(${PROJECT_NAME}_min uart_drv)
-add_executable(${PROJECT_NAME}_min2 test/min2.c lib/hal_mcu/hal_mcu.c)
+add_executable(${PROJECT_NAME}_min2 test/min2.c lib/hal_mcu/hal_mcu.c
+lib/uart_drv/uart_drv.c
+lib/uart_drv/circ_buf.c
+lib/uart_drv/ee_printf.c)
target_link_libraries(${PROJECT_NAME}_min2)
add_executable(${PROJECT_NAME}_rxer test/LaunchPad_trx_main.c test/LaunchPad_trx_demo.c)
diff --git a/source/test/min2.c b/source/test/min2.c
index b191d0c..03f3c7c 100644
--- a/source/test/min2.c
+++ b/source/test/min2.c
@@ -2,14 +2,20 @@
#include "stdio.h"
#include "lib/radio_drv/hal_types.h"
#include "lib/hal_mcu/hal_mcu_fr5.h"
+#include "lib/uart_drv/uart_drv.h"
/******************************************************************************
* LOCAL FUNCTIONS
*/
extern void msp_setup(void);
-unsigned long volatile time_counter;
-
+int ee_printf(const char *fmt, ...);
+/******************************************************************************
+ * GLOBALS
+ */
+char u_str[UART_BUFF_SIZE];
+unsigned char txBuffer[TX_BUFF_SIZE];
+unsigned long volatile time_counter;
/******************************************************************************
* @fn main
@@ -44,6 +50,9 @@ void main (void)
//Comes from lib/hal_mcu/hal_mcu.c
msp_setup();
+ /* Initialize the UART port */
+ hal_uart_init();
+
// Enable the interupts on port 2 to catch the user button (TRXEB)
@@ -53,9 +62,13 @@ void main (void)
/* Infinite loop with a 1 second timer */
while(1)
{
- P1OUT ^= BIT0;
_delay_us(4166);
_delay_us(8332);
+ if(idle_counter!=time_counter){
+ idle_counter=time_counter;
+ ee_printf("Cnt:%3i\n\r", idle_counter);
+ _delay_us(100000);
+ }
}
}
@@ -75,6 +88,7 @@ void main (void)
*/
HAL_ISR_FUNC_DECLARATION(wdt_isr,WDT)
{
+ time_counter++;
/* global "0.5 second" counter used for printing time stamped packet sniffer data */
P1OUT ^= BIT1;
--
GitLab