Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] auto stabilizer for jaxon wheel #71

Open
wants to merge 1,498 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1498 commits
Select commit Hold shift + click to select a range
55e8498
fix bug; disable use_force_sensor flag for arm
Nov 12, 2020
d35220f
set flywheel balance parameter
YutaKojio Nov 13, 2020
b9deb91
fix bug on jumping arm position soon after walking
YutaKojio Nov 13, 2020
26e0eb3
completly disable damping when torque mode
Nov 18, 2020
5dbfe4c
fix bug on torque control
YutaKojio Nov 18, 2020
c89d3fe
[SequencePlayer] fix bug in remoteJointGroup
Naoki-Hiraoka Nov 25, 2020
9f33725
fix pkg pass of opencv
Nov 28, 2020
5104200
interpolate pd gain when stopStabilizer
Nov 28, 2020
17ab6db
truncate zmp in st when is_walking
Nov 29, 2020
f2473a9
Merge branch 'fix-removejointgroup' of github.com:Naoki-Hiraoka/hrpsy…
YutaKojio Nov 29, 2020
1e0e480
disable toe joint in FullbodyIK
YutaKojio Dec 1, 2020
bef4f51
check openhrp3 version
YutaKojio Dec 2, 2020
5c7b068
Revert "check openhrp3 version"
YutaKojio Dec 2, 2020
f758360
set qpoases to ON and do not build Stabilizer rtc
YutaKojio Dec 3, 2020
7372fd3
fix bug on ref_force
YutaKojio Dec 3, 2020
1d44311
add libproj-dev to package.xml
Naoki-Hiraoka Dec 4, 2020
c1dfe10
Merge pull request #5 from Naoki-Hiraoka/foot-guided-walk-fullbody
YutaKojio Dec 4, 2020
6b442cf
fix param; increase damping gain fisrt and last of walking
YutaKojio Dec 4, 2020
0ab547d
fix contactstates
Naoki-Hiraoka Dec 5, 2020
6c2b0b4
Merge pull request #6 from Naoki-Hiraoka/foot-guided-walk-fullbody
YutaKojio Dec 5, 2020
446680d
fix bug; initialize i = 0 in for
Dec 5, 2020
e04988d
Merge branch 'foot-guided-walk-fullbody' of https://github.com/YutaKo…
Dec 5, 2020
92e34e8
[Stabilizer] fix size_t initialization
Naoki-Hiraoka Dec 5, 2020
0c2ada8
revert add_definition
Dec 5, 2020
396dfdb
fix damping param in double
Dec 5, 2020
3a83667
Merge pull request #1298 from Naoki-Hiraoka/fix-i
fkanehiro Dec 7, 2020
be0765a
use preprev_footstep if steppble region is not read
Dec 11, 2020
c473b18
add debug_landing_height
Dec 11, 2020
7d05391
add read_steppable_region for debug
YutaKojio Dec 11, 2020
5240923
cannot walk without ST
YutaKojio Dec 18, 2020
12fc5ef
goStop when startAutobalancer if gg_is_walking is true
YutaKojio Dec 18, 2020
96594a1
rotate foot 0.1 ratio earlier than landing timing
YutaKojio Dec 18, 2020
a9ac4e4
cannot startAutobalancer while gg_is_walking is true
YutaKojio Dec 18, 2020
00d9ce0
reset torque gain if st is idle
YutaKojio Dec 19, 2020
0674799
limit max_stride_x when forward stepping up heigher stair than step_h…
YutaKojio Dec 20, 2020
8cb0405
separate calc touchoff remain time function
YutaKojio Dec 21, 2020
5728394
limit max_stride_x when forward and rear stepping up
YutaKojio Dec 22, 2020
bcb0b03
limit stride when stair down
YutaKojio Dec 22, 2020
b5f6bc1
fix param om stair_margin
YutaKojio Dec 22, 2020
ef4354e
limit stride before vision
YutaKojio Dec 22, 2020
76c7a21
fix bug; limit stride by vision at least once
Dec 22, 2020
e4b52a1
limit stride even when govelocity_x == 0.0
YutaKojio Dec 22, 2020
7816574
add comment on TODO
YutaKojio Dec 22, 2020
7476acf
add idl for front_edge_offset_of_steppalbe_region
Dec 23, 2020
a3f8b72
Merge branch 'foot-guided-walk-fullbody' of https://github.com/YutaKo…
Dec 23, 2020
5a87ea9
fix code on limit stride on stair
YutaKojio Dec 23, 2020
eace619
fix bug on swing modification
Dec 25, 2020
6c71307
add log for landing pos
YutaKojio Dec 27, 2020
2638bf9
enable disturbance after 1 step
YutaKojio Dec 27, 2020
188b627
Revert "enable disturbance after 1 step"
YutaKojio Dec 27, 2020
92f497b
disable disturbance fy
YutaKojio Dec 27, 2020
2d35e5b
interpolate zmp in last phase
YutaKojio Dec 30, 2020
ff2b011
set normal_ratio to 0 when arm is active
Dec 30, 2020
ad2dfaf
increase arm weight
Dec 30, 2020
0cc48c1
interpolate zmp after walking to new_refzmp
YutaKojio Jan 5, 2021
d4dec6b
fix bug: interpolate hand position after walking
YutaKojio Jan 5, 2021
d5bcd5c
fix param; interpolation time when after walking
YutaKojio Jan 14, 2021
784d20c
use fabs to fix ambiguous overload call error
fkanehiro Jan 26, 2021
a916942
fix bug; set rg.step_count and refzmp_count when changing step time
YutaKojio Jan 31, 2021
f495177
add is_slow_stair_mode
YutaKojio Jan 31, 2021
2870d44
Merge pull request #1300 from fkanehiro/use_fabs
fkanehiro Feb 8, 2021
efc1c64
support cross step
YutaKojio Apr 3, 2021
e0c2411
[rtc/PDcontroller] apply fabs() to torque limit computed from joint p…
fkanehiro Apr 20, 2021
9d2d11a
Merge pull request #1303 from fkanehiro/apply_fabs
fkanehiro Apr 20, 2021
5affc93
[ec] add wait() to ~hrpExecutionContext
fkanehiro Apr 22, 2021
dd2cc15
Merge pull request #1304 from fkanehiro/fix_ec
fkanehiro Apr 22, 2021
8523705
add footguided balance mode
YutaKojio Apr 30, 2021
84c827f
use footguide balance default in Stabilizer
YutaKojio May 5, 2021
df637ff
Merge pull request #1297 from Naoki-Hiraoka/fix-removejointgroup
fkanehiro May 5, 2021
ff81f3d
fix bug when single support st
YutaKojio May 13, 2021
0376112
initialize jacobian size to make AddressSanitizer to pass
YutaKojio May 17, 2021
bbce27b
fix bug of ff81f3d93d06e27edafb5ebafb7be49b66893e37
YutaKojio May 17, 2021
5852d38
fix more bug of ff81f3d93d06e27edafb5ebafb7be49b66893e37
YutaKojio May 17, 2021
092692b
rm tmp file
YutaKojio May 20, 2021
6409371
fix bug on sbp_cog_offset in footguided stabilizer
jaxon-user May 24, 2021
c2b941a
fix typo
jaxon-user May 24, 2021
85982ef
disable after walking interpolation when use_act_states is nil
YutaKojio May 25, 2021
30b5898
Merge branch 'master' of https://github.com/fkanehiro/hrpsys-base int…
YutaKojio May 27, 2021
b461a00
Revert "disable disturbance fy"
YutaKojio Jun 11, 2021
9d054a8
set to zero dex_fxy before ending walking
YutaKojio Jun 14, 2021
db6b8ee
Use the less ambiguous std::abs
mehdi-benallegue Jun 16, 2021
4f12adb
Merge pull request #1305 from mehdi-benallegue/master
fkanehiro Jun 16, 2021
15b5893
truncate feedforward zmp
YutaKojio Jun 19, 2021
bc92c7d
add retrieve duration
ketaro-m Jun 22, 2021
99b85b7
Merge pull request #7 from ketaro-m/pr-add-retrieve-duration
YutaKojio Jun 22, 2021
ee9f28f
rewirte footguided controller for n line zmp trajectory
YutaKojio Jun 23, 2021
bad9fc7
fix on touchoff_remain_count
YutaKojio Jun 30, 2021
857037d
disable guided balance while walking using act_states
YutaKojio Jun 30, 2021
c213520
set future step index to 5 for govelocity
YutaKojio Jun 30, 2021
f248e15
support guided walk using 2step future
YutaKojio Jun 30, 2021
552c7e6
fix >> of vector for g++4
Jul 2, 2021
3df1399
change default of guided_balance_time_const
jaxon-user Jul 2, 2021
75a3918
fix bug on remain_count
YutaKojio Jul 17, 2021
f83145e
Merge branch 'master' of github.com:fkanehiro/hrpsys-base into foot-g…
YutaKojio Jul 19, 2021
417e81f
use steppable region height
YutaKojio Aug 18, 2021
f1e18b4
fix bug on steppable height
YutaKojio Aug 19, 2021
45c9a30
fix bug on steppable height; fix timing
YutaKojio Aug 19, 2021
a06bb3d
touch foot deeper than true ground height
YutaKojio Aug 24, 2021
1be5638
touch foot deeper than true ground height ver2
YutaKojio Aug 24, 2021
88f3471
scale goal_off by 0.5 before touch phase
YutaKojio Aug 26, 2021
bdae5eb
fix position of stopWalking()
YutaKojio Aug 27, 2021
a7471f0
rm m_tmp.data 21 - 23
YutaKojio Sep 17, 2021
ceae9b9
rm unused file
YutaKojio Oct 12, 2021
b2a1685
add goWheel
YutaKojio Jun 16, 2021
be940e3
update wheel_midcoords
YutaKojio Jun 17, 2021
3ab5642
verify 1 linear wheel
YutaKojio Jul 20, 2021
7bf2351
support hoffarbib trajectory for wheel
YutaKojio Jul 23, 2021
591d9e8
fix bug on zmp_offsets
YutaKojio Aug 4, 2021
dd91972
add wheel_major_index
YutaKojio Aug 11, 2021
431bf2a
separate update_wheel_controller
YutaKojio Aug 11, 2021
9bebc8a
add goPosWheel
YutaKojio Aug 31, 2021
061c57d
fix bug on wheel_interpolator
YutaKojio Sep 16, 2021
e0c324a
consider until num_preview_step to zmp_traj
YutaKojio Sep 17, 2021
4fd0ce1
support longer go-pos-wheel
YutaKojio Sep 20, 2021
338ed26
fix bug on longer go-pos-wheel
YutaKojio Sep 30, 2021
9b84180
change wheel interpolation
YutaKojio Oct 2, 2021
072b9b6
add tm_offset to goPosWheel
YutaKojio Oct 2, 2021
ccd1a2f
enable stopFootForEarlyTouchDown() only when use_act_states is true
Oct 15, 2021
4e0e325
add goWheel
YutaKojio Jun 16, 2021
5450954
update wheel_midcoords
YutaKojio Jun 17, 2021
1017456
verify 1 linear wheel
YutaKojio Jul 20, 2021
d2e90ca
support hoffarbib trajectory for wheel
YutaKojio Jul 23, 2021
43ff102
fix bug on zmp_offsets
YutaKojio Aug 4, 2021
477e65b
add wheel_major_index
YutaKojio Aug 11, 2021
413ac3b
separate update_wheel_controller
YutaKojio Aug 11, 2021
c93aa42
add goPosWheel
YutaKojio Aug 31, 2021
e137754
fix bug on wheel_interpolator
YutaKojio Sep 16, 2021
934b8e6
consider until num_preview_step to zmp_traj
YutaKojio Sep 17, 2021
832e78f
support longer go-pos-wheel
YutaKojio Sep 20, 2021
3ac7407
fix bug on longer go-pos-wheel
YutaKojio Sep 30, 2021
1735b85
change wheel interpolation
YutaKojio Oct 2, 2021
04fe065
add tm_offset to goPosWheel
YutaKojio Oct 2, 2021
7d8afde
add mode_additional_force_mode
YutaKojio Oct 20, 2021
0d1eb0f
consider moment for additional force
YutaKojio Oct 21, 2021
f4a6409
add is_wheeling to waitFootSteps
Oct 27, 2021
50be32a
support toe heel mode
YutaKojio Nov 10, 2021
95f98a6
disable second_angle for toe_heel
YutaKojio Nov 11, 2021
a342ff9
fix bug when stair; rm incorrect line
YutaKojio Nov 17, 2021
596d91c
make rectangle swing movement slower at first
YutaKojio Nov 18, 2021
d715553
add margin to fxy limitation
YutaKojio Nov 19, 2021
70c2a6e
change default of rectangle_time_smooth_offset
jaxon-user Nov 22, 2021
04c57c5
Merge branch 'foot-guided-walk-wheel' of github.com:YutaKojio/hrpsys-…
YutaKojio Nov 24, 2021
78ffc33
Merge branch 'foot-guided-walk-fullbody' of github.com:YutaKojio/hrps…
YutaKojio Nov 24, 2021
f0286bb
revese z-axis of waist force sensor
Nov 24, 2021
e37f6a5
[python/hrpsys_config.py] switch rfu and es and correct force flow
ketaro-m Nov 26, 2021
047a242
Merge pull request #8 from ketaro-m/rfu-es-order
YutaKojio Nov 26, 2021
67b0a20
[python/hrpsys_config.py] add necessary indent
ketaro-m Nov 26, 2021
a0143e3
Merge pull request #9 from ketaro-m/fix-rfu-es-order
YutaKojio Nov 26, 2021
49c37c7
limit stride when stair height is larger than stair_thre
jaxon-user Nov 27, 2021
8f9731b
use steppable region height once every step
jaxon-user Nov 27, 2021
f403f2f
merge
YutaKojio Dec 3, 2021
82e7770
add setFootStepsWithWheel
YutaKojio Dec 8, 2021
00e05b6
fix bug on goPosWheel; return false soon after ending walk/wheel
YutaKojio Dec 14, 2021
670ba13
verfy setFootStepWithWheel
YutaKojio Dec 14, 2021
0b351d9
support multi wheel command for setFootStepsWithWheel
YutaKojio Dec 14, 2021
a5a8862
support only multi wheeling
YutaKojio Dec 14, 2021
eebf1fe
fix bug on goPosWheel
YutaKojio Dec 15, 2021
3716023
add jumpTo
YutaKojio Dec 16, 2021
a65849f
add jump controller
YutaKojio Dec 17, 2021
72bde65
distribute ZMP and use damping only in support phase
YutaKojio Dec 17, 2021
e60e8cf
get act cogvel in jump phase
YutaKojio Dec 17, 2021
eb13eba
umset is_emergency_step_mode after done
YutaKojio Dec 17, 2021
9f75cde
use t_squat for recover time
YutaKojio Dec 17, 2021
553bf1f
change fly_weight when jumping
YutaKojio Dec 17, 2021
fd715b6
project refzmp to nominal ground
YutaKojio Dec 18, 2021
b83d1ac
consider z change for walking
YutaKojio Dec 18, 2021
24e4f1b
enable emergency step when AFTER_JUMP
YutaKojio Dec 19, 2021
663f22a
adapt early/late touchdown for jump
YutaKojio Dec 20, 2021
77d58f8
tmp fix; disable checkEmergency
YutaKojio Dec 20, 2021
9a10515
fix bug on target_cog
YutaKojio Dec 21, 2021
dc90a93
change default param of cog_z_constraint
YutaKojio Dec 21, 2021
9ad6548
fix bug on limit_stride_vision
YutaKojio Dec 24, 2021
8e79fc9
fix bug on next2_pos
YutaKojio Dec 24, 2021
31b7acc
revert part of 72bde65045f7
YutaKojio Dec 31, 2021
54e4baf
fix bug on project_to_nominal_ground
YutaKojio Jan 2, 2022
5b06f16
merge foot-guided-walk-fullbody
YutaKojio Jan 3, 2022
8b6a3d6
add TODO
YutaKojio Jan 3, 2022
5f006bf
fix project_to_nominal_ground
YutaKojio Jan 3, 2022
e1c6796
fix limit_stride_vision; use RCR for limitation
YutaKojio Jan 5, 2022
86bd930
change fly_weight
YutaKojio Jan 5, 2022
7f655c7
fix vector initialization for C++98
YutaKojio Jan 7, 2022
232058f
add idl for ik loop
YutaKojio Jan 7, 2022
fafcb14
interpolate momentum for flywheel balance
YutaKojio Jan 18, 2022
309d52d
add arm_collision
YutaKojio Jan 19, 2022
a55f83f
set ik_max_loop to 3
YutaKojio Jan 19, 2022
c6e6aa9
merge auto-stabilizer
YutaKojio Jan 19, 2022
a840557
fix is_touch_ground and disable it
YutaKojio Jan 25, 2022
42b85a5
Merge branch 'auto-stabilizer' of github.com:YutaKojio/hrpsys-base in…
YutaKojio Jan 25, 2022
5e495c1
modify normal_ratio when arm is active
YutaKojio Jan 25, 2022
cea1e51
disble goal_off when use_force_sensor nil
YutaKojio Jan 25, 2022
dd18851
fix bug on ref_force; use accelaration for ref_force
YutaKojio Jan 26, 2022
4e65607
Merge branch 'auto-stabilizer' of github.com:YutaKojio/hrpsys-base in…
YutaKojio Jan 27, 2022
db40a3e
consider external ref_force z to omega
YutaKojio Feb 7, 2022
59d8655
Merge branch 'auto-stabilizer' of github.com:YutaKojio/hrpsys-base in…
YutaKojio Feb 7, 2022
3a72760
fix for wheel; , total_external_force_z)
YutaKojio Feb 7, 2022
1d88f6f
add variable for wheel_id
YutaKojio Feb 7, 2022
a61dc7a
implement calc_x_k to consider act cog states, but it is not used
YutaKojio Feb 10, 2022
8e37c8b
Merge branch 'auto-stabilizer' of github.com:YutaKojio/hrpsys-base in…
YutaKojio Feb 10, 2022
f8f5fb3
consider wheel base vel
YutaKojio Feb 10, 2022
5b0ca8b
disable stopFootForEarlyTouchDown when use_force_sensor nil
YutaKojio Feb 12, 2022
e0bfd61
Merge branch 'auto-stabilizer' of github.com:YutaKojio/hrpsys-base in…
YutaKojio Feb 12, 2022
99d63dc
disable calcSwingEEModification when use_force_sensor nil
YutaKojio Feb 12, 2022
98a0328
Merge branch 'auto-stabilizer' of github.com:YutaKojio/hrpsys-base in…
YutaKojio Feb 12, 2022
57f092e
fix bug; always set zmp_offset when MODE_IDLE
YutaKojio Feb 13, 2022
76ff553
Merge branch 'auto-stabilizer' of github.com:YutaKojio/hrpsys-base in…
YutaKojio Feb 13, 2022
f9a3710
revert order of static_balance_point_proc_one
YutaKojio Feb 14, 2022
26b3d0a
Merge branch 'auto-stabilizer' of github.com:YutaKojio/hrpsys-base in…
YutaKojio Feb 15, 2022
d83dc74
remove WholeBodyMasterSlave
Naoki-Hiraoka Feb 17, 2022
1cedc46
Merge pull request #10 from Naoki-Hiraoka/auto-stabilizer-remove-wbms
YutaKojio Feb 17, 2022
04fb3c5
Merge branch 'auto-stabilizer' of github.com:YutaKojio/hrpsys-base in…
YutaKojio Feb 17, 2022
896509f
remove Stabilizer diff
Naoki-Hiraoka Feb 17, 2022
9a72c6e
remove KFilter.diff
Naoki-Hiraoka Feb 17, 2022
d83ebcd
Merge pull request #11 from Naoki-Hiraoka/auto-stabilizer-remove-stab…
YutaKojio Feb 17, 2022
6e4c353
Merge pull request #12 from Naoki-Hiraoka/remove-kfilterdiff
YutaKojio Feb 17, 2022
f0305cd
Merge branch 'auto-stabilizer' of github.com:YutaKojio/hrpsys-base in…
YutaKojio Feb 17, 2022
c46f977
[AutoBalancer/Integrator.cpp] fix comment
Naoki-Hiraoka Feb 17, 2022
8256eaa
Merge pull request #13 from Naoki-Hiraoka/fix-integrator-comment
YutaKojio Feb 17, 2022
08cc1a7
[AutoBalancer/Stabilizer] remove RUNST
Naoki-Hiraoka Feb 17, 2022
61590ec
Merge pull request #14 from Naoki-Hiraoka/remove-twodofcontroller
YutaKojio Feb 17, 2022
54a4865
[python/hrpsys_config.py] fix https://github.com/YutaKojio/hrpsys-bas…
Naoki-Hiraoka Feb 17, 2022
6fa26b2
Merge pull request #15 from Naoki-Hiraoka/fix-hrpsys_config
YutaKojio Feb 17, 2022
bb5d2f4
Merge branch 'auto-stabilizer' of github-yutakojio:YutaKojio/hrpsys-b…
Feb 17, 2022
f646fcd
[AutoBalancer/AutoBalancer.cpp] fix port instance name
Naoki-Hiraoka Feb 17, 2022
c40cffe
Merge pull request #16 from Naoki-Hiraoka/auto-stabilizer-fix-instance
YutaKojio Feb 17, 2022
1502938
[idl/HRPDataTypes.idl] add comment
Naoki-Hiraoka Feb 17, 2022
5aab7f9
Merge pull request #17 from Naoki-Hiraoka/add-comment-idl
YutaKojio Feb 17, 2022
d6dceb5
[AutoBalancer/Stabilizer] remove RUNST
Naoki-Hiraoka Feb 21, 2022
b78ca46
Merge pull request #37 from Naoki-Hiraoka/auto-stabilizer-runst
YutaKojio Feb 21, 2022
a6f1a9f
judge isContact using force_z in foot origin frame
YutaKojio Feb 21, 2022
f82e59b
[AutoBalancer/Stablizer] fix moment calculation in calcTorque
Naoki-Hiraoka Feb 21, 2022
f32f252
add tmp log for vision update timing
YutaKojio Feb 22, 2022
03bc233
Merge pull request #39 from Naoki-Hiraoka/auto-stabilizer-ref-moment
YutaKojio Feb 23, 2022
8e725bb
support 0 ~ 3 of overwritable-footstep-index-offset
YutaKojio Feb 23, 2022
a1e7119
change default param of weight_fly_interpolator_time
YutaKojio Mar 1, 2022
507d06f
fix bug on count; see https://github.com/YutaKojio/hrpsys-base/discus…
YutaKojio Mar 4, 2022
bacb4a0
rm fake comment
YutaKojio Mar 4, 2022
7ff863f
disable Stabilizer rtc build
YutaKojio Mar 7, 2022
cfd80ee
merge auto-stabilizer
YutaKojio Mar 7, 2022
ed6e14b
[AutoBalancer] add m_landingTarget.tm and m_endCogState.tm
Naoki-Hiraoka Mar 8, 2022
49aeca8
Merge pull request #57 from Naoki-Hiraoka/auto-stabilizer-stamp
YutaKojio Mar 8, 2022
b63a6a8
[AutoBalancer/Stablizer] fix filter hz for act_contact_states
Naoki-Hiraoka Mar 8, 2022
8dc1a44
Merge branch 'auto-stabilizer' of github-yutakojio:YutaKojio/hrpsys-b…
Mar 9, 2022
1ae45f3
Merge pull request #58 from Naoki-Hiraoka/auto-stabilizer-act-contact-hz
YutaKojio Mar 25, 2022
e506f82
change flywheel tau limit
jaxon-user Mar 25, 2022
600c5cc
[AutoBalancer.cpp] modify wheel radius and joint id and add rear wheel
kindsenior Mar 27, 2022
1784c63
Merge branch 'auto-stabilizer-archive' of github.com:YutaKojio/hrpsys…
kindsenior Apr 22, 2022
c079ab3
https://projects.coin-or.org have mved to github
98shimpei Apr 26, 2022
c4d15d3
[ReferenceForceUpdater] remove modifications for waist force sensor 7…
kindsenior Jun 9, 2022
556faf8
[SoftErrorLimitter/robot.cpp] not set error limit to invalid jointId …
kindsenior Jun 11, 2022
00c4f37
[CMakeLists.txt] add address sanitizer option
kindsenior Jun 12, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
3rdparty/qpOASES/qpOASES-3.0/
plugin/hrpsysBaseStub.jar
idl/*.hh
idl/*.cpp
Expand Down
101 changes: 60 additions & 41 deletions .travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ set -x

function error {
travis_time_end 31
mkdir -p ${HOME}/.ros/test_results || echo "OK"
find ${HOME}/.ros/test_results -type f -exec echo "=== {} ===" \; -exec\
cat {} \;
for file in ${HOME}/.ros/log/rostest-*; do echo "=== $file ==="; cat \$\
Expand Down Expand Up @@ -33,6 +34,16 @@ function travis_time_end {
set -x
}

export DEBIAN_FRONTEND=noninteractive
apt-get update -q=5
apt-get install -q=5 -y wget sudo git sed
apt-get install -q=5 -y software-properties-common # apt-add-repository
apt-get install -q=5 -y lsb-release
apt-get install -q=5 -y tzdata
lsb_release -a
echo $ROS_DISTRO
echo $DISTRO

travis_time_start mongo_hack

# MongoDB hack
Expand All @@ -47,7 +58,7 @@ travis_time_start setup_ros
export CI_SOURCE_PATH=$(pwd)
export REPOSITORY_NAME=${PWD##*/}
echo "Testing branch $TRAVIS_BRANCH of $REPOSITORY_NAME"
sudo sh -c 'echo "deb http://packages.ros.org/ros-shadow-fixed/ubuntu precise main" > /etc/apt/sources.list.d/ros-latest.list'
sudo -E sh -c 'echo "deb http://packages.ros.org/ros-shadow-fixed/ubuntu ${DISTRO} main" > /etc/apt/sources.list.d/ros-latest.list'
wget http://packages.ros.org/ros.key -O - | sudo apt-key add -
sudo apt-get update -qq

