From 8fe09d0fd6de3263430dd442c423a3f0e5586815 Mon Sep 17 00:00:00 2001 From: Michael Wiebusch Date: Fri, 20 Dec 2013 17:50:35 +0100 Subject: [PATCH] removed work from usart1 interrup routine --- firmware/src/CB_functions.c | 2 +- firmware/src/main.c | 12 +++++++++++- firmware/src/{spi.c => spi1.c} | 0 firmware/src/{spi.h => spi1.h} | 0 4 files changed, 12 insertions(+), 2 deletions(-) rename firmware/src/{spi.c => spi1.c} (100%) rename firmware/src/{spi.h => spi1.h} (100%) diff --git a/firmware/src/CB_functions.c b/firmware/src/CB_functions.c index 7e94b38..3f5cfd0 100644 --- a/firmware/src/CB_functions.c +++ b/firmware/src/CB_functions.c @@ -17,8 +17,8 @@ uint16_t uC_regs[UC_NO_REGS]; void uart_byte_to_fpga(uint8_t byte){ - USART_SendData(USART1, byte); // send address while (USART_GetFlagStatus(USART1, USART_FLAG_TXE) == RESET); + USART_SendData(USART1, byte); // send address } void report_register(uint8_t addr) { diff --git a/firmware/src/main.c b/firmware/src/main.c index 59c56db..dc52a17 100644 --- a/firmware/src/main.c +++ b/firmware/src/main.c @@ -48,6 +48,8 @@ void USART1_IRQHandler(void); // MAIN --------------------------------------------------------------------- int main(int argc, char *argv[]) { + + uint8_t UcRegAddr; SystemInit(); disable_JTAG(); //disable JTAG to free GPIO ports @@ -71,6 +73,13 @@ int main(int argc, char *argv[]) { report_all_registers(); + while(1) { + + if(BufferOut(&UcRegAddr)){ + decode_register(UcRegAddr); + } + + } return 0; @@ -135,7 +144,8 @@ void USART1_IRQHandler(void) byte0 = data; uC_regs[addr] = ((uint16_t) byte1)<<8 | (uint16_t) byte0; byte_counter = 0; - decode_register(addr); +// decode_register(addr); + BufferIn(addr); break; } } diff --git a/firmware/src/spi.c b/firmware/src/spi1.c similarity index 100% rename from firmware/src/spi.c rename to firmware/src/spi1.c diff --git a/firmware/src/spi.h b/firmware/src/spi1.h similarity index 100% rename from firmware/src/spi.h rename to firmware/src/spi1.h -- 2.43.0