From: Joseph Coffland <joseph@cauldrondevelopment.com>
Date: Thu, 12 Nov 2020 01:03:31 +0000 (-0800)
Subject: Improved axis under/over warning tooltip.
X-Git-Url: https://git.buildbotics.com/?a=commitdiff_plain;h=d72c026291d0e42aa0573c919839799e248a872e;p=bbctrl-firmware

Improved axis under/over warning tooltip.
---

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 69f2678..71331d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,9 @@
 Buildbotics CNC Controller Firmware Changelog
 =============================================
 
+## v0.4.16
+ - Improved axis under/over warning tooltip.
+
 ## v0.4.15
  - Set GCode variables ``#5400`` and ``#<_tool>``.
  - Added ``#<_timestamp>`` GCode variable.
diff --git a/package.json b/package.json
index c7bbe66..77a85b2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bbctrl",
-  "version": "0.4.15",
+  "version": "0.4.16",
   "homepage": "http://buildbotics.com/",
   "repository": "https://github.com/buildbotics/bbctrl-firmware",
   "license": "CERN-OHL-S v2",
diff --git a/src/js/axis-vars.js b/src/js/axis-vars.js
index de1d502..1140ecd 100644
--- a/src/js/axis-vars.js
+++ b/src/js/axis-vars.js
@@ -107,13 +107,15 @@ module.exports = {
       case 'HOMED': title = 'Axis successfuly homed.'; break;
 
       case 'OVER':
-        title = 'Tool path would move ' +
-          this._length_str(pathMax + off - max) + ' beyond axis bounds.';
+        title = 'Current program would move ' +
+          this._length_str(pathMax + off - max) + ' beyond axis bounds.  ' +
+          'Offsets must be adjusted or soft limits set correctly.';
         break;
 
       case 'UNDER':
-        title = 'Tool path would move ' +
-          this._length_str(min - pathMin - off) + ' below axis bounds.';
+        title = 'Current program would move ' +
+          this._length_str(min - pathMin - off) + ' below axis bounds.  ' +
+          'Offsets must be adjusted of soft limits set correctly.';
         break;
 
       case 'NO FIT':