Merge branch 'master' into Simon-Steinmann-Kuka

cyberbotics · Aug 13, 2020 · 91bb03c · 91bb03c
2 parents cc88d67 + 3f05dc2
commit 91bb03c
Show file tree

Hide file tree

Showing 20 changed files with 1,142 additions and 0 deletions.
diff --git a/devices/robotiq/protos/Robotiq2f.proto b/devices/robotiq/protos/Robotiq2f.proto
diff --git a/robots/WLkata/Mirobot.proto → robots/WLkata/protos/Mirobot.proto b/robots/WLkata/Mirobot.proto → robots/WLkata/protos/Mirobot.proto
diff --git a/robots/kuka/lrb_iiwa/protos/KukaLbrIiwa14R820_meshes/base_link_0Mesh.proto b/robots/kuka/lrb_iiwa/protos/KukaLbrIiwa14R820_meshes/base_link_0Mesh.proto
diff --git a/robots/kuka/lrb_iiwa/protos/KukaLbrIiwa14R820_meshes/link_1_0Mesh.proto b/robots/kuka/lrb_iiwa/protos/KukaLbrIiwa14R820_meshes/link_1_0Mesh.proto
diff --git a/robots/kuka/lrb_iiwa/protos/KukaLbrIiwa14R820_meshes/link_2_0Mesh.proto b/robots/kuka/lrb_iiwa/protos/KukaLbrIiwa14R820_meshes/link_2_0Mesh.proto
diff --git a/robots/kuka/lrb_iiwa/protos/KukaLbrIiwa14R820_meshes/link_2_1Mesh.proto b/robots/kuka/lrb_iiwa/protos/KukaLbrIiwa14R820_meshes/link_2_1Mesh.proto
diff --git a/robots/kuka/lrb_iiwa/protos/KukaLbrIiwa14R820_meshes/link_3_0Mesh.proto b/robots/kuka/lrb_iiwa/protos/KukaLbrIiwa14R820_meshes/link_3_0Mesh.proto
diff --git a/robots/kuka/lrb_iiwa/protos/KukaLbrIiwa14R820_meshes/link_3_1Mesh.proto b/robots/kuka/lrb_iiwa/protos/KukaLbrIiwa14R820_meshes/link_3_1Mesh.proto
diff --git a/robots/kuka/lrb_iiwa/protos/KukaLbrIiwa14R820_meshes/link_3_2Mesh.proto b/robots/kuka/lrb_iiwa/protos/KukaLbrIiwa14R820_meshes/link_3_2Mesh.proto
diff --git a/robots/kuka/lrb_iiwa/protos/KukaLbrIiwa14R820_meshes/link_4_0Mesh.proto b/robots/kuka/lrb_iiwa/protos/KukaLbrIiwa14R820_meshes/link_4_0Mesh.proto
diff --git a/robots/kuka/lrb_iiwa/protos/KukaLbrIiwa14R820_meshes/link_4_1Mesh.proto b/robots/kuka/lrb_iiwa/protos/KukaLbrIiwa14R820_meshes/link_4_1Mesh.proto
diff --git a/robots/kuka/lrb_iiwa/protos/KukaLbrIiwa14R820_meshes/link_4_2Mesh.proto b/robots/kuka/lrb_iiwa/protos/KukaLbrIiwa14R820_meshes/link_4_2Mesh.proto
diff --git a/robots/kuka/lrb_iiwa/protos/KukaLbrIiwa14R820_meshes/link_5_0Mesh.proto b/robots/kuka/lrb_iiwa/protos/KukaLbrIiwa14R820_meshes/link_5_0Mesh.proto
diff --git a/robots/kuka/lrb_iiwa/protos/KukaLbrIiwa14R820_meshes/link_5_1Mesh.proto b/robots/kuka/lrb_iiwa/protos/KukaLbrIiwa14R820_meshes/link_5_1Mesh.proto
diff --git a/robots/kuka/lrb_iiwa/protos/KukaLbrIiwa14R820_meshes/link_5_2Mesh.proto b/robots/kuka/lrb_iiwa/protos/KukaLbrIiwa14R820_meshes/link_5_2Mesh.proto
diff --git a/robots/kuka/lrb_iiwa/protos/KukaLbrIiwa14R820_meshes/link_6_0Mesh.proto b/robots/kuka/lrb_iiwa/protos/KukaLbrIiwa14R820_meshes/link_6_0Mesh.proto
diff --git a/robots/kuka/lrb_iiwa/protos/KukaLbrIiwa14R820_meshes/link_6_1Mesh.proto b/robots/kuka/lrb_iiwa/protos/KukaLbrIiwa14R820_meshes/link_6_1Mesh.proto
diff --git a/robots/kuka/lrb_iiwa/protos/KukaLbrIiwa14R820_meshes/link_7_0Mesh.proto b/robots/kuka/lrb_iiwa/protos/KukaLbrIiwa14R820_meshes/link_7_0Mesh.proto
diff --git a/robots/kuka/lrb_iiwa/protos/KukaLbrIiwa14R820_meshes/link_7_1Mesh.proto b/robots/kuka/lrb_iiwa/protos/KukaLbrIiwa14R820_meshes/link_7_1Mesh.proto
diff --git a/robots/kuka/lrb_iiwa/protos/KukaLbrIiwa14R820_meshes/link_7_2Mesh.proto b/robots/kuka/lrb_iiwa/protos/KukaLbrIiwa14R820_meshes/link_7_2Mesh.proto