bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Merge https://github.com/kieranc/Marlin into PIDdebug

Browse Source 
Conflicts:
	Marlin/temperature.cpp

Cleaned merge conflict.

Codeposition had changed.
Variable pid_input had vanished.

Signed-off-by: AnHardt <github@kitelab.de>
This commit is contained in:
AnHardt
2015-03-20 00:07:36 +01:00
parent e650d4044e 8ccdac9898
commit 47c1ea72af
9 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/example_configurations/SCARA/Configuration.h
View File

@ -254,6 +254,8 @@ Here are some standard links for getting your machine calibrated:
// so you shouldn't use it unless you are OK with PWM on your bed. (see the comment on enabling PIDTEMPBED)
#define MAX_BED_POWER 255 // limits duty cycle to bed; 255=full current
//#define PID_BED_DEBUG // Sends debug data to the serial port.
#ifdef PIDTEMPBED
//120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
//from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)