Skip to content

Commit 14ca4d4

Browse files
Merge pull request #85 from ROBOTIS-GIT/develop
Develop
2 parents 6c8b70a + 477ae94 commit 14ca4d4

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

library.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=Dynamixel2Arduino
2-
version=0.5.0
2+
version=0.5.1
33
author=ROBOTIS
44
license=Apache-2.0
55
maintainer=Will Son([email protected])

src/Dynamixel2Arduino.cpp

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1162,6 +1162,14 @@ const ModelDependencyFuncItemAndRangeInfo_t dependency_xl330_M288_M077[] PROGMEM
11621162
{LAST_DUMMY_FUNC, ControlTableItem::LAST_DUMMY_ITEM, UNIT_RAW, 0, 0, 0}
11631163
};
11641164

1165+
const ModelDependencyFuncItemAndRangeInfo_t dependency_xl430_xc430[] PROGMEM = {
1166+
#if (ENABLE_ACTUATOR_MX28_PROTOCOL2 || ENABLE_ACTUATOR_XL430 || ENABLE_ACTUATOR_XC430)
1167+
{SET_VELOCITY, GOAL_VELOCITY, UNIT_RPM, -1023, 1023, 0.229},
1168+
{GET_VELOCITY, PRESENT_VELOCITY, UNIT_RPM, -1023, 1023, 0.229},
1169+
#endif
1170+
{LAST_DUMMY_FUNC, ControlTableItem::LAST_DUMMY_ITEM, UNIT_RAW, 0, 0, 0}
1171+
};
1172+
11651173
const ModelDependencyFuncItemAndRangeInfo_t dependency_xc330_m181_m288[] PROGMEM = {
11661174
#if (ENABLE_ACTUATOR_XC330)
11671175
{SET_CURRENT, GOAL_CURRENT, UNIT_MILLI_AMPERE, -2352, 2352, 1},
@@ -1495,6 +1503,7 @@ static ItemAndRangeInfo_t getModelDependencyFuncInfo(uint16_t model_num, uint8_t
14951503
case XL430_W250:
14961504
case XXL430_W250:
14971505
p_common_ctable = dependency_ctable_2_0_common;
1506+
p_dep_ctable = dependency_xl430_xc430;
14981507
break;
14991508

15001509
case MX64_2:
@@ -1752,5 +1761,3 @@ static float f_map(float x, float in_min, float in_max, float out_min, float out
17521761
{
17531762
return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min;
17541763
}
1755-
1756-

0 commit comments

Comments
 (0)