Spaces:
Running
Running
RemiFabre commited on
Commit ·
263b53b
1
Parent(s): 504a94a
Use new antenna neutral position [-0.1745, 0.1745] to reduce shaking
Browse files- marionette/main.py +3 -3
- tests/test_antenna_collision.py +2 -2
- tests/test_beep_collision_sync.py +1 -1
- tests/test_collision_mic.py +1 -1
- tests/test_marionette_sync.py +1 -1
- tests/test_move_sync.py +1 -1
marionette/main.py
CHANGED
|
@@ -176,7 +176,7 @@ class Marionette(DatasetMixin, RecordingMixin, StateMixin, ReachyMiniApp):
|
|
| 176 |
self._goto_pose_scaled(
|
| 177 |
reachy_mini,
|
| 178 |
INIT_HEAD_POSE,
|
| 179 |
-
antennas=[0.
|
| 180 |
min_duration=0.2,
|
| 181 |
)
|
| 182 |
print(
|
|
@@ -320,7 +320,7 @@ class Marionette(DatasetMixin, RecordingMixin, StateMixin, ReachyMiniApp):
|
|
| 320 |
self._goto_pose_scaled(
|
| 321 |
reachy_mini,
|
| 322 |
INIT_HEAD_POSE,
|
| 323 |
-
antennas=[0.
|
| 324 |
min_duration=0.2,
|
| 325 |
)
|
| 326 |
|
|
@@ -330,7 +330,7 @@ class Marionette(DatasetMixin, RecordingMixin, StateMixin, ReachyMiniApp):
|
|
| 330 |
self._goto_pose_scaled(
|
| 331 |
reachy_mini,
|
| 332 |
INIT_HEAD_POSE,
|
| 333 |
-
antennas=[0.
|
| 334 |
min_duration=0.2,
|
| 335 |
)
|
| 336 |
self._goto_sleep_and_release(reachy_mini)
|
|
|
|
| 176 |
self._goto_pose_scaled(
|
| 177 |
reachy_mini,
|
| 178 |
INIT_HEAD_POSE,
|
| 179 |
+
antennas=[-0.1745, 0.1745],
|
| 180 |
min_duration=0.2,
|
| 181 |
)
|
| 182 |
print(
|
|
|
|
| 320 |
self._goto_pose_scaled(
|
| 321 |
reachy_mini,
|
| 322 |
INIT_HEAD_POSE,
|
| 323 |
+
antennas=[-0.1745, 0.1745],
|
| 324 |
min_duration=0.2,
|
| 325 |
)
|
| 326 |
|
|
|
|
| 330 |
self._goto_pose_scaled(
|
| 331 |
reachy_mini,
|
| 332 |
INIT_HEAD_POSE,
|
| 333 |
+
antennas=[-0.1745, 0.1745],
|
| 334 |
min_duration=0.2,
|
| 335 |
)
|
| 336 |
self._goto_sleep_and_release(reachy_mini)
|
tests/test_antenna_collision.py
CHANGED
|
@@ -7,7 +7,7 @@ so detection alignment is unambiguous.
|
|
| 7 |
|
| 8 |
Collision setup:
|
| 9 |
- Right antenna fixed at -0.68 rad
|
| 10 |
-
- Left antenna moves from 0.
|
| 11 |
- Hold 100ms, then return to rest
|
| 12 |
- Low PID + flexible antennas = safe, produces audible click
|
| 13 |
|
|
@@ -32,7 +32,7 @@ import numpy as np
|
|
| 32 |
|
| 33 |
# Collision parameters
|
| 34 |
RIGHT_REST = -0.68 # right antenna fixed position (rad)
|
| 35 |
-
LEFT_REST = 0.
|
| 36 |
LEFT_COLLISION = 0.70 # left antenna collision target (past contact at ~0.60)
|
| 37 |
HOLD_DURATION = 0.2 # seconds to hold at collision position
|
| 38 |
|
|
|
|
| 7 |
|
| 8 |
Collision setup:
|
| 9 |
- Right antenna fixed at -0.68 rad
|
| 10 |
+
- Left antenna moves from -0.1745 to 0.70 rad (collision at ~0.60 rad)
|
| 11 |
- Hold 100ms, then return to rest
|
| 12 |
- Low PID + flexible antennas = safe, produces audible click
|
| 13 |
|
|
|
|
| 32 |
|
| 33 |
# Collision parameters
|
| 34 |
RIGHT_REST = -0.68 # right antenna fixed position (rad)
|
| 35 |
+
LEFT_REST = -0.1745 # left antenna rest position (rad) ~10° offset to reduce shaking
|
| 36 |
LEFT_COLLISION = 0.70 # left antenna collision target (past contact at ~0.60)
|
| 37 |
HOLD_DURATION = 0.2 # seconds to hold at collision position
|
| 38 |
|
tests/test_beep_collision_sync.py
CHANGED
|
@@ -48,7 +48,7 @@ ROBOT_SR = 16000
|
|
| 48 |
|
| 49 |
# Collision parameters
|
| 50 |
RIGHT_REST = -0.68
|
| 51 |
-
LEFT_REST = 0.
|
| 52 |
LEFT_COLLISION = 0.70
|
| 53 |
HOLD_DURATION = 0.2
|
| 54 |
|
|
|
|
| 48 |
|
| 49 |
# Collision parameters
|
| 50 |
RIGHT_REST = -0.68
|
| 51 |
+
LEFT_REST = -0.1745
|
| 52 |
LEFT_COLLISION = 0.70
|
| 53 |
HOLD_DURATION = 0.2
|
| 54 |
|
tests/test_collision_mic.py
CHANGED
|
@@ -35,7 +35,7 @@ from audio_analysis import detect_transient_onsets
|
|
| 35 |
|
| 36 |
# Collision parameters (same as test_antenna_collision.py)
|
| 37 |
RIGHT_REST = -0.68
|
| 38 |
-
LEFT_REST = 0.
|
| 39 |
LEFT_COLLISION = 0.70
|
| 40 |
HOLD_DURATION = 0.2
|
| 41 |
COLLISION_TIMES = [1.0, 2.3, 4.0, 6.3, 9.4]
|
|
|
|
| 35 |
|
| 36 |
# Collision parameters (same as test_antenna_collision.py)
|
| 37 |
RIGHT_REST = -0.68
|
| 38 |
+
LEFT_REST = -0.1745
|
| 39 |
LEFT_COLLISION = 0.70
|
| 40 |
HOLD_DURATION = 0.2
|
| 41 |
COLLISION_TIMES = [1.0, 2.3, 4.0, 6.3, 9.4]
|
tests/test_marionette_sync.py
CHANGED
|
@@ -43,7 +43,7 @@ ROBOT_SR = 16000
|
|
| 43 |
|
| 44 |
# Collision
|
| 45 |
RIGHT_REST = -0.68
|
| 46 |
-
LEFT_REST = 0.
|
| 47 |
LEFT_COLLISION = 0.70
|
| 48 |
HOLD_DURATION = 0.2
|
| 49 |
|
|
|
|
| 43 |
|
| 44 |
# Collision
|
| 45 |
RIGHT_REST = -0.68
|
| 46 |
+
LEFT_REST = -0.1745
|
| 47 |
LEFT_COLLISION = 0.70
|
| 48 |
HOLD_DURATION = 0.2
|
| 49 |
|
tests/test_move_sync.py
CHANGED
|
@@ -42,7 +42,7 @@ ROBOT_SR = 16000
|
|
| 42 |
|
| 43 |
# Collision
|
| 44 |
RIGHT_REST = -0.68
|
| 45 |
-
LEFT_REST = 0.
|
| 46 |
LEFT_COLLISION = 0.70
|
| 47 |
HOLD_DURATION = 0.2
|
| 48 |
|
|
|
|
| 42 |
|
| 43 |
# Collision
|
| 44 |
RIGHT_REST = -0.68
|
| 45 |
+
LEFT_REST = -0.1745
|
| 46 |
LEFT_COLLISION = 0.70
|
| 47 |
HOLD_DURATION = 0.2
|
| 48 |
|