fix cartesian path bug

This commit is contained in:
Agnel Wang 2023-04-18 20:26:55 +08:00
parent 0ded261331
commit aebf9e5377
49 changed files with 6497 additions and 6495 deletions

2
.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
.vscode
build

View File

@ -5,7 +5,7 @@ set(PACKAGE_NAME z1_controller)
set(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} -O3")
# ----------------------options----------------------
set(COMMUNICATION UDP) # UDP
set(COMMUNICATION UDP) # UDP
# set(COMMUNICATION ROS) # ROS

2
include/FSM/State_Cartesian.h Executable file → Normal file
View File

@ -16,7 +16,7 @@ private:
double _posSpeed = 0.2;
double oriSpeedLimit = 0.5;// limits in SDK
double posSpeedLimit = 0.5;
VecX _changeDirections;
VecX _changeDirectionsf;
Vec6 _twist;
HomoMat _endHomoGoal, _endHomoPast, _endHomoDelta;

0
include/FSM/State_MoveJ.h Executable file → Normal file
View File

0
include/FSM/State_MoveL.h Executable file → Normal file
View File

0
include/common/math/Filter.h Normal file → Executable file
View File

0
include/common/utilities/loop.h Normal file → Executable file
View File

View File

@ -7,7 +7,7 @@
class ARMSDK : public CmdPanel{
public:
ARMSDK(std::vector<KeyAction*> events,
EmptyAction emptyAction, const char* IP, uint toport, uint ownport, double dt = 0.002);
EmptyAction emptyAction, const char* IP, uint port, double dt = 0.002);
~ARMSDK();
SendCmd getSendCmd();
int getState(size_t channelID = 0);

View File

@ -76,7 +76,7 @@ private:
double _dV = 0.0; //delta value per delta time
double _dt = 0.0;
double _dVdt = 0.0; // delta value per second
double _dVdtf = 0.0; // delta value per second after filter
double _dVdtf = 0.0; // delta value per second after fliter
double _lim1, _lim2;
bool _hasLim = false;
bool _hasGoZero = false;

0
include/interface/IOROS.h Executable file → Normal file
View File

0
include/message/arm_common.h Normal file → Executable file
View File

0
include/thirdparty/quadProgpp/Array.hh vendored Normal file → Executable file
View File

0
include/thirdparty/quadProgpp/QuadProg++.hh vendored Normal file → Executable file
View File

0
include/trajectory/EndLineTraj.h Executable file → Normal file
View File

BIN
lib/libZ1_ROS_Linux64.so Normal file → Executable file

Binary file not shown.

BIN
lib/libZ1_UDP_Linux64.so Normal file → Executable file

Binary file not shown.

2
main.cpp Executable file → Normal file
View File

@ -48,7 +48,7 @@ int main(int argc, char **argv){
ctrlComp->stateCSV = new CSVTool("../config/savedArmStates.csv");
ctrlComp->geneObj();
if(ctrlComp->ctrl == Control::SDK){
ctrlComp->cmdPanel = new ARMSDK(events, emptyAction, "127.0.0.1", 8072, 8071, 0.002);
ctrlComp->cmdPanel = new ARMSDK(events, emptyAction, "127.0.0.1", 8072, 0.002);
}else if(ctrlComp->ctrl == Control::KEYBOARD){
events.push_back(new StateAction("`", (int)ArmFSMStateName::BACKTOSTART));
events.push_back(new StateAction("1", (int)ArmFSMStateName::PASSIVE));