Skip to content

Commit

Permalink
further refinement of new filament + sensor representation
Browse files Browse the repository at this point in the history
  • Loading branch information
moggieuk committed Jan 22, 2024
1 parent 617762f commit 86552c3
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions panels/mmu_main.py
Original file line number Diff line number Diff line change
Expand Up @@ -646,12 +646,11 @@ def get_filament_text(self, markup=False, bold=False):
space = "┈"
home = "┫"
gate = "│"
gs = es = ts = '○'
# PAUL
gs = es = ts = '◯'
past = lambda pos: arrow if filament_pos >= pos else space
homed = lambda pos, sensor: (gate,arrow,sensor) if filament_pos > pos else (home,space,sensor) if filament_pos == pos else (gate,space,sensor)
nozz = lambda pos: (arrow,home,arrow) if filament_pos == pos else (space,gate,' ')
trig = lambda name, sensor: re.sub(r'[a-zA-Z]', '●', name) if self._check_sensor(sensor) else name
trig = lambda name, sensor: re.sub(r'[a-zA-Z]', '●', name) if self._check_sensor(sensor) else name
bseg = 4 + 2 * sum(not self._has_sensor(sensor) for sensor in [self.ENDSTOP_ENCODER, self.ENDSTOP_GATE, self.ENDSTOP_EXTRUDER, self.ENDSTOP_TOOLHEAD]) - (tool == self.TOOL_GATE_BYPASS)

t_str = ("T%s " % str(tool))[:3] if tool >= 0 else "BYPASS " if tool == self.TOOL_GATE_BYPASS else "T? "
Expand Down Expand Up @@ -680,7 +679,7 @@ def get_filament_text(self, markup=False, bold=False):
visual = self._add_markup(visual, color)

if bold:
visual = visual.replace("━", "█").replace("▶", "▌")
visual = visual.replace('━', '█').replace('▶', '▌').replace('●', '◙')

return visual

Expand Down

0 comments on commit 86552c3

Please sign in to comment.