diff options
| author | unknown <Greg@.(none)> | 2011-09-11 16:36:15 +0930 |
|---|---|---|
| committer | unknown <Greg@.(none)> | 2011-09-11 16:36:15 +0930 |
| commit | 614b60b038cf14e1a9f469cd04bfe1bda44f28fb (patch) | |
| tree | de495cb377a97bfb7c4f4d841bf29506aff3a680 /Sprinter/Sprinter.h | |
| parent | 78be8881ce2eb537724a47bf9cfd6e27316306b1 (diff) | |
Fix temp readings for multiple sensor types.
Signed-off-by: Greg Frost <gregfrost1@bigpond.com>
Diffstat (limited to 'Sprinter/Sprinter.h')
| -rw-r--r-- | Sprinter/Sprinter.h | 42 |
1 files changed, 20 insertions, 22 deletions
diff --git a/Sprinter/Sprinter.h b/Sprinter/Sprinter.h index a7c7a8f..e77da12 100644 --- a/Sprinter/Sprinter.h +++ b/Sprinter/Sprinter.h @@ -11,31 +11,29 @@ void manage_inactivity(byte debug); void setup_acceleration(); void manage_heater(); -int temp2analogu(int celsius, const short table[][2], int numtemps, int source); -int analog2tempu(int raw, const short table[][2], int numtemps, int source); -#ifdef HEATER_USES_THERMISTOR - #define HEATERSOURCE 1 -#endif -#ifdef HEATER_USES_AD595 - #define HEATERSOURCE 2 -#endif -#ifdef HEATER_USES_MAX6675 - #define HEATERSOURCE 3 -#endif -#ifdef BED_USES_THERMISTOR - #define BEDSOURCE 1 -#endif -#ifdef BED_USES_AD595 - #define BEDSOURCE 2 + +#if defined HEATER_USES_THERMISTOR +#define temp2analogh( c ) temp2analog_thermistor(c,temptable,NUMTEMPS) +#define analog2temp( c ) analog2temp_thermistor(c,temptable,NUMTEMPS) +#elif defined HEATER_USES_AD595 +#define temp2analogh( c ) temp2analog_ad595(c) +#define analog2temp( c ) analog2temp_ad595(c) +#elif defined HEATER_USES_MAX6675 +#define temp2analogh( c ) temp2analog_max6675(c) +#define analog2temp( c ) analog2temp_max6675(c) #endif -#ifdef BED_USES_MAX6675 - #define BEDSOURCE 3 + +#if defined BED_USES_THERMISTOR +#define temp2analogBed( c ) temp2analog_thermistor((c),bedtemptable,BNUMTEMPS) +#define analog2tempBed( c ) analog2temp_thermistor((c),bedtemptable,BNUMTEMPS) +#elif defined BED_USES_AD595 +#define temp2analogBed( c ) temp2analog_ad595(c) +#define analog2tempBed( c ) analog2temp_ad595(c) +#elif defined BED_USES_MAX6675 +#define temp2analogBed( c ) temp2analog_max6675(c) +#define analog2tempBed( c ) analog2temp_max6675(c) #endif -#define temp2analogh( c ) temp2analogu((c),temptable,NUMTEMPS,HEATERSOURCE) -#define temp2analogBed( c ) temp2analogu((c),bedtemptable,BNUMTEMPS,BEDSOURCE) -#define analog2temp( c ) analog2tempu((c),temptable,NUMTEMPS,HEATERSOURCE) -#define analog2tempBed( c ) analog2tempu((c),bedtemptable,BNUMTEMPS,BEDSOURCE) #if X_ENABLE_PIN > -1 #define enable_x() WRITE(X_ENABLE_PIN, X_ENABLE_ON) #define disable_x() WRITE(X_ENABLE_PIN,!X_ENABLE_ON) |