Expand All @@ -66,9 +77,9 @@ case $TEST_PACKAGE in
travis_time_start install_python

#http://askubuntu.com/questions/204510/how-to-install-python-2-5-4
sudo apt-add-repository -y ppa:fkrull/deadsnakes
sudo apt-add-repository -y ppa:deadsnakes
sudo apt-get update -qq
sudo apt-get install -qq -y python2.5 python3.4
sudo apt-get install -qq -y --force-yes python2.5 python2.7 python3.4

travis_time_end
travis_time_start check_python
Expand Down Expand Up @@ -102,8 +113,8 @@ case $TEST_PACKAGE in
stable_rtc)
travis_time_start install_openrtm

sudo apt-get install -qq -y omniidl diffstat wget ros-hydro-openrtm-aist
source /opt/ros/hydro/setup.bash
sudo apt-get install -qq -y omniidl diffstat wget ros-${ROS_DISTRO}-openrtm-aist
source /opt/ros/${ROS_DISTRO}/setup.bash
## check stableRTCList
sed -i 's@^from@#from@g' python/hrpsys_config.py
sed -i 's@^import@#import@' python/hrpsys_config.py
Expand All @@ -121,8 +132,8 @@ case $TEST_PACKAGE in
mkdir stable_idl
for idl_file in SequencePlayerService.idl StateHolderService.idl ForwardKinematicsService.idl CollisionDetectorService.idl SoftErrorLimiterService.idl DataLoggerService.idl ExecutionProfileService.idl HRPDataTypes.idl RobotHardwareService.idl ; do
wget https://github.com/fkanehiro/hrpsys-base/raw/315.1.9/idl/${idl_file} -O stable_idl/${idl_file}
omniidl -bcxx -I/opt/ros/hydro/include/openrtm-1.1/rtm/idl/ idl/${idl_file}
omniidl -bcxx -I/opt/ros/hydro/include/openrtm-1.1/rtm/idl/ -C stable_idl stable_idl/${idl_file}
omniidl -bcxx -I/opt/ros/${ROS_DISTRO}/include/openrtm-1.1/rtm/idl/ idl/${idl_file}
omniidl -bcxx -I/opt/ros/${ROS_DISTRO}/include/openrtm-1.1/rtm/idl/ -C stable_idl stable_idl/${idl_file}
sk_file=$(basename ${idl_file} .idl)SK.cc
cat ${sk_file}
cat stable_idl/${sk_file}
Expand All @@ -142,10 +153,10 @@ case $TEST_PACKAGE in
travis_time_end
travis_time_start install_openhrp3

