From 6ad1dd0ee2448ae34d975906a4fe2865d83c3e7a Mon Sep 17 00:00:00 2001 From: bjoern Date: Thu, 24 Jul 2025 15:50:35 +0200 Subject: [PATCH] Fix for Mac --- Demo/AHSimulation/pyproject.toml | 1 + Demo/HandTracking/pyproject.toml | 2 +- Demo/README.md | 18 ++++++++++-------- Demo/dataflow_tracking_simu.yml | 3 ++- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/Demo/AHSimulation/pyproject.toml b/Demo/AHSimulation/pyproject.toml index fed98d0..e0568cf 100644 --- a/Demo/AHSimulation/pyproject.toml +++ b/Demo/AHSimulation/pyproject.toml @@ -7,6 +7,7 @@ requires-python = ">=3.12" dependencies = [ "dora-rs>=0.3.11", "loop-rate-limiters>=1.1.2", + "numpy<2", "mink>=0.0.11", "mujoco>=3.3.2", "onshape-to-robot>=1.7.5", diff --git a/Demo/HandTracking/pyproject.toml b/Demo/HandTracking/pyproject.toml index 8f16e00..da80030 100644 --- a/Demo/HandTracking/pyproject.toml +++ b/Demo/HandTracking/pyproject.toml @@ -3,7 +3,7 @@ name = "HandTracking" version = "0.1.0" description = "Add your description here" readme = "README.md" -requires-python = ">=3.9,<=3.12" +requires-python = ">=3.9,<3.13" dependencies = [ "dora-rs>=0.3.11", "loop-rate-limiters>=1.1.2", diff --git a/Demo/README.md b/Demo/README.md index 25f03a5..f8b3d33 100644 --- a/Demo/README.md +++ b/Demo/README.md @@ -6,17 +6,19 @@ - Install dora-rs: https://dora-rs.ai/docs/guides/Installation/installing - start the daemon: `dora up` -- Clone this repository and in a console from the directory run: -- `uv venv --python 3.12` +- Clone this repository in to a folder, that dora has access to and in a console run: +- `cd AmazingHand/Demo/` +- `python3.12 -m venv ./venv` +- `source venv/bin/activate` - To run the webcam hand tracking demo in simulation only: - - `dora build dataflow_tracking_simu.yml --uv` (needs to be done only once) - - `dora run dataflow_tracking_simu.yml --uv` + - `dora build dataflow_tracking_simu.yml` (needs to be done only once) + - `dora run dataflow_tracking_simu.yml` - To run the webcam hand tracking demo with real hardware: - - `dora build dataflow_tracking_real.yml --uv` (needs to be done only once) - - `dora run dataflow_tracking_real.yml --uv` + - `dora build dataflow_tracking_real.yml` (needs to be done only once) + - `dora run dataflow_tracking_real.yml` - To run a simple example to control the finger angles in simulation: - - `dora build dataflow_angle_simu.yml --uv` (needs to be done only once) - - `dora run dataflow_angle_simu.yml --uv` + - `dora build dataflow_angle_simu.yml` (needs to be done only once) + - `dora run dataflow_angle_simu.yml` ## Hand Setup diff --git a/Demo/dataflow_tracking_simu.yml b/Demo/dataflow_tracking_simu.yml index 426fa2e..51e99ba 100644 --- a/Demo/dataflow_tracking_simu.yml +++ b/Demo/dataflow_tracking_simu.yml @@ -9,7 +9,8 @@ nodes: - id: hand_simulation build: pip install -e AHSimulation - path: AHSimulation/AHSimulation/mj_mink_right.py + path: venv/bin/mjpython + args: AHSimulation/AHSimulation/mj_mink_right.py inputs: hand_pos: hand_tracker/hand_pos tick: dora/timer/millis/2