Skip to content

Commit

Permalink
Revert "prototyping record hand data (#338)" (#344)
Browse files Browse the repository at this point in the history
This reverts commit 56adbf8.
  • Loading branch information
Fotios Papadopoulos authored Apr 20, 2021
1 parent 56adbf8 commit 92058c1
Show file tree
Hide file tree
Showing 13 changed files with 0 additions and 65 deletions.
4 changes: 0 additions & 4 deletions ansible/inventory/teleop/group_vars/control_machine.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,6 @@ arm_ip_left: "" # Specify the IP address of left arm
arm_ip_right: "" # Specify the IP address of right arm
ur_robot_type: "ur10e" # Specify ur robot type: ur10, ur10e, ur5, ur5e
biotacs: true # Whether the hands will have biotac fingertips
bag_all_data_from: ["shadowrobot_210312", "shadowrobot_210311"]
remote_bag_user: "shadowop"
remote_bag_storage_IP: "10.5.10.59"
remote_bag_storage_location: "/volume1/ros_bags"
pr_branches: "" # Space-separated list of PRs (https://github.com/shadow-robot/repo/pull/266) or branches (https://github.com/shadow-robot/repo/tree/custom_branch) to check out on NUC and catkin_make
ansible_become_password: !vault |
$ANSIBLE_VAULT;1.1;AES256
Expand Down
4 changes: 0 additions & 4 deletions ansible/inventory/teleop/group_vars/simulation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@ remote_teleop: false # Flag to enable/disable remote_teleop software install
ur_robot_type: "ur10e" # Specify ur robot type: ur10, ur10e, ur5, ur5e
arm_ip_left: "" # Specify the IP address of left arm
arm_ip_right: "" # Specify the IP address of right arm
bag_all_data_from: ["shadowrobot_210312", "shadowrobot_210311"]
remote_bag_user: "shadowop"
remote_bag_storage_IP: "10.5.10.59"
remote_bag_storage_location: "/volume1/ros_bags"
pr_branches: "" # Space-separated list in double quotes of PRs and branches like this "https://github.com/shadow-robot/repo/pull/266 https://github.com/shadow-robot/repo/tree/custom_branch" to check out on server and catkin_make
scene_file: "" # Allows the user to override the scene_file used in GUI launch e.g. scene_file="\$(find sr_description_common)/scenes/custom.scene" (if empty, default in Github will be used)
haptx_teleop_readthedocs_token: !vault |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,3 @@ pr_branches: ""
product: ""
private_github_ssh_key_base64: ""
private_ssh_keys_path: "{{ user_folder }}/.ssh/id_rsa_private"
record_hand_data: "disabled"
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,6 @@
set_fact:
shared_volumes: "{{ common_shared_volumes + container_type_shared_volumes + custom_shared_volumes }}"

- name: Find out if we should record all data from these hands
set_fact:
record_hand_data: "enabled"
when: config_branch in bag_all_data_from

- name: Creating the container with no terminator and no setup
changed_when: false
community.docker.docker_container:
Expand All @@ -31,7 +26,6 @@
ROS_MASTER_URI: "http://{{ ros_master }}:11311"
arm_ips: "{{ arm_ip_right }}_{{ arm_ip_left }}"
XDG_RUNTIME_DIR: "/run/user/1000"
SR_RECORD_HAND_DATA: "{{ record_hand_data }}"
network_mode: "host"
pid_mode: "host"
privileged: yes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
ROS_MASTER_URI: "http://{{ ros_master }}:11311"
arm_ips: "{{ arm_ip_right }}_{{ arm_ip_left }}"
XDG_RUNTIME_DIR: "/run/user/1000"
SR_RECORD_HAND_DATA: "{{ record_hand_data }}"
network_mode: "host"
pid_mode: "host"
privileged: yes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
NVIDIA_DRIVER_CAPABILITIES: "all"
arm_ips: "{{ arm_ip_right }}_{{ arm_ip_left }}"
XDG_RUNTIME_DIR: "/run/user/1000"
SR_RECORD_HAND_DATA: "{{ record_hand_data }}"
network_mode: "host"
pid_mode: "host"
privileged: yes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,6 @@
container_type_shared_volumes:
- "{{ user_folder }}/.Xauthority:/home/user/.Xauthority"

- name: Find out if we should record all data from these hands
set_fact:
record_hand_data: "enabled"
when: config_branch in bag_all_data_from

- name: Set shared volumes
set_fact:
shared_volumes: "{{ common_shared_volumes + container_type_shared_volumes + custom_shared_volumes }}"
Expand All @@ -31,7 +26,6 @@
ROS_MASTER_URI: "http://{{ ros_master }}:11311"
arm_ips: "{{ arm_ip_right }}_{{ arm_ip_left }}"
XDG_RUNTIME_DIR: "/run/user/1000"
SR_RECORD_HAND_DATA: "{{ record_hand_data }}"
network_mode: "host"
pid_mode: "host"
privileged: yes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
ROS_MASTER_URI: "http://{{ ros_master }}:11311"
arm_ips: "{{ arm_ip_right }}_{{ arm_ip_left }}"
XDG_RUNTIME_DIR: "/run/user/1000"
SR_RECORD_HAND_DATA: "{{ record_hand_data }}"
network_mode: "host"
pid_mode: "host"
privileged: yes
Expand All @@ -34,4 +33,3 @@
command: "terminator {{ term_args }} -T '{{ container_terminal_title }}' -x bash -c '[[ -e {{ setup_directory }}/{{ setup_script }} ]] && {{ setup_directory }}/{{ setup_script }} && bash || bash'"
container_default_behavior: compatibility
become: yes

This file was deleted.

27 changes: 0 additions & 27 deletions ansible/roles/products/common/record-hand-data/tasks/main.yml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,6 @@
include_role:
name: installation/chrony-client

- name: Include products/common/record-hand-data role
include_role:
name: products/common/record-hand-data
when: config_branch in bag_all_data_from

- name: Include docker/docker-image role
include_role:
name: docker/docker-image
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,3 @@ haptx_teleop_readthedocs_token: ""
shadow_glove_teleop_readthedocs_token: ""
pr_branches: ""
polhemus_type: "viper"
bag_all_data_from: []
5 changes: 0 additions & 5 deletions ansible/roles/products/teleop/server/deploy/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,6 @@
name: installation/chrony-server
when: groups['server'] is defined

- name: Include products/common/record-hand-data role
include_role:
name: products/common/record-hand-data
when: config_branch in bag_all_data_from

- name: Include installation/shadow_glove_driver role
include_role:
name: installation/shadow_glove_driver
Expand Down

0 comments on commit 92058c1

Please sign in to comment.