From: Joseph Coffland <joseph@cauldrondevelopment.com>
Date: Wed, 7 Apr 2021 19:21:29 +0000 (-0700)
Subject: Fixed splash screen centering.
X-Git-Url: https://git.buildbotics.com/?a=commitdiff_plain;h=823ec8b0a1fb095294644c1f6b198c57c5ee229d;p=bbctrl-firmware

Fixed splash screen centering.
---

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8e8c198..e1d5042 100644
--- 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 8e31cd1..66f5329 100644
--- 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 5965308..9fc6cd5 100755
--- 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 54bdc1d..e99fee5 100644
--- 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 51fb51d..3f75ae6 100644
--- 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);