Merge branch 'master' into master

opetany93 · Jan 22, 2018 · 59ca006 · 59ca006
2 parents 75a3db6 + 300c314
commit 59ca006
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/main.c b/src/main.c
@@ -85,6 +85,7 @@
 
 #include "system.h"
 #include "altera_avalon_pio_regs.h"
+
 #include "altera_up_avalon_rs232_regs.h"
 #include "altera_up_avalon_rs232.h"
 
@@ -104,7 +105,7 @@ volatile uint8_t flag = 0;
 volatile uint32_t set;
 
 // UART VARIABLES
-volatile uint32_t uart_context;		/* Kontekst do przerwañ z uartu */
+volatile uint32_t uart_context;		/* Kontekst do przerwa� z uartu */
 void* uart_ptr = (void*) &uart_context;
 
 //UART INTERRUPT FUNCTION
@@ -143,6 +144,7 @@ int main()
   while (1)
   {
 
+
 	if(flag){
 		//CLEAR FLAG
 		flag = 0x0;
@@ -175,5 +177,6 @@ int main()
 
   }
 
-  return 0;
+
+	return 0;
 }
diff --git a/src/uart.c b/src/uart.c
@@ -18,6 +18,7 @@ static void sendByte(char byte)
 uint16_t ReceiveData(void){
 
 	return IORD_ALT_UP_RS232_DATA(UART_0_BASE);
+
 }
 
 void sendStrig(char* s)
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,6 +18,7 @@ static void sendByte(char byte) @@
     uint16_t ReceiveData(void){
     	return IORD_ALT_UP_RS232_DATA(UART_0_BASE);
     }
     void sendStrig(char* s)
@@ Expand Down @@