sudo apt-get install -qq -y ros-hydro-openhrp3
source /opt/ros/hydro/setup.bash
sudo apt-get install -qq -y ros-${ROS_DISTRO}-openhrp3
source /opt/ros/${ROS_DISTRO}/setup.bash
if [ "$USE_SRC_OPENHRP3" == true ] ; then
sudo dpkg -r --force-depends ros-hydro-openhrp3
sudo dpkg -r --force-depends ros-${ROS_DISTRO}-openhrp3
mkdir -p ~/build_openhrp3
cd ~/build_openhrp3
git clone http://github.com/fkanehiro/openhrp3
Expand Down Expand Up @@ -179,13 +190,13 @@ case $TEST_PACKAGE in
travis_time_start install_$TEST_PACKAGE

pkg=$TEST_PACKAGE
sudo apt-get install -qq -y python-wstool ros-hydro-catkin ros-hydro-mk ros-hydro-rostest ros-hydro-rtmbuild ros-hydro-roslint > /dev/null
sudo apt-get install -qq -y python-wstool ros-${ROS_DISTRO}-catkin ros-${ROS_DISTRO}-mk ros-${ROS_DISTRO}-rostest ros-${ROS_DISTRO}-rtmbuild ros-${ROS_DISTRO}-roslint > /dev/null

