forked from Z-Bolt/OctoScreen
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
added new extrusion screen for for toolchanger and returned universal…
… filament screen
- Loading branch information
Showing
5 changed files
with
434 additions
and
44 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,195 @@ | ||
| package ui | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "strings" | ||
| "time" | ||
|
|
||
| "github.com/gotk3/gotk3/gtk" | ||
| "github.com/mcuadros/go-octoprint" | ||
| ) | ||
|
|
||
| var extrudeMultitoolPanelInstance *extrudeMultitoolPanel | ||
|
|
||
| type extrudeMultitoolPanel struct { | ||
| CommonPanel | ||
|
|
||
| amount *StepButton | ||
|
|
||
| box *gtk.Box | ||
| labels map[string]*LabelWithImage | ||
| previous *octoprint.TemperatureState | ||
| } | ||
|
|
||
| func ExtrudeMultitoolPanel(ui *UI, parent Panel) Panel { | ||
| if extrudeMultitoolPanelInstance == nil { | ||
| m := &extrudeMultitoolPanel{CommonPanel: NewCommonPanel(ui, parent), | ||
| labels: map[string]*LabelWithImage{}, | ||
| } | ||
| m.panelH = 3 | ||
| m.b = NewBackgroundTask(time.Second*5, m.updateTemperatures) | ||
| m.initialize() | ||
| extrudeMultitoolPanelInstance = m | ||
| } | ||
|
|
||
| return extrudeMultitoolPanelInstance | ||
| } | ||
|
|
||
| func (m *extrudeMultitoolPanel) initialize() { | ||
| defer m.Initialize() | ||
|
|
||
| m.Grid().Attach(m.createChangeToolButton(0), 1, 0, 1, 1) | ||
| m.Grid().Attach(m.createChangeToolButton(1), 2, 0, 1, 1) | ||
| m.Grid().Attach(m.createChangeToolButton(2), 3, 0, 1, 1) | ||
| m.Grid().Attach(m.createChangeToolButton(3), 4, 0, 1, 1) | ||
|
|
||
| m.Grid().Attach(m.createExtrudeButton("Extrude", "extrude.svg", 1), 1, 1, 1, 1) | ||
| m.Grid().Attach(m.createExtrudeButton("Retract", "retract.svg", -1), 4, 1, 1, 1) | ||
|
|
||
| m.box = MustBox(gtk.ORIENTATION_VERTICAL, 5) | ||
| m.box.SetVAlign(gtk.ALIGN_CENTER) | ||
| m.box.SetHAlign(gtk.ALIGN_CENTER) | ||
| m.Grid().Attach(m.box, 2, 1, 2, 1) | ||
|
|
||
| m.Grid().Attach(MustButtonImageStyle("Temperature", "heat-up.svg", "color4", m.showTemperature), 1, 2, 1, 1) | ||
| m.amount = MustStepButton("move-step.svg", Step{"1mm", 1}, Step{"5mm", 5}, Step{"10mm", 10}) | ||
| m.Grid().Attach(m.amount, 2, 2, 1, 1) | ||
|
|
||
| m.Grid().Attach(m.createFlowrateButton(), 3, 2, 1, 1) | ||
| } | ||
|
|
||
| func (m *extrudeMultitoolPanel) updateTemperatures() { | ||
| s, err := (&octoprint.ToolStateRequest{ | ||
| History: true, | ||
| Limit: 1, | ||
| }).Do(m.UI.Printer) | ||
|
|
||
| if err != nil { | ||
| Logger.Error(err) | ||
| return | ||
| } | ||
|
|
||
| m.loadTemperatureState(s) | ||
| } | ||
|
|
||
| func (m *extrudeMultitoolPanel) loadTemperatureState(s *octoprint.TemperatureState) { | ||
| for tool, current := range s.Current { | ||
| if _, ok := m.labels[tool]; !ok { | ||
| m.addNewTool(tool) | ||
| } | ||
|
|
||
| m.loadTemperatureData(tool, ¤t) | ||
| } | ||
|
|
||
| m.previous = s | ||
| } | ||
|
|
||
| func (m *extrudeMultitoolPanel) addNewTool(tool string) { | ||
| m.labels[tool] = MustLabelWithImage("extruder.svg", "") | ||
| m.box.Add(m.labels[tool]) | ||
|
|
||
| Logger.Infof("New tool detected %s", tool) | ||
| } | ||
|
|
||
| func (m *extrudeMultitoolPanel) loadTemperatureData(tool string, d *octoprint.TemperatureData) { | ||
| text := fmt.Sprintf("%s: %.1f°C / %.1f°C", strings.Title(tool), d.Actual, d.Target) | ||
|
|
||
| if m.previous != nil && d.Target > 0 { | ||
| if p, ok := m.previous.Current[tool]; ok { | ||
| text = fmt.Sprintf("%s (%.1f°C)", text, d.Actual-p.Actual) | ||
| } | ||
| } | ||
|
|
||
| m.labels[tool].Label.SetText(text) | ||
| m.labels[tool].ShowAll() | ||
| } | ||
|
|
||
| func (m *extrudeMultitoolPanel) createFlowrateButton() *StepButton { | ||
| b := MustStepButton("speed-step.svg", Step{"Slow", 75}, Step{"Normal", 100}, Step{"High", 125}) | ||
| b.Callback = func() { | ||
| cmd := &octoprint.ToolFlowrateRequest{} | ||
| cmd.Factor = b.Value().(int) | ||
|
|
||
| Logger.Infof("Changing flowrate to %d%%", cmd.Factor) | ||
| if err := cmd.Do(m.UI.Printer); err != nil { | ||
| Logger.Error(err) | ||
| return | ||
| } | ||
| } | ||
|
|
||
| return b | ||
| } | ||
|
|
||
| func (m *extrudeMultitoolPanel) createLoadButton() gtk.IWidget { | ||
| length := 750.0 | ||
|
|
||
| if m.UI.Settings != nil { | ||
| length = m.UI.Settings.FilamentInLength | ||
| } | ||
|
|
||
| return MustButtonImage("Load", "extrude.svg", func() { | ||
| cmd := &octoprint.CommandRequest{} | ||
| cmd.Commands = []string{ | ||
| "G91", | ||
| fmt.Sprintf("G0 E%.1f F5000", length*0.80), | ||
| fmt.Sprintf("G0 E%.1f F500", length*0.20), | ||
| "G90", | ||
| } | ||
|
|
||
| Logger.Info("Sending filament load request") | ||
| if err := cmd.Do(m.UI.Printer); err != nil { | ||
| Logger.Error(err) | ||
| return | ||
| } | ||
| }) | ||
| } | ||
|
|
||
| func (m *extrudeMultitoolPanel) createUnloadButton() gtk.IWidget { | ||
|
|
||
| length := 800.0 | ||
|
|
||
| if m.UI.Settings != nil { | ||
| length = m.UI.Settings.FilamentOutLength | ||
| } | ||
|
|
||
| return MustButtonImage("Unload", "retract.svg", func() { | ||
| cmd := &octoprint.CommandRequest{} | ||
| cmd.Commands = []string{ | ||
| "G91", | ||
| fmt.Sprintf("G0 E-%.1f F5000", length), | ||
| "G90", | ||
| } | ||
|
|
||
| Logger.Info("Sending filament unload request") | ||
| if err := cmd.Do(m.UI.Printer); err != nil { | ||
| Logger.Error(err) | ||
| return | ||
| } | ||
| }) | ||
| } | ||
|
|
||
| func (m *extrudeMultitoolPanel) createExtrudeButton(label, image string, dir int) gtk.IWidget { | ||
| return MustPressedButton(label, image, func() { | ||
| cmd := &octoprint.ToolExtrudeRequest{} | ||
| cmd.Amount = m.amount.Value().(int) * dir | ||
|
|
||
| Logger.Infof("Sending extrude request, with amount %d", cmd.Amount) | ||
| if err := cmd.Do(m.UI.Printer); err != nil { | ||
| Logger.Error(err) | ||
| return | ||
| } | ||
| }, 200) | ||
| } | ||
|
|
||
| func (m *extrudeMultitoolPanel) createChangeToolButton(num int) gtk.IWidget { | ||
| style := fmt.Sprintf("color%d", num+1) | ||
| name := fmt.Sprintf("Tool%d", num+1) | ||
| gcode := fmt.Sprintf("T%d", num) | ||
| return MustButtonImageStyle(name, "extruder.svg", style, func() { | ||
| m.command(gcode) | ||
| }) | ||
| } | ||
|
|
||
| func (m *extrudeMultitoolPanel) showTemperature() { | ||
| m.UI.Add(TemperaturePanel(m.UI, m)) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.