From 50ae506da8f1aca47d406a9e8d6ea85e46c00f5a Mon Sep 17 00:00:00 2001
From: Brendan Bartels <bbartels@iastate.edu>
Date: Sat, 22 Apr 2017 10:14:17 -0500
Subject: [PATCH] quad: remove breaking include in hw_iface, update virt_quad
---
quad/src/quad_app/hw_iface.h | 2 --
quad/src/virt_quad/main.c | 8 ++++----
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/quad/src/quad_app/hw_iface.h b/quad/src/quad_app/hw_iface.h
index 1a5f5109c..0d6bfb9ba 100644
--- a/quad/src/quad_app/hw_iface.h
+++ b/quad/src/quad_app/hw_iface.h
@@ -1,8 +1,6 @@
#ifndef HW_IFACE_H
#define HW_IFACE_H
-#include "xbasic_types.h"
-
/**
* Hardware Interfaces
*
diff --git a/quad/src/virt_quad/main.c b/quad/src/virt_quad/main.c
index 1e24ab458..0937f9f9a 100644
--- a/quad/src/virt_quad/main.c
+++ b/quad/src/virt_quad/main.c
@@ -31,7 +31,7 @@ void help_sub_command(char *argv[]);
* Implement each of the hardware interfaces.
*/
int setup_hardware(hardware_t *hardware) {
- hardware->i2c = create_unix_i2c();
+ hardware->i2c_0 = create_unix_i2c();
hardware->rc_receiver = create_unix_rc_receiver();
hardware->motors = create_unix_motors();
hardware->uart = create_unix_uart();
@@ -39,9 +39,9 @@ int setup_hardware(hardware_t *hardware) {
hardware->axi_timer = create_unix_axi_timer();
hardware->mio7_led = create_unix_mio7_led();
hardware->sys = create_unix_system();
- hardware->imu = create_unix_imu(&hardware->i2c);
- hardware->lidar = create_unix_lidar(&hardware->i2c);
- hardware->of = create_unix_optical_flow(&hardware->i2c);
+ hardware->imu = create_unix_imu(&hardware->i2c_0);
+ hardware->lidar = create_unix_lidar(&hardware->i2c_0);
+ hardware->of = create_unix_optical_flow(&hardware->i2c_0);
return 0;
}
--
GitLab