Commit e024ac80 authored by Sergi Hernandez's avatar Sergi Hernandez

Changed the name of the bus info structures for the FTDI and serial interfaces.

Changed the HEADER definition of the serial interface.
parent 1041e71d
......@@ -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();
}
......
......@@ -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
......
#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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment