heater: Rename thermistor_type config name to sensor_type

Rename the thermistor_type and thermistor_pin config variables to
sensor_type and sensor_pin.  This is in preparation for support of
sensors beyond thermistors.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor
2017-03-06 15:33:21 -05:00
parent 4388a294a4
commit ff6a96665a
5 changed files with 26 additions and 26 deletions

View File

@@ -45,8 +45,8 @@ step_distance: .004242
nozzle_diameter: 0.500
filament_diameter: 3.500
heater_pin: ar4
thermistor_pin: analog1
thermistor_type: EPCOS 100K B57560G104F
sensor_type: EPCOS 100K B57560G104F
sensor_pin: analog1
control: pid
pid_Kp: 22.2
pid_Ki: 1.08
@@ -57,8 +57,8 @@ max_temp: 210
[heater_bed]
heater_pin: ar3
thermistor_pin: analog0
thermistor_type: EPCOS 100K B57560G104F
sensor_type: EPCOS 100K B57560G104F
sensor_pin: analog0
control: watermark
min_temp: 0
max_temp: 110

View File

@@ -47,8 +47,8 @@ step_distance: .0022
nozzle_diameter: 0.400
filament_diameter: 1.750
heater_pin: ar10
thermistor_pin: analog13
thermistor_type: ATC Semitec 104GT-2
sensor_type: ATC Semitec 104GT-2
sensor_pin: analog13
control: pid
pid_Kp: 22.2
pid_Ki: 1.08
@@ -58,8 +58,8 @@ max_temp: 250
[heater_bed]
heater_pin: ar8
thermistor_pin: analog14
thermistor_type: EPCOS 100K B57560G104F
sensor_type: EPCOS 100K B57560G104F
sensor_pin: analog14
control: watermark
min_temp: 0
max_temp: 130

View File

@@ -160,13 +160,12 @@ heater_pin: ar4
# allow the pin to be enabled for no more than half the time. This
# setting may be used to limit the total power output (over extended
# periods) to the heater. The default is 1.0.
thermistor_pin: analog1
sensor_type: EPCOS 100K B57560G104F
# Type of sensor - this may be "EPCOS 100K B57560G104F" or "ATC
# Semitec 104GT-2". This parameter must be provided.
sensor_pin: analog1
# Analog input pin connected to thermistor. This parameter must be
# provided.
thermistor_type: EPCOS 100K B57560G104F
# Type of thermistor (see the Thermistors variable at the top of
# klippy/heater.py for available types). This parameter must be
# provided.
#pullup_resistor: 4700
# The resistance (in ohms) of the pullup attached to the
# thermistor. The default is 4700 ohms.
@@ -203,8 +202,8 @@ max_temp: 210
# section if not present).
[heater_bed]
heater_pin: ar3
thermistor_pin: analog0
thermistor_type: EPCOS 100K B57560G104F
sensor_type: EPCOS 100K B57560G104F
sensor_pin: analog0
control: watermark
#max_delta: 2.0
# On 'watermark' controlled heaters this is the number of degrees in

View File

@@ -52,8 +52,8 @@ nozzle_diameter: 0.350
filament_diameter: 1.750
pressure_advance: 0.07
heater_pin: PH6
thermistor_pin: PF0
thermistor_type: EPCOS 100K B57560G104F
sensor_type: EPCOS 100K B57560G104F
sensor_pin: PF0
control: pid
pid_Kp: 7.0
pid_Ki: 0.1
@@ -63,8 +63,8 @@ max_temp: 210
[heater_bed]
heater_pin: PE5
thermistor_pin: PF2
thermistor_type: EPCOS 100K B57560G104F
sensor_type: EPCOS 100K B57560G104F
sensor_pin: PF2
control: watermark
min_temp: 0
max_temp: 100