Skip to content

Commit fd01361

Browse files
committed
Fixed build error on ARM Cortex-M based Arduino boards.
1 parent 022a601 commit fd01361

3 files changed

Lines changed: 12 additions & 18 deletions

File tree

src/Dynamixel2Arduino.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -610,10 +610,10 @@ bool Dynamixel2Arduino::setLedState(uint8_t id, bool state)
610610
case PRO_M54P_040_S250_R:
611611
case PRO_M54P_060_S250_R:
612612
if (state == false) {
613-
writeControlTableItem(ControlTableItem::LED_GREEN, id, state);
614-
writeControlTableItem(ControlTableItem::LED_BLUE, id, state);
613+
writeControlTableItem(ControlTableItem::DXL_LED_GREEN, id, state);
614+
writeControlTableItem(ControlTableItem::DXL_LED_BLUE, id, state);
615615
}
616-
ret = writeControlTableItem(ControlTableItem::LED_RED, id, state);
616+
ret = writeControlTableItem(ControlTableItem::DXL_LED_RED, id, state);
617617
break;
618618

619619
default:

src/actuator.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -319,9 +319,9 @@ const ModelControlTableInfo_t pro_r_control_table[] PROGMEM = {
319319
{ControlTableItem::SHUTDOWN, 48, 1},
320320

321321
{ControlTableItem::TORQUE_ENABLE, 562, 1},
322-
{ControlTableItem::LED_RED, 563, 1},
323-
{ControlTableItem::LED_GREEN, 564, 1},
324-
{ControlTableItem::LED_BLUE, 565, 1},
322+
{ControlTableItem::DXL_LED_RED, 563, 1},
323+
{ControlTableItem::DXL_LED_GREEN, 564, 1},
324+
{ControlTableItem::DXL_LED_BLUE, 565, 1},
325325
{ControlTableItem::VELOCITY_I_GAIN, 586, 2},
326326
{ControlTableItem::VELOCITY_P_GAIN, 588, 2},
327327
{ControlTableItem::POSITION_P_GAIN, 594, 2},
@@ -377,9 +377,9 @@ const ModelControlTableInfo_t pro_ra_pro_plus_control_table[] PROGMEM = {
377377
{ControlTableItem::SHUTDOWN, 63, 1},
378378

379379
{ControlTableItem::TORQUE_ENABLE, 512, 1},
380-
{ControlTableItem::LED_RED, 513, 1},
381-
{ControlTableItem::LED_GREEN, 514, 1},
382-
{ControlTableItem::LED_BLUE, 515, 1},
380+
{ControlTableItem::DXL_LED_RED, 513, 1},
381+
{ControlTableItem::DXL_LED_GREEN, 514, 1},
382+
{ControlTableItem::DXL_LED_BLUE, 515, 1},
383383
{ControlTableItem::STATUS_RETURN_LEVEL, 516, 1},
384384
{ControlTableItem::REGISTERED_INSTRUCTION, 517, 1},
385385
{ControlTableItem::HARDWARE_ERROR_STATUS, 518, 1},

src/actuator.h

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,6 @@
77
#define DXL_TORQUE_ON 1
88
#define DXL_TORQUE_OFF 0
99

10-
#if defined(ARDUINO_UNOR4_WIFI) || defined(ARDUINO_MINIMA) || defined(ARDUINO_ARCH_STM32)
11-
#undef LED_RED
12-
#undef LED_GREEN
13-
#undef LED_BLUE
14-
#endif
15-
1610
// The reason for checking #ifndef here is to avoid conflict with Dynamixel SDK.
1711
#ifndef AX12A
1812
#define AX12A (uint16_t)12
@@ -338,9 +332,9 @@ namespace ControlTableItem{
338332

339333
TORQUE_ENABLE,
340334
LED,
341-
LED_RED,
342-
LED_GREEN,
343-
LED_BLUE,
335+
DXL_LED_RED,
336+
DXL_LED_GREEN,
337+
DXL_LED_BLUE,
344338
REGISTERED_INSTRUCTION,
345339
HARDWARE_ERROR_STATUS,
346340
VELOCITY_P_GAIN,

0 commit comments

Comments
 (0)