Skip to content

Commit

Permalink
ROS Humble Migration (#1)
Browse files Browse the repository at this point in the history
* humble migration

* update readme
  • Loading branch information
gezp authored Sep 12, 2022
1 parent 3ea2c9a commit 5af64d3
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.5)
project(rmoss_ign_resources)
project(rmoss_gz_resources)

# ros package
find_package(ament_cmake REQUIRED)
Expand All @@ -11,7 +11,7 @@ install( DIRECTORY
)

#environment hooks, ROS 2 >=Eloquent
ament_environment_hooks("${CMAKE_CURRENT_SOURCE_DIR}/env-hooks/ignition.dsv.in")
ament_environment_hooks("${CMAKE_CURRENT_SOURCE_DIR}/env-hooks/gazebo.dsv.in")

#test
if(BUILD_TESTING)
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# rmoss_ign_resources
# rmoss_gz_resources

rmoss_ign_resources为[rmoss_ign](https://github.com/robomaster-oss/rmoss_ign)项目中的RoboMaster Ignition Simulator提供公共基本模型资源,包括以下3种类型:
rmoss_gz_resources为[rmoss_gazebo](https://github.com/robomaster-oss/rmoss_gazebo)项目中的RoboMaster Gazebo Simulator提供公共基本模型资源,包括以下3种类型:

* 裁判系统模块组件:装甲板模块,枪口测速模块,指示灯模块等
* 标准射击弹丸:17mm荧光弹,42mm荧光弹
Expand All @@ -18,7 +18,7 @@ RoboMaster2021赛季裁判系统

* rm21_video_transmitter_module(图传模块):`video_transmitter`.

* rm21_rfid_interaction_module(RFID模块):暂不考虑,需要等待Ignition Gazebo的支持
* rm21_rfid_interaction_module(RFID模块):暂不考虑,需要等待Gazebo新版本相关功能的支持

RoboMaster2022赛季裁判系统

Expand All @@ -32,7 +32,7 @@ RoboMaster2022赛季裁判系统
RoboMaster University AI Challenge 2019 标准步兵机器人

* 模型图纸来自官方[RoboMaster产品/ 机器人 / AI 机器人](https://www.robomaster.com/zh-CN/products/components/detail/1839)资料,使用[xmacro](https://github.com/gezp/xmacro) 进行SDF建模
* 支持麦克拉姆轮地盘,使用[rmoss_ign](https://github.com/robomaster-oss/rmoss_ign)中的[麦克拉姆轮插件](https://github.com/robomaster-oss/rmoss_ign/tree/main/rmoss_ign_plugins/src/mecanum_drive2).
* 支持麦克拉姆轮地盘,使用[rmoss_gazebo](https://github.com/robomaster-oss/rmoss_gazebo)中的[麦克拉姆轮插件](https://github.com/robomaster-oss/rmoss_gazebo/tree/main/rmoss_gz_plugins/src/mecanum_drive2).
* 支持云台(pitch,yaw)角度控制,使用Ignition官方插件`JointPositionController`.
* 具有装甲板灯条发光效果,需使用插件,可测试自瞄等识别算法。

Expand Down Expand Up @@ -67,7 +67,7 @@ RoboMaster University AI Challenge 2019 标准步兵机器人
* `插件分离原则` : 使用xmacro进行模块化时,插件应该和模型分离,这样方便使用自定义的插件作为控制器。
* `Collision简洁原则`:在构建机器人<collision>时,尽可能采用简单的几何(如box,cylinder, sphere)代替复杂mesh文件,必要时可以忽略部分collision,减小仿真计算量。

具体建模使用可参考[RMOSS Ign建模指南](https://robomaster-oss.github.io/rmoss_tutorials/#/developer_guides/rmoss_ign_modeling)
具体建模使用可参考[RMOSS Ign建模指南](https://robomaster-oss.github.io/rmoss_tutorials/#/developer_guides/rmoss_gazebo_modeling)

> Tip: 使用SW,blender等3D建模工具将整个机器人分成几个模块(依照可活动关节分离),模块之间使用关节连接,然后再把各个模块导出STL或dea文件,连杆,关节的尺寸,以及之间的相对位姿可在3D建模工具测量得到。
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions package.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0"?>
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>rmoss_ign_resources</name>
<name>rmoss_gz_resources</name>
<version>0.9.0</version>
<description>RoboMaster Referee System Module and RMUA Standard Robot SDF Models for Ignition Simulator</description>
<description>RoboMaster Referee System Module and RMUA Standard Robot SDF Models for Gazebo Simulator</description>
<maintainer email="[email protected]">Zhenpeng Ge</maintainer>
<license>Apache License 2.0</license>
<buildtool_depend>ament_cmake</buildtool_depend>
Expand Down

0 comments on commit 5af64d3

Please sign in to comment.