Skip to content

Commit

Permalink
manual z speeds changing with unit change
Browse files Browse the repository at this point in the history
  • Loading branch information
wholetthedogsout committed Dec 21, 2018
1 parent cc6e495 commit 09319bb
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
4 changes: 3 additions & 1 deletion config/machine_config.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,9 @@ MachineConfig.prototype.update = function(data, callback, force) {
'xy_min',
'xy_max',
'xy_jerk',
'z_jerk'].forEach(function(key) {
'z_jerk',
'z_fast_speed',
'z_slow_speed'].forEach(function(key) {
this._cache.manual[key] = round(this._cache.manual[key]*conv, new_units);
}.bind(this));
}
Expand Down
1 change: 0 additions & 1 deletion dashboard/static/js/libs/fabmoui.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ function FabMoUI(tool, options){
$('#dro-tab').css('width', '0.5em');
}, 200);
if(!$('#right-position-container').hasClass('dropped')){
console.log('Ishould be removing')
$('.dro-dropdown').removeClass('dropped');
setTimeout(function(){
$('#right-position-container').removeClass('dropped');
Expand Down

0 comments on commit 09319bb

Please sign in to comment.