Skip to content
This repository has been archived by the owner on Sep 23, 2024. It is now read-only.

Commit

Permalink
Rename from "t07_ros" to "t07_robot.
Browse files Browse the repository at this point in the history
  • Loading branch information
aentinger committed Nov 13, 2023
1 parent 727826f commit 7ff603a
Show file tree
Hide file tree
Showing 10 changed files with 28 additions and 29 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ros2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ jobs:
- uses: actions/checkout@v4
with:
path: 'ros2_ws/src/t07_ros'
path: 'ros2_ws/src/t07_robot'
submodules: true
fetch-depth: 1

Expand Down
15 changes: 7 additions & 8 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
#######################################################################################
cmake_minimum_required(VERSION 3.8)
#######################################################################################
project(t07_ros)
set(T07_ROS_TARGET ${PROJECT_NAME}_node)
project(t07_robot)
set(T07_ROBOT_TARGET ${PROJECT_NAME}_node)
#######################################################################################
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
add_compile_options(-Wall -Wextra -Wpedantic)
add_compile_options(-Wall -Wextra -Werror -Wpedantic)
endif()
#######################################################################################
# find dependencies
find_package(ament_cmake REQUIRED)
find_package(rclcpp REQUIRED)
find_package(std_msgs REQUIRED)
Expand All @@ -21,18 +20,18 @@ include_directories(
include
)
#######################################################################################
add_executable(${T07_ROS_TARGET}
add_executable(${T07_ROBOT_TARGET}
src/CanManager.cpp
src/Node.cpp
src/main.cpp
)
#######################################################################################
target_link_libraries(${T07_ROS_TARGET}
target_link_libraries(${T07_ROBOT_TARGET}
cyphal++ socketcan
)
#######################################################################################
target_compile_features(${T07_ROS_TARGET} PRIVATE cxx_std_20)
ament_target_dependencies(${T07_ROS_TARGET} rclcpp std_msgs mp-units)
target_compile_features(${T07_ROBOT_TARGET} PRIVATE cxx_std_20)
ament_target_dependencies(${T07_ROBOT_TARGET} rclcpp std_msgs mp-units)
#######################################################################################
if(BUILD_TESTING)
find_package(ament_lint_auto REQUIRED)
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<a href="https://107-systems.org/"><img align="right" src="https://raw.githubusercontent.com/107-systems/.github/main/logo/107-systems.png" width="15%"></a>
:floppy_disk: `t07_ros`
=======================
[![Build Status](https://github.com/107-systems/t07_ros/actions/workflows/ros2.yml/badge.svg)](https://github.com/107-systems/t07_ros/actions/workflows/ros2.yml)
[![Spell Check status](https://github.com/107-systems/t07_ros/actions/workflows/spell-check.yml/badge.svg)](https://github.com/107-systems/t07_ros/actions/workflows/spell-check.yml)
:floppy_disk: `t07_robot`
=========================
[![Build Status](https://github.com/107-systems/t07_robot/actions/workflows/ros2.yml/badge.svg)](https://github.com/107-systems/t07_robot/actions/workflows/ros2.yml)
[![Spell Check status](https://github.com/107-systems/t07_robot/actions/workflows/spell-check.yml/badge.svg)](https://github.com/107-systems/t07_robot/actions/workflows/spell-check.yml)

ROS control code for the [T07](https://github.com/107-systems/T07) robot.

Expand Down Expand Up @@ -40,17 +40,17 @@ sudo make install
* Build with `colcon`
```bash
cd $COLCON_WS/src
git clone https://github.com/107-systems/t07_ros
git clone --recursive https://github.com/107-systems/t07_robot
cd $COLCON_WS
source /opt/ros/humble/setup.bash
colcon build --packages-select t07_ros
colcon build --packages-select t07_robot
```

#### How-to-run
```bash
cd $COLCON_WS
. install/setup.bash
ros2 launch t07_ros t07.py
ros2 launch t07_robot robot.py
```

#### Interface Documentation
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* Copyright (c) 2022 LXRobotics GmbH.
* Author: Alexander Entinger <[email protected]>
* Contributors: https://github.com/107-systems/ros2_cyphal_bridge/graphs/contributors.
* Contributors: https://github.com/107-systems/t07_robot/graphs/contributors.
*/

#pragma once
Expand Down
2 changes: 1 addition & 1 deletion include/t07_ros/Node.h → include/t07_robot/Node.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* Copyright (c) 2023 LXRobotics GmbH.
* Author: Alexander Entinger <[email protected]>
* Contributors: https://github.com/107-systems/t07_ros/graphs/contributors.
* Contributors: https://github.com/107-systems/t07_robot/graphs/contributors.
*/

#pragma once
Expand Down
6 changes: 3 additions & 3 deletions launch/t07.py → launch/robot.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
def generate_launch_description():
return LaunchDescription([
Node(
package='t07_ros',
executable='t07_ros_node',
name='t07_ros',
package='t07_robot',
executable='t07_robot_node',
name='t07_robot',
namespace='t07',
output='screen',
emulate_tty=True,
Expand Down
2 changes: 1 addition & 1 deletion package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?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>t07_ros</name>
<name>t07_robot</name>
<version>1.0.0</version>
<description>ROS control code for the T07 robot.</description>
<maintainer email="[email protected]">alex</maintainer>
Expand Down
4 changes: 2 additions & 2 deletions src/CanManager.cpp
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
/**
* Copyright (c) 2022 LXRobotics GmbH.
* Author: Alexander Entinger <[email protected]>
* Contributors: https://github.com/107-systems/ros2_cyphal_bridge/graphs/contributors.
* Contributors: https://github.com/107-systems/t07_robot/graphs/contributors.
*/

/**************************************************************************************
* INCLUDES
**************************************************************************************/

#include <t07_ros/CanManager.h>
#include <t07_robot/CanManager.h>

#include <unistd.h>

Expand Down
6 changes: 3 additions & 3 deletions src/Node.cpp
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
/**
* Copyright (c) 2023 LXRobotics GmbH.
* Author: Alexander Entinger <[email protected]>
* Contributors: https://github.com/107-systems/t07_ros/graphs/contributors.
* Contributors: https://github.com/107-systems/t07_robot/graphs/contributors.
*/

/**************************************************************************************
* INCLUDE
**************************************************************************************/

#include <t07_ros/Node.h>
#include <t07_robot/Node.h>

/**************************************************************************************
* NAMESPACE
Expand All @@ -22,7 +22,7 @@ namespace t07
**************************************************************************************/

Node::Node()
: rclcpp::Node("t07_ros_node")
: rclcpp::Node("t07_robot_node")
, _node_heap{}
, _node_hdl{_node_heap.data(),
_node_heap.size(),
Expand Down
4 changes: 2 additions & 2 deletions src/main.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* Copyright (c) 2023 LXRobotics GmbH.
* Author: Alexander Entinger <[email protected]>
* Contributors: https://github.com/107-systems/t07_ros/graphs/contributors.
* Contributors: https://github.com/107-systems/t07_robot/graphs/contributors.
*/

/**************************************************************************************
Expand All @@ -10,7 +10,7 @@

#include <rclcpp/rclcpp.hpp>

#include <t07_ros/Node.h>
#include <t07_robot/Node.h>

/**************************************************************************************
* MAIN
Expand Down

0 comments on commit 7ff603a

Please sign in to comment.