Skip to content

Commit d2cf3a3

Browse files
thowellcopybara-github
authored andcommitted
Update schema.xml from generated schema to include tactile cutoff attribute.
PiperOrigin-RevId: 973076751 Change-Id: I7c78859e2a1a1b1a8dcd111dbdb66f15681b693e
1 parent 6b3298d commit d2cf3a3

1 file changed

Lines changed: 34 additions & 11 deletions

File tree

‎dm_control/mjcf/schema.xml‎

Lines changed: 34 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2193,7 +2193,7 @@
21932193
<attribute name="armature" type="float"/>
21942194
<attribute name="cranklength" type="float"/>
21952195
<attribute name="joint" type="reference" reference_namespace="joint"/>
2196-
<attribute name="jointinparent" type="string"/>
2196+
<attribute name="jointinparent" type="reference" reference_namespace="joint"/>
21972197
<attribute name="tendon" type="reference" reference_namespace="tendon"/>
21982198
<attribute name="slidersite" type="reference" reference_namespace="site"/>
21992199
<attribute name="cranksite" type="reference" reference_namespace="site"/>
@@ -2232,7 +2232,7 @@
22322232
<attribute name="armature" type="float"/>
22332233
<attribute name="cranklength" type="float"/>
22342234
<attribute name="joint" type="reference" reference_namespace="joint"/>
2235-
<attribute name="jointinparent" type="string"/>
2235+
<attribute name="jointinparent" type="reference" reference_namespace="joint"/>
22362236
<attribute name="tendon" type="reference" reference_namespace="tendon"/>
22372237
<attribute name="slidersite" type="reference" reference_namespace="site"/>
22382238
<attribute name="cranksite" type="reference" reference_namespace="site"/>
@@ -2260,7 +2260,7 @@
22602260
<attribute name="armature" type="float"/>
22612261
<attribute name="cranklength" type="float"/>
22622262
<attribute name="joint" type="reference" reference_namespace="joint"/>
2263-
<attribute name="jointinparent" type="string"/>
2263+
<attribute name="jointinparent" type="reference" reference_namespace="joint"/>
22642264
<attribute name="tendon" type="reference" reference_namespace="tendon"/>
22652265
<attribute name="slidersite" type="reference" reference_namespace="site"/>
22662266
<attribute name="cranksite" type="reference" reference_namespace="site"/>
@@ -2291,7 +2291,7 @@
22912291
<attribute name="armature" type="float"/>
22922292
<attribute name="cranklength" type="float"/>
22932293
<attribute name="joint" type="reference" reference_namespace="joint"/>
2294-
<attribute name="jointinparent" type="string"/>
2294+
<attribute name="jointinparent" type="reference" reference_namespace="joint"/>
22952295
<attribute name="tendon" type="reference" reference_namespace="tendon"/>
22962296
<attribute name="slidersite" type="reference" reference_namespace="site"/>
22972297
<attribute name="cranksite" type="reference" reference_namespace="site"/>
@@ -2322,7 +2322,7 @@
23222322
<attribute name="armature" type="float"/>
23232323
<attribute name="cranklength" type="float"/>
23242324
<attribute name="joint" type="reference" reference_namespace="joint"/>
2325-
<attribute name="jointinparent" type="string"/>
2325+
<attribute name="jointinparent" type="reference" reference_namespace="joint"/>
23262326
<attribute name="tendon" type="reference" reference_namespace="tendon"/>
23272327
<attribute name="slidersite" type="reference" reference_namespace="site"/>
23282328
<attribute name="cranksite" type="reference" reference_namespace="site"/>
@@ -2372,7 +2372,7 @@
23722372
<attribute name="armature" type="float"/>
23732373
<attribute name="cranklength" type="float"/>
23742374
<attribute name="joint" type="reference" reference_namespace="joint"/>
2375-
<attribute name="jointinparent" type="string"/>
2375+
<attribute name="jointinparent" type="reference" reference_namespace="joint"/>
23762376
<attribute name="tendon" type="reference" reference_namespace="tendon"/>
23772377
<attribute name="slidersite" type="reference" reference_namespace="site"/>
23782378
<attribute name="cranksite" type="reference" reference_namespace="site"/>
@@ -2400,7 +2400,7 @@
24002400
<attribute name="armature" type="float"/>
24012401
<attribute name="cranklength" type="float"/>
24022402
<attribute name="joint" type="reference" reference_namespace="joint"/>
2403-
<attribute name="jointinparent" type="string"/>
2403+
<attribute name="jointinparent" type="reference" reference_namespace="joint"/>
24042404
<attribute name="tendon" type="reference" reference_namespace="tendon"/>
24052405
<attribute name="slidersite" type="reference" reference_namespace="site"/>
24062406
<attribute name="cranksite" type="reference" reference_namespace="site"/>
@@ -2431,7 +2431,7 @@
24312431
<attribute name="armature" type="float"/>
24322432
<attribute name="cranklength" type="float"/>
24332433
<attribute name="joint" type="reference" reference_namespace="joint"/>
2434-
<attribute name="jointinparent" type="string"/>
2434+
<attribute name="jointinparent" type="reference" reference_namespace="joint"/>
24352435
<attribute name="tendon" type="reference" reference_namespace="tendon"/>
24362436
<attribute name="slidersite" type="reference" reference_namespace="site"/>
24372437
<attribute name="cranksite" type="reference" reference_namespace="site"/>
@@ -2486,7 +2486,7 @@
24862486
<attribute name="armature" type="float"/>
24872487
<attribute name="cranklength" type="float"/>
24882488
<attribute name="joint" type="reference" reference_namespace="joint"/>
2489-
<attribute name="jointinparent" type="string"/>
2489+
<attribute name="jointinparent" type="reference" reference_namespace="joint"/>
24902490
<attribute name="site" type="reference" reference_namespace="site"/>
24912491
<attribute name="actdim" type="int" default="-1"/>
24922492
<attribute name="dyntype" type="keyword" valid_values="none integrator filter filterexact muscle dcmotor pid user" default="none"/>
@@ -3092,6 +3092,28 @@
30923092
<attribute name="body2" type="reference" reference_namespace="body"/>
30933093
</attributes>
30943094
</element>
3095+
<element name="contact" repeated="true" namespace="sensor">
3096+
<attributes>
3097+
<attribute name="name" type="identifier"/>
3098+
<attribute name="nsample" type="int"/>
3099+
<attribute name="interp" type="keyword" valid_values="zoh linear cubic"/>
3100+
<attribute name="delay" type="float"/>
3101+
<attribute name="interval" type="array" array_type="float" array_size="2"/>
3102+
<attribute name="cutoff" type="float"/>
3103+
<attribute name="noise" type="float"/>
3104+
<attribute name="user" type="array" array_type="float"/>
3105+
<attribute name="geom1" type="reference" reference_namespace="geom"/>
3106+
<attribute name="geom2" type="reference" reference_namespace="geom"/>
3107+
<attribute name="body1" type="reference" reference_namespace="body"/>
3108+
<attribute name="body2" type="reference" reference_namespace="body"/>
3109+
<attribute name="subtree1" type="reference" reference_namespace="body"/>
3110+
<attribute name="subtree2" type="reference" reference_namespace="body"/>
3111+
<attribute name="site" type="reference" reference_namespace="site"/>
3112+
<attribute name="num" type="int"/>
3113+
<attribute name="data" type="string"/>
3114+
<attribute name="reduce" type="keyword" valid_values="none mindist maxforce netforce"/>
3115+
</attributes>
3116+
</element>
30953117
<element name="e_potential" repeated="true" namespace="sensor">
30963118
<attributes>
30973119
<attribute name="name" type="identifier"/>
@@ -3137,6 +3159,7 @@
31373159
<attribute name="interp" type="keyword" valid_values="zoh linear cubic"/>
31383160
<attribute name="delay" type="float"/>
31393161
<attribute name="interval" type="array" array_type="float" array_size="2"/>
3162+
<attribute name="cutoff" type="float"/>
31403163
<attribute name="user" type="array" array_type="float"/>
31413164
</attributes>
31423165
</element>
@@ -3182,13 +3205,13 @@
31823205
<attributes>
31833206
<attribute name="name" type="identifier" required="true"/>
31843207
<attribute name="size" type="int"/>
3185-
<attribute name="data" type="string"/>
3208+
<attribute name="data" type="array" array_type="float"/>
31863209
</attributes>
31873210
</element>
31883211
<element name="text" repeated="true">
31893212
<attributes>
31903213
<attribute name="name" type="identifier" required="true"/>
3191-
<attribute name="data" type="string" required="true"/>
3214+
<attribute name="data" type="string"/>
31923215
</attributes>
31933216
</element>
31943217
<element name="tuple" repeated="true">

0 commit comments

Comments
 (0)