From ef10b8f392afbe799ba3f7db11800146b50fe83a Mon Sep 17 00:00:00 2001 From: philipp schoenberger Date: Thu, 18 Jun 2015 19:42:28 +0200 Subject: [PATCH] fix access flags --- lwrserv/Point.h | 0 lwrserv/SocketObject.cpp | 0 lwrserv/SocketObject.h | 0 lwrserv/friComm.h | 0 lwrserv/friremote.cpp | 0 lwrserv/friremote.h | 0 lwrserv/friudp.cpp | 0 lwrserv/friudp.h | 0 lwrserv/global.cpp | 1 - lwrserv/global.h | 12 +++++++++++- lwrserv/header.h | 0 lwrserv/program.cpp | 2 +- lwrserv/resource.h | 0 lwrserv/sgn.h | 0 lwrserv/vec.h | 0 15 files changed, 12 insertions(+), 3 deletions(-) mode change 100755 => 100644 lwrserv/Point.h mode change 100755 => 100644 lwrserv/SocketObject.cpp mode change 100755 => 100644 lwrserv/SocketObject.h mode change 100755 => 100644 lwrserv/friComm.h mode change 100755 => 100644 lwrserv/friremote.cpp mode change 100755 => 100644 lwrserv/friremote.h mode change 100755 => 100644 lwrserv/friudp.cpp mode change 100755 => 100644 lwrserv/friudp.h mode change 100755 => 100644 lwrserv/global.cpp mode change 100755 => 100644 lwrserv/global.h mode change 100755 => 100644 lwrserv/header.h mode change 100755 => 100644 lwrserv/resource.h mode change 100755 => 100644 lwrserv/sgn.h mode change 100755 => 100644 lwrserv/vec.h diff --git a/lwrserv/Point.h b/lwrserv/Point.h old mode 100755 new mode 100644 diff --git a/lwrserv/SocketObject.cpp b/lwrserv/SocketObject.cpp old mode 100755 new mode 100644 diff --git a/lwrserv/SocketObject.h b/lwrserv/SocketObject.h old mode 100755 new mode 100644 diff --git a/lwrserv/friComm.h b/lwrserv/friComm.h old mode 100755 new mode 100644 diff --git a/lwrserv/friremote.cpp b/lwrserv/friremote.cpp old mode 100755 new mode 100644 diff --git a/lwrserv/friremote.h b/lwrserv/friremote.h old mode 100755 new mode 100644 diff --git a/lwrserv/friudp.cpp b/lwrserv/friudp.cpp old mode 100755 new mode 100644 diff --git a/lwrserv/friudp.h b/lwrserv/friudp.h old mode 100755 new mode 100644 diff --git a/lwrserv/global.cpp b/lwrserv/global.cpp old mode 100755 new mode 100644 index e9f5677..2bba56b --- a/lwrserv/global.cpp +++ b/lwrserv/global.cpp @@ -33,4 +33,3 @@ double maxRangeJnt[] = {170.0,120.0,170.0,120.0,170.0,120.0,170.0}; - diff --git a/lwrserv/global.h b/lwrserv/global.h old mode 100755 new mode 100644 index 3b0c854..0d39727 --- a/lwrserv/global.h +++ b/lwrserv/global.h @@ -29,4 +29,14 @@ extern double ACCELARATION; extern double maxVelJnt[LBR_MNJ]; extern double maxAccJnt[LBR_MNJ]; extern double maxTrqJnt[LBR_MNJ]; -extern double maxRangeJnt[LBR_MNJ]; \ No newline at end of file +extern double maxRangeJnt[LBR_MNJ]; + +#ifndef SSSS +#define SSSS +//void sleep(DWORD ms); + +//void sleep(DWORD ms) +//{ +// Sleep(ms); +//} +#endif diff --git a/lwrserv/header.h b/lwrserv/header.h old mode 100755 new mode 100644 diff --git a/lwrserv/program.cpp b/lwrserv/program.cpp index b8a9e5b..c66ca7b 100644 --- a/lwrserv/program.cpp +++ b/lwrserv/program.cpp @@ -149,7 +149,7 @@ void doRalf() { friInst.doCartesianImpedanceControl(cartPos, highStiff, fastDamp, NULL, NULL, false); } else - { + { friInst.doCartesianImpedanceControl(cartPos, highStiff, fastDamp, NULL, NULL, false); } #endif diff --git a/lwrserv/resource.h b/lwrserv/resource.h old mode 100755 new mode 100644 diff --git a/lwrserv/sgn.h b/lwrserv/sgn.h old mode 100755 new mode 100644 diff --git a/lwrserv/vec.h b/lwrserv/vec.h old mode 100755 new mode 100644