Skip to content

Commit 7fba716

Browse files
slimasziommacmacal
andauthored
Apply suggestions from code review
CHG: use scoped enums with first element set to 0u Co-authored-by: Maciej Aleksandrowicz <mac.aleksandrowicz@gmail.com>
1 parent ed8ada6 commit 7fba716

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

robotiq_hande_driver/include/communication.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
namespace hande_driver
1414
{
1515
constexpr auto kRegisterWordLength = 3;
16-
enum OutputBytes{
17-
OUTPUT_BYTES_RESERVED_1,
16+
enum class OutputBytes : uint8_t {
17+
OUTPUT_BYTES_RESERVED_1 = 0u,
1818
OUTPUT_BYTES_ACTION_REQUEST,
1919
OUTPUT_BYTES_POSITION_REQUEST,
2020
OUTPUT_BYTES_RESERVED_2,
@@ -23,8 +23,8 @@ enum OutputBytes{
2323
OUTPUT_BYTES_MAX
2424
};
2525

26-
enum InputBytes{
27-
INPUT_BYTES_RESERVED_1,
26+
enum class InputBytes : uint8_t {
27+
INPUT_BYTES_RESERVED_1 = 0u,
2828
INPUT_BYTES_GRIPPER_STATUS,
2929
INPUT_BYTES_POSITION_REQUEST_ECHO,
3030
INPUT_BYTES_FAULT_STATUS,

robotiq_hande_driver/include/protocol_logic.hpp

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,26 @@ namespace hande_driver
1515
// Action Request
1616
constexpr uint8_t kActionRequestByte = 0;
1717
constexpr uint8_t kActivatePositionByte = 0; // rACT
18-
enum Activate{
19-
DEACTIVATE_GRIPPER,
18+
enum class Activate : uint8_t {
19+
DEACTIVATE_GRIPPER = 0u,
2020
ACTIVATE_GRIPPER
2121
};
2222

2323
constexpr uint8_t kGoToPositionByte = 3; // rGTO
24-
enum GoTo{
25-
STOP,
24+
enum class GoTo : uint8_t {
25+
STOP = 0u,
2626
GO_TO_REQ_POS
2727
};
2828

2929
constexpr uint8_t kAutomaticReleasePositionByte = 4; // rATR
30-
enum AutomaticRelease{
31-
NORMAL,
30+
enum class AutomaticRelease : uint8_t {
31+
NORMAL = 0u,
3232
EMERGENCY_AUTO_RELEASE
3333
};
3434

3535
constexpr uint8_t kAutoReleaseDirectionPositionByte = 5; // rARD
36-
enum AutoReleaseDirection{
37-
CLOSING,
36+
enum class AutoReleaseDirection : uint8_t {
37+
CLOSING = 0u,
3838
OPENING
3939
};
4040

@@ -58,31 +58,31 @@ constexpr uint8_t kForceRequestByte = 5;
5858
constexpr uint8_t kStatusByte = 0;
5959
constexpr uint8_t kActivationStatusPositionByte = 0; // gACT
6060
constexpr auto kActivationStatusBits = 0b1;
61-
enum ActivationStatus{
62-
GRIPPER_RESET,
61+
enum class ActivationStatus : uint8_t {
62+
GRIPPER_RESET = 0u,
6363
GRIPPER_ACTIVATION
6464
};
6565

6666
constexpr uint8_t kActionStatusPositionByte = 3; // gGTO
6767
constexpr auto kActionStatusBits = 0b1;
68-
enum ActionStatus{
69-
STOPPED,
68+
enum class ActionStatus : uint8_t {
69+
STOPPED = 0u,
7070
GO_TO_POSITION_REQUEST
7171
};
7272

7373
constexpr uint8_t kGripperStatusPositionByte = 4; // gSTA
7474
constexpr auto kGripperStatusBits = 0b11;
75-
enum GripperStatus{
76-
GRIPPER_IN_RESET,
75+
enum class GripperStatus : uint8_t {
76+
GRIPPER_IN_RESET = 0u,
7777
ACTIVATION_IN_PROGRESS,
7878
NOT_USED,
7979
ACTIVATION_COMPLETE
8080
};
8181

8282
constexpr uint8_t kObjectDetectionStatusPositionByte = 6; // gObj
8383
constexpr auto kObjectDetectionStatusBits = 0b11;
84-
enum ObjectDetectionStatus{
85-
MOTION_NO_OBJECT,
84+
enum class ObjectDetectionStatus : uint8_t {
85+
MOTION_NO_OBJECT = 0u,
8686
STOPPED_OPENING_DETECTED,
8787
STOPPED_CLOSING_DETECTED,
8888
REQ_POS_NO_OBJECT

0 commit comments

Comments
 (0)