Skip to content

Commit

Permalink
Merge pull request #85 from ROBOTIS-GIT/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
ROBOTIS-David authored Oct 21, 2021
2 parents 6c8b70a + 477ae94 commit 14ca4d4
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
2 changes: 1 addition & 1 deletion library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=Dynamixel2Arduino
version=0.5.0
version=0.5.1
author=ROBOTIS
license=Apache-2.0
maintainer=Will Son([email protected])
Expand Down
11 changes: 9 additions & 2 deletions src/Dynamixel2Arduino.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1162,6 +1162,14 @@ const ModelDependencyFuncItemAndRangeInfo_t dependency_xl330_M288_M077[] PROGMEM
{LAST_DUMMY_FUNC, ControlTableItem::LAST_DUMMY_ITEM, UNIT_RAW, 0, 0, 0}
};

const ModelDependencyFuncItemAndRangeInfo_t dependency_xl430_xc430[] PROGMEM = {
#if (ENABLE_ACTUATOR_MX28_PROTOCOL2 || ENABLE_ACTUATOR_XL430 || ENABLE_ACTUATOR_XC430)
{SET_VELOCITY, GOAL_VELOCITY, UNIT_RPM, -1023, 1023, 0.229},
{GET_VELOCITY, PRESENT_VELOCITY, UNIT_RPM, -1023, 1023, 0.229},
#endif
{LAST_DUMMY_FUNC, ControlTableItem::LAST_DUMMY_ITEM, UNIT_RAW, 0, 0, 0}
};

const ModelDependencyFuncItemAndRangeInfo_t dependency_xc330_m181_m288[] PROGMEM = {
#if (ENABLE_ACTUATOR_XC330)
{SET_CURRENT, GOAL_CURRENT, UNIT_MILLI_AMPERE, -2352, 2352, 1},
Expand Down Expand Up @@ -1495,6 +1503,7 @@ static ItemAndRangeInfo_t getModelDependencyFuncInfo(uint16_t model_num, uint8_t
case XL430_W250:
case XXL430_W250:
p_common_ctable = dependency_ctable_2_0_common;
p_dep_ctable = dependency_xl430_xc430;
break;

case MX64_2:
Expand Down Expand Up @@ -1752,5 +1761,3 @@ static float f_map(float x, float in_min, float in_max, float out_min, float out
{
return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min;
}


0 comments on commit 14ca4d4

Please sign in to comment.