Skip to content

Commit

Permalink
Updating all files with version, author and website information
Browse files Browse the repository at this point in the history
  • Loading branch information
adnanmunawar committed Jul 9, 2020
1 parent 91eab0e commit 88114da
Show file tree
Hide file tree
Showing 97 changed files with 1,001 additions and 658 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Software License Agreement (BSD License)
# Copyright (c) 2019, AMBF.
# (www.aimlab.wpi.edu)
# Copyright (c) 2020, AMBF.
# (https://github.com/WPI-AIM/ambf)
#
# All rights reserved.
#
Expand Down
6 changes: 3 additions & 3 deletions ambf_controller/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Software License Agreement (BSD License)
# Copyright (c) 2019, AMBF.
# (www.aimlab.wpi.edu)
# Copyright (c) 2020, AMBF.
# (https://github.com/WPI-AIM/ambf)
#
# All rights reserved.
#
Expand Down Expand Up @@ -49,7 +49,7 @@ add_executable (ambf_controller raven2/include/ambf_defines.h
raven2/include/ambf_controller.h
raven2/include/ambf_motion_planner.h
raven2/src/ambf_motion_planner.cpp
raven2/src/ambf_controller.cpp
raven2/src/ambf_controller.cpp
raven2/src/ambf_defines.cpp
raven2/src/main.cpp )

Expand Down
10 changes: 5 additions & 5 deletions ambf_controller/raven2/include/ambf_controller.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
//===========================================================================
/*
Software License Agreement (BSD License)
Copyright (c) 2019, AMBF
(www.aimlab.wpi.edu)
Copyright (c) 2020, AMBF
(https://github.com/WPI-AIM/ambf)
All rights reserved.
Expand Down Expand Up @@ -37,7 +37,7 @@
\author: Melody Su
\date: April, 2019
\version: $
\version: 1.0$
*/
//===========================================================================

Expand All @@ -53,7 +53,7 @@ class AMBFController{
mutex _mutex;
bool print_menu;
bool debug_mode;
ros::NodeHandle nh_;
ros::NodeHandle nh_;

vector<ros::Publisher> raven_pubs; // raven command publisher
vector<ros::Subscriber> raven_subs; // raven state subscriber
Expand Down Expand Up @@ -87,4 +87,4 @@ class AMBFController{
~AMBFController();
};

#endif
#endif
52 changes: 47 additions & 5 deletions ambf_controller/raven2/include/ambf_defines.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,45 @@
//===========================================================================
/*
Software License Agreement (BSD License)
Copyright (c) 2020, AMBF
(https://github.com/WPI-AIM/ambf)
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following
disclaimer in the documentation and/or other materials provided
with the distribution.
* Neither the name of authors nor the names of its contributors may
be used to endorse or promote products derived from this software
without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
\author: Melody Su
\date: April, 2019
\version: 1.0$
*/
//===========================================================================
#ifndef AMBFDEFINES_H
#define AMBFDEFINES_H

Expand Down Expand Up @@ -44,13 +86,13 @@ struct AMBFSta

vector<float> jp; // raven joint space position state
tf::Transform cp; // raven catesian space position state
tf::Vector3 cf; // raven cartesian force state
tf::Vector3 ct; // raven cartesian torque state
tf::Vector3 cf; // raven cartesian force state
tf::Vector3 ct; // raven cartesian torque state
};


class AMBFDef {

public:

static const int V;
Expand All @@ -62,7 +104,7 @@ class AMBFDef {
static const float safe_ori_incr;
static const float safe_pos_incr;
static const string sub_append; // place holder for namescpace strings
static const string pub_append;
static const string pub_append;
static const string raven_append;
static const string env_append;
static const vector<string> arm_append; // left arm 0 & right arm 1
Expand All @@ -89,4 +131,4 @@ class AMBFDef {
static const tf::Transform raven_T_CB; // raven crtk frame to base frame (have seperate ones for each arm)
};

#endif
#endif
20 changes: 10 additions & 10 deletions ambf_controller/raven2/include/ambf_motion_planner.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
//===========================================================================
/*
Software License Agreement (BSD License)
Copyright (c) 2019, AMBF
(www.aimlab.wpi.edu)
Copyright (c) 2020, AMBF
(https://github.com/WPI-AIM/ambf)
All rights reserved.
Expand Down Expand Up @@ -37,7 +37,7 @@
\author: Melody Su
\date: April, 2019
\version: $
\version: 1.0$
*/
//===========================================================================

Expand Down Expand Up @@ -91,30 +91,30 @@ class AMBFRavenPlanner{
bool joint_to_dhvalue(vector<float>, vector<float>&, int);
bool dhvalue_to_joint(vector<float>, vector<float>&, float, int);
bool check_incr_safety(vector<float>, vector<float>&, int);

bool go_home(bool,int); // jp command will be used
bool sine_dance(bool, int); // jp command will be used
bool trace_cube(bool, int, bool); // cp command will be used

};


// Raven Note:
//
// Raven Note:
//
// if(command.type == _jp || command.type == _jw)
// update command.js
//
//
// if(command.type == _cp)
// do inverse kinematics
// update command.js
//
//
// if(command.type == _cw)
// update command.cf
// update command.ct
//
//
// Remember to set:
// command.type = _???;
// command.updated = true;
// state.updated = false;

#endif
#endif
Loading

0 comments on commit 88114da

Please sign in to comment.