Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
U
ucbus-stepper
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
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
Jake Read
ucbus-stepper
Commits
9fef161d
Commit
9fef161d
authored
2 years ago
by
Jake Read
Browse files
Options
Downloads
Patches
Plain Diff
axl minors cont'd
parent
936b3d58
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
firmware/axl-stepper/src/axl
+1
-1
1 addition, 1 deletion
firmware/axl-stepper/src/axl
firmware/axl-stepper/src/main.cpp
+8
-3
8 additions, 3 deletions
firmware/axl-stepper/src/main.cpp
firmware/axl-stepper/src/osape
+1
-1
1 addition, 1 deletion
firmware/axl-stepper/src/osape
with
10 additions
and
5 deletions
axl
@
0b8fc43e
Compare
d1e3aafd
...
0b8fc43e
Subproject commit
d1e3aafd55d1fa784b6f05fce71ee70e5630b3d7
Subproject commit
0b8fc43e4c0ac860abc96a51eccc5d222ed11bb6
This diff is collapsed.
Click to expand it.
firmware/axl-stepper/src/main.cpp
+
8
−
3
View file @
9fef161d
...
...
@@ -105,13 +105,18 @@ Endpoint statesEP(&osap, "states", onStateData);
// -------------------------------------------------------- 4: Axl Queue Addition
EP_ONDATA_RESPONSES
onPlannedMoveData
(
uint8_t
*
data
,
uint16_t
len
){
EP_ONDATA_RESPONSES
onSegmentData
(
uint8_t
*
data
,
uint16_t
len
){
// careful, if you add a new field in axlPlannedSegment_t, recall you have to copy
// it manually into the buffer (!)
axlPlannedSegment_t
move
;
uint16_t
rptr
=
0
;
// location of move-in-sequence, to count continuity,
move
.
segmentNumber
=
ts_readUint32
(
data
,
&
rptr
);
// which actuator is requested to ack this mfer,
move
.
returnActuator
=
data
[
rptr
++
];
move
.
returnActuator
=
ts_readUint8
(
data
,
&
rptr
);
// is it the end of this stream ?
move
.
isLastSegment
=
ts_readBoolean
(
data
,
&
rptr
);
OSAP
::
debug
(
"segnum, isLast "
+
String
(
move
.
segmentNumber
)
+
", "
+
String
(
move
.
isLastSegment
));
// unit vector describing move's direction,
for
(
uint8_t
a
=
0
;
a
<
AXL_NUM_DOF
;
a
++
){
move
.
unitVector
.
axis
[
a
]
=
ts_readFloat32
(
data
,
&
rptr
);
...
...
@@ -128,7 +133,7 @@ EP_ONDATA_RESPONSES onPlannedMoveData(uint8_t* data, uint16_t len){
return
EP_ONDATA_REJECT
;
}
Endpoint
precalculatedMoveEP
(
&
osap
,
"
plannedMovesIn"
,
onPlannedMove
Data
);
Endpoint
precalculatedMoveEP
(
&
osap
,
"
segmentsIn"
,
onSegment
Data
);
// -------------------------------------------------------- 5: Halt Input
...
...
This diff is collapsed.
Click to expand it.
osape
@
02d0a15f
Compare
d523fa27
...
02d0a15f
Subproject commit
d523fa272285385edd6f2f9aff1c6abbf5a6d439
Subproject commit
02d0a15f90372e1f15f37ca4e0882b956d2eec70
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