Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Z-Bolt/OctoScreen.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksei Kvitinskii <aleksei.kvitinskii@gmail.com>2019-08-30 12:37:42 +0300
committerAleksei Kvitinskii <aleksei.kvitinskii@gmail.com>2019-08-30 12:37:42 +0300
commit92e22e009dee4589795471e7bd44c7cdd980d883 (patch)
tree6254007670f9624a808f76b5e19f5f12a9807336
parent65dbd4d994dc8f68bbb75b92131ca542459743e3 (diff)
fixed system screen issue
-rw-r--r--Makefile2
-rw-r--r--ui/filament.go2
-rw-r--r--ui/system.go6
3 files changed, 6 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 831b8fc..a04a0af 100644
--- a/Makefile
+++ b/Makefile
@@ -66,7 +66,7 @@ build-internal: prepare-internal
cp ../*.deb /build/;
prepare-internal:
- dch --create -v $(VERSION)-1 --package $(PACKAGE_NAME) empty; \
+ dch --create -v $(VERSION)-2 --package $(PACKAGE_NAME) empty; \
cd $(WORKDIR)/..; \
tar -czf octoscreen_$(VERSION).orig.tar.gz --exclude-vcs OctoScreen
diff --git a/ui/filament.go b/ui/filament.go
index 648f60e..36a2209 100644
--- a/ui/filament.go
+++ b/ui/filament.go
@@ -141,7 +141,7 @@ func (m *filamentPanel) createLoadButton() gtk.IWidget {
return MustButtonImage("Load", "extrude.svg", func() {
cmd := &octoprint.CommandRequest{}
- cmd.Commands = []string{"G92 E0", "G0 E600 F5000", "G92 E0", "G0 E65 F500"}
+ cmd.Commands = []string{"G92 E0", "G0 E600 F5000", "G92 E0", "G0 E120 F500"}
Logger.Info("Sending filament load request")
if err := cmd.Do(m.UI.Printer); err != nil {
diff --git a/ui/system.go b/ui/system.go
index 6d08d41..07a9911 100644
--- a/ui/system.go
+++ b/ui/system.go
@@ -55,7 +55,8 @@ func (m *systemPanel) createOctoPrintInfo() *gtk.Box {
img := MustImageFromFileWithSize("logo-octoprint.png", logoWidth, int(float64(logoWidth)*1.25))
info.Add(img)
- info.Add(MustLabel("\nOctoPrint Version: <b>%s (%s)</b>", r.Server, r.API))
+ info.Add(MustLabel("\nOctoPrint Version"))
+ info.Add(MustLabel("<b>%s (%s)</b>", r.Server, r.API))
return info
}
@@ -71,7 +72,8 @@ func (m *systemPanel) createOctoScreenInfo() *gtk.Box {
img := MustImageFromFileWithSize("logo-z-bolt.svg", logoWidth, int(float64(logoWidth)*0.8))
info.Add(img)
- info.Add(MustLabel("OctoScreen Version: <b>%s (%s)</b>", Version, Build))
+ info.Add(MustLabel("OctoScreen Version"))
+ info.Add(MustLabel("<b>%s (%s)</b>", Version, Build))
return info
}