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
ff4ec79f
Commit
ff4ec79f
authored
9 years ago
by
MagoKimbra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix LCD contrast
parent
6ee6b319
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
5 deletions
+6
-5
conditionals.h
MarlinKimbra/conditionals.h
+1
-0
configuration_store.cpp
MarlinKimbra/configuration_store.cpp
+1
-1
planner.cpp
MarlinKimbra/planner.cpp
+4
-4
No files found.
MarlinKimbra/conditionals.h
View file @
ff4ec79f
...
@@ -392,6 +392,7 @@
...
@@ -392,6 +392,7 @@
#define DOUBLE_STEP_FREQUENCY MAX_STEP_FREQUENCY
#define DOUBLE_STEP_FREQUENCY MAX_STEP_FREQUENCY
#else
#else
#define MAX_STEP_FREQUENCY 40000 // Max step frequency for Arduino mega
#define MAX_STEP_FREQUENCY 40000 // Max step frequency for Arduino mega
#define DOUBLE_STEP_FREQUENCY 10000
#endif
#endif
#endif
#endif
...
...
This diff is collapsed.
Click to expand it.
MarlinKimbra/configuration_store.cpp
View file @
ff4ec79f
...
@@ -513,7 +513,7 @@ void Config_ResetDefault() {
...
@@ -513,7 +513,7 @@ void Config_ResetDefault() {
gumPreheatFanSpeed
=
GUM_PREHEAT_FAN_SPEED
;
gumPreheatFanSpeed
=
GUM_PREHEAT_FAN_SPEED
;
#endif
#endif
#if
def
HAS_LCD_CONTRAST
#if HAS_LCD_CONTRAST
lcd_contrast
=
DEFAULT_LCD_CONTRAST
;
lcd_contrast
=
DEFAULT_LCD_CONTRAST
;
#endif //DOGLCD
#endif //DOGLCD
...
...
This diff is collapsed.
Click to expand it.
MarlinKimbra/planner.cpp
View file @
ff4ec79f
...
@@ -503,7 +503,7 @@ float junction_deviation = 0.1;
...
@@ -503,7 +503,7 @@ float junction_deviation = 0.1;
long
target
[
NUM_AXIS
];
long
target
[
NUM_AXIS
];
target
[
X_AXIS
]
=
lround
(
x
*
axis_steps_per_unit
[
X_AXIS
]);
target
[
X_AXIS
]
=
lround
(
x
*
axis_steps_per_unit
[
X_AXIS
]);
target
[
Y_AXIS
]
=
lround
(
y
*
axis_steps_per_unit
[
Y_AXIS
]);
target
[
Y_AXIS
]
=
lround
(
y
*
axis_steps_per_unit
[
Y_AXIS
]);
target
[
Z_AXIS
]
=
lround
(
z
*
axis_steps_per_unit
[
Z_AXIS
]);
target
[
Z_AXIS
]
=
lround
(
z
*
axis_steps_per_unit
[
Z_AXIS
]);
target
[
E_AXIS
]
=
lround
(
e
*
axis_steps_per_unit
[
E_AXIS
+
extruder
]);
target
[
E_AXIS
]
=
lround
(
e
*
axis_steps_per_unit
[
E_AXIS
+
extruder
]);
// If changing extruder have to recalculate current position based on
// If changing extruder have to recalculate current position based on
...
@@ -1000,11 +1000,9 @@ float junction_deviation = 0.1;
...
@@ -1000,11 +1000,9 @@ float junction_deviation = 0.1;
// block nominal speed limits both the current and next maximum junction speeds. Hence, in both
// block nominal speed limits both the current and next maximum junction speeds. Hence, in both
// the reverse and forward planners, the corresponding block junction speed will always be at the
// the reverse and forward planners, the corresponding block junction speed will always be at the
// the maximum junction speed and may always be ignored for any speed reduction checks.
// the maximum junction speed and may always be ignored for any speed reduction checks.
block
->
nominal_length_flag
=
(
block
->
nominal_speed
<=
v_allowable
);
block
->
nominal_length_flag
=
(
block
->
nominal_speed
<=
v_allowable
);
block
->
recalculate_flag
=
true
;
// Always calculate trapezoid for new block
block
->
recalculate_flag
=
true
;
// Always calculate trapezoid for new block
calculate_trapezoid_for_block
(
block
,
block
->
entry_speed
/
block
->
nominal_speed
,
safe_speed
/
block
->
nominal_speed
);
// Update previous path unit_vector and nominal speed
// Update previous path unit_vector and nominal speed
memcpy
(
previous_speed
,
current_speed
,
sizeof
(
previous_speed
));
// previous_speed[] = current_speed[]
memcpy
(
previous_speed
,
current_speed
,
sizeof
(
previous_speed
));
// previous_speed[] = current_speed[]
previous_nominal_speed
=
block
->
nominal_speed
;
previous_nominal_speed
=
block
->
nominal_speed
;
...
@@ -1027,6 +1025,8 @@ float junction_deviation = 0.1;
...
@@ -1027,6 +1025,8 @@ float junction_deviation = 0.1;
*/
*/
#endif // ADVANCE
#endif // ADVANCE
calculate_trapezoid_for_block
(
block
,
block
->
entry_speed
/
block
->
nominal_speed
,
safe_speed
/
block
->
nominal_speed
);
// Move buffer head
// Move buffer head
block_buffer_head
=
next_buffer_head
;
block_buffer_head
=
next_buffer_head
;
...
...
This diff is collapsed.
Click to expand it.
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