From 89b841d50c6145f5c33e671c6eb66687a9b26af6 Mon Sep 17 00:00:00 2001
From: Ben <86227623+BenStarmerSmith@users.noreply.github.com>
Date: Thu, 15 Sep 2022 14:01:19 +0100
Subject: [PATCH] Fix release bugs (#497)

* 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
---
 .../common/docker-container/tasks/reinstall.yml  | 16 +++++++++++-----
 .../desktop-icons/tasks/hand-and-glove.yml       |  4 ++--
 .../desktop-icons/tasks/only-simulation.yml      | 12 ++++++------
 .../server/desktop-icons/tasks/real-robots.yml   |  4 ++--
 4 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/ansible/roles/products/common/docker-container/tasks/reinstall.yml b/ansible/roles/products/common/docker-container/tasks/reinstall.yml
index aeadc2cf8..a01e0e4a2 100644
--- a/ansible/roles/products/common/docker-container/tasks/reinstall.yml
+++ b/ansible/roles/products/common/docker-container/tasks/reinstall.yml
@@ -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"
diff --git a/ansible/roles/products/hand-e/server/desktop-icons/tasks/hand-and-glove.yml b/ansible/roles/products/hand-e/server/desktop-icons/tasks/hand-and-glove.yml
index 79c1c99c3..f122eb4f9 100644
--- a/ansible/roles/products/hand-e/server/desktop-icons/tasks/hand-and-glove.yml
+++ b/ansible/roles/products/hand-e/server/desktop-icons/tasks/hand-and-glove.yml
@@ -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"
diff --git a/ansible/roles/products/teleop/server/desktop-icons/tasks/only-simulation.yml b/ansible/roles/products/teleop/server/desktop-icons/tasks/only-simulation.yml
index 3c5d3a963..de0f00d5d 100644
--- a/ansible/roles/products/teleop/server/desktop-icons/tasks/only-simulation.yml
+++ b/ansible/roles/products/teleop/server/desktop-icons/tasks/only-simulation.yml
@@ -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
diff --git a/ansible/roles/products/teleop/server/desktop-icons/tasks/real-robots.yml b/ansible/roles/products/teleop/server/desktop-icons/tasks/real-robots.yml
index e4123a0c8..a68c9c449 100644
--- a/ansible/roles/products/teleop/server/desktop-icons/tasks/real-robots.yml
+++ b/ansible/roles/products/teleop/server/desktop-icons/tasks/real-robots.yml
@@ -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"