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
a00a83f3
Commit
a00a83f3
authored
Jan 31, 2015
by
MagoKimbra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Delta
parent
7e90c0c1
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
27 additions
and
24 deletions
+27
-24
Configuration.h
MarlinKimbra/Configuration.h
+2
-2
ConfigurationStore.cpp
MarlinKimbra/ConfigurationStore.cpp
+13
-13
Configuration_Delta.h
MarlinKimbra/Configuration_Delta.h
+5
-8
Marlin_main.cpp
MarlinKimbra/Marlin_main.cpp
+7
-1
No files found.
MarlinKimbra/Configuration.h
View file @
a00a83f3
...
...
@@ -540,9 +540,9 @@ your extruder heater takes 2 minutes to hit the target on heating.
// M502 - reverts to the default "factory settings". You still need to store them in EEPROM afterwards if you want to.
//define this to enable EEPROM support
//#define EEPROM_SETTINGS
//to disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out:
//
to disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out:
// please keep turned on if you can.
//
#define EEPROM_CHITCHAT
#define EEPROM_CHITCHAT
//========================= Bowden Filament management ======================
//#define EASY_LOAD
...
...
MarlinKimbra/ConfigurationStore.cpp
View file @
a00a83f3
...
...
@@ -142,7 +142,7 @@ void Config_StoreSettings() {
#endif //EEPROM_SETTINGS
#if
ndef DISABLE_M503
#if
def EEPROM_CHITCHAT
void
Config_PrintSettings
()
{
// Always have this function, even with EEPROM_SETTINGS disabled, the current values will be shown
SERIAL_ECHO_START
;
SERIAL_ECHOPAIR
(
"Baudrate: "
,
baudrate
);
...
...
@@ -365,7 +365,7 @@ void Config_PrintSettings() { // Always have this function, even with EEPROM_SE
}
#endif //FWRETRACT
}
#endif //
DISABLE_M503
#endif //
EEPROM_CHITCHAT
#ifdef EEPROM_SETTINGS
...
...
MarlinKimbra/Configuration_Delta.h
View file @
a00a83f3
...
...
@@ -22,24 +22,21 @@
// Horizontal offset of the universal joints on the carriages.
#define DELTA_CARRIAGE_OFFSET 20.0 // mm
// Printer radius
//
Bed
Printer radius
#define PRINTER_RADIUS 70 // mm
// Effective horizontal distance bridged by diagonal push rods.
#define DEFAULT_DELTA_RADIUS (DELTA_SMOOTH_ROD_OFFSET-DELTA_EFFECTOR_OFFSET-DELTA_CARRIAGE_OFFSET)
//Uncomment to enable autocalibration debug messages
#define DEBUG_MESSAGES
// Precision for G30 delta autocalibration function
#define AUTOCALIBRATION_PRECISION 0.1 // mm
//
Diameter of print bed - this is used to set the distance that autocalibration probes the bed at
.
#define
BED_DIAMETER 140 // 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
6
00 // Speed for individual probe Use: G30 A F600
#define PROBING_FEEDRATE
5
00 // Speed for individual probe Use: G30 A F600
#define Z_PROBE_OFFSET {0,0,-1,0} // X, Y, Z, E distance between hotend nozzle and deployed bed leveling probe.
#define Z_PROBE_DEPLOY_START_LOCATION {0,0,30,0} // X, Y, Z, E start location for z-probe deployment sequence
#define Z_PROBE_DEPLOY_END_LOCATION {0,0,30,0} // X, Y, Z, E end location for z-probe deployment sequence
...
...
@@ -108,7 +105,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic o
//Manual homing switch locations:
#define MANUAL_X_HOME_POS 0
#define MANUAL_Y_HOME_POS 0
#define MANUAL_Z_HOME_POS 2
10
// Distance between nozzle and print surface after homing.
#define MANUAL_Z_HOME_POS 2
05
// Distance between nozzle and print surface after homing.
// Travel limits after homing
#define X_MAX_POS PRINTER_RADIUS
...
...
MarlinKimbra/Marlin_main.cpp
View file @
a00a83f3
...
...
@@ -271,7 +271,7 @@ float delta_radius; // = DEFAULT_delta_radius;
float
delta_diagonal_rod
;
// = DEFAULT_DELTA_DIAGONAL_ROD;
float
DELTA_DIAGONAL_ROD_2
;
float
ac_prec
=
AUTOCALIBRATION_PRECISION
/
2
;
float
bed_radius
=
BED_DIAMETER
/
2
;
float
bed_radius
=
PRINTER_RADIUS
;
float
delta_tower1_x
,
delta_tower1_y
;
float
delta_tower2_x
,
delta_tower2_y
;
float
delta_tower3_x
,
delta_tower3_y
;
...
...
@@ -2589,6 +2589,11 @@ void process_commands()
if
(
code_seen
(
'A'
))
{
SERIAL_ECHOLN
(
"Starting Auto Calibration.."
);
LCD_MESSAGEPGM
(
"Auto Calibration..."
);
if
(
code_value
()
!=
0
)
ac_prec
=
code_value
();
SERIAL_ECHO
(
"Calibration precision: +/-"
);
SERIAL_PROTOCOL_F
(
ac_prec
,
3
);
SERIAL_ECHOLN
(
"mm"
);
//Zero the bedlevel array in case this affects bed probing
for
(
int
y
=
0
;
y
>=
6
;
y
++
)
{
...
...
@@ -2963,6 +2968,7 @@ void process_commands()
while
(
loopcount
<
iterations
);
SERIAL_ECHOLN
(
"Auto Calibration Complete"
);
LCD_MESSAGEPGM
(
"Complete"
);
SERIAL_ECHOLN
(
"Issue M500 Command to save calibration settings to EPROM (if enabled)"
);
/*
if ((abs(delta_diagonal_rod - saved_delta_diagonal_rod) > 1) and (adj_dr_allowed == true)) {
...
...
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