Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
MarlinKimbra
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
machinery
MarlinKimbra
Commits
1a251e0c
Commit
1a251e0c
authored
Mar 17, 2015
by
MagoKimbra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update
parent
2f44269f
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
75 additions
and
76 deletions
+75
-76
pins.h
MarlinKimbra/pins.h
+72
-72
stepper.cpp
MarlinKimbra/stepper.cpp
+3
-4
No files found.
MarlinKimbra/pins.h
View file @
1a251e0c
...
...
@@ -2026,7 +2026,7 @@
/* On some broken versions of the Sanguino libraries the pin definitions are wrong, which then needs SDSS as pin 24. But you better upgrade your Sanguino libraries! See #368. */
//#define SDSS 24
#ifdef ULTRA_LCD
#ifdef ULTRA_LCD
#ifdef NEWPANEL
//we have no buzzer installed
#define BEEPER -1
...
...
@@ -2076,9 +2076,9 @@
#define SDCARDDETECT -1
#endif //Newpanel
#endif //Ultipanel
#endif //ULTRA_LCD
#ifdef MAKRPANEL
#ifdef MAKRPANEL
#define BEEPER 29
// Pins for DOGM SPI LCD Support
#define DOGLCD_A0 30
...
...
@@ -2097,7 +2097,7 @@
#define BTN_ENC 16 //the click switch
//not connected to a pin
#define SDCARDDETECT -1
#endif //Makrpanel
#endif //Makrpanel
#endif // SANGUINOLOLU_11
/****************************************************************************************/
...
...
MarlinKimbra/stepper.cpp
View file @
1a251e0c
...
...
@@ -596,10 +596,10 @@ ISR(TIMER1_COMPA_vect) {
#endif
#define STEP_IF_COUNTER(axis, AXIS) \
if (counter_## axis > 0) {
if (counter_## axis > 0) {
\
counter_## axis -= current_block->step_event_count; \
count_position[AXIS ##_AXIS] += count_direction[AXIS ##_AXIS]; \
AXIS
##
_STEP_WRITE
(
LOW
);
AXIS ##_STEP_WRITE(LOW);
\
}
STEP_IF_COUNTER
(
x
,
X
);
...
...
@@ -711,7 +711,7 @@ ISR(TIMER1_COMPA_vect) {
// Set E direction (Depends on E direction + advance)
for
(
unsigned
char
i
=
0
;
i
<
4
;
i
++
)
{
if
(
e_steps
[
0
]
!=
0
)
{
E0_STEP_WRITE
(
INVERT_E_STEP_PIN
);
E0_STEP_WRITE
(
INVERT_E_STEP_PIN
);
if
(
e_steps
[
0
]
<
0
)
{
E0_DIR_WRITE
(
INVERT_E0_DIR
);
e_steps
[
0
]
++
;
...
...
@@ -786,7 +786,6 @@ void st_init() {
L6470_init
();
#endif
// Initialize Dir Pins
#if defined(X_DIR_PIN) && X_DIR_PIN >= 0
X_DIR_INIT
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment