Echo contact (#1)
* added cartesian interface * general fix and optimization
This commit is contained in:
@@ -43,20 +43,23 @@
|
||||
#include <sas_robot_driver/sas_robot_driver.h>
|
||||
#include "robot_interface_franka.h"
|
||||
#include <ros/common.h>
|
||||
#include "sas_robot_dynamic_provider.h"
|
||||
|
||||
using namespace DQ_robotics;
|
||||
using namespace Eigen;
|
||||
|
||||
struct RobotInterfaceFranka::FrankaInterfaceConfiguration; // Forward declaration
|
||||
|
||||
namespace sas
|
||||
{
|
||||
|
||||
|
||||
struct RobotDriverFrankaConfiguration
|
||||
{
|
||||
std::string ip_address;
|
||||
std::string mode;
|
||||
int port;
|
||||
double speed;
|
||||
RobotInterfaceFranka::FrankaInterfaceConfiguration interface_configuration;
|
||||
};
|
||||
|
||||
|
||||
@@ -67,6 +70,8 @@ private:
|
||||
|
||||
std::shared_ptr<RobotInterfaceFranka> robot_driver_interface_sptr_ = nullptr;
|
||||
|
||||
RobotDynamicProvider* robot_dynamic_provider_;
|
||||
|
||||
//Joint positions
|
||||
VectorXd joint_positions_;
|
||||
//VectorXd joint_velocities_;
|
||||
@@ -77,6 +82,9 @@ private:
|
||||
|
||||
std::atomic_bool* break_loops_;
|
||||
|
||||
// hotfix function to update cartesian contact and pose information
|
||||
void _update_stiffness_contact_and_pose() const;
|
||||
|
||||
|
||||
public:
|
||||
//const static int SLAVE_MODE_JOINT_CONTROL;
|
||||
@@ -86,7 +94,11 @@ public:
|
||||
RobotDriverFranka()=delete;
|
||||
~RobotDriverFranka();
|
||||
|
||||
RobotDriverFranka(const RobotDriverFrankaConfiguration& configuration, std::atomic_bool* break_loops);
|
||||
RobotDriverFranka(
|
||||
RobotDynamicProvider* robot_dynamic_provider,
|
||||
const RobotDriverFrankaConfiguration& configuration,
|
||||
std::atomic_bool* break_loops
|
||||
);
|
||||
|
||||
|
||||
VectorXd get_joint_positions() override;
|
||||
|
||||
Reference in New Issue
Block a user