Improved axis under/over warning tooltip.

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 69f2678c77f90cf1da6426eda6a07686424974d1..71331d67e79a1f5a6708a2546d1982fa3651f8b1 100644 (file)
--- 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 c7bbe6696b3ca306418181cba6feb4c7ddf0e649..77a85b2cec5822fb0320f13707d7788e04a5db72 100644 (file)
--- 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 de1d5026a8f0d23a5f62efb6369e3ce699d87d98..1140ecd2f083108b9243c2fce5812cde6e543ff8 100644 (file)
--- 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':