3d_print_resources/Marlin
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Apply all changes from latest Marlin_V1

Browse source 
Diffed and merged, preserving my updates
This commit is contained in:
Scott Lahteine 2013-06-06 15:49:25 -07:00
parent a5cd582665
commit 5dabc95409
22 changed files with 3221 additions and 996 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Marlin/temperature.h
View file

@ -37,6 +37,9 @@ extern int target_temperature[EXTRUDERS];
extern float current_temperature[EXTRUDERS];
extern int target_temperature_bed;
extern float current_temperature_bed;
#ifdef TEMP_SENSOR_1_AS_REDUNDANT
extern float redundant_temperature;
#endif
#ifdef PIDTEMP
extern float Kp,Ki,Kd,Kc;