Skip to content
This repository was archived by the owner on Dec 1, 2020. It is now read-only.

Commit ae1d8a6

Browse files
author
Olav de Haas
committed
Rename joint and march_robot
1 parent 240607e commit ae1d8a6

File tree

12 files changed

+19
-17
lines changed

12 files changed

+19
-17
lines changed

‎march_hardware/CMakeLists.txt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ add_library(${PROJECT_NAME}
5454
include/${PROJECT_NAME}/imotioncube/imotioncube.h
5555
include/${PROJECT_NAME}/imotioncube/imotioncube_state.h
5656
include/${PROJECT_NAME}/imotioncube/imotioncube_target_state.h
57+
include/${PROJECT_NAME}/joint.h
58+
include/${PROJECT_NAME}/march_robot.h
5759
include/${PROJECT_NAME}/power/boot_shutdown_offsets.h
5860
include/${PROJECT_NAME}/power/high_voltage.h
5961
include/${PROJECT_NAME}/power/low_voltage.h
@@ -62,8 +64,6 @@ add_library(${PROJECT_NAME}
6264
include/${PROJECT_NAME}/power/power_distribution_board.h
6365
include/${PROJECT_NAME}/temperature/temperature_ges.h
6466
include/${PROJECT_NAME}/temperature/temperature_sensor.h
65-
src/Joint.cpp
66-
src/MarchRobot.cpp
6767
src/encoder/absolute_encoder.cpp
6868
src/encoder/encoder.cpp
6969
src/encoder/incremental_encoder.cpp
@@ -75,6 +75,8 @@ add_library(${PROJECT_NAME}
7575
src/ethercat/sdo_interface.cpp
7676
src/imotioncube/imotioncube.cpp
7777
src/imotioncube/imotioncube_target_state.cpp
78+
src/joint.cpp
79+
src/march_robot.cpp
7880
src/power/high_voltage.cpp
7981
src/power/low_voltage.cpp
8082
src/power/power_distribution_board.cpp

‎march_hardware/include/march_hardware/ethercat/ethercat_master.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include <mutex>
99
#include <condition_variable>
1010

11-
#include <march_hardware/Joint.h>
11+
#include <march_hardware/joint.h>
1212

1313
namespace march
1414
{

march_hardware/include/march_hardware/Joint.h renamed to march_hardware/include/march_hardware/joint.h

File renamed without changes.

march_hardware/include/march_hardware/MarchRobot.h renamed to march_hardware/include/march_hardware/march_robot.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// Copyright 2019 Project March.
22

3-
#ifndef MARCH_HARDWARE_MARCHROBOT_H
4-
#define MARCH_HARDWARE_MARCHROBOT_H
3+
#ifndef MARCH_HARDWARE_MARCH_ROBOT_H
4+
#define MARCH_HARDWARE_MARCH_ROBOT_H
55
#include "march_hardware/ethercat/ethercat_master.h"
6-
#include "march_hardware/Joint.h"
6+
#include "march_hardware/joint.h"
77
#include "march_hardware/power/power_distribution_board.h"
88

99
#include <cstdint>
@@ -101,4 +101,4 @@ class MarchRobot
101101
}
102102
};
103103
} // namespace march
104-
#endif // MARCH_HARDWARE_MARCHROBOT_H
104+
#endif // MARCH_HARDWARE_MARCH_ROBOT_H

march_hardware/src/Joint.cpp renamed to march_hardware/src/joint.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright 2019 Project March.
22
#include "march_hardware/ethercat/slave.h"
3-
#include "march_hardware/Joint.h"
3+
#include "march_hardware/joint.h"
44
#include "march_hardware/error/hardware_exception.h"
55
#include "march_hardware/error/motion_error.h"
66

march_hardware/src/MarchRobot.cpp renamed to march_hardware/src/march_robot.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright 2018 Project March.
2-
#include "march_hardware/Joint.h"
3-
#include "march_hardware/MarchRobot.h"
2+
#include "march_hardware/joint.h"
3+
#include "march_hardware/march_robot.h"
44
#include "march_hardware/temperature/temperature_sensor.h"
55
#include "march_hardware/error/hardware_exception.h"
66

‎march_hardware/test/TestJoint.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include "mocks/MockTemperatureGES.h"
33
#include "mocks/MockIMotionCube.h"
44
#include "march_hardware/error/hardware_exception.h"
5-
#include "march_hardware/Joint.h"
5+
#include "march_hardware/joint.h"
66

77
#include <memory>
88
#include <utility>

‎march_hardware/test/mocks/MockJoint.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22
#include "gmock/gmock.h" // Brings in Google Mock.
3-
#include "march_hardware/Joint.h"
3+
#include "march_hardware/joint.h"
44

55
class MockJoint : public march::Joint
66
{

‎march_hardware_builder/include/march_hardware_builder/hardware_builder.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
#include <march_hardware/ethercat/pdo_interface.h>
1717
#include <march_hardware/ethercat/sdo_interface.h>
1818
#include <march_hardware/imotioncube/imotioncube.h>
19-
#include <march_hardware/Joint.h>
20-
#include <march_hardware/MarchRobot.h>
19+
#include <march_hardware/joint.h>
20+
#include <march_hardware/march_robot.h>
2121
#include <march_hardware/power/power_distribution_board.h>
2222
#include <march_hardware/temperature/temperature_ges.h>
2323

‎march_hardware_interface/include/march_hardware_interface/march_hardware_interface.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include <realtime_tools/realtime_publisher.h>
1919
#include <ros/ros.h>
2020

21-
#include <march_hardware/MarchRobot.h>
21+
#include <march_hardware/march_robot.h>
2222
#include <march_hardware_builder/hardware_builder.h>
2323
#include <march_shared_resources/AfterLimitJointCommand.h>
2424
#include <march_shared_resources/ImcState.h>

0 commit comments

Comments
 (0)