Fixed splash screen centering.

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8e8c1985cfa664732be502509a9db0247002420f..e1d5042f606f39ca06d2b9f706af8cf88b6ef03f 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ Buildbotics CNC Controller Firmware Changelog
  - Allow multiple file upload.
  - Moved documentation pages to ``DOCS`` page.
  - Show program messages in 3D view.
+ - Fix bug where rehoming fails after stop. #294
 
 ## v0.4.16
  - Improved axis under/over warning tooltip.

diff --git a/MANIFEST.in b/MANIFEST.in
index 8e31cd16efc7709f13e69c3784d9e1f14a3214b6..66f5329ba6538e657c169dd7eb1e13ce04ce1640 100644 (file)
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,6 +4,7 @@ include src/py/bbctrl/camotics.so
 include package.json README.md scripts/install.sh
 include src/avr/bbctrl-avr-firmware.hex
 include src/bbserial/bbserial.ko
+include src/splash/*
 include scripts/avr109-flash.py
 include scripts/buildbotics.gc
 include scripts/xinitrc

diff --git a/scripts/install.sh b/scripts/install.sh
index 5965308ae0cd4676a4c8bf54414b7853c2c29275..9fc6cd5a885a89467b693238c40ce44ff552cf5f 100755 (executable)
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -100,6 +100,9 @@ if [ $? -ne 0 ]; then
     REBOOT=true
 fi
 
+# Install splash
+cp src/splash/* /usr/share/plymouth/themes/buildbotics/
+
 # Install rc.local
 cp scripts/rc.local /etc/
 

diff --git a/src/py/bbctrl/Planner.py b/src/py/bbctrl/Planner.py
index 54bdc1ddc37f7e99182c7574d0afe9b9b4c7dc2a..e99fee50e283f82ead1b91d78fb0298312a21714 100644 (file)
--- a/src/py/bbctrl/Planner.py
+++ b/src/py/bbctrl/Planner.py
@@ -367,7 +367,7 @@ class Planner():
         if msg is not None: self._log_time(msg)
 
 
-    def load(self, path, done):
+    def load(self, path, done = None):
         if done is not None and self.end_cb is not None:
             raise Exception('End callback already set')
 

diff --git a/src/splash/buildbotics.script b/src/splash/buildbotics.script
index 51fb51d499b95f9ef656a6d06f46d9361b6c36c3..3f75ae63b075e357ba826b3b6e864898dcfae2b4 100644 (file)
--- a/src/splash/buildbotics.script
+++ b/src/splash/buildbotics.script
@@ -1,32 +1,16 @@
 screenW = Window.GetWidth();
 screenH = Window.GetHeight();
 
-image = Image("splash.png");
+image  = Image("splash.png");
 imageW = image.GetWidth();
 imageH = image.GetHeight();
 
 scaleX = imageW / screenW;
 scaleY = imageH / screenH;
 
-flag = 1;
+if (scaleY < scaleX) image = image.Scale(screenW, imageH / scaleX);
+else image = image.Scale(imageW / scaleY, screenH);
 
-if (scaleX > 1 || scaleY > 1) {
-  if (scaleX > scaleY) {
-    resized = image.Scale(screenW, imageH / scaleX);
-    imageX = 0;
-    imageY = (screenH - ((imageH  * screenW) / imageW)) / 2;
-
-  } else {
-    resized = image.Scale(imageW / scaleY, screenH);
-    imageX = (screenW - ((imageW  * screenH) / imageH)) / 2;
-    imageY = 0;
-  }
-
-} else {
-  resized = image.Scale(imageW, imageH);
-  imageX = (screenW - imageW) / 2;
-  imageY = (screenH - imageH) / 2;
-}
-
-sprite = Sprite(resized);
-sprite.SetPosition(imageX, imageY, -100);
+sprite = Sprite(image);
+sprite.SetX((screenW - image.GetWidth())  / 2);
+sprite.SetY((screenH - image.GetHeight()) / 2);