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

M141 Heated Chamber, Temperature rework (#12201)

Browse Source
This commit is contained in:
3dlabsio
2019-03-07 00:09:39 -08:00
committed by Scott Lahteine
parent 44571775bd
commit 645ca7af7a
196 changed files with 2183 additions and 676 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/module/thermistor/thermistor_20.h
View File

@ -43,6 +43,10 @@
#define HEATER_4_RAW_HI_TEMP 16383
#define HEATER_4_RAW_LO_TEMP 0
#endif
#if THERMISTORHEATER_5 == 20
#define HEATER_5_RAW_HI_TEMP 16383
#define HEATER_5_RAW_LO_TEMP 0
#endif
#if THERMISTORBED == 20
#define HEATER_BED_RAW_HI_TEMP 16383
#define HEATER_BED_RAW_LO_TEMP 0

11
Marlin/src/module/thermistor/thermistors.h
View File

@ -26,7 +26,7 @@
#define OVERSAMPLENR 16
#define OV(N) int16_t((N) * (OVERSAMPLENR))
#define ANY_THERMISTOR_IS(n) (THERMISTORHEATER_0 == n || THERMISTORHEATER_1 == n || THERMISTORHEATER_2 == n || THERMISTORHEATER_3 == n || THERMISTORHEATER_4 == n || THERMISTORBED == n || THERMISTORCHAMBER == n)
#define ANY_THERMISTOR_IS(n) (THERMISTORHEATER_0 == n || THERMISTORHEATER_1 == n || THERMISTORHEATER_2 == n || THERMISTORHEATER_3 == n || THERMISTORHEATER_4 == n || THERMISTORHEATER_5 == n || THERMISTORBED == n || THERMISTORCHAMBER == n)
// Pt1000 and Pt100 handling
//
@ -272,6 +272,15 @@ static_assert(HEATER_0_TEMPTABLE_LEN < 256 && HEATER_1_TEMPTABLE_LEN < 256 && HE
#define HEATER_4_RAW_LO_TEMP 0
#endif
#endif
#ifndef HEATER_5_RAW_HI_TEMP
#ifdef HEATER_5_USES_THERMISTOR
#define HEATER_5_RAW_HI_TEMP 0
#define HEATER_5_RAW_LO_TEMP 16383
#else
#define HEATER_5_RAW_HI_TEMP 16383
#define HEATER_5_RAW_LO_TEMP 0
#endif
#endif
#ifndef HEATER_BED_RAW_HI_TEMP
#ifdef HEATER_BED_USES_THERMISTOR
#define HEATER_BED_RAW_HI_TEMP 0