Merge branch 'master' of git.ece.iastate.edu:danc/MicroCART_17-18

quad/sw/comm_dev/src/uart.h

@@ -12,6 +12,7 @@
 #include "xuartps.h"
 #include "stringBuilder.h"
 #include "xscugic.h"
+#include "new_comm.h"
 
 #define PACKET_START_CHAR 2
 #define PACKET_END_CHAR 3
@@ -51,7 +52,7 @@ char uart_recvByte(XUartPs* uartps_ptr);
 /************************************************/
 /********** UART 0 convenience methods **********/
 XUartPs* uart0_init(u16 deviceID, int baudRate);
-int uart0_int_init(u16 deviceID);
+int uart0_int_init(u16 UartIntrId, Xil_ExceptionHandler handler);
 void uart0_clearFIFOs();
 void uart0_sendByte(u8 data);
 void uart0_sendStr(char* data);

website/content/pages/documents.md

@@ -11,26 +11,7 @@ sortorder: 005
 [Design Document 1](/files/DesignDocument1.docx.pdf)
 
 ## Weekly Reports
-
-[Weekly Report 1](/files/weeklyReports/may1716_microCART_report1.pdf)
-
-[Weekly Report 2](/files/weeklyReports/may1716_microCART_report2.pdf)
-
-[Weekly Report 3](/files/weeklyReports/may1716_microCART_report3.pdf)
-
-[Weekly Report 4](/files/weeklyReports/may1716_microCART_report4.pdf)
-
-[Weekly Report 5](/files/weeklyReports/may1716_microCART_report5.pdf)
-
-[Weekly Report 6](/files/weeklyReports/may1716_microCART_report6.pdf)
-
-[Weekly Report 7](/files/weeklyReports/may1716_microCART_report7.pdf)
-
-[Weekly Report 8](/files/weeklyReports/may1716_microCART_report8.pdf)
-
-[Weekly Report 9](/files/weeklyReports/may1716_microCART_report9.pdf)
-
-[Weekly Report 10](/files/weeklyReports/may1716_microCART_report10.pdf)
+<iframe src="https://drive.google.com/embeddedfolderview?id=0BywzM7Q_7PUSeF8tdWpmMVN0eG8#list" width="100%" height="500" frameborder="0"></iframe>
 
 ## Documentation
 <iframe src="https://drive.google.com/embeddedfolderview?id=0B7xOyPfCRH4DTlZyaHZCRjN1Wmc#list" width="100%" height="500" frameborder="0"></iframe>