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

c040eb8d · ucart · 94c68816 · 67c74a75 · c040eb8d · c040eb8d
Commit c040eb8d authored 8 years ago by ucart
--- a/quad/xsdk_workspace/modular_quad_pid/Release/objects.mk
+++ b/quad/xsdk_workspace/modular_quad_pid/Release/objects.mk
--- a/quad/xsdk_workspace/modular_quad_pid/Release/sources.mk
+++ b/quad/xsdk_workspace/modular_quad_pid/Release/sources.mk
--- a/quad/xsdk_workspace/modular_quad_pid/Release/src/subdir.mk
+++ b/quad/xsdk_workspace/modular_quad_pid/Release/src/subdir.mk
--- a/quad/xsdk_workspace/modular_quad_pid/ext/__CAUTION__.md
+++ b/quad/xsdk_workspace/modular_quad_pid/ext/__CAUTION__.md
--- a/quad/xsdk_workspace/modular_quad_pid/src/hw_impl_zybo.c
+++ b/quad/xsdk_workspace/modular_quad_pid/src/hw_impl_zybo.c
--- a/quad/xsdk_workspace/modular_quad_pid/src/hw_impl_zybo.h
+++ b/quad/xsdk_workspace/modular_quad_pid/src/hw_impl_zybo.h
--- a/quad/xsdk_workspace/modular_quad_pid/src/hw_impl_zybo_axi_timer.c
+++ b/quad/xsdk_workspace/modular_quad_pid/src/hw_impl_zybo_axi_timer.c
--- a/quad/xsdk_workspace/modular_quad_pid/src/hw_impl_zybo_global_timer.c
+++ b/quad/xsdk_workspace/modular_quad_pid/src/hw_impl_zybo_global_timer.c
--- a/quad/xsdk_workspace/modular_quad_pid/src/hw_impl_zybo_i2c.c
+++ b/quad/xsdk_workspace/modular_quad_pid/src/hw_impl_zybo_i2c.c
--- a/quad/xsdk_workspace/modular_quad_pid/src/hw_impl_zybo_mio7_led.c
+++ b/quad/xsdk_workspace/modular_quad_pid/src/hw_impl_zybo_mio7_led.c
--- a/quad/xsdk_workspace/modular_quad_pid/src/hw_impl_zybo_pwm_input.c
+++ b/quad/xsdk_workspace/modular_quad_pid/src/hw_impl_zybo_pwm_input.c
--- a/quad/xsdk_workspace/modular_quad_pid/src/hw_impl_zybo_pwm_output.c
+++ b/quad/xsdk_workspace/modular_quad_pid/src/hw_impl_zybo_pwm_output.c
--- a/quad/xsdk_workspace/modular_quad_pid/src/hw_impl_zybo_system.c
+++ b/quad/xsdk_workspace/modular_quad_pid/src/hw_impl_zybo_system.c
--- a/quad/xsdk_workspace/modular_quad_pid/src/hw_impl_zybo_tests.c
+++ b/quad/xsdk_workspace/modular_quad_pid/src/hw_impl_zybo_tests.c
@@ -230,7 +230,7 @@ int test_zybo_global_timer() {
 * 2) Set the RUN_TESTS macro in main.c
 * 3) Uncomment only this test in main.c
 * 4) Run main.c
- * 5) Execute quad/scripts/test_zybo_uart.py
+ * 5) Execute quad/scripts/tests/test_zybo_uart.py
 *    - Observe test results on terminal
 *    - You might be able to see LED MIO7 blink when it receives bytes
 */

--- a/quad/xsdk_workspace/modular_quad_pid/src/hw_impl_zybo_uart.c
+++ b/quad/xsdk_workspace/modular_quad_pid/src/hw_impl_zybo_uart.c
--- a/quad/xsdk_workspace/modular_quad_pid/src/lscript.ld
+++ b/quad/xsdk_workspace/modular_quad_pid/src/lscript.ld
--- a/quad/xsdk_workspace/modular_quad_pid/src/main.c
+++ b/quad/xsdk_workspace/modular_quad_pid/src/main.c
--- a/quad/xsdk_workspace/modular_quad_pid/src/platform.c
+++ b/quad/xsdk_workspace/modular_quad_pid/src/platform.c
--- a/quad/xsdk_workspace/modular_quad_pid/src/platform.h
+++ b/quad/xsdk_workspace/modular_quad_pid/src/platform.h
--- a/quad/xsdk_workspace/modular_quad_pid/src/platform_config.h
+++ b/quad/xsdk_workspace/modular_quad_pid/src/platform_config.h