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
b7003494
Commit
b7003494
authored
9 years ago
by
MagoKimbra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update autobed level for DELTA
parent
3fc90cbf
master
dev
k40_flow_cooler
k40_noflow_nocooler
nextime
No related merge requests found
Changes
7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
241 additions
and
264 deletions
+241
-264
Configuration.h
MarlinKimbra/Configuration.h
+4
-4
Configuration_Delta.h
MarlinKimbra/Configuration_Delta.h
+2
-7
Marlin.h
MarlinKimbra/Marlin.h
+1
-0
Marlin_main.cpp
MarlinKimbra/Marlin_main.cpp
+217
-244
conditionals.h
MarlinKimbra/conditionals.h
+8
-0
configuration_store.cpp
MarlinKimbra/configuration_store.cpp
+1
-1
language.h
MarlinKimbra/language.h
+8
-8
No files found.
MarlinKimbra/Configuration.h
View file @
b7003494
...
...
@@ -27,11 +27,11 @@
// User-specified version info of this build to display in [Pronterface, etc] terminal window during
// startup. Implementation of an idea by Prof Braino to inform user that any changes made to this
// build by the user have been successfully uploaded into firmware.
#define
STRING_VERSION "4.1.3
"
#define STRING_
VERSION_CONFIG_H __DATE__ " " __TIME__
// build date and time
#define
BUILD_VERSION "4.1.3 dev
"
#define STRING_
DISTRIBUTION_DATE __DATE__ " " __TIME__
// build date and time
#define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes.
#define STRING_SPLASH_LINE1 "v"
STRING_VERSION
// will be shown during bootup in line 1
#define STRING_SPLASH_LINE2 STRING_
VERSION_CONFIG_H
// will be shown during bootup in line 2
#define STRING_SPLASH_LINE1 "v"
BUILD_VERSION
// will be shown during bootup in line 1
#define STRING_SPLASH_LINE2 STRING_
DISTRIBUTION_DATE
// will be shown during bootup in line 2
// SERIAL_PORT selects which serial port should be used for communication with the host.
// This allows the connection of wireless adapters (for instance) to non-default port pins.
...
...
This diff is collapsed.
Click to expand it.
MarlinKimbra/Configuration_Delta.h
View file @
b7003494
...
...
@@ -31,15 +31,9 @@
//Uncomment to enable autocalibration debug messages
#define DEBUG_MESSAGES
//Amount to lift head after probing a point
#define AUTOCAL_PROBELIFT 3 // mm
// Precision for G30 delta autocalibration function
#define AUTOCALIBRATION_PRECISION 0.1 // mm
// Effective horizontal distance bridged by diagonal push rods.
#define DEFAULT_DELTA_RADIUS (DELTA_SMOOTH_ROD_OFFSET-DELTA_EFFECTOR_OFFSET-DELTA_CARRIAGE_OFFSET)
// Z-Probe variables
// Start and end location values are used to deploy/retract the probe (will move from start to end and back again)
#define PROBING_FEEDRATE 1000 // Speed in mm/min for individual probe Use: G30 A F600
...
...
@@ -48,8 +42,9 @@
#define Z_PROBE_DEPLOY_END_LOCATION {0, 0, 30, 0} // X, Y, Z, E end location for z-probe deployment sequence
#define Z_PROBE_RETRACT_START_LOCATION {0, 0, 30, 0} // X, Y, Z, E start location for z-probe retract sequence
#define Z_PROBE_RETRACT_END_LOCATION {0, 0, 30, 0} // X, Y, Z, E end location for z-probe retract sequence
#define Z_RAISE_BETWEEN_PROBINGS
2 // How much the extruder
will be raised when travelling from between next probing points
#define Z_RAISE_BETWEEN_PROBINGS
3 // How much the nozzle
will be raised when travelling from between next probing points
#define AUTOLEVEL_GRID 20 // Distance between autolevel Z probing points, should be less than print surface radius/3.
#define AUTO_BED_LEVELING_GRID_POINTS 9 // Works best with ACCURATE_BED_LEVELING_POINTS 5 or higher.
//===========================================================================
//=============================Mechanical Settings===========================
...
...
This diff is collapsed.
Click to expand it.
MarlinKimbra/Marlin.h
View file @
b7003494
...
...
@@ -165,6 +165,7 @@ void ok_to_send();
void
save_carriage_positions
(
int
position_num
);
void
calculate_delta
(
float
cartesian
[
3
]);
void
adjust_delta
(
float
cartesian
[
3
]);
void
reset_bed_level
();
void
prepare_move_raw
();
extern
float
delta
[
3
];
extern
float
delta_tmp
[
3
];
...
...
This diff is collapsed.
Click to expand it.
MarlinKimbra/Marlin_main.cpp
View file @
b7003494
This diff is collapsed.
Click to expand it.
MarlinKimbra/conditionals.h
View file @
b7003494
...
...
@@ -332,6 +332,14 @@
#undef Z_HOME_BUMP_MM
#define Y_HOME_BUMP_MM X_HOME_BUMP_MM
#define Z_HOME_BUMP_MM X_HOME_BUMP_MM
// Effective horizontal distance bridged by diagonal push rods.
#define DEFAULT_DELTA_RADIUS (DELTA_SMOOTH_ROD_OFFSET-DELTA_EFFECTOR_OFFSET-DELTA_CARRIAGE_OFFSET)
#define DELTA_PROBABLE_RADIUS (PRINTER_RADIUS - 10)
#define LEFT_PROBE_BED_POSITION -DELTA_PROBABLE_RADIUS
#define RIGHT_PROBE_BED_POSITION DELTA_PROBABLE_RADIUS
#define FRONT_PROBE_BED_POSITION -DELTA_PROBABLE_RADIUS
#define BACK_PROBE_BED_POSITION DELTA_PROBABLE_RADIUS
#endif
/**
...
...
This diff is collapsed.
Click to expand it.
MarlinKimbra/configuration_store.cpp
View file @
b7003494
...
...
@@ -490,7 +490,7 @@ void Config_ResetDefault() {
home_offset
[
X_AXIS
]
=
home_offset
[
Y_AXIS
]
=
home_offset
[
Z_AXIS
]
=
0
;
#ifdef ENABLE_AUTO_BED_LEVELING
zprobe_zoffset
=
-
Z_PROBE_OFFSET_FROM_EXTRUDER
;
zprobe_zoffset
=
Z_PROBE_OFFSET_FROM_EXTRUDER
;
#elif !defined(DELTA)
zprobe_zoffset
=
0
;
#endif
...
...
This diff is collapsed.
Click to expand it.
MarlinKimbra/language.h
View file @
b7003494
...
...
@@ -65,7 +65,7 @@
#endif
#ifndef BUILD_VERSION
#define BUILD_VERSION "V
4;
"
#define BUILD_VERSION "V
1; Sprinter/grbl mashup for gen6
"
#endif
#ifndef MACHINE_UUID
...
...
@@ -88,13 +88,14 @@
#define MSG_ENQUEUEING "enqueueing \""
#define MSG_POWERUP "PowerUp"
#define MSG_EXTERNAL_RESET "
External Reset"
#define MSG_BROWNOUT_RESET "
Brown out Reset"
#define MSG_WATCHDOG_RESET "
Watchdog Reset"
#define MSG_SOFTWARE_RESET "
Software Reset"
#define MSG_EXTERNAL_RESET "External Reset"
#define MSG_BROWNOUT_RESET "Brown out Reset"
#define MSG_WATCHDOG_RESET "Watchdog Reset"
#define MSG_SOFTWARE_RESET "Software Reset"
#define MSG_AUTHOR " | Author: "
#define MSG_CONFIGURATION_VER " Last Updated: "
#define MSG_FREE_MEMORY " Free Memory: "
#define MSG_CONFIGURATION_VER "Last Updated: "
#define MSG_COMPILED "Compiled: "
#define MSG_FREE_MEMORY "Free Memory: "
#define MSG_PLANNER_BUFFER_BYTES " PlannerBufferBytes: "
#define MSG_FILE_SAVED "Done saving file."
#define MSG_ERR_LINE_NO "Line Number is not Last Line Number+1, Last Line: "
...
...
@@ -233,7 +234,6 @@
#define MSG_ENDSTOP_ES "E"
//other
#define MSG_COMPILED "Compiled: "
#define MSG_ERR_HOMING_DIV "The Homing Bump Feedrate Divisor cannot be less than 1"
#define MSG_BED_LEVELLING_BED "Bed"
#define MSG_BED_LEVELLING_X " X: "
...
...
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