sudo apt-get install -qq -y ros-hydro-pcl-ros ros-hydro-moveit-commander ros-hydro-rqt-robot-dashboard > /dev/null
sudo apt-get install -qq -y ros-${ROS_DISTRO}-pcl-ros ros-${ROS_DISTRO}-moveit-commander ros-${ROS_DISTRO}-rqt-robot-dashboard > /dev/null

sudo apt-get install -qq -y ros-hydro-$pkg
sudo apt-get install -qq -y ros-${ROS_DISTRO}-$pkg

source /opt/ros/hydro/setup.bash
source /opt/ros/${ROS_DISTRO}/setup.bash

travis_time_end
travis_time_start setup_catkin_ws
Expand Down Expand Up @@ -216,9 +227,9 @@ case $TEST_PACKAGE in

travis_time_start compile_and_install_downstream

sudo dpkg -r --force-depends ros-hydro-hrpsys
sudo dpkg -r --force-depends ros-${ROS_DISTRO}-hrpsys

catkin_make_isolated --install -j1 -l1
catkin_make_isolated --install
# you need to pretend this is catkin package since you only have hrpsys in catkin_ws
export ROS_PACKAGE_PATH=`pwd`/install_isolated/share:`pwd`/install_isolated/stacks:$ROS_PACKAGE_PATH
source install_isolated/setup.bash
Expand All @@ -239,8 +250,8 @@ case $TEST_PACKAGE in
wstool set rtmros_hironx http://github.com/start-jsk/rtmros_hironx --git -y
wstool set rtmros_nextage http://github.com/tork-a/rtmros_nextage --git -y
wstool update
sudo apt-get install -qq -y ros-hydro-urdf
sudo dpkg -r --force-depends ros-hydro-hrpsys
sudo apt-get install -qq -y ros-${ROS_DISTRO}-urdf
sudo dpkg -r --force-depends ros-${ROS_DISTRO}-hrpsys
export ROS_LANG_DISABLE=genlisp

