CreatBot/CreatBotMainsail
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bugfix: subscription of special extras

Browse Source
This commit is contained in:
Stefan Dej 2020-07-14 12:49:51 +02:00
parent 316763e92e
commit d18355507f
3 changed files with 32 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/store/actions.js
View File

@ -118,6 +118,27 @@ export default {
getObjectInfo({ commit }, data) {
commit('setObjectData', data);
let subscripts = {}
for (let key of Object.keys(data)) {
let nameSplit = key.split(" ");
if (
nameSplit[0] === "temperature_fan" ||
nameSplit[0] === "temperature_probe" ||
nameSplit[0] === "temperature_sensors" ||
nameSplit[0] === "filament_switch_sensor" ||
nameSplit[0] === "bed_mesh"
) subscripts = {...subscripts, [key]: []}
}
if (subscripts !== {}) Vue.prototype.$socket.sendObj('post_printer_objects_subscription', subscripts);
if (subscripts.bed_mesh) Vue.prototype.$socket.sendObj('get_printer_objects_status', { bed_mesh: [] }, 'getPrinterData');
},
getPrinterData({ commit }, data) {
commit('setPrinterData', data);
},
getHeatersInfo({ commit }, data) {
@ -282,6 +303,10 @@ export default {
commit('removeLoading', { name: 'bedMeshClear' });
},
responseBedMeshCalibrate({commit}) {
commit('removeLoading', { name: 'bedMeshCalibrate' });
},
responseBedMeshSave({commit}) {
commit('removeLoading', { name: 'bedMeshSave' });
},

5
src/store/getters.js
View File

@ -227,8 +227,9 @@ export default {
if (nameSplit.length > 1 && nameSplit[0] === "bed_mesh" && nameSplit[1] !== undefined) {
profiles.push({
name: nameSplit[1]+(currentProfile === nameSplit[1] ? " (current)": ""),
data: value
name: nameSplit[1],
data: value,
is_active: (currentProfile === nameSplit[1] ? true: false),
});
}
}

24
src/store/mutations.js
View File

@ -31,13 +31,14 @@ export default {
datasets: [],
},
helplist: [],
files: [],
filetree: [],
}
}
);
},
setPrinterData(state, data) {
if (data.requestParams) delete data.requestParams;
let now = Date.now();
Object.entries(data).forEach(([key, value]) => {
@ -173,21 +174,6 @@ export default {
setObjectData(state, data) {
Object.assign(state.object, data);
let subscripts = {}
for (let key of Object.keys(data)) {
let nameSplit = key.split(" ");
if (
nameSplit[0] === "temperature_fan" ||
nameSplit[0] === "temperature_probe" ||
nameSplit[0] === "temperature_sensors" ||
nameSplit[0] === "filament_switch_sensor" ||
nameSplit[0] === "bed_mesh"
) subscripts = {...subscripts, [key]: []}
}
if (subscripts.length) Vue.prototype.$socket.sendObj('post_printer_objects_subscription', subscripts);
},
setPrinterConfig(state, data) {
@ -221,11 +207,11 @@ export default {
setDirectory(state, data) {
let parent = undefined;
let parentPath = "";
//let parentPath = "";
if (data && data.requestParams && data.requestParams.path) {
let arrayPath = data.requestParams.path.split("/");
parent = findDirectory(state.filetree, arrayPath);
parentPath = data.requestParams.path;
//parentPath = data.requestParams.path;
}
if (parent === undefined) parent = state.filetree;
@ -246,8 +232,6 @@ export default {
modified: Date.parse(dir.modified),
childrens: [],
});
Vue.prototype.$socket.sendObj('get_directory', { path: parentPath+"/"+dir.dirname }, 'getDirectory');
}
}
}