Skip to content

Commit

Permalink
Improved axis under/over warning tooltip.
Browse files Browse the repository at this point in the history
  • Loading branch information
jcoffland committed Nov 12, 2020
1 parent cb1f05d commit d72c026
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
10 changes: 6 additions & 4 deletions src/js/axis-vars.js
Original file line number Diff line number Diff line change
Expand Up @@ -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':
Expand Down

0 comments on commit d72c026

Please sign in to comment.