Skip to content

Commit eef12e7

Browse files
committed
necessary upstream changes
PiperOrigin-RevId: 828440392
1 parent 1b86ece commit eef12e7

File tree

2 files changed

+2
-244
lines changed

2 files changed

+2
-244
lines changed

LICENSE

Lines changed: 0 additions & 243 deletions
Original file line numberDiff line numberDiff line change
@@ -1307,249 +1307,6 @@ License for contents in the directory 'franka_emika_panda/'
13071307
END OF TERMS AND CONDITIONS
13081308

13091309

1310-
================================================================================
1311-
License for contents in the directory 'franka_fr3/'
1312-
================================================================================
1313-
1314-
1315-
Apache License
1316-
Version 2.0, January 2004
1317-
http://www.apache.org/licenses/
1318-
1319-
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1320-
1321-
1. Definitions.
1322-
1323-
"License" shall mean the terms and conditions for use, reproduction,
1324-
and distribution as defined by Sections 1 through 9 of this document.
1325-
1326-
"Licensor" shall mean the copyright owner or entity authorized by
1327-
the copyright owner that is granting the License.
1328-
1329-
"Legal Entity" shall mean the union of the acting entity and all
1330-
other entities that control, are controlled by, or are under common
1331-
control with that entity. For the purposes of this definition,
1332-
"control" means (i) the power, direct or indirect, to cause the
1333-
direction or management of such entity, whether by contract or
1334-
otherwise, or (ii) ownership of fifty percent (50%) or more of the
1335-
outstanding shares, or (iii) beneficial ownership of such entity.
1336-
1337-
"You" (or "Your") shall mean an individual or Legal Entity
1338-
exercising permissions granted by this License.
1339-
1340-
"Source" form shall mean the preferred form for making modifications,
1341-
including but not limited to software source code, documentation
1342-
source, and configuration files.
1343-
1344-
"Object" form shall mean any form resulting from mechanical
1345-
transformation or translation of a Source form, including but
1346-
not limited to compiled object code, generated documentation,
1347-
and conversions to other media types.
1348-
1349-
"Work" shall mean the work of authorship, whether in Source or
1350-
Object form, made available under the License, as indicated by a
1351-
copyright notice that is included in or attached to the work
1352-
(an example is provided in the Appendix below).
1353-
1354-
"Derivative Works" shall mean any work, whether in Source or Object
1355-
form, that is based on (or derived from) the Work and for which the
1356-
editorial revisions, annotations, elaborations, or other modifications
1357-
represent, as a whole, an original work of authorship. For the purposes
1358-
of this License, Derivative Works shall not include works that remain
1359-
separable from, or merely link (or bind by name) to the interfaces of,
1360-
the Work and Derivative Works thereof.
1361-
1362-
"Contribution" shall mean any work of authorship, including
1363-
the original version of the Work and any modifications or additions
1364-
to that Work or Derivative Works thereof, that is intentionally
1365-
submitted to Licensor for inclusion in the Work by the copyright owner
1366-
or by an individual or Legal Entity authorized to submit on behalf of
1367-
the copyright owner. For the purposes of this definition, "submitted"
1368-
means any form of electronic, verbal, or written communication sent
1369-
to the Licensor or its representatives, including but not limited to
1370-
communication on electronic mailing lists, source code control systems,
1371-
and issue tracking systems that are managed by, or on behalf of, the
1372-
Licensor for the purpose of discussing and improving the Work, but
1373-
excluding communication that is conspicuously marked or otherwise
1374-
designated in writing by the copyright owner as "Not a Contribution."
1375-
1376-
"Contributor" shall mean Licensor and any individual or Legal Entity
1377-
on behalf of whom a Contribution has been received by Licensor and
1378-
subsequently incorporated within the Work.
1379-
1380-
2. Grant of Copyright License. Subject to the terms and conditions of
1381-
this License, each Contributor hereby grants to You a perpetual,
1382-
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
1383-
copyright license to reproduce, prepare Derivative Works of,
1384-
publicly display, publicly perform, sublicense, and distribute the
1385-
Work and such Derivative Works in Source or Object form.
1386-
1387-
3. Grant of Patent License. Subject to the terms and conditions of
1388-
this License, each Contributor hereby grants to You a perpetual,
1389-
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
1390-
(except as stated in this section) patent license to make, have made,
1391-
use, offer to sell, sell, import, and otherwise transfer the Work,
1392-
where such license applies only to those patent claims licensable
1393-
by such Contributor that are necessarily infringed by their
1394-
Contribution(s) alone or by combination of their Contribution(s)
1395-
with the Work to which such Contribution(s) was submitted. If You
1396-
institute patent litigation against any entity (including a
1397-
cross-claim or counterclaim in a lawsuit) alleging that the Work
1398-
or a Contribution incorporated within the Work constitutes direct
1399-
or contributory patent infringement, then any patent licenses
1400-
granted to You under this License for that Work shall terminate
1401-
as of the date such litigation is filed.
1402-
1403-
4. Redistribution. You may reproduce and distribute copies of the
1404-
Work or Derivative Works thereof in any medium, with or without
1405-
modifications, and in Source or Object form, provided that You
1406-
meet the following conditions:
1407-
1408-
(a) You must give any other recipients of the Work or
1409-
Derivative Works a copy of this License; and
1410-
1411-
(b) You must cause any modified files to carry prominent notices
1412-
stating that You changed the files; and
1413-
1414-
(c) You must retain, in the Source form of any Derivative Works
1415-
that You distribute, all copyright, patent, trademark, and
1416-
attribution notices from the Source form of the Work,
1417-
excluding those notices that do not pertain to any part of
1418-
the Derivative Works; and
1419-
1420-
(d) If the Work includes a "NOTICE" text file as part of its
1421-
distribution, then any Derivative Works that You distribute must
1422-
include a readable copy of the attribution notices contained
1423-
within such NOTICE file, excluding those notices that do not
1424-
pertain to any part of the Derivative Works, in at least one
1425-
of the following places: within a NOTICE text file distributed
1426-
as part of the Derivative Works; within the Source form or
1427-
documentation, if provided along with the Derivative Works; or,
1428-
within a display generated by the Derivative Works, if and
1429-
wherever such third-party notices normally appear. The contents
1430-
of the NOTICE file are for informational purposes only and
1431-
do not modify the License. You may add Your own attribution
1432-
notices within Derivative Works that You distribute, alongside
1433-
or as an addendum to the NOTICE text from the Work, provided
1434-
that such additional attribution notices cannot be construed
1435-
as modifying the License.
1436-
1437-
You may add Your own copyright statement to Your modifications and
1438-
may provide additional or different license terms and conditions
1439-
for use, reproduction, or distribution of Your modifications, or
1440-
for any such Derivative Works as a whole, provided Your use,
1441-
reproduction, and distribution of the Work otherwise complies with
1442-
the conditions stated in this License.
1443-
1444-
5. Submission of Contributions. Unless You explicitly state otherwise,
1445-
any Contribution intentionally submitted for inclusion in the Work
1446-
by You to the Licensor shall be under the terms and conditions of
1447-
this License, without any additional terms or conditions.
1448-
Notwithstanding the above, nothing herein shall supersede or modify
1449-
the terms of any separate license agreement you may have executed
1450-
with Licensor regarding such Contributions.
1451-
1452-
6. Trademarks. This License does not grant permission to use the trade
1453-
names, trademarks, service marks, or product names of the Licensor,
1454-
except as required for reasonable and customary use in describing the
1455-
origin of the Work and reproducing the content of the NOTICE file.
1456-
1457-
7. Disclaimer of Warranty. Unless required by applicable law or
1458-
agreed to in writing, Licensor provides the Work (and each
1459-
Contributor provides its Contributions) on an "AS IS" BASIS,
1460-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
1461-
implied, including, without limitation, any warranties or conditions
1462-
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
1463-
PARTICULAR PURPOSE. You are solely responsible for determining the
1464-
appropriateness of using or redistributing the Work and assume any
1465-
risks associated with Your exercise of permissions under this License.
1466-
1467-
8. Limitation of Liability. In no event and under no legal theory,
1468-
whether in tort (including negligence), contract, or otherwise,
1469-
unless required by applicable law (such as deliberate and grossly
1470-
negligent acts) or agreed to in writing, shall any Contributor be
1471-
liable to You for damages, including any direct, indirect, special,
1472-
incidental, or consequential damages of any character arising as a
1473-
result of this License or out of the use or inability to use the
1474-
Work (including but not limited to damages for loss of goodwill,
1475-
work stoppage, computer failure or malfunction, or any and all
1476-
other commercial damages or losses), even if such Contributor
1477-
has been advised of the possibility of such damages.
1478-
1479-
9. Accepting Warranty or Additional Liability. While redistributing
1480-
the Work or Derivative Works thereof, You may choose to offer,
1481-
and charge a fee for, acceptance of support, warranty, indemnity,
1482-
or other liability obligations and/or rights consistent with this
1483-
License. However, in accepting such obligations, You may act only
1484-
on Your own behalf and on Your sole responsibility, not on behalf
1485-
of any other Contributor, and only if You agree to indemnify,
1486-
defend, and hold each Contributor harmless for any liability
1487-
incurred by, or claims asserted against, such Contributor by reason
1488-
of your accepting any such warranty or additional liability.
1489-
1490-
END OF TERMS AND CONDITIONS
1491-
1492-
APPENDIX: How to apply the Apache License to your work.
1493-
1494-
To apply the Apache License to your work, attach the following
1495-
boilerplate notice, with the fields enclosed by brackets "[]"
1496-
replaced with your own identifying information. (Don't include
1497-
the brackets!) The text should be enclosed in the appropriate
1498-
comment syntax for the file format. We also recommend that a
1499-
file or class name and description of purpose be included on the
1500-
same "printed page" as the copyright notice for easier
1501-
identification within third-party archives.
1502-
1503-
Copyright [yyyy] [name of copyright owner]
1504-
1505-
Licensed under the Apache License, Version 2.0 (the "License");
1506-
you may not use this file except in compliance with the License.
1507-
You may obtain a copy of the License at
1508-
1509-
http://www.apache.org/licenses/LICENSE-2.0
1510-
1511-
Unless required by applicable law or agreed to in writing, software
1512-
distributed under the License is distributed on an "AS IS" BASIS,
1513-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1514-
See the License for the specific language governing permissions and
1515-
limitations under the License.
1516-
1517-
1518-
1519-
----------------------------
1520-
1521-
1522-
1523-
Software License Agreement (BSD License)
1524-
1525-
Redistribution and use in source and binary forms, with or without
1526-
modification, are permitted provided that the following conditions
1527-
are met:
1528-
1529-
* Redistributions of source code must retain the above copyright
1530-
notice, this list of conditions and the following disclaimer.
1531-
* Redistributions in binary form must reproduce the above
1532-
copyright notice, this list of conditions and the following
1533-
disclaimer in the documentation and/or other materials provided
1534-
with the distribution.
1535-
* Neither the name of Willow Garage, Inc. nor the names of its
1536-
contributors may be used to endorse or promote products derived
1537-
from this software without specific prior written permission.
1538-
1539-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
1540-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
1541-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
1542-
FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
1543-
COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
1544-
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
1545-
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
1546-
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
1547-
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
1548-
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
1549-
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
1550-
POSSIBILITY OF SUCH DAMAGE.
1551-
1552-
15531310
================================================================================
15541311
License for contents in the directory 'google_barkour_v0/'
15551312
================================================================================

franka_emika_panda/mjx_panda.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,8 @@
269269
forcerange="-12 12" ctrlrange="-2.8973 2.8973"/>
270270
<position class="panda" name="actuator6" joint="joint6" kp="300" kv="2" forcerange="-12 12"
271271
ctrlrange="-0.0175 3.7525"/>
272-
<position class="panda" name="actuator7" joint="joint7" kp="300" kv="2" forcerange="-12 12"/>
272+
<position class="panda" name="actuator7" joint="joint7" kp="300" kv="2" forcerange="-12 12"
273+
ctrlrange="-2.8973 2.8973"/>
273274
<general class="panda" name="actuator8" joint="finger_joint1"
274275
ctrlrange="0 0.04" gainprm="350 0 0" biasprm="0 -350 -10" forcerange="-200 200"/>
275276
</actuator>

0 commit comments

Comments
 (0)