From e024ac806fac9a943111ba224411946490f4ed36 Mon Sep 17 00:00:00 2001
From: Sergi Hernandez Juan <shernand@iri.upc.edu>
Date: Tue, 10 Jul 2018 16:38:14 +0200
Subject: [PATCH] Changed the name of the bus info structures for the FTDI and
serial interfaces. Changed the HEADER definition of the serial interface.
---
src/dynamixel_slave_serial.cpp | 1 -
src/dynamixelserver_ftdi.h | 4 ++--
src/dynamixelserver_serial.h | 8 ++++----
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/dynamixel_slave_serial.cpp b/src/dynamixel_slave_serial.cpp
index 8d6bd41..27e5246 100644
--- a/src/dynamixel_slave_serial.cpp
+++ b/src/dynamixel_slave_serial.cpp
@@ -22,7 +22,6 @@ CDynamixelSlaveSerial::CDynamixelSlaveSerial(const std::string& cont_id,const st
serial_config.stop_bits=1;
this->comm_dev->config(&serial_config);
this->bus_info.baud_rate=921600;
- ((CRS232 *)this->comm_dev)->clear_control_signal(rs232_dtr);
this->start();
}
diff --git a/src/dynamixelserver_ftdi.h b/src/dynamixelserver_ftdi.h
index 8190803..979bdf8 100644
--- a/src/dynamixelserver_ftdi.h
+++ b/src/dynamixelserver_ftdi.h
@@ -14,7 +14,7 @@ typedef struct
int baud_rate;
int bus_id;
std::string serial;
-}TBus_info;
+}TBus_info_ftdi;
/**
* \brief
@@ -32,7 +32,7 @@ class CDynamixelServerFTDI : public CDynamixelServer
* \brief
*
*/
- TBus_info bus_info;
+ TBus_info_ftdi bus_info;
protected:
/**
* \brief
diff --git a/src/dynamixelserver_serial.h b/src/dynamixelserver_serial.h
index 4a7dd21..0e1e1fc 100644
--- a/src/dynamixelserver_serial.h
+++ b/src/dynamixelserver_serial.h
@@ -1,5 +1,5 @@
-#ifndef _DYNAMIXEL_SERVER_FTDI_H
-#define _DYNAMIXEL_SERVER_FTDI_H
+#ifndef _DYNAMIXEL_SERVER_SERIAL_H
+#define _DYNAMIXEL_SERVER_SERIAL_H
#include "dynamixelserver.h"
@@ -13,7 +13,7 @@ typedef struct
{
int baud_rate;
std::string device;
-}TBus_info;
+}TBus_info_serial;
/**
* \brief
@@ -31,7 +31,7 @@ class CDynamixelServerSerial : public CDynamixelServer
* \brief
*
*/
- TBus_info bus_info;
+ TBus_info_serial bus_info;
protected:
/**
* \brief
--
GitLab