Skip to content

Commit

Permalink
Fix release bugs (#497)
Browse files Browse the repository at this point in the history
* Fixed Sim Icons, Added Watchdog, fixed error (#483)

* Fixed the sim icons for default hand.

* Changed external control loop to false.

* Fixed conditional issue.

* Changed calabraition side

* Added system montior

* Added pip fix.

* Added comment.

* Added mock to hand+glove.

* Renamed Icon.

* renamed file again

* Removed real glove for sim.

* Remove mock.

* Fixed changes for documentation and that Max noticed.

* Updated glove calibration
BenStarmerSmith authored Sep 15, 2022

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent 6cd0787 commit 89b841d
Showing 4 changed files with 21 additions and 15 deletions.
16 changes: 11 additions & 5 deletions ansible/roles/products/common/docker-container/tasks/reinstall.yml
Original file line number Diff line number Diff line change
@@ -157,14 +157,20 @@
documentation_repo: sr_teleop_polhemus_documentation
readthedocs_token: "{{ shadow_glove_teleop_readthedocs_token }}"
documentation_product: teleop-polhemus
when: glove == "shadow_glove" and skip_molecule_task is not defined
when:
- glove == "shadow_glove"
- product is not defined
- skip_molecule_task is not defined

- name: Set documentation variables for haptx teleop
set_fact:
documentation_repo: sr_teleop_haptx_documentation
readthedocs_token: "{{ haptx_teleop_readthedocs_token }}"
documentation_product: teleop-haptx
when: glove == "haptx" and skip_molecule_task is not defined
when:
- glove == "haptx"
- product is not defined
- skip_molecule_task is not defined

- name: Set documentation variables for arm and hand
set_fact:
@@ -175,16 +181,16 @@
- "'arm_' in product"
- skip_molecule_task is not defined

- name: Set documentation variables for arm and glove
- name: Set documentation variables for glove and hand
set_fact:
documentation_repo: sr_dexterous_hand_glove_documentation
readthedocs_token: "{{ glove_hand_readthedocs_token }}"
documentation_product: dexterous-hand-and-glove
when:
- "'arm_' in product"
- "'glove_' in product"
- skip_molecule_task is not defined

- name: Update documentation inside the docker container for teleop or arm+hand
- name: Update documentation inside the docker container for teleop or arm+hand or glove+hand
import_tasks: modify-container.yml
vars:
modify_script_name: "update_documentation.sh"
Original file line number Diff line number Diff line change
@@ -116,9 +116,9 @@
vars:
desktop_icon_png: "shadow_glove_{{ glove_driver_type }}.png"
launch_script: "shadow_glove_calibration.sh"
desktop_icon_name: "Launch Shadow {{ glove_driver_type }} Glove Calibration"
desktop_icon_name: "Launch Shadow {{ glove_driver_type | title }} Glove Calibration"
template: templates/scripts/launch-shadow-glove-calibration.j2
desktop_icon_path: "Shadow Advanced Launchers/Launch Shadow {{ glove_driver_type }} Glove Calibration"
desktop_icon_path: "Shadow Advanced Launchers/Launch Shadow {{ glove_driver_type | title }} Glove Calibration"
launch_terminal: "false"
glove_driver_value: "{{ glove_driver_type }}"
when: glove=="shadow_glove"
Original file line number Diff line number Diff line change
@@ -410,9 +410,9 @@
vars:
desktop_icon_png: "shadow_glove_{{ glove_driver_type }}.png"
launch_script: "shadow_glove_calibration.sh"
desktop_icon_name: "Launch Shadow {{ glove_driver_type }} Glove Calibration"
desktop_icon_name: "Launch Shadow {{ glove_driver_type | title }} Glove Calibration"
template: templates/scripts/launch-shadow-glove-calibration.j2
desktop_icon_path: "Shadow Advanced Launchers/Launch Shadow {{ glove_driver_type }} Glove Calibration"
desktop_icon_path: "Shadow Advanced Launchers/Launch Shadow {{ glove_driver_type | title }} Glove Calibration"
launch_terminal: "false"
glove_driver_value: "{{ glove_driver_type }}"
when: glove=="shadow_glove" and real_glove|bool
@@ -428,9 +428,9 @@
vars:
desktop_icon_png: "shadow_glove_{{ glove_driver_type }}.png"
launch_script: "shadow_glove_calibration.sh"
desktop_icon_name: "Launch Shadow {{ glove_driver_type }} Glove Calibration"
desktop_icon_name: "Launch Shadow {{ glove_driver_type | title }} Glove Calibration"
template: templates/scripts/launch-shadow-glove-calibration.j2
desktop_icon_path: "Shadow Advanced Launchers/Launch Shadow {{ glove_driver_type }} Glove Calibration"
desktop_icon_path: "Shadow Advanced Launchers/Launch Shadow {{ glove_driver_type | title }} Glove Calibration"
launch_terminal: "false"
glove_driver_value: "{{ glove_driver_type }}"
when: glove=="shadow_glove" and real_glove|bool
@@ -446,9 +446,9 @@
vars:
desktop_icon_png: "shadow_glove_{{ glove_driver_type }}.png"
launch_script: "shadow_glove_calibration.sh"
desktop_icon_name: "Launch Shadow {{ glove_driver_type }} Glove Calibration"
desktop_icon_name: "Launch Shadow {{ glove_driver_type | title }} Glove Calibration"
template: templates/scripts/launch-shadow-glove-calibration.j2
desktop_icon_path: "Shadow Advanced Launchers/Launch Shadow {{ glove_driver_type }} Glove Calibration"
desktop_icon_path: "Shadow Advanced Launchers/Launch Shadow {{ glove_driver_type | title }} Glove Calibration"
launch_terminal: "false"
glove_driver_value: "{{ glove_driver_type }}"
when: glove=="shadow_glove" and real_glove|bool
Original file line number Diff line number Diff line change
@@ -689,9 +689,9 @@
vars:
desktop_icon_png: "shadow_glove_{{ glove_driver_type }}.png"
launch_script: "shadow_glove_calibration.sh"
desktop_icon_name: "Launch Shadow {{ glove_driver_type }} Glove Calibration"
desktop_icon_name: "Launch Shadow {{ glove_driver_type | title }} Glove Calibration"
template: templates/scripts/launch-shadow-glove-calibration.j2
desktop_icon_path: "Shadow Advanced Launchers/Launch Shadow {{ glove_driver_type }} Glove Calibration"
desktop_icon_path: "Shadow Advanced Launchers/Launch Shadow {{ glove_driver_type | title }} Glove Calibration"
launch_terminal: "false"
glove_driver_value: "{{ glove_driver_type }}"
when: glove=="shadow_glove"

0 comments on commit 89b841d

Please sign in to comment.