Skip to content

Commit

Permalink
Update documentation links and added increased timeout to teleop (#538)
Browse files Browse the repository at this point in the history
* Updated the documentation links. Increased wait time before control loop and gui for teleop.

* Added sleep.
  • Loading branch information
BenStarmerSmith authored Apr 26, 2023
1 parent 0b6c2d3 commit 2d32ab7
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 24 deletions.
46 changes: 23 additions & 23 deletions ansible/roles/products/common/documentation/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ bucket_name: "shadowrobot.aurora.files"
hand_lite_version: "test"
hand_e_version: "2.2.0"
hand_arm_version: "2.2.0"
hand_glove_version: "2.1.8"
hand_glove_version: "2.2.1"
teleop_polhemus_version: "2.1.8"
teleop_haptx_version: "latest"
teleop_haptx_version: "2.2.1"
# 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.0/"
Expand All @@ -47,30 +47,30 @@ arm_hand_readthedocs_link: !vault |
glove_hand_readthedocs_link: !vault |
$ANSIBLE_VAULT;1.1;AES256
36303133356634393332643139353565356434656563663161353039623738363530663535353136
6464346163333866643533363663643136363839616162370a613366386230316635333835636237
64663133613831643465303336613731303834623632396362303834336334383132643966313434
3265393538623438660a353237383363376332633030356562396531353330306135373336356365
35383066323362373334353066343933363166346266393334386232633035653662623632373562
36326366666134633935663337396634346539383865313533383131366333306230653732383132
38313562646430616535643664316131653063636235643334656661613462636462336230623731
61323965306330323865386339306232333962396565363034653262333863613061613434386537
37373565306630306636366364303066393239646561393063333266353861663539346463623932
35383566666539356132646237336362366637316539636161376436373036333662373739353961
393135623166333137323363343766336532
66333137313832363734383765353331663334383535613164313834383863623639313263323464
6562363639643464326138353537656133316235613461640a356332663037396564396539633364
35306237313336636531633033356237346261386135616166303630653763333935303937623735
6637356335323339360a626139623865336133613336363564646139623139336533626136656666
65663530623832316363306638316636366331353439336339366463636164303665333033376465
34343832343365643633303231636666653831356565643161643731363163323737346137663330
34313436636430613638623833623733663763616639396433383464323966626635396237643364
31353033613633626339613033613964343736623461363538666564303764363861633631383236
62383964373066653830366335353066373565333337633933356166623935633937653066363736
39396135333765313339616463656466386362346264393761323664346238363835376536646361
653834303364656330663563373462326466
haptx_teleop_readthedocs_link: !vault |
$ANSIBLE_VAULT;1.1;AES256
30333632343539353239656365643334343739633332636635366439376432336433396535326534
3664323733363938356565643738626438326635663661650a653965326266643439346235353463
61623164343066343865663835663833373537323061316534353932373063653462613834313134
6432633137326262380a643663393235313733666332643263626665643562306236303235646137
35666562343466623939306139656635323466336261306561323633343163356234653961666637
39303035363862323563333763383962316234326530666266623066636363393435646130303430
65336432643639623033376333613436383565323330363434313032663861633033633662633165
35313937663037363536323938323037386635653766663463636461313861323261366336613961
35653566626439373232616135303538386465336563383363626131623766663163613439363839
6635373730343535383431366437633162373564383763373163
62303766313732373438316531623938336637323966653530393865643636633638646337326233
6437626433333364613034616432623530383363333130350a303266363831663835323937636332
65653264653338643963666463373363343639363430643535393663663731643564386136653362
3831663364623737340a336330343834636333363030666364383736336461616530356364616138
37666564353239666462333433643662353830316236343238656565373735313830323134343662
36623034666633636564653734323836343434393132353565336339303633633730366239333163
35383833393935383763636662306164616634616265306461353564306531343032353331643133
64353439623465396133353438373565323963303836366531323864633334663866636434353231
32643032656561663634636433356465303935643533336664643962383764373464303839313931
6364373130613437373931393861326361353666373039613736
shadow_glove_teleop_readthedocs_link: !vault |
$ANSIBLE_VAULT;1.1;AES256
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,11 @@ if [ "$proceed" == false ]; then
fi

terminator --geometry "{{ term_3 }}" -T 'NUC {{ arm_side }} hardware control loop' -e "{{ shadow_hand_launcher_folder}}/{{ control_loop_script }}"
sleep 30 # temporary workaround until arm controllers starting on time is fixed
if [[ "{{ arm_side }}" == "Bimanual" ]]; then # temporary workaround until arm controllers starting on time is fixed
sleep 60
else
sleep 40
fi
terminator --geometry "{{ term_4 }}" -T 'Server {{ arm_side }} GUI' -e "{{ shadow_hand_launcher_folder}}/{{ gui_script }}"
if [[ "{{ glove }}" == "haptx" ]]; then
terminator --geometry "{{ term_5 }}" -T 'Server HaptX {{ arm_side }} Mapping' -e "{{ shadow_hand_launcher_folder}}/{{ haptx_mapping_script }}"
Expand Down

0 comments on commit 2d32ab7

Please sign in to comment.