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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jake Read
ucbus-stepper
Commits
2966b169
Commit
2966b169
authored
3 years ago
by
Jake Read
Browse files
Options
Downloads
Patches
Plain Diff
home in bus interrupt
parent
a5cd7d25
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
firmware/stepper-drop/src/main.cpp
+6
-4
6 additions, 4 deletions
firmware/stepper-drop/src/main.cpp
firmware/stepper-drop/src/osape-d51
+1
-1
1 addition, 1 deletion
firmware/stepper-drop/src/osape-d51
with
7 additions
and
5 deletions
firmware/stepper-drop/src/main.cpp
+
6
−
4
View file @
2966b169
...
@@ -119,8 +119,6 @@ void loop() {
...
@@ -119,8 +119,6 @@ void loop() {
osapLoop
();
osapLoop
();
stepper_hw
->
dacRefresh
();
stepper_hw
->
dacRefresh
();
limitHit
()
?
ERRLIGHT_ON
:
ERRLIGHT_OFF
;
limitHit
()
?
ERRLIGHT_ON
:
ERRLIGHT_OFF
;
// home statemachine
if
(
getHomeState
()
!=
HOMESTATE_NONE
)
runHomingRoutine
();
}
// end loop
}
// end loop
// -------------------------------------------------------- BUS INTERRUPT / STEP
// -------------------------------------------------------- BUS INTERRUPT / STEP
...
@@ -138,10 +136,14 @@ void ucBusDrop_onPacketARx(uint8_t* inBufferA, volatile uint16_t len){
...
@@ -138,10 +136,14 @@ void ucBusDrop_onPacketARx(uint8_t* inBufferA, volatile uint16_t len){
}
}
void
ucBusDrop_onRxISR
(
void
){
void
ucBusDrop_onRxISR
(
void
){
// if we're currently homing the motor, bail
// home statemachine
if
(
getHomeState
()
!=
HOMESTATE_NONE
){
runHomingRoutine
();
return
;
}
// if we dont' have valid steps, bail
// if we dont' have valid steps, bail
if
(
!
stepValid
)
return
;
if
(
!
stepValid
)
return
;
// if we're currently homing the motor, bail
if
(
getHomeState
()
!=
HOMESTATE_NONE
)
return
;
// extract our step mask
// extract our step mask
stepMask
=
0b00000011
&
(
stepCache
[
cachePtr
]
>>
(
axisPick
*
2
));
stepMask
=
0b00000011
&
(
stepCache
[
cachePtr
]
>>
(
axisPick
*
2
));
// mask -> step api:
// mask -> step api:
...
...
This diff is collapsed.
Click to expand it.
osape-d51
@
f33baa5f
Compare
53c513f4
...
f33baa5f
Subproject commit
53c513f461e43ac61d13d0111127b3f174fef466
Subproject commit
f33baa5ff96067f3474518abdd5f7d44712c6121
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