fix bug where fdm driver was overriding origin center in cam mode
This commit is contained in:
parent
a15cb2fd81
commit
f2d862df1e
4 changed files with 3 additions and 8 deletions
|
|
@ -394,7 +394,7 @@
|
||||||
camStockZ: 0,
|
camStockZ: 0,
|
||||||
camStockOffset: true,
|
camStockOffset: true,
|
||||||
outputClockwise: false,
|
outputClockwise: false,
|
||||||
outputOriginCenter: true,
|
outputOriginCenter: false,
|
||||||
outputInvertX: false,
|
outputInvertX: false,
|
||||||
outputInvertY: false
|
outputInvertY: false
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -568,9 +568,8 @@
|
||||||
dev.new = false;
|
dev.new = false;
|
||||||
dev.deviceName = devicename;
|
dev.deviceName = devicename;
|
||||||
|
|
||||||
proc.outputOriginCenter = dev.outputOriginCenter;
|
|
||||||
UI.deviceName.value = devicename;
|
UI.deviceName.value = devicename;
|
||||||
UI.deviceOrigin.checked = proc.outputOriginCenter;
|
UI.deviceOrigin.checked = dev.outputOriginCenter;
|
||||||
|
|
||||||
// add extruder selection buttons
|
// add extruder selection buttons
|
||||||
if (dev.extruders) {
|
if (dev.extruders) {
|
||||||
|
|
|
||||||
|
|
@ -1758,11 +1758,6 @@
|
||||||
// allow mode driver to take any necessary actions
|
// allow mode driver to take any necessary actions
|
||||||
API.event.emit("settings.load", settings);
|
API.event.emit("settings.load", settings);
|
||||||
|
|
||||||
// FDM process settings overridden by device
|
|
||||||
// if (mode == "FDM") {
|
|
||||||
// settings.process.outputOriginCenter = (settings.device.originCenter || false);
|
|
||||||
// }
|
|
||||||
|
|
||||||
// update UI fields to reflect current settings
|
// update UI fields to reflect current settings
|
||||||
updateFields();
|
updateFields();
|
||||||
API.conf.update();
|
API.conf.update();
|
||||||
|
|
|
||||||
|
|
@ -46,6 +46,7 @@
|
||||||
|
|
||||||
function init(kiri, api) {
|
function init(kiri, api) {
|
||||||
api.event.on("settings.load", (settings) => {
|
api.event.on("settings.load", (settings) => {
|
||||||
|
if (settings.mode !== 'FDM') return;
|
||||||
settings.process.outputOriginCenter = (settings.device.originCenter || false);
|
settings.process.outputOriginCenter = (settings.device.originCenter || false);
|
||||||
});
|
});
|
||||||
api.event.on("settings.saved", (settings) => {
|
api.event.on("settings.saved", (settings) => {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue