drenayaz commited on
Commit
8b2dcf1
·
1 Parent(s): 49c6bc2

fix antenna movement button

Browse files
Files changed (1) hide show
  1. hand_tracker_v2/main.py +4 -7
hand_tracker_v2/main.py CHANGED
@@ -48,7 +48,7 @@ class HandTrackerV2(ReachyMiniApp):
48
 
49
  self.show_img = False
50
  self.track_mode = True
51
- self.antenna_mode = True
52
  self.preferred_side = "Left"
53
  self.antenna_mode = "Same Movement"
54
 
@@ -77,7 +77,7 @@ class HandTrackerV2(ReachyMiniApp):
77
  if state.tracking is not None:
78
  self.track_mode = state.tracking
79
  if state.antenna is not None:
80
- self.antenna_mode = state.antenna
81
  if state.preferred_side is not None:
82
  print("Preferred side set to:", state.preferred_side)
83
  self.preferred_side = state.preferred_side
@@ -173,11 +173,8 @@ class HandTrackerV2(ReachyMiniApp):
173
  rightmost_hand = min(hands, key=lambda h: h["palm"][0])
174
  leftmost_hand = max(hands, key=lambda h: h["palm"][0])
175
  if self.preferred_side == "Left":
176
- print(self.preferred_side)
177
  self.hand_pos = np.array(leftmost_hand["palm"])
178
  else:
179
- print(self.preferred_side)
180
-
181
  self.hand_pos = np.array(rightmost_hand["palm"])
182
  self.left_antenna_angle = - finger_orientation_deg(
183
  rightmost_hand["index_mcp"], rightmost_hand["index_tip"]
@@ -227,7 +224,7 @@ class HandTrackerV2(ReachyMiniApp):
227
  t0 = time.time()
228
  time_since_last_hand = time.time() - self.last_hand_seen
229
 
230
- if time_since_last_hand > self.idle_timeout or (not self.track_mode and not self.antenna_mode):
231
  if not self.is_idle:
232
  print("Entering IDLE mode")
233
  self.previous_antenna_angles = reachy_mini.get_present_antenna_joint_positions()
@@ -290,7 +287,7 @@ class HandTrackerV2(ReachyMiniApp):
290
  head_pose[:3, :3] = R.from_euler("xyz", euler_rot).as_matrix()
291
  head_pose[:3, 3][2] = error[1] * kz
292
 
293
- if not self.antenna_mode:
294
  antennas = self.previous_antenna_angles.copy()
295
  else:
296
  # Antennas
 
48
 
49
  self.show_img = False
50
  self.track_mode = True
51
+ self.antenna_tracking = True
52
  self.preferred_side = "Left"
53
  self.antenna_mode = "Same Movement"
54
 
 
77
  if state.tracking is not None:
78
  self.track_mode = state.tracking
79
  if state.antenna is not None:
80
+ self.antenna_tracking = state.antenna
81
  if state.preferred_side is not None:
82
  print("Preferred side set to:", state.preferred_side)
83
  self.preferred_side = state.preferred_side
 
173
  rightmost_hand = min(hands, key=lambda h: h["palm"][0])
174
  leftmost_hand = max(hands, key=lambda h: h["palm"][0])
175
  if self.preferred_side == "Left":
 
176
  self.hand_pos = np.array(leftmost_hand["palm"])
177
  else:
 
 
178
  self.hand_pos = np.array(rightmost_hand["palm"])
179
  self.left_antenna_angle = - finger_orientation_deg(
180
  rightmost_hand["index_mcp"], rightmost_hand["index_tip"]
 
224
  t0 = time.time()
225
  time_since_last_hand = time.time() - self.last_hand_seen
226
 
227
+ if time_since_last_hand > self.idle_timeout or (not self.track_mode and not self.antenna_tracking):
228
  if not self.is_idle:
229
  print("Entering IDLE mode")
230
  self.previous_antenna_angles = reachy_mini.get_present_antenna_joint_positions()
 
287
  head_pose[:3, :3] = R.from_euler("xyz", euler_rot).as_matrix()
288
  head_pose[:3, 3][2] = error[1] * kz
289
 
290
+ if not self.antenna_tracking:
291
  antennas = self.previous_antenna_angles.copy()
292
  else:
293
  # Antennas