shinys000114/klipper
1
0
Fork 0
mirror of git://soft.sys114.com/klipper synced 2026-02-12 16:10:26 +09:00
Code Issues Packages Projects Releases Wiki Activity

extruder: Consistently use "extruder" for the primary extruder

Browse Source 
No longer allow the primary extruder to be named "extruder0".  This
avoids internal and external confusion between the printer objects and
config section names.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor
2019-11-07 16:24:52 -05:00
parent 29b5961d9f
commit ed610a6600
8 changed files with 48 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
klippy/extras/display/display.py
View File

@@ -26,7 +26,7 @@ class PrinterLCD:
self.menu = menu.MenuManager(config, self.lcd_chip)
# printer objects
self.toolhead = self.sdcard = None
self.fan = self.extruder0 = self.extruder1 = self.heater_bed = None
self.fan = self.extruder = self.extruder1 = self.heater_bed = None
self.printer.register_event_handler("klippy:ready", self.handle_ready)
# screen updating
self.screen_update_timer = self.reactor.register_timer(
@@ -42,7 +42,7 @@ class PrinterLCD:
self.toolhead = self.printer.lookup_object('toolhead')
self.sdcard = self.printer.lookup_object('virtual_sdcard', None)
self.fan = self.printer.lookup_object('fan', None)
self.extruder0 = self.printer.lookup_object('extruder0', None)
self.extruder = self.printer.lookup_object('extruder', None)
self.extruder1 = self.printer.lookup_object('extruder1', None)
self.heater_bed = self.printer.lookup_object('heater_bed', None)
self.prg_time = .0
@@ -97,8 +97,8 @@ class PrinterLCD:
def screen_update_hd44780(self, eventtime):
lcd_chip = self.lcd_chip
# Heaters
if self.extruder0 is not None:
info = self.extruder0.get_heater().get_status(eventtime)
if self.extruder is not None:
info = self.extruder.get_heater().get_status(eventtime)
lcd_chip.write_glyph(0, 0, 'extruder')
self.draw_heater(1, 0, info)
if self.extruder1 is not None:
@@ -140,8 +140,8 @@ class PrinterLCD:
self.draw_status(0, 3, gcode_info, toolhead_info)
def screen_update_128x64(self, eventtime):
# Heaters
if self.extruder0 is not None:
info = self.extruder0.get_heater().get_status(eventtime)
if self.extruder is not None:
info = self.extruder.get_heater().get_status(eventtime)
self.lcd_chip.write_glyph(0, 0, 'extruder')
self.draw_heater(2, 0, info)
extruder_count = 1

34
klippy/extras/display/menu.cfg
View File

@@ -391,15 +391,15 @@ items:
[menu __temp __hotend0_current]
type: item
enable: extruder0.is_enabled
enable: extruder.is_enabled
name: "Ex0:{0:4.0f} T"
parameter: extruder0.temperature
parameter: extruder.temperature
[menu __temp __hotend0_target]
type: input
enable: extruder0.is_enabled
enable: extruder.is_enabled
name: "{0:4.0f}"
parameter: extruder0.target
parameter: extruder.target
input_min: 0
input_max: 250
input_step: 1
@@ -450,7 +450,7 @@ items:
[menu __temp __preheat_pla __all]
type: command
enable: extruder0.is_enabled,heater_bed.is_enabled
enable: extruder.is_enabled,heater_bed.is_enabled
name: Preheat all
gcode:
M140 S60
@@ -458,7 +458,7 @@ gcode:
[menu __temp __preheat_pla __hotend]
type: command
enable: extruder0.is_enabled
enable: extruder.is_enabled
name: Preheat hotend
gcode: M104 S200
@@ -478,7 +478,7 @@ items:
[menu __temp __preheat_abs __all]
type: command
enable: extruder0.is_enabled,heater_bed.is_enabled
enable: extruder.is_enabled,heater_bed.is_enabled
name: Preheat all
gcode:
M140 S110
@@ -486,7 +486,7 @@ gcode:
[menu __temp __preheat_abs __hotend]
type: command
enable: extruder0.is_enabled
enable: extruder.is_enabled
name: Preheat hotend
gcode: M104 S245
@@ -506,7 +506,7 @@ items:
[menu __temp __cooldown __all]
type: command
enable: extruder0.is_enabled,heater_bed.is_enabled
enable: extruder.is_enabled,heater_bed.is_enabled
name: Cooldown all
gcode:
M104 S0
@@ -514,7 +514,7 @@ gcode:
[menu __temp __cooldown __hotend]
type: command
enable: extruder0.is_enabled
enable: extruder.is_enabled
name: Cooldown hotend
gcode: M104 S0
@@ -611,7 +611,7 @@ gcode: PROBE
[menu __prepare __hotend_pid_tuning]
type: command
enable: !toolhead.is_printing, extruder0.is_enabled
enable: !toolhead.is_printing, extruder.is_enabled
name: Tune Hotend PID
gcode: PID_CALIBRATE HEATER=extruder TARGET=210 WRITE_FILE=1
@@ -821,23 +821,23 @@ items:
[menu __card_hotend0_current]
type: item
enable: extruder0.is_enabled
enable: extruder.is_enabled
name: "{1:3.0f}"
parameter: extruder0.temperature
parameter: extruder.temperature
transform: abs()
[menu __card_hotend0_target]
type: item
enable: extruder0.is_enabled
enable: extruder.is_enabled
name: "{1:3.0f}"
parameter: extruder0.target
parameter: extruder.target
transform: abs()
[menu __card_hotend0_target_in]
type: input
enable: extruder0.is_enabled
enable: extruder.is_enabled
name: "{1:3.0f}"
parameter: extruder0.target
parameter: extruder.target
transform: abs()
input_min: 0
input_max: 250

2
klippy/extras/heater_fan.py
View File

@@ -11,7 +11,7 @@ class PrinterHeaterFan:
def __init__(self, config):
self.printer = config.get_printer()
self.printer.register_event_handler("klippy:ready", self.handle_ready)
self.heater_name = config.get("heater", "extruder0")
self.heater_name = config.get("heater", "extruder")
self.heater_temp = config.getfloat("heater_temp", 50.0)
self.heaters = []
self.fan = fan.PrinterFan(config, default_shutdown_speed=1.)