cd ..
Expand All @@ -260,7 +271,7 @@ case $TEST_PACKAGE in
travis_time_end
travis_time_start compile_new_version

catkin_make_isolated -j1 -l1 --install --only-pkg-with-deps `echo $pkg | sed s/-/_/g` | grep -v '^-- \(Up-to-date\|Installing\):' | grep -v 'Generating \(Python\|C++\) code from' | grep -v '^Compiling .*.py ...$' | uniq
catkin_make_isolated --install --only-pkg-with-deps `echo $pkg | sed s/-/_/g` | grep -v '^-- \(Up-to-date\|Installing\):' | grep -v 'Generating \(Python\|C++\) code from' | grep -v '^Compiling .*.py ...$' | uniq
rm -fr ./install_isolated/hrpsys/share/hrpsys ./install_isolated/hrpsys/lib/pkgconfig/hrpsys.pc
source install_isolated/setup.bash

Expand All @@ -276,13 +287,19 @@ case $TEST_PACKAGE in
#
sed -i "1imacro(dummy_macro)\nmessage(\"dummy(\${ARGN})\")\nendmacro()" hrpsys/catkin.cmake
sed -i "s@install(DIRECTORY test share@dummy_macro(DIRECTORY test share@" hrpsys/catkin.cmake
sed -i "s@find_package(catkin REQUIRED COMPONENTS rostest mk openrtm_aist openhrp3)@find_package(catkin REQUIRED COMPONENTS rostest mk)\nset(openrtm_aist_PREFIX /opt/ros/hydro/)\nset(openhrp3_PREFIX /opt/ros/hydro/)@" hrpsys/catkin.cmake
sed -i "s@find_package(catkin REQUIRED COMPONENTS rostest mk openrtm_aist openhrp3)@find_package(catkin REQUIRED COMPONENTS rostest mk)\nset(openrtm_aist_PREFIX /opt/ros/${ROS_DISTRO}/)\nset(openhrp3_PREFIX /opt/ros/${ROS_DISTRO}/)@" hrpsys/catkin.cmake
cat hrpsys/catkin.cmake
sed -i "s@NUM_OF_CPUS = \$(shell grep -c '^processor' /proc/cpuinfo)@NUM_OF_CPUS = 2@" hrpsys/Makefile.hrpsys-base
sed -i "s@touch installed@@" hrpsys/Makefile.hrpsys-base
cat hrpsys/Makefile.hrpsys-base
# use git repository, instead of svn due to googlecode shoutdown
git clone http://github.com/fkanehiro/hrpsys-base --depth 1 -b 315.1.9 ../build_isolated/hrpsys/build/hrpsys-base-source
git clone http://github.com/fkanehiro/hrpsys-base ../build_isolated/hrpsys/build/hrpsys-base-source
(cd ../build_isolated/hrpsys/build/hrpsys-base-source; git checkout 315.1.9)
if [ "${ROS_DISTRO}" != "hydro" ]; then
# tmp fix to build old hrpsys
sudo ln -s /usr/lib/x86_64-linux-gnu/libboost_thread.so /usr/lib/x86_64-linux-gnu/libboost_thread-mt.so
sudo ln -s /usr/lib/x86_64-linux-gnu/libboost_system.so /usr/lib/x86_64-linux-gnu/libboost_system-mt.so
fi
# we use latest hrpsys_ocnfig.py for this case, so do not install them
sed -i -e 's/\(add_subdirectory(python)\)/#\1/' ../build_isolated/hrpsys/build/hrpsys-base-source/CMakeLists.txt
sed -i -e 's/\(add_subdirectory(test)\)/#\1/' ../build_isolated/hrpsys/build/hrpsys-base-source/CMakeLists.txt
Expand Down Expand Up @@ -311,7 +328,7 @@ case $TEST_PACKAGE in
trap 0 ERR
need_compile=1
while [ $need_compile != 0 ]; do
catkin_make_isolated -j1 -l1 --merge
catkin_make_isolated --merge
need_compile=$?
done
trap error ERR
Expand All @@ -322,7 +339,7 @@ case $TEST_PACKAGE in
trap 0 ERR
need_compile=1
while [ $need_compile != 0 ]; do
catkin_make_isolated -j1 -l1 --install | grep -v '^-- \(Up-to-date\|Installing\):'
catkin_make_isolated --install | grep -v '^-- \(Up-to-date\|Installing\):'
need_compile=${PIPESTATUS[0]}
done
trap error ERR
Expand Down Expand Up @@ -350,24 +367,26 @@ case $TEST_PACKAGE in
rospack profile


