From ed2b6e3edae6a5e79a5b09e6bfae1e75213ce0f9 Mon Sep 17 00:00:00 2001 From: rnzenha-s <107403736+rnzenha-s@users.noreply.github.com> Date: Fri, 10 May 2024 18:07:38 +0200 Subject: [PATCH] Update aurora with haptx release 0.1.11 (#606) --- README.md | 5 +++-- .../common/documentation/defaults/main.yml | 22 +++++++++---------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 2f2fcde62..83efcb06f 100644 --- a/README.md +++ b/README.md @@ -71,13 +71,14 @@ bash <(curl -Ls https://raw.githubusercontent.com/shadow-robot/aurora/v2.2.5/bin Example for real robots with haptx bimanual teleop: ```bash -bash <(curl -Ls https://raw.githubusercontent.com/shadow-robot/aurora/v2.1.7/bin/run-ansible.sh) teleop_deploy --branch v2.1.7 --inventory production --read-secure customer_key reinstall=true bimanual=true upgrade_check=true image="080653068785.dkr.ecr.eu-west-2.amazonaws.com/shadow-teleop-haptx-binary" tag="noetic-v0.0.23" glove="haptx" use_steamvr=false arm_ip_right="10.8.1.1" arm_ip_left="10.8.2.1" ethercat_right_arm="eno1" ethercat_left_arm="enx000ec6bfe175" +bash <(curl -Ls https://raw.githubusercontent.com/shadow-robot/aurora/v2.2.5/bin/run-ansible.sh) teleop_deploy --branch v2.2.5 --inventory production --read-secure customer_key reinstall=true bimanual=true upgrade_check=true image="080653068785.dkr.ecr.eu-west-2.amazonaws.com/shadow-teleop-haptx-binary" tag="noetic-v0.1.11" glove="haptx" use_steamvr=false arm_ip_right="10.8.1.1" arm_ip_left="10.8.2.1" ethercat_right_arm="eno1" ethercat_left_arm="enx000ec6bfe175" ``` +**_NOTE:_** you may need to change `ethercat_right_arm` depending on the default interface on the NUC (for instance, to `enp1s0`) Example for simulated robots without a real vive system or real gloves: ```bash -bash <(curl -Ls https://raw.githubusercontent.com/shadow-robot/aurora/v2.1.7/bin/run-ansible.sh) teleop_deploy --branch v2.1.7 --inventory simulation --read-secure customer_key reinstall=true upgrade_check=true image="080653068785.dkr.ecr.eu-west-2.amazonaws.com/shadow-teleop-haptx-binary" tag="noetic-v0.0.23" glove="haptx" real_glove=false real_vive=false +bash <(curl -Ls https://raw.githubusercontent.com/shadow-robot/aurora/v2.2.5/bin/run-ansible.sh) teleop_deploy --branch v2.2.5 --inventory simulation --read-secure customer_key reinstall=true upgrade_check=true image="080653068785.dkr.ecr.eu-west-2.amazonaws.com/shadow-teleop-haptx-binary" tag="noetic-v0.1.11" glove="haptx" real_glove=false real_vive=false ``` Options for teleop_deploy playbook are here for the following machines: diff --git a/ansible/roles/products/common/documentation/defaults/main.yml b/ansible/roles/products/common/documentation/defaults/main.yml index 4e38279b3..4bedd9e49 100644 --- a/ansible/roles/products/common/documentation/defaults/main.yml +++ b/ansible/roles/products/common/documentation/defaults/main.yml @@ -26,7 +26,7 @@ hand_e_version: "2.2.5" hand_arm_version: "2.2.5" hand_glove_version: "2.2.1" teleop_polhemus_version: "2.2.5" -teleop_haptx_version: "2.2.1" +teleop_haptx_version: "2.2.5" # ReadTheDocs links dexterous_hand_lite_readthedocs_link: "https://shadow-robot-company-dexterous-hand-lite.readthedocs-hosted.com/en/latest/" dexterous_hand_readthedocs_link: "https://shadow-robot-company-dexterous-hand.readthedocs-hosted.com/en/2.2.5/" @@ -61,16 +61,16 @@ glove_hand_readthedocs_link: !vault | haptx_teleop_readthedocs_link: !vault | $ANSIBLE_VAULT;1.1;AES256 - 62303766313732373438316531623938336637323966653530393865643636633638646337326233 - 6437626433333364613034616432623530383363333130350a303266363831663835323937636332 - 65653264653338643963666463373363343639363430643535393663663731643564386136653362 - 3831663364623737340a336330343834636333363030666364383736336461616530356364616138 - 37666564353239666462333433643662353830316236343238656565373735313830323134343662 - 36623034666633636564653734323836343434393132353565336339303633633730366239333163 - 35383833393935383763636662306164616634616265306461353564306531343032353331643133 - 64353439623465396133353438373565323963303836366531323864633334663866636434353231 - 32643032656561663634636433356465303935643533336664643962383764373464303839313931 - 6364373130613437373931393861326361353666373039613736 + 63623036326264383766363566326639633162653236636365326534393839623330393632303431 + 3664303133663038646561356461323864663834313464340a363166623032623534323838346433 + 39353937356237653731623830333232633539343138316539316330376238653464333437646235 + 6336613534633865360a653130376365363165346331353039333633623266626331313339363861 + 34363465303764613138396633626530363033323963313538643034613330366432306639333565 + 32646136396430343566313036623732613839623663306230653066663230343566376464393937 + 30313036333431336635353034613661303734343666633236353264666232386331643030303738 + 35316235356536373934393264613239333663323537643036336362373938626230613361643834 + 31356431656139396339326536373463333364613561636139633962363137323330613533646362 + 6466346235633266356365343938303839633763323262613636 shadow_glove_teleop_readthedocs_link: !vault | $ANSIBLE_VAULT;1.1;AES256