muehe/onefinity-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

saving config in vue

Browse Source
This commit is contained in:
sanjayk03-dev
2024-07-08 15:32:05 +05:30
parent 9ca1e18e93
commit 3cbaedf905
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/js/control-view.js
View File

@@ -725,7 +725,9 @@ module.exports = {
return; return;
} }
const macrosList = this.state.macros_list.map(item => item.file_name); const macrosList = this.state.macros_list.map(item => item.file_name);
var files_to_delete = selected_folder.files.map(item => item.file_name).filter(item => !macrosList.includes(item)); var files_to_delete = selected_folder.files
.map(item => item.file_name)
.filter(item => !macrosList.includes(item));
if (selected_folder.name != "default") { if (selected_folder.name != "default") {
this.config.gcode_list = this.config.gcode_list.filter(item => item.name != this.state.folder); this.config.gcode_list = this.config.gcode_list.filter(item => item.name != this.state.folder);
} else { } else {
@@ -773,8 +775,17 @@ module.exports = {
SvelteComponents.showDialog("Message", { title: this[axis].toolmsg }); SvelteComponents.showDialog("Message", { title: this[axis].toolmsg });
}, },
set_position: function (axis, position) { set_position: async function (axis, position) {
api.put(`position/${axis}`, { position: parseFloat(position) }); this.update_config();
if (!this.config.axes) {
this.config.axes = {};
}
this.config.axes[axis] = {
abs: position + this.state["offset_" + axis],
off: this.state["offset_" + axis],
};
console.log(this.config);
await api.put(`position/${axis}`, { position: parseFloat(position) });
}, },
zero_all: function () { zero_all: function () {

12
src/py/bbctrl/Mach.py
View File

@@ -358,7 +358,7 @@ class Mach(Comm):
def set_position(self, axis, position): def set_position(self, axis, position):
axis = axis.lower() axis = axis.lower()
state = self.ctrl.state state = self.ctrl.state
config = self.ctrl.config # config = self.ctrl.config
if state.is_axis_homed(axis): if state.is_axis_homed(axis):
# If homed, change the offset rather than the absolute position # If homed, change the offset rather than the absolute position
@@ -371,11 +371,11 @@ class Mach(Comm):
# Set the absolute position both locally and via the AVR # Set the absolute position both locally and via the AVR
target = position + state.get('offset_' + axis) target = position + state.get('offset_' + axis)
json_data = config.values # json_data = config.values
axes = json_data.setdefault('axes', {}) # axes = json_data.setdefault('axes', {})
axes[axis] = { 'abs' : target, 'off' : state.get('offset_' + axis)} # axes[axis] = { 'abs' : target, 'off' : state.get('offset_' + axis)}
self.mlog.info('json_data: ' + repr(json_data)) self.mlog.info('target ' + target)
# config.save(json_data) self.mlog.info('state.get ' + state.get('offset_' + axis))
state.set(axis + 'p', target) state.set(axis + 'p', target)
super().queue_command(Cmd.set_axis(axis, target)) super().queue_command(Cmd.set_axis(axis, target))