Skip to content
Snippets Groups Projects
Commit d0036d11 authored by odri's avatar odri
Browse files

Tweak joystick references

parent deb370cf
No related branches found
No related tags found
No related merge requests found
Pipeline #16564 failed
...@@ -116,14 +116,14 @@ class Joystick { ...@@ -116,14 +116,14 @@ class Joystick {
// Maximum velocity values // Maximum velocity values
double vXScale = 0.3; // Lateral double vXScale = 0.3; // Lateral
double vYScale = 0.6; // Forward double vYScale = 0.5; // Forward
double vYawScale = 1.0; // Rotation double vYawScale = 1.0; // Rotation
// Maximum position values // Maximum position values
double pRollScale = 0.32; // Lateral double pRollScale = -0.32; // Lateral
double pPitchScale = 0.28; // Forward double pPitchScale = -0.28; // Forward
double pHeightScale = 0.025; // Forward double pHeightScale = 0.025; // Forward
double pYawScale = 0.25; // Rotation double pYawScale = -0.35; // Rotation
// Variable to handle the automatic static/trot switching // Variable to handle the automatic static/trot switching
bool switch_static = false; bool switch_static = false;
......
...@@ -361,7 +361,7 @@ class Controller: ...@@ -361,7 +361,7 @@ class Controller:
# self.p_ref[3, 0] = np.clip((self.k - 2000) / 2000, 0.0, 1.0) # self.p_ref[3, 0] = np.clip((self.k - 2000) / 2000, 0.0, 1.0)
self.xgoals[[3, 4], 0] = self.p_ref[[3, 4], 0] self.xgoals[[3, 4], 0] = self.p_ref[[3, 4], 0]
self.h_ref = self.p_ref[2, 0] self.h_ref = self.p_ref[2, 0]
hRb = pin.rpy.rpyToMatrix(0.0, 0.0, self.p_ref[3, 0] * 0.35) hRb = pin.rpy.rpyToMatrix(0.0, 0.0, self.p_ref[5, 0])
# print(self.joystick.getPRef()) # print(self.joystick.getPRef())
# print(self.p_ref[2]) # print(self.p_ref[2])
else: else:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment