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
3eafea84
Commit
3eafea84
authored
Mar 1, 2015
by
chrono
Browse files
Options
Downloads
Patches
Plain Diff
Minor fixes in Configuration.h
parent
c7fb1b70
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
Marlin/Configuration.h
+8
-23
8 additions, 23 deletions
Marlin/Configuration.h
with
8 additions
and
23 deletions
Marlin/Configuration.h
+
8
−
23
View file @
3eafea84
...
@@ -70,7 +70,7 @@ Here are some standard links for getting your machine calibrated:
...
@@ -70,7 +70,7 @@ Here are some standard links for getting your machine calibrated:
// #define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
// #define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
// This defines the number of extruders
// This defines the number of extruders
#define EXTRUDERS
1
#define EXTRUDERS
2
//// The following define selects which power supply you have. Please choose the one that matches your setup
//// The following define selects which power supply you have. Please choose the one that matches your setup
// 1 = ATX
// 1 = ATX
...
@@ -134,7 +134,7 @@ Here are some standard links for getting your machine calibrated:
...
@@ -134,7 +134,7 @@ Here are some standard links for getting your machine calibrated:
#define MAX_REDUNDANT_TEMP_SENSOR_DIFF 10
#define MAX_REDUNDANT_TEMP_SENSOR_DIFF 10
// Actual temperature must be close to target for this long before M109 returns success
// Actual temperature must be close to target for this long before M109 returns success
#define TEMP_RESIDENCY_TIME 1
0
// (seconds)
#define TEMP_RESIDENCY_TIME 1
5
// (seconds)
#define TEMP_HYSTERESIS 3 // (degC) range of +/- temperatures considered "close" to the target one
#define TEMP_HYSTERESIS 3 // (degC) range of +/- temperatures considered "close" to the target one
#define TEMP_WINDOW 1 // (degC) Window around target to start the residency timer x degC early.
#define TEMP_WINDOW 1 // (degC) Window around target to start the residency timer x degC early.
...
@@ -186,21 +186,11 @@ Here are some standard links for getting your machine calibrated:
...
@@ -186,21 +186,11 @@ Here are some standard links for getting your machine calibrated:
#define K1 0.95 //smoothing factor within the PID
#define K1 0.95 //smoothing factor within the PID
#define PID_dT ((OVERSAMPLENR * 10.0)/(F_CPU / 64.0 / 256.0)) //sampling period of the temperature routine
#define PID_dT ((OVERSAMPLENR * 10.0)/(F_CPU / 64.0 / 256.0)) //sampling period of the temperature routine
// If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
// Felix 2.0+ electronics with v4 Hotend
// Felix 2.0+ electronics with v4 Hotend
#define DEFAULT_Kp 12
#define DEFAULT_Kp 12
#define DEFAULT_Ki 0.84
#define DEFAULT_Ki 0.84
#define DEFAULT_Kd 85
#define DEFAULT_Kd 85
// MakerGear
// #define DEFAULT_Kp 7.0
// #define DEFAULT_Ki 0.1
// #define DEFAULT_Kd 12
// Mendel Parts V9 on 12V
// #define DEFAULT_Kp 63.0
// #define DEFAULT_Ki 2.25
// #define DEFAULT_Kd 440
#endif // PIDTEMP
#endif // PIDTEMP
//===========================================================================
//===========================================================================
...
@@ -783,7 +773,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
...
@@ -783,7 +773,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
//#define TEMP_STAT_LEDS
//#define TEMP_STAT_LEDS
// Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
// Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
// which is not as
s
annoying as with the hardware PWM. On the other hand, if this frequency
// which is not as annoying as with the hardware PWM. On the other hand, if this frequency
// is too low, you should also increment SOFT_PWM_SCALE.
// is too low, you should also increment SOFT_PWM_SCALE.
//#define FAN_SOFT_PWM
//#define FAN_SOFT_PWM
...
@@ -857,12 +847,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
...
@@ -857,12 +847,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
//#define FILAMENT_LCD_DISPLAY
//#define FILAMENT_LCD_DISPLAY
#include
"Configuration_adv.h"
#include
"Configuration_adv.h"
#include
"thermistortables.h"
#include
"thermistortables.h"
#endif //__CONFIGURATION_H
#endif //__CONFIGURATION_H
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