Fixed some issues with different opening of the robot hand, the behav…

…iours should now be consistent. Resolves #1
adore-hrzz · Feb 2, 2017 · ce4516a · ce4516a
1 parent ba9e6ac
commit ce4516a
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 19 deletions.
diff --git a/Adore gestures/Adore gestures.pml b/Adore gestures/Adore gestures.pml
@@ -24,12 +24,6 @@
         <File name="ovo_je_zaba" src="sounds/ovo_je_zaba.wav" />
         <File name="probajmo_ponovo" src="sounds/probajmo_ponovo.wav" />
         <File name="vidi_ovo" src="sounds/vidi_ovo.wav" />
-        <File name="frog" src="sounds/frog.wav" />
-        <File name="pokusajmoponovo" src="sounds/pokusajmoponovo.wav" />
-        <File name="sada_ti" src="sounds/sada_ti.wav" />
-        <File name="salica" src="sounds/salica.wav" />
-        <File name="vidiovo" src="sounds/vidiovo.wav" />
-        <File name="zaba" src="sounds/zaba.wav" />
         <File name="icon" src="icon.png" />
     </Resources>
     <Topics />

diff --git a/Adore gestures/Drinking (left)/behavior.xar b/Adore gestures/Drinking (left)/behavior.xar
@@ -227,10 +227,10 @@ class MyClass(GeneratedClass):
                                     </ActuatorCurve>
                                     <ActuatorCurve name="value" actuator="LHand" recordable="1" mute="0" unit="1">
                                         <Key frame="25" value="0" />
-                                        <Key frame="49" value="0.1064" />
-                                        <Key frame="75" value="0.1188" />
-                                        <Key frame="79" value="0.1188" />
-                                        <Key frame="104" value="0.1064" />
+                                        <Key frame="49" value="0" />
+                                        <Key frame="75" value="0" />
+                                        <Key frame="79" value="0" />
+                                        <Key frame="104" value="0" />
                                         <Key frame="150" value="0" />
                                     </ActuatorCurve>
                                     <ActuatorCurve name="value" actuator="LShoulderPitch" recordable="1" mute="0" unit="0">

diff --git a/Adore gestures/Drinking (right)/behavior.xar b/Adore gestures/Drinking (right)/behavior.xar
@@ -275,10 +275,10 @@ class MyClass(GeneratedClass):
                                     </ActuatorCurve>
                                     <ActuatorCurve name="value" actuator="RHand" recordable="1" mute="0" unit="1">
                                         <Key frame="25" value="0" />
-                                        <Key frame="49" value="0.1064" />
-                                        <Key frame="75" value="0.1188" />
+                                        <Key frame="49" value="0" />
+                                        <Key frame="75" value="0" />
                                         <Key frame="79" value="0.1188" />
-                                        <Key frame="104" value="0.1064" />
+                                        <Key frame="104" value="0" />
                                         <Key frame="150" value="0" />
                                     </ActuatorCurve>
                                     <ActuatorCurve name="value" actuator="RShoulderPitch" recordable="1" mute="0" unit="0">

diff --git a/Adore gestures/Frog (left)/behavior.xar b/Adore gestures/Frog (left)/behavior.xar
@@ -464,14 +464,14 @@ class MyClass(GeneratedClass):
                                         <Key frame="159" value="-15.3786" />
                                     </ActuatorCurve>
                                     <ActuatorCurve name="value" actuator="LHand" recordable="0" mute="0" unit="1">
-                                        <Key frame="16" value="0.0743999" />
-                                        <Key frame="25" value="0.114" />
+                                        <Key frame="16" value="0.01" />
+                                        <Key frame="25" value="0.02" />
                                         <Key frame="31" value="0.01" />
-                                        <Key frame="36" value="0.56" />
+                                        <Key frame="36" value="0.02" />
                                         <Key frame="46" value="0" />
                                         <Key frame="70" value="0.00480002" />
                                         <Key frame="85" value="0" />
-                                        <Key frame="111" value="0.0548" />
+                                        <Key frame="111" value="0.01" />
                                         <Key frame="141" value="0.01" />
                                         <Key frame="159" value="0.01" />
                                     </ActuatorCurve>

diff --git a/Adore gestures/Frog (right)/behavior.xar b/Adore gestures/Frog (right)/behavior.xar
@@ -536,8 +536,8 @@ class MyClass(GeneratedClass):
                                         <Key frame="159" value="15.3786" />
                                     </ActuatorCurve>
                                     <ActuatorCurve name="value" actuator="RHand" recordable="0" mute="0" unit="1">
-                                        <Key frame="16" value="0.0743999" />
-                                        <Key frame="25" value="0.114" />
+                                        <Key frame="16" value="0.03" />
+                                        <Key frame="25" value="0.04" />
                                         <Key frame="31" value="0.01" />
                                         <Key frame="46" value="0" />
                                         <Key frame="70" value="0.00480002" />