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

Merge remote-tracking branch 'daid/Marlin_v1' into Test

Browse Source
This commit is contained in:
Erik van der Zalm 2012-02-26 16:10:59 +01:00
commit 4fbda5c3f5
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/Configuration.h
View File

@ -71,6 +71,12 @@
#define HEATER_2_MAXTEMP 275
#define BED_MAXTEMP 150
//These defines help to calibrate the AD595 sensor in case you get wrong temperature measurements.
//The measured temperature is defined as "actualTemp = (measuredTemp * TEMP_SENSOR_AD595_GAIN) + TEMP_SENSOR_AD595_OFFSET"
#define TEMP_SENSOR_AD595_OFFSET 0.0
#define TEMP_SENSOR_AD595_GAIN 1.0
// PID settings:
// Comment the following line to disable PID and enable bang-bang.
#define PIDTEMP

8
Marlin/temperature.cpp
View File

@ -312,7 +312,7 @@ int temp2analog(int celsius, uint8_t e) {
return (1023 * OVERSAMPLENR) - raw;
}
return celsius * (1024.0 / (5.0 * 100.0) ) * OVERSAMPLENR;
return ((celsius-TEMP_SENSOR_AD595_OFFSET)/TEMP_SENSOR_AD595_GAIN) * (1024.0 / (5.0 * 100.0) ) * OVERSAMPLENR;
}
// Takes bed temperature value as input and returns corresponding raw value.
@ -342,7 +342,7 @@ int temp2analogBed(int celsius) {
return (1023 * OVERSAMPLENR) - raw;
#elif defined BED_USES_AD595
return lround(celsius * (1024.0 * OVERSAMPLENR/ (5.0 * 100.0) ) );
return lround(((celsius-TEMP_SENSOR_AD595_OFFSET)/TEMP_SENSOR_AD595_GAIN) * (1024.0 * OVERSAMPLENR/ (5.0 * 100.0) ) );
#else
#warning No heater-type defined for the bed.
return 0;
@ -390,7 +390,7 @@ float analog2temp(int raw, uint8_t e) {
return celsius;
}
return raw * ((5.0 * 100.0) / 1024.0) / OVERSAMPLENR;
return ((raw * ((5.0 * 100.0) / 1024.0) / OVERSAMPLENR) * TEMP_SENSOR_AD595_GAIN) + TEMP_SENSOR_AD595_OFFSET;
}
// Derived from RepRap FiveD extruder::getTemperature()
@ -421,7 +421,7 @@ float analog2tempBed(int raw) {
return celsius;
#elif defined BED_USES_AD595
return raw * ((5.0 * 100.0) / 1024.0) / OVERSAMPLENR;
return ((raw * ((5.0 * 100.0) / 1024.0) / OVERSAMPLENR) * TEMP_SENSOR_AD595_GAIN) + TEMP_SENSOR_AD595_OFFSET;
#else
#warning No heater-type defined for the bed.
#endif