Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
stm32_libraries
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
humanoides
tools
stm32_libraries
Commits
6dae8ea5
Commit
6dae8ea5
authored
5 years ago
by
Sergi Hernandez
Browse files
Options
Downloads
Patches
Plain Diff
Solved a bug in the store of the joint motion data (the RAM offset was wrong).
parent
fd803995
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dynamixel_manager/include/modules/joint_motion_registers.h
+2
-2
2 additions, 2 deletions
dynamixel_manager/include/modules/joint_motion_registers.h
dynamixel_manager/src/modules/joint_motion.c
+1
-1
1 addition, 1 deletion
dynamixel_manager/src/modules/joint_motion.c
with
3 additions
and
3 deletions
dynamixel_manager/include/modules/joint_motion_registers.h
+
2
−
2
View file @
6dae8ea5
...
...
@@ -9,8 +9,8 @@
#define JOINT_MOTION_RUNNING 0x80
#define JOINT_MOTION_GROUP_SERVOS_OFFSET NUM_JOINT_GROUPS
#define JOINT_MOTION_SERVO_ANGLES_OFFSET (5*NUM_JOINT_GROUPS)
#define JOINT_MOTION_SERVO_SPEEDS_OFFSET (5*NUM_JOINT_GROUPS)+DYN_MANAGER_MAX_NUM_DEVICES*2
#define JOINT_MOTION_SERVO_ACCELS_OFFSET (5*NUM_JOINT_GROUPS)+DYN_MANAGER_MAX_NUM_DEVICES*3
#define JOINT_MOTION_SERVO_SPEEDS_OFFSET
(
(5*NUM_JOINT_GROUPS)+DYN_MANAGER_MAX_NUM_DEVICES*2
)
#define JOINT_MOTION_SERVO_ACCELS_OFFSET
(
(5*NUM_JOINT_GROUPS)+DYN_MANAGER_MAX_NUM_DEVICES*3
)
#endif
This diff is collapsed.
Click to expand it.
dynamixel_manager/src/modules/joint_motion.c
+
1
−
1
View file @
6dae8ea5
...
...
@@ -19,7 +19,7 @@ void joint_motion_write_cmd(TJointMModule *module,unsigned short int address,uns
ram_offset
=
address
-
module
->
ram_base_address
;
for
(
i
=
0
;
i
<
DYN_MANAGER_MAX_NUM_DEVICES
*
4
;
i
++
)
if
(
ram_in_range
(
module
->
ram_base_address
+
JOINT_MOTION_SERVO_ANGLES_OFFSET
+
i
,
address
,
length
))
module
->
memory
->
data
[
i
]
=
data
[
JOINT_MOTION_SERVO_ANGLES_OFFSET
+
i
-
ram_offset
];
module
->
memory
->
data
[
module
->
ram_base_address
+
JOINT_MOTION_SERVO_ANGLES_OFFSET
+
i
]
=
data
[
JOINT_MOTION_SERVO_ANGLES_OFFSET
+
i
-
ram_offset
];
// group servos
for
(
j
=
0
;
j
<
NUM_JOINT_GROUPS
;
j
++
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment