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
11ff6f80
Commit
11ff6f80
authored
Dec 06, 2014
by
MagoKimbra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add TOSHIBA DRIVERS + lcd menu for stepper extruder
parent
7598ccf2
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
77 additions
and
7 deletions
+77
-7
Configuration_adv.h
MarlinKimbra/Configuration_adv.h
+5
-3
language.h
MarlinKimbra/language.h
+8
-2
stepper.cpp
MarlinKimbra/stepper.cpp
+54
-1
ultralcd.cpp
MarlinKimbra/ultralcd.cpp
+10
-1
No files found.
MarlinKimbra/Configuration_adv.h
View file @
11ff6f80
...
...
@@ -78,7 +78,7 @@
#define EXTRUDER_0_AUTO_FAN_PIN -1
#define EXTRUDER_1_AUTO_FAN_PIN -1
#define EXTRUDER_2_AUTO_FAN_PIN -1
#define EXTRUDER_AUTO_FAN_TEMPERATURE
1
50
#define EXTRUDER_AUTO_FAN_TEMPERATURE 50
#define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed
...
...
@@ -223,9 +223,11 @@
//#define QUICK_HOME //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially.
#define AXIS_RELATIVE_MODES {false, false, false, false}
#ifdef CONFIG_STEPPERS_TOSHIBA
#define MAX_STEP_FREQUENCY 10000 // Max step frequency for Toshiba Stepper Controllers
#else
#define MAX_STEP_FREQUENCY 40000 // Max step frequency for Ultimaker (5000 pps / half step)
#endif
//By default pololu step drivers require an active high signal. However, some high power drivers require an active low signal as step.
#define INVERT_X_STEP_PIN false
#define INVERT_Y_STEP_PIN false
...
...
MarlinKimbra/language.h
View file @
11ff6f80
...
...
@@ -239,7 +239,10 @@
#define MSG_XSTEPS "Xsteps/mm"
#define MSG_YSTEPS "Ysteps/mm"
#define MSG_ZSTEPS "Zsteps/mm"
#define MSG_ESTEPS "Esteps/mm"
#define MSG_E0STEPS "E0steps/mm"
#define MSG_E1STEPS "E1steps/mm"
#define MSG_E2STEPS "E2steps/mm"
#define MSG_E3STEPS "E3steps/mm"
#define MSG_RECTRACT "Rectract"
#define MSG_TEMPERATURE "Temperature"
#define MSG_MOTION "Motion"
...
...
@@ -1062,7 +1065,10 @@
#define MSG_XSTEPS "Xpassi/mm"
#define MSG_YSTEPS "Ypassi/mm"
#define MSG_ZSTEPS "Zpassi/mm"
#define MSG_ESTEPS "Epassi/mm"
#define MSG_E0STEPS "E0steps/mm"
#define MSG_E1STEPS "E1steps/mm"
#define MSG_E2STEPS "E2steps/mm"
#define MSG_E3STEPS "E3steps/mm"
#define MSG_RECTRACT "Ritrai"
#define MSG_TEMPERATURE "Temperatura"
#define MSG_MOTION "Movimento"
...
...
MarlinKimbra/stepper.cpp
View file @
11ff6f80
...
...
@@ -631,7 +631,59 @@ ISR(TIMER1_COMPA_vect)
}
#endif //ADVANCE
counter_x
+=
current_block
->
steps_x
;
counter_x
+=
current_block
->
steps_x
;
#ifdef CONFIG_STEPPERS_TOSHIBA
/* The toshiba stepper controller require much longer pulses
* tjerfore we 'stage' decompose the pulses between high, and
* low instead of doing each in turn. The extra tests add enough
* lag to allow it work with without needing NOPs */
if
(
counter_x
>
0
)
{
WRITE
(
X_STEP_PIN
,
HIGH
);
}
counter_y
+=
current_block
->
steps_y
;
if
(
counter_y
>
0
)
{
WRITE
(
Y_STEP_PIN
,
HIGH
);
}
counter_z
+=
current_block
->
steps_z
;
if
(
counter_z
>
0
)
{
WRITE
(
Z_STEP_PIN
,
HIGH
);
}
#ifndef ADVANCE
counter_e
+=
current_block
->
steps_e
;
if
(
counter_e
>
0
)
{
WRITE_E_STEP
(
HIGH
);
}
#endif //!ADVANCE
if
(
counter_x
>
0
)
{
counter_x
-=
current_block
->
step_event_count
;
count_position
[
X_AXIS
]
+=
count_direction
[
X_AXIS
];
WRITE
(
X_STEP_PIN
,
LOW
);
}
if
(
counter_y
>
0
)
{
counter_y
-=
current_block
->
step_event_count
;
count_position
[
Y_AXIS
]
+=
count_direction
[
Y_AXIS
];
WRITE
(
Y_STEP_PIN
,
LOW
);
}
if
(
counter_z
>
0
)
{
counter_z
-=
current_block
->
step_event_count
;
count_position
[
Z_AXIS
]
+=
count_direction
[
Z_AXIS
];
WRITE
(
Z_STEP_PIN
,
LOW
);
}
#ifndef ADVANCE
if
(
counter_e
>
0
)
{
counter_e
-=
current_block
->
step_event_count
;
count_position
[
E_AXIS
]
+=
count_direction
[
E_AXIS
];
WRITE_E_STEP
(
LOW
);
}
#endif //!ADVANCE
#else
if
(
counter_x
>
0
)
{
#ifdef DUAL_X_CARRIAGE
if
(
extruder_duplication_enabled
){
...
...
@@ -708,6 +760,7 @@ ISR(TIMER1_COMPA_vect)
WRITE_E_STEP
(
INVERT_E_STEP_PIN
);
}
#endif //!ADVANCE
#endif // CONFIG_STEPPERS_TOSHIBA
step_events_completed
+=
1
;
if
(
step_events_completed
>=
current_block
->
step_event_count
)
break
;
}
...
...
MarlinKimbra/ultralcd.cpp
View file @
11ff6f80
...
...
@@ -1118,7 +1118,16 @@ static void lcd_control_motion_menu()
MENU_ITEM_EDIT
(
float52
,
MSG_XSTEPS
,
&
axis_steps_per_unit
[
X_AXIS
],
5
,
9999
);
MENU_ITEM_EDIT
(
float52
,
MSG_YSTEPS
,
&
axis_steps_per_unit
[
Y_AXIS
],
5
,
9999
);
MENU_ITEM_EDIT
(
float51
,
MSG_ZSTEPS
,
&
axis_steps_per_unit
[
Z_AXIS
],
5
,
9999
);
MENU_ITEM_EDIT
(
float51
,
MSG_ESTEPS
,
&
axis_steps_per_unit
[
active_extruder
+
3
],
5
,
9999
);
MENU_ITEM_EDIT
(
float51
,
MSG_E0STEPS
,
&
axis_steps_per_unit
[
3
],
5
,
9999
);
#if EXTRUDERS > 1
MENU_ITEM_EDIT
(
float51
,
MSG_E1STEPS
,
&
axis_steps_per_unit
[
4
],
5
,
9999
);
#endif
#if EXTRUDERS > 2
MENU_ITEM_EDIT
(
float51
,
MSG_E2STEPS
,
&
axis_steps_per_unit
[
5
],
5
,
9999
);
#endif
#if EXTRUDERS > 3
MENU_ITEM_EDIT
(
float51
,
MSG_E3STEPS
,
&
axis_steps_per_unit
[
6
],
5
,
9999
);
#endif
#ifdef ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
MENU_ITEM_EDIT
(
bool
,
MSG_ENDSTOP_ABORT
,
&
abort_on_endstop_hit
);
#endif
...
...
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