removed work from usart1 interrup routine

diff --git a/firmware/src/CB_functions.c b/firmware/src/CB_functions.c
index 7e94b3812b2122a3f29bc77a728c1a11706eaee5..3f5cfd0c5070ead1fe2d425622a4ac34ad23a458 100644 (file)
--- 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 59c56db93c0a36177e7459ae50bee4e6b8f6017c..dc52a1743e1a0ea9a329354387975218a0cab847 100644 (file)
--- 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