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
800c174a
Commit
800c174a
authored
Jan 02, 2015
by
MagoKimbra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Pid_BED
parent
2efb5870
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
16 deletions
+17
-16
Configuration_Cartesian.h
MarlinKimbra/Configuration_Cartesian.h
+3
-2
Configuration_Delta.h
MarlinKimbra/Configuration_Delta.h
+12
-12
temperature.cpp
MarlinKimbra/temperature.cpp
+2
-2
No files found.
MarlinKimbra/Configuration_Cartesian.h
View file @
800c174a
...
@@ -141,9 +141,10 @@ const bool Z_MAX_ENDSTOP_INVERTING = false; // set to true to invert the lo
...
@@ -141,9 +141,10 @@ const bool Z_MAX_ENDSTOP_INVERTING = false; // set to true to invert the lo
// these are the offsets to the probe relative to the extruder tip (Hotend - Probe)
// these are the offsets to the probe relative to the extruder tip (Hotend - Probe)
// X and Y offsets must be integers
#define X_PROBE_OFFSET_FROM_EXTRUDER 0
#define X_PROBE_OFFSET_FROM_EXTRUDER 0
#define Y_PROBE_OFFSET_FROM_EXTRUDER
2
0
#define Y_PROBE_OFFSET_FROM_EXTRUDER 0
#define Z_PROBE_OFFSET_FROM_EXTRUDER -
3.75
#define Z_PROBE_OFFSET_FROM_EXTRUDER -
1
#define Z_RAISE_BEFORE_HOMING 10 // (in mm) Raise Z before homing (G28) for Probe Clearance.
#define Z_RAISE_BEFORE_HOMING 10 // (in mm) Raise Z before homing (G28) for Probe Clearance.
// Be sure you have this distance over your Z_MAX_POS in case
// Be sure you have this distance over your Z_MAX_POS in case
...
...
MarlinKimbra/Configuration_Delta.h
View file @
800c174a
...
@@ -15,19 +15,19 @@
...
@@ -15,19 +15,19 @@
#define DELTA_SEGMENTS_PER_SECOND 200
#define DELTA_SEGMENTS_PER_SECOND 200
// Center-to-center distance of the holes in the diagonal push rods.
// Center-to-center distance of the holes in the diagonal push rods.
#define DEFAULT_DELTA_DIAGONAL_ROD 217 // mm
#define DEFAULT_DELTA_DIAGONAL_ROD 217
.0
// mm
// Horizontal offset from middle of printer to smooth rod center.
// Horizontal offset from middle of printer to smooth rod center.
#define DELTA_SMOOTH_ROD_OFFSET 145 // mm
#define DELTA_SMOOTH_ROD_OFFSET 145
.0
// mm
// Horizontal offset of the universal joints on the end effector.
// Horizontal offset of the universal joints on the end effector.
#define DELTA_EFFECTOR_OFFSET 20 // mm
#define DELTA_EFFECTOR_OFFSET 20
.0
// mm
// Horizontal offset of the universal joints on the carriages.
// Horizontal offset of the universal joints on the carriages.
#define DELTA_CARRIAGE_OFFSET 20 // mm
#define DELTA_CARRIAGE_OFFSET 20
.0
// mm
// Printer radius
// Printer radius
#define PRINTER_RADIUS 70
#define PRINTER_RADIUS 70
// mm
// Effective horizontal distance bridged by diagonal push rods.
// Effective horizontal distance bridged by diagonal push rods.
#define DEFAULT_DELTA_RADIUS (DELTA_SMOOTH_ROD_OFFSET-DELTA_EFFECTOR_OFFSET-DELTA_CARRIAGE_OFFSET)
#define DEFAULT_DELTA_RADIUS (DELTA_SMOOTH_ROD_OFFSET-DELTA_EFFECTOR_OFFSET-DELTA_CARRIAGE_OFFSET)
...
@@ -44,10 +44,10 @@
...
@@ -44,10 +44,10 @@
// Z-Probe variables
// Z-Probe variables
// Start and end location values are used to deploy/retract the probe (will move from start to end and back again)
// Start and end location values are used to deploy/retract the probe (will move from start to end and back again)
#define PROBING_FEEDRATE 600 // Speed for individual probe Use: G30 A F600
#define PROBING_FEEDRATE 600 // Speed for individual probe Use: G30 A F600
#define Z_PROBE_OFFSET {0,
-10,-11.5,0}
// X, Y, Z, E distance between hotend nozzle and deployed bed leveling probe.
#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_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
#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_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_PROBE_RETRACT_END_LOCATION {0,0,30,0} // X, Y, Z, E end location for z-probe retract sequence
#define AUTOLEVEL_GRID 20 // Distance between autolevel Z probing points, should be less than print surface radius/3.
#define AUTOLEVEL_GRID 20 // Distance between autolevel Z probing points, should be less than print surface radius/3.
...
...
MarlinKimbra/temperature.cpp
View file @
800c174a
...
@@ -663,9 +663,9 @@ void manage_heater()
...
@@ -663,9 +663,9 @@ void manage_heater()
temp_dState_bed
=
pid_input
;
temp_dState_bed
=
pid_input
;
pid_output
=
pTerm_bed
+
iTerm_bed
-
dTerm_bed
;
pid_output
=
pTerm_bed
+
iTerm_bed
-
dTerm_bed
;
if
(
pid_output
>
PID_MAX
)
{
if
(
pid_output
>
MAX_BED_POWER
)
{
if
(
pid_error_bed
>
0
)
temp_iState_bed
-=
pid_error_bed
;
// conditional un-integration
if
(
pid_error_bed
>
0
)
temp_iState_bed
-=
pid_error_bed
;
// conditional un-integration
pid_output
=
PID_MAX
;
pid_output
=
MAX_BED_POWER
;
}
else
if
(
pid_output
<
0
){
}
else
if
(
pid_output
<
0
){
if
(
pid_error_bed
<
0
)
temp_iState_bed
-=
pid_error_bed
;
// conditional un-integration
if
(
pid_error_bed
<
0
)
temp_iState_bed
-=
pid_error_bed
;
// conditional un-integration
pid_output
=
0
;
pid_output
=
0
;
...
...
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