Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
marlin-anet-a8
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jonas Leder
marlin-anet-a8
Commits
33752de1
Commit
33752de1
authored
Feb 11, 2018
by
Scott Lahteine
Browse files
Options
Downloads
Patches
Plain Diff
Update some outdated configs
parent
38c7d53b
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
Marlin/src/config/examples/MakerParts/Configuration.h
+25
-12
25 additions, 12 deletions
Marlin/src/config/examples/MakerParts/Configuration.h
Marlin/src/config/examples/stm32f103ret6/Configuration.h
+241
-99
241 additions, 99 deletions
Marlin/src/config/examples/stm32f103ret6/Configuration.h
with
266 additions
and
111 deletions
Marlin/src/config/examples/MakerParts/Configuration.h
+
25
−
12
View file @
33752de1
...
@@ -126,6 +126,15 @@
...
@@ -126,6 +126,15 @@
*/
*/
#define SERIAL_PORT 0
#define SERIAL_PORT 0
/**
* Select a secondary serial port on the board to use for communication with the host.
* This allows the connection of wireless adapters (for instance) to non-default port pins.
* Serial port -1 is the USB emulated serial port, if avaialble.
*
* :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
*/
#define SERIAL_PORT_2 -1
/**
/**
* This setting determines the communication speed of the printer.
* This setting determines the communication speed of the printer.
*
*
...
@@ -373,8 +382,9 @@
...
@@ -373,8 +382,9 @@
// Comment the following line to disable PID and enable bang-bang.
// Comment the following line to disable PID and enable bang-bang.
#define PIDTEMP
#define PIDTEMP
#define BANG_MAX 255 // limits current to nozzle while in bang-bang mode; 255=full current
#define BANG_MAX 255 // Limits current to nozzle while in bang-bang mode; 255=full current
#define PID_MAX BANG_MAX // limits current to nozzle while PID is active (see PID_FUNCTIONAL_RANGE below); 255=full current
#define PID_MAX BANG_MAX // Limits current to nozzle while PID is active (see PID_FUNCTIONAL_RANGE below); 255=full current
#define PID_K1 0.95 // Smoothing factor within any PID loop
#if ENABLED(PIDTEMP)
#if ENABLED(PIDTEMP)
#define PID_AUTOTUNE_MENU // Add PID Autotune to the LCD "Temperature" menu to run M303 and apply the result.
#define PID_AUTOTUNE_MENU // Add PID Autotune to the LCD "Temperature" menu to run M303 and apply the result.
//#define PID_DEBUG // Sends debug data to the serial port.
//#define PID_DEBUG // Sends debug data to the serial port.
...
@@ -384,7 +394,6 @@
...
@@ -384,7 +394,6 @@
// Set/get with gcode: M301 E[extruder number, 0-2]
// Set/get with gcode: M301 E[extruder number, 0-2]
#define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature
#define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature
// is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
// is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
#define K1 0.95 //smoothing factor within the PID
// If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
// If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
...
@@ -465,12 +474,13 @@
...
@@ -465,12 +474,13 @@
//===========================================================================
//===========================================================================
/**
/**
* Thermal Protection protects your printer from damage and fire if a
* Thermal Protection provides additional protection to your printer from damage
* thermistor falls out or temperature sensors fail in any way.
* and fire. Marlin always includes safe min and max temperature ranges which
* protect against a broken or disconnected thermistor wire.
*
*
* The issue: If a thermistor falls out
or a temperature sensor fails,
* The issue: If a thermistor falls out
, it will report the much lower
*
Marlin can no longer sense the actual temperature. Since a disconnected
*
temperature of the air in the room, and the the firmware will keep
*
thermistor reads as a low temperature, the firmware will keep
the heater on.
* the heater on.
*
*
* If you get "Thermal Runaway" or "Heating failed" errors the
* If you get "Thermal Runaway" or "Heating failed" errors the
* details can be tuned in Configuration_adv.h
* details can be tuned in Configuration_adv.h
...
@@ -723,14 +733,16 @@
...
@@ -723,14 +733,16 @@
// X and Y axis travel speed (mm/m) between probes
// X and Y axis travel speed (mm/m) between probes
#define XY_PROBE_SPEED 8000
#define XY_PROBE_SPEED 8000
// Speed for the first approach when double-probing (
with PROBE_DOUBLE_TOUCH
)
// Speed for the first approach when double-probing (
MULTIPLE_PROBING == 2
)
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
// Speed for the "accurate" probe of each point
// Speed for the "accurate" probe of each point
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
// Use double touch for probing
// The number of probes to perform at each point.
//#define PROBE_DOUBLE_TOUCH
// Set to 2 for a fast/slow probe, using the second probe result.
// Set to 3 or more for slow probes, averaging the results.
//#define MULTIPLE_PROBING 2
/**
/**
* Z probes require clearance when deploying, stowing, and moving between
* Z probes require clearance when deploying, stowing, and moving between
...
@@ -920,7 +932,8 @@
...
@@ -920,7 +932,8 @@
#define ENABLE_LEVELING_FADE_HEIGHT
#define ENABLE_LEVELING_FADE_HEIGHT
// For Cartesian machines, instead of dividing moves on mesh boundaries,
// For Cartesian machines, instead of dividing moves on mesh boundaries,
// split up moves into short segments like a Delta.
// split up moves into short segments like a Delta. This follows the
// contours of the bed more closely than edge-to-edge straight moves.
#define SEGMENT_LEVELED_MOVES
#define SEGMENT_LEVELED_MOVES
#define LEVELED_SEGMENT_LENGTH 5.0 // (mm) Length of all segments (except the last one)
#define LEVELED_SEGMENT_LENGTH 5.0 // (mm) Length of all segments (except the last one)
...
...
...
...
This diff is collapsed.
Click to expand it.
Marlin/src/config/examples/stm32f103ret6/Configuration.h
+
241
−
99
View file @
33752de1
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment