Skip to content

Commit 71c722d

Browse files
committed
Merge branch 'auto-stabilizer-archive' of github.com:YutaKojio/rtmros_choreonoid into kindsenior/auto-stabilizer-jaxon-wheel
2 parents 3cba190 + 4c7b967 commit 71c722d

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

hrpsys_choreonoid_tutorials/launch/jaxon_red_choreonoid.launch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<arg name="GUI" default="true" />
1414
<arg name="hrpsys_precreate_rtc" default=""/>
1515
<arg name="hrpsys_opt_rtc_config_args" default="" />
16-
<arg name="LAUNCH_FOOTCOORDS" default="true" />
16+
<arg name="LAUNCH_FOOTCOORDS" default="false" />
1717

1818
<!-- robot dependant settings -->
1919
<arg if="$(arg LOAD_OBJECTS)"

hrpsys_choreonoid_tutorials/scripts/jaxon_blue_rh_setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ def startABSTIMP (self):
5151
# Suppress limit over message and behave like real robot that always angle-vector is in seq.
5252
# Latter four 0.0 are for hands.
5353
self.seq_svc.setJointAngles(self.jaxonResetPose(), 1.0)
54-
self.ic_svc.startImpedanceController("larm")
55-
self.ic_svc.startImpedanceController("rarm")
5654
self.abc_svc.startAutoBalancer(['rleg','lleg'])
55+
# self.ic_svc.startImpedanceController("larm")
56+
# self.ic_svc.startImpedanceController("rarm")
5757
self.startStabilizer()
5858

5959
if __name__ == '__main__':

hrpsys_choreonoid_tutorials/scripts/jaxon_red_rh_setup.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,9 @@ def startABSTIMP (self):
5252
# Latter four 0.0 are for hands.
5353
self.seq_svc.setJointAngles(self.jaxonResetPose()+[0.0, 0.0, 0.0, 0.0] , 1.0)
5454
self.abc_svc.startAutoBalancer(['rleg','lleg'])
55-
time.sleep(1)
56-
self.abc_svc.startStabilizer()
55+
# self.ic_svc.startImpedanceController("larm")
56+
# self.ic_svc.startImpedanceController("rarm")
57+
self.startStabilizer()
5758

5859
if __name__ == '__main__':
5960
hcf = JAXON_RED_HrpsysConfigurator("JAXON_RED")

hrpsys_choreonoid_tutorials/scripts/jaxon_red_setup.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,9 @@ def startABSTIMP (self):
5252
# Latter four 0.0 are for hands.
5353
self.seq_svc.setJointAngles(self.jaxonResetPose()+[0.0, 0.0, 0.0, 0.0] , 1.0)
5454
self.abc_svc.startAutoBalancer(['rleg','lleg'])
55-
self.abc_svc.startStabilizer()
55+
# self.ic_svc.startImpedanceController("larm")
56+
# self.ic_svc.startImpedanceController("rarm")
57+
self.startStabilizer()
5658

5759
if __name__ == '__main__':
5860
hcf = JAXON_RED_HrpsysConfigurator("JAXON_RED")

0 commit comments

Comments
 (0)