From 5dc46c3d55336f986990dbd7e33ef41116cf1ec4 Mon Sep 17 00:00:00 2001
From: asantamaria <asantamaria@iri.upc.edu>
Date: Mon, 28 Nov 2016 19:59:16 +0100
Subject: [PATCH] Fixing includes issue
---
src/examples/lidar_lite_test.cpp | 1 +
src/exceptions/lidar_lite_exceptions.cpp | 2 --
src/lidar_lite.cpp | 6 ++++++
src/lidar_lite.h | 6 ------
4 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/examples/lidar_lite_test.cpp b/src/examples/lidar_lite_test.cpp
index 936bed8..ecd2cc3 100644
--- a/src/examples/lidar_lite_test.cpp
+++ b/src/examples/lidar_lite_test.cpp
@@ -1,4 +1,5 @@
#include "lidar_lite.h"
+#include "exceptions/lidar_lite_exceptions.h"
int main(int argc, char *argv[])
{
diff --git a/src/exceptions/lidar_lite_exceptions.cpp b/src/exceptions/lidar_lite_exceptions.cpp
index c288ce5..6c7199e 100644
--- a/src/exceptions/lidar_lite_exceptions.cpp
+++ b/src/exceptions/lidar_lite_exceptions.cpp
@@ -3,8 +3,6 @@
#include <string.h>
#include <stdio.h>
-#include "exceptions/lidar_lite_exceptions.h"
-
const std::string lidar_lite_error_message="LidarLite - ";
CLidarLiteException::CLidarLiteException(const std::string& where,const std::string &error_msg):CException(where,lidar_lite_error_message)
diff --git a/src/lidar_lite.cpp b/src/lidar_lite.cpp
index f9581fb..9df5c7d 100644
--- a/src/lidar_lite.cpp
+++ b/src/lidar_lite.cpp
@@ -1,9 +1,15 @@
#include "lidar_lite.h"
+#include <exceptions/lidar_lite_exceptions.h>
//******************************************************************************
// PUBLIC API
//******************************************************************************
+// The device has a 7-bit slave address with a default value of 0x62.
+// Fill in new address here if changed.
+// See operating manual for instructions.
+unsigned char DEVICE_ID = 0x62;
+
CLidarLite::CLidarLite(const std::string &serial, const int config)
{
this->serial_ = serial;
diff --git a/src/lidar_lite.h b/src/lidar_lite.h
index 00e4c28..c1f381b 100644
--- a/src/lidar_lite.h
+++ b/src/lidar_lite.h
@@ -7,12 +7,6 @@
#include <iomanip>
#include <cmath>
#include <usb_i2c.h>
-#include "exceptions/lidar_lite_exceptions.h"
-
-// The device has a 7-bit slave address with a default value of 0x62.
-// Fill in new address here if changed.
-// See operating manual for instructions.
-unsigned char DEVICE_ID = 0x62;
enum V3_REGISTER_DEF
{
--
GitLab