Skip to content

Commit 0827a8d

Browse files
authored
Merge pull request #1 from Juliaj/bringin_current_changes
Bringing in all current changes made in Feb 2026
2 parents fca5a02 + 1656009 commit 0827a8d

9 files changed

Lines changed: 305 additions & 259 deletions

AmazingHand.code-workspace

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"folders": [
3+
{
4+
"path": "."
5+
}
6+
],
7+
"settings": {}
8+
}

Demo/HandTracking/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "HandTracking"
33
version = "0.1.0"
44
description = "Add your description here"
55
readme = "README.md"
6-
requires-python = ">=3.9,<=3.12"
6+
requires-python = ">=3.9,<3.13"
77
dependencies = [
88
"dora-rs>=0.3.11,<=0.3.13",
99
"loop-rate-limiters>=1.1.2",

Demo/dataflow_angle_simu.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1+
# Note: Using 'python -m pip' instead of 'pip' to ensure pixi environment's pip is used.
2+
# Direct 'pip' command may resolve to system pip which is externally-managed (PEP 668).
13
nodes:
24
- id: move_angle
3-
build: pip install -e AHSimulation
5+
build: python -m pip install -e AHSimulation
46
path: AHSimulation/examples/finger_angle_control.py
57
inputs:
68
tick: dora/timer/millis/50
79
outputs:
810
- hand_quat
911

1012
- id: hand_simulation_r
11-
build: pip install -e AHSimulation
13+
build: python -m pip install -e AHSimulation
1214
path: AHSimulation/AHSimulation/mj_mink_right.py
1315
inputs:
1416
r_hand_quat: move_angle/hand_quat
@@ -19,7 +21,7 @@ nodes:
1921
args: -m quat
2022

2123
- id: hand_simulation_l
22-
build: pip install -e AHSimulation
24+
build: python -m pip install -e AHSimulation
2325
path: AHSimulation/AHSimulation/mj_mink_left.py
2426
inputs:
2527
l_hand_quat: move_angle/hand_quat

Demo/dataflow_tracking_real.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1+
# Note: Using 'python -m pip' instead of 'pip' to ensure pixi environment's pip is used.
2+
# Direct 'pip' command may resolve to system pip which is externally-managed (PEP 668).
13
nodes:
24
- id: hand_tracker
3-
build: pip install -e HandTracking
5+
build: python -m pip install -e HandTracking
46
path: HandTracking/HandTracking/main.py
57
inputs:
68
tick: dora/timer/millis/50
79
outputs:
810
- r_hand_pos
911

1012
- id: r_hand_simulation
11-
build: pip install -e AHSimulation
13+
build: python -m pip install -e AHSimulation
1214
path: AHSimulation/AHSimulation/mj_mink_right.py
1315
inputs:
1416
r_hand_pos: hand_tracker/r_hand_pos

Demo/dataflow_tracking_real_2hands.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
# Note: Using 'python -m pip' instead of 'pip' to ensure pixi environment's pip is used.
2+
# Direct 'pip' command may resolve to system pip which is externally-managed (PEP 668).
13
nodes:
24
- id: hand_tracker
3-
build: pip install -e HandTracking
5+
build: python -m pip install -e HandTracking
46
path: HandTracking/HandTracking/main.py
57
inputs:
68
tick: dora/timer/millis/50
@@ -9,7 +11,7 @@ nodes:
911
- l_hand_pos
1012

1113
- id: r_hand_simulation
12-
build: pip install -e AHSimulation
14+
build: python -m pip install -e AHSimulation
1315
path: AHSimulation/AHSimulation/mj_mink_right.py
1416
inputs:
1517
r_hand_pos: hand_tracker/r_hand_pos
@@ -19,7 +21,7 @@ nodes:
1921
- mj_r_joints_pos
2022

2123
- id: l_hand_simulation
22-
build: pip install -e AHSimulation
24+
build: python -m pip install -e AHSimulation
2325
path: AHSimulation/AHSimulation/mj_mink_left.py
2426
inputs:
2527
l_hand_pos: hand_tracker/l_hand_pos

Demo/dataflow_tracking_simu.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
# Note: Using 'python -m pip' instead of 'pip' to ensure pixi environment's pip is used.
2+
# Direct 'pip' command may resolve to system pip which is externally-managed (PEP 668).
13
nodes:
24
- id: hand_tracker
3-
build: pip install -e HandTracking
5+
build: python -m pip install -e HandTracking
46
path: HandTracking/HandTracking/main.py
57
inputs:
68
tick: dora/timer/millis/50
@@ -9,7 +11,7 @@ nodes:
911
- l_hand_pos
1012

1113
- id: r_hand_simulation
12-
build: pip install -e AHSimulation
14+
build: python -m pip install -e AHSimulation
1315
path: AHSimulation/AHSimulation/mj_mink_right.py
1416
inputs:
1517
r_hand_pos: hand_tracker/r_hand_pos
@@ -19,7 +21,7 @@ nodes:
1921
- mj_joints_pos
2022

2123
- id: l_hand_simulation
22-
build: pip install -e AHSimulation
24+
build: python -m pip install -e AHSimulation
2325
path: AHSimulation/AHSimulation/mj_mink_left.py
2426
inputs:
2527
l_hand_pos: hand_tracker/l_hand_pos

0 commit comments

Comments
 (0)