# https://github.com/fkanehiro/openhrp3/issues/46
ls -al /opt/ros/hydro/share/openhrp3/share/OpenHRP-3.1/sample/controller/SampleController || echo "ok"
sudo mkdir -p /opt/ros/hydro/share/openhrp3/share/OpenHRP-3.1/sample/controller/SampleController/etc/ || echo "ok"
sudo wget https://raw.githubusercontent.com/fkanehiro/openhrp3/master/sample/controller/SampleController/etc/Sample.pos -O /opt/ros/hydro/share/openhrp3/share/OpenHRP-3.1/sample/controller/SampleController/etc/Sample.pos || echo "ok"
sudo wget https://raw.githubusercontent.com/fkanehiro/openhrp3/master/sample/controller/SampleController/etc/Sample.vel -O /opt/ros/hydro/share/openhrp3/share/OpenHRP-3.1/sample/controller/SampleController/etc/Sample.vel || echo "ok"
# https://github.com/start-jsk/rtmros_hironx/issues/287
if [ -e /opt/ros/hydro/share/hironx_ros_bridge/test/test_hironx_ros_bridge.py ]; then
sudo sed -i "s@test_tf_and_controller@_test_tf_and_controller@" /opt/ros/hydro/share/hironx_ros_bridge/test/test_hironx_ros_bridge.py
fi
#https://github.com/start-jsk/rtmros_hironx/pull/358
if [ -e /opt/ros/hydro/lib/python2.7/dist-packages/hironx_ros_bridge/hironx_client.py ]; then
sudo wget https://raw.githubusercontent.com/k-okada/rtmros_hironx/stop_unfinished_battle/hironx_ros_bridge/src/hironx_ros_bridge/hironx_client.py -O /opt/ros/hydro/lib/python2.7/dist-packages/hironx_ros_bridge/hironx_client.py
fi
#https://github.com/start-jsk/rtmros_common/commit/51ec26b899f09304705fe0528a068e57b061b9b7
#https://github.com/start-jsk/rtmros_common/pull/880
#https://github.com/start-jsk/rtmros_common/pull/879
if [ -e /opt/ros/hydro/share/hrpsys_ros_bridge/test/test-samplerobot.test ]; then
sudo wget https://raw.githubusercontent.com/start-jsk/rtmros_common/1.3.1/hrpsys_ros_bridge/test/test-samplerobot.test -O /opt/ros/hydro/share/hrpsys_ros_bridge/test/test-samplerobot.test
if [ "${ROS_DISTRO}" == "hydro" ]; then
# https://github.com/fkanehiro/openhrp3/issues/46
ls -al /opt/ros/${ROS_DISTRO}/share/openhrp3/share/OpenHRP-3.1/sample/controller/SampleController || echo "ok"
sudo mkdir -p /opt/ros/${ROS_DISTRO}/share/openhrp3/share/OpenHRP-3.1/sample/controller/SampleController/etc/ || echo "ok"
sudo wget https://raw.githubusercontent.com/fkanehiro/openhrp3/master/sample/controller/SampleController/etc/Sample.pos -O /opt/ros/${ROS_DISTRO}/share/openhrp3/share/OpenHRP-3.1/sample/controller/SampleController/etc/Sample.pos || echo "ok"
sudo wget https://raw.githubusercontent.com/fkanehiro/openhrp3/master/sample/controller/SampleController/etc/Sample.vel -O /opt/ros/${ROS_DISTRO}/share/openhrp3/share/OpenHRP-3.1/sample/controller/SampleController/etc/Sample.vel || echo "ok"
# https://github.com/start-jsk/rtmros_hironx/issues/287
if [ -e /opt/ros/${ROS_DISTRO}/share/hironx_ros_bridge/test/test_hironx_ros_bridge.py ]; then
sudo sed -i "s@test_tf_and_controller@_test_tf_and_controller@" /opt/ros/${ROS_DISTRO}/share/hironx_ros_bridge/test/test_hironx_ros_bridge.py
fi
#https://github.com/start-jsk/rtmros_hironx/pull/358
if [ -e /opt/ros/${ROS_DISTRO}/lib/python2.7/dist-packages/hironx_ros_bridge/hironx_client.py ]; then
sudo wget https://raw.githubusercontent.com/k-okada/rtmros_hironx/stop_unfinished_battle/hironx_ros_bridge/src/hironx_ros_bridge/hironx_client.py -O /opt/ros/${ROS_DISTRO}/lib/python2.7/dist-packages/hironx_ros_bridge/hironx_client.py
fi
#https://github.com/start-jsk/rtmros_common/commit/51ec26b899f09304705fe0528a068e57b061b9b7
#https://github.com/start-jsk/rtmros_common/pull/880
#https://github.com/start-jsk/rtmros_common/pull/879
if [ -e /opt/ros/${ROS_DISTRO}/share/hrpsys_ros_bridge/test/test-samplerobot.test ]; then
sudo wget https://raw.githubusercontent.com/start-jsk/rtmros_common/1.3.1/hrpsys_ros_bridge/test/test-samplerobot.test -O /opt/ros/${ROS_DISTRO}/share/hrpsys_ros_bridge/test/test-samplerobot.test
fi
fi
travis_time_end

Expand Down
Loading