factor device dialog out of init. remove Pallete3 support

src/kiri-mode/fdm/export.js

@@ -120,15 +120,6 @@ FDM.export = function(print, online, ondone, ondebug) {
         minz = { x: Infinity, y: Infinity, z: Infinity },
         // lenghts of each filament (by nozzle) consumed
         segments = [],
-        // palette & ping data
-        isPalette = device.filamentSource === 'palette3',
-        paletteInfo = extras.palette || {},
-        palettePingStart = Math.max(paletteInfo.ping, paletteInfo.feed, paletteInfo.push) || 500,
-        palettePingSpace = paletteInfo.ping || 0,
-        // track purges for palette3 pings
-        purgePos,
-        purgeOn = 0,
-        purgeOff = 0,
         extrudeMM = FDM.extrudeMM,
         extrudePerMM = FDM.extrudePerMM;
 
@@ -615,41 +606,6 @@ FDM.export = function(print, online, ondone, ondebug) {
             out = path[pidx];
             speedMMM = (out.speed || process.outputFeedrate) * 60; // range
 
-            // track purge towers for palette3
-            // do not generate pings before total tube length exhausted
-            // because the palette cannot respond to differences before then
-            if (isPalette && palettePingSpace && emitted >= palettePingStart) {
-                if (purgeOn === 0 && out.point.purgeOn && emitted - purgeOff >= palettePingSpace) {
-                    retract();
-                    pushPos(out.point.purgeOn);
-                    // shorter pause accounts for retract/move
-                    dwell(12750);
-                    popPos();
-                    unretract();
-                    purgeOn = emitted;
-                    purgePos = out.point.purgeOn;
-                    pingRemain = 20;
-                }
-                if (purgeOn && pingRemain <= 0) {
-                    retract();
-                    pushPos(purgePos);
-                    // shorter pause accounts for retract/move
-                    dwell(6750);
-                    popPos();
-                    unretract();
-                    if (!print.purges) {
-                        print.purges = [];
-                    }
-                    print.purges.push({
-                        length: purgeOn,
-                        extrusion: emitted - purgeOn
-                    });
-                    purgeOff = emitted;
-                    purgeOn = 0;
-                    pingRemain = 0;
-                }
-            }
-
             // emit comment on output type chage
             if (last && out.type !== last.type) {
                 lastType = subst.feature = out.type;
@@ -674,10 +630,7 @@ FDM.export = function(print, online, ondone, ondebug) {
                     extruder.extFilament,
                     path.layer === 0 ?
                         (process.firstSliceHeight || process.sliceHeight) : path.height);
-                // do not run extruder swapping code when source is Palette3
+                appendAllSub(extruder.extSelect);
-                if (!isPalette) {
-                    appendAllSub(extruder.extSelect);
-                }
             }
 
             // if no point in output, it's a dwell command
@@ -1002,7 +955,6 @@ FDM.export = function(print, online, ondone, ondebug) {
     // force emit of buffer
     append();
     // console.log({segments, emitted, outputLength});
-    print.segments = isPalette ? segments : undefined;
     print.distance = emitted;
     print.lines = lines;
     print.bytes = bytes + lines - 1;

src/kiri/conf.js

@@ -265,7 +265,7 @@ const conf = exports({
                     extOffsetY: 0
                 }],
                 profiles: [],
-                // other stored info like palette3 config
+                // other stored config info
                 extras: {}
             },
             // process defaults FDM:Process

src/kiri/consts.js

@@ -62,10 +62,6 @@ const LISTS = {
         { name: "flat" },
         { name: "line" }
     ],
-    filasrc: [
-        { name: "direct" },
-        { name: "palette3" }
-    ],
     animesh: [
         { name: "100" },
         { name: "200" },

src/kiri/devices.js

@@ -0,0 +1,386 @@
+/** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
+
+"use strict";
+
+// dep: kiri.settings
+gapp.register("kiri.devices", (root, exports) => {
+
+    let { kiri } = root;
+    let { api, conf } = kiri;
+
+    api.device = {
+        clone: cloneDevice,
+        code: currentDeviceCode,
+        get: currentDeviceName,
+        set: selectDevice,
+        isBelt
+    };
+
+    api.devices = {
+        show: showDevices,
+        select: selectDevice,
+        refresh: updateDeviceList
+    };
+
+    function isBelt() {
+        return api.conf.get().device.bedBelt;
+    }
+
+    function currentDeviceName() {
+        return api.conf.get().filter[api.mode.get()];
+    }
+
+    function currentDeviceCode() {
+        return api.conf.get().devices[currentDeviceName()];
+    }
+
+    function getModeDevices() {
+        // devices are injected into self scope by
+        // app.js generateDevices()
+        return Object.keys(devices[api.mode.get_lower()]).sort();
+    }
+
+    function showDevices() {
+        api.settings.sync.get().then(_showDevices);
+    }
+
+    function _showDevices() {
+        updateDeviceList();
+        api.modal.show('setup');
+    }
+
+    function updateDeviceList() {
+        renderDevices(getModeDevices());
+    }
+
+    function updateDeviceName(newname) {
+        let selected = api.device.get(),
+            devs = api.conf.get().devices;
+        if (newname !== selected) {
+            devs[newname] = devs[selected];
+            delete devs[selected];
+            selectDevice(newname);
+            updateDeviceList();
+        }
+    }
+
+    function putLocalDevice(devicename, obj) {
+        api.conf.get().devices[devicename] = obj;
+        api.conf.save();
+    }
+
+    function removeLocalDevice(devicename) {
+        delete api.conf.get().devices[devicename];
+        api.conf.save();
+        sync_put();
+    }
+
+    function isLocalDevice(devicename) {
+        return api.conf.get().devices[devicename] ? true : false;
+    }
+
+    function getSelectedDevice() {
+        return api.device.get();
+    }
+
+    function selectDevice(devicename) {
+        if (isLocalDevice(devicename)) {
+            setDeviceCode(api.conf.get().devices[devicename], devicename);
+        } else {
+            let code = devices[api.mode.get_lower()][devicename];
+            if (code) {
+                setDeviceCode(code, devicename);
+            }
+        }
+    }
+
+    // only for local filters
+    function cloneDevice() {
+        let name = `${getSelectedDevice().replace(/\./g,' ')}`;
+        let code = api.clone(api.conf.get().device);
+        code.mode = api.mode.get();
+        if (name.toLowerCase().indexOf('my ') >= 0) {
+            name = `${name} copy`;
+        } else {
+            name = `My ${name}`;
+        }
+        putLocalDevice(name, code);
+        setDeviceCode(code, name);
+        sync_put();
+    }
+
+    function updateLaserState() {
+        const dev = api.conf.get().device;
+        $('laser-on').style.display = dev.useLaser ? 'flex' : 'none';
+        $('laser-off').style.display = dev.useLaser ? 'flex' : 'none';
+    }
+
+    function setDeviceCode(code, devicename) {
+        api.event.emit('device.select', devicename);
+        try {
+            if (typeof(code) === 'string') code = js2o(code) || {};
+
+            let mode = api.mode.get(),
+                lmode = mode.toLowerCase(),
+                current = api.conf.get(),
+                local = isLocalDevice(devicename),
+                dev = current.device = conf.device_from_code(code,mode),
+                dproc = current.devproc[devicename], // last process name for this device
+                newdev = dproc === undefined,   // first time device is selected
+                predev = current.filter[mode],  // previous device selection
+                chgdev = predev !== devicename; // device is changing
+
+            // fill missing device fields
+            conf.fill_cull_once(dev, conf.defaults[lmode].d);
+
+            // first time device use, add any print profiles and set to default if present
+            if (code.profiles) {
+                for (let profile of code.profiles) {
+                    let profname = profile.processName;
+                    // if no saved profile by that name for this mode...
+                    if (!current.sproc[mode][profname]) {
+                        console.log('adding profile', profname, 'to', mode);
+                        current.sproc[mode][profname] = profile;
+                    }
+                    // if it's a new device, seed the new profile name as last profile
+                    if (newdev && !current.devproc[devicename]) {
+                        console.log('setting default profile for new device', devicename, 'to', profname);
+                        current.devproc[devicename] = dproc = profname;
+                    }
+                }
+            }
+
+            dev.new = false;
+            dev.deviceName = devicename;
+
+            let { platform, ui, uc } = api;
+            let { space } = kiri;
+
+            ui.deviceBelt.checked = dev.bedBelt;
+            ui.deviceRound.checked = dev.bedRound;
+            ui.deviceOrigin.checked = dev.ctOriginCenter || dev.originCenter || dev.bedRound;
+            ui.fwRetract.checked = dev.fwRetract;
+
+            // add extruder selection buttons
+            if (dev.extruders) {
+                let ext = api.lists.extruders = [];
+                dev.internal = 0;
+                for (let i=0; i<dev.extruders.length; i++) {
+                    ext.push({id:i, name:i});
+                }
+            }
+
+            // disable editing for non-local devices
+            [
+                // ui.deviceName,
+                ui.gcodePre,
+                ui.gcodePost,
+                ui.bedDepth,
+                ui.bedWidth,
+                ui.maxHeight,
+                ui.useLaser,
+                ui.resolutionX,
+                ui.resolutionY,
+                ui.deviceOrigin,
+                ui.deviceRound,
+                ui.deviceBelt,
+                ui.fwRetract,
+                ui.deviceZMax,
+                ui.gcodeTime,
+                ui.gcodeFan,
+                ui.gcodeFeature,
+                ui.gcodeTrack,
+                ui.gcodeLayer,
+                ui.extFilament,
+                ui.extNozzle,
+                ui.spindleMax,
+                ui.gcodeSpindle,
+                ui.gcodeDwell,
+                ui.gcodeChange,
+                ui.gcodeFExt,
+                ui.gcodeSpace,
+                ui.gcodeStrip,
+                ui.gcodeLaserOn,
+                ui.gcodeLaserOff,
+                ui.extPrev,
+                ui.extNext,
+                ui.extAdd,
+                ui.extDel,
+                ui.extOffsetX,
+                ui.extOffsetY,
+                ui.extSelect,
+                ui.extDeselect
+            ].forEach(function(e) {
+                e.disabled = !local;
+            });
+
+            ui.deviceSave.disabled = !local;
+            ui.deviceDelete.disabled = !local;
+            ui.deviceRename.disabled = !local;
+            ui.deviceExport.disabled = !local;
+            ui.deviceAdd.style.display = mode === 'SLA' ? 'none' : '';
+
+            if (local) {
+                ui.deviceAdd.innerText = "copy";
+                ui.deviceDelete.style.display = '';
+                ui.deviceRename.style.display = '';
+                ui.deviceExport.style.display = '';
+            } else {
+                ui.deviceAdd.innerText = "customize";
+                ui.deviceDelete.style.display = 'none';
+                ui.deviceRename.style.display = 'none';
+                ui.deviceExport.style.display = 'none';
+            }
+            ui.deviceAdd.disabled = dev.noclone;
+
+            api.conf.update_fields();
+            space.platform.setBelt(isBelt());
+            platform.update_size();
+            platform.update_origin();
+            platform.update();
+            updateLaserState();
+
+            // store current device name for this mode
+            current.filter[mode] = devicename;
+            // cache device record for this mode (restored in setMode)
+            current.cdev[mode] = dev;
+
+            if (dproc) {
+                // restore last process associated with this device
+                api.conf.load(null, dproc);
+            } else {
+                api.conf.update();
+            }
+
+            api.conf.save();
+
+            if (isBelt()) {
+                // space.view.setHome(dev.bedBelt ? Math.PI/2 : 0, Math.PI / 2.5);
+                space.view.setHome(0, Math.PI / 2.5);
+            } else {
+                space.view.setHome(0);
+            }
+            // when changing devices, update focus on widgets
+            if (chgdev) {
+                setTimeout(api.space.set_focus, 0);
+            }
+
+            uc.refresh(1);
+        } catch (e) {
+            console.log({error:e, device:code, devicename});
+            api.show.alert(`invalid or deprecated device: "${devicename}"`, 10);
+            api.show.alert(`please select a new device`, 10);
+            throw e;
+            showDevices();
+        }
+        api.function.clear();
+        api.event.settings();
+    }
+
+    function renderDevices(devices) {
+        let selected = api.device.get() || devices[0],
+            features = api.feature,
+            devs = api.conf.get().devices,
+            dfilter = typeof(features.device_filter) === 'function' ? features.device_filter : undefined;
+
+        for (let local in devs) {
+            if (!(devs.hasOwnProperty(local) && devs[local])) {
+                continue;
+            }
+            let dev = devs[local],
+                fdmCode = dev.cmd,
+                fdmMode = (api.mode.get() === 'FDM');
+            if (dev.mode ? (dev.mode === api.mode.get()) : (fdmCode ? fdmMode : !fdmMode)) {
+                devices.push(local);
+            }
+        };
+
+        devices = devices.sort();
+
+        let { event, ui } = api;
+
+        event.emit('devices.render', devices);
+
+        ui.deviceSave.onclick = function() {
+            event.emit('device.save');
+            api.function.clear();
+            api.conf.save();
+            api.settings.sync.put();
+            showDevices();
+            api.modal.hide();
+        };
+        ui.deviceAdd.onclick = function() {
+            api.function.clear();
+            cloneDevice();
+            showDevices();
+        };
+        ui.deviceDelete.onclick = function() {
+            api.function.clear();
+            removeLocalDevice(getSelectedDevice());
+            selectDevice(getModeDevices()[0]);
+            showDevices();
+        };
+        ui.deviceRename.onclick = function() {
+            api.uc.prompt(`Rename "${selected}`, selected).then(newname => {
+                if (newname) {
+                    updateDeviceName(newname);
+                    api.conf.save();
+                    api.settings.sync.put();
+                    showDevices();
+                } else {
+                    showDevices();
+                }
+            });
+        };
+        ui.deviceExport.onclick = function(event) {
+            const record = {
+                version: kiri.version,
+                device: selected,
+                process: api.process.code(),
+                profiles: event.altKey ? api.settings.prof() : undefined,
+                code: devs[selected],
+                time: Date.now()
+            };
+            let exp = api.util.b64enc(record);
+            api.device.export(exp, selected, { event, record });
+        };
+
+        let dedup = {};
+        let list_cdev = [];
+        let list_mdev = [];
+        devices.forEach(function(device, index) {
+            // prevent device from appearing twice
+            // such as local name = standard device name
+            if (dedup[device]) {
+                return;
+            }
+            dedup[device] = device;
+            let loc = isLocalDevice(device);
+            if (dfilter && dfilter(device) === false) {
+                return;
+            }
+            if (loc) {
+                list_mdev.push(h.option(device));
+            } else {
+                list_cdev.push(h.option(device));
+            }
+        });
+
+        let dev_list = $('dev-list');
+        h.bind(dev_list, [
+            h.option({ _: '-- My Devices --', disabled: true }),
+            ...list_mdev,
+            h.option({ _: '-- Stock Devices --', disabled: true }),
+            ...list_cdev
+        ]);
+        let dev_opts = [...dev_list.options].map(o => o.innerText);
+        dev_list.selectedIndex = dev_opts.indexOf(selected);
+        dev_list.onchange = ev => {
+            const seldev = dev_list.options[dev_list.selectedIndex];
+            selectDevice(seldev.innerText);
+            api.platform.layout();
+        }
+        selectDevice(selected);
+    }
+
+});

src/kiri/export.js

@@ -517,133 +517,6 @@ function exportGCodeDialog(gcode, sections, info, names) {
             })
         };
 
-        // in palette mode, show download button
-        let downloadPalette = $('print-palette');
-        downloadPalette.style.display = info.segments ? 'flex' : 'none';
-        // generate MAFX downloadble file
-        if (info.segments) {
-            // todo: reduce segments to eliminate 0 lenghts and transitions before 150mm
-            let { settings, segments } = info;
-            let { device, bounds } = settings;
-            let { min, max } = bounds;
-            let extras = device.extras || {};
-            let pinfo = extras.palette || {};
-            // filter pings to those occuring after all tubes combined
-            let pings = info.purges || [];
-            let driveInfo = {};
-            let volume = {};
-            let length = {};
-            // clean up and round pings
-            pings.forEach(p => {
-                p.length = p.length.round(3);
-                // p.length = (p.length - pinfo.offset).round(2);
-                // p.length = (p.length + pinfo.offset).round(2);
-                p.extrusion = p.extrusion.round(3);
-            });
-            // add length of push filament to the last segment
-            segments.peek().emitted += pinfo.push;
-            let lastEmit = 0;
-            let ratioVolume = (0.4 * 0.4) / (1.75 * 1.75);
-            for (let seg of segments) {
-                let seginfo = driveInfo[seg.tool] = driveInfo[seg.tool] || { length: 0, volume: 0 };
-                seg.emitted += pinfo.offset;
-                seginfo.length += seg.emitted - lastEmit;
-                seginfo.volume = seginfo.length * ratioVolume;
-                volume[seg.tool+1] = seginfo.volume.round(2);
-                length[seg.tool+1] = seginfo.length.round(2);
-                lastEmit = seg.emitted;
-            }
-            let totalLength = Object.values(length).reduce((a,v) => a+v).round(2);
-            let totalVolume = Object.values(volume).reduce((a,v) => a+v).round(2);
-            // console.log({info, device, pinfo, segments, volume, length, totalLength});
-            let meta = {
-                version: "3.2",
-                printerProfile: {
-                    id: pinfo.printer,
-                    name: device.deviceName || "My Printer"
-                },
-                preheatTemperature: { nozzle: [0], bed: 0 },
-                paletteNozzle: 0,
-                time: info.time.round(1),
-                volume,
-                length,
-                totalLength,
-                totalVolume,
-                inputsUsed: Object.keys(driveInfo).length,
-                splices: segments.length,
-                pings: pings.length,
-                boundingBox: {
-                    min: [ min.x, min.y, min.z ],
-                    max: [ max.x, max.y, max.z ]
-                },
-                filaments: Object.keys(driveInfo).map(v => { return {
-                    name: `Color${v}`,
-                    type: "Filament",
-                    color: `#${v}0${v}0${v}0`,
-                    materialId: parseInt(v) + 1,
-                    filamentId: parseInt(v) + 1
-                }}),
-            };
-            let lastDrive;
-            let algokeys = {};
-            let algorithms = [];
-            let defaultSplice = {
-                compression: pinfo.press,
-                cooling: pinfo.cool,
-                heat: pinfo.heat
-            };
-            for (let key of Object.keys(driveInfo)) {
-                key = parseInt(key) + 1;
-                algorithms.push({
-                    ingoingId: key,
-                    outgoingId: key,
-                    ...defaultSplice
-                });
-            }
-            let palette = {
-                version: "3.0",
-                drives: [0, 0, 0, 0, 0, 0, 0, 0].map((v,i) => {
-                    return driveInfo[i] ? i+1 : 0
-                }),
-                splices: segments.filter(r => {
-                    return r.emitted >= 150;
-                }).map(r => {
-                    if (lastDrive >= 0 && lastDrive !== r.tool) {
-                        let key = `${lastDrive}+${r.tool}`;
-                        if (!algokeys[key]) {
-                            let rec = algokeys[key] = {
-                                ingoingId: lastDrive + 1,
-                                outgoingId: r.tool + 1,
-                                ...defaultSplice
-                            };
-                            algorithms.push(rec);
-                        }
-                    }
-                    lastDrive = r.tool;
-                    return { id: r.tool + 1, length: r.emitted.round(2) }
-                }),
-                pings,
-                algorithms
-            };
-            let png;
-            kiri.client.png({}, data => {
-                png = data.png;
-            });
-            console.log({meta,palette});
-            downloadPalette.onclick = function() {
-                kiri.client.zip([
-                    {name:"meta.json", data:JSON.stringify(meta,undefined,4)},
-                    {name:"palette.json", data:JSON.stringify(palette,undefined,4)},
-                    {name:"thumbnail.png", data:png.buffer}
-                ], progress => {
-                    api.show.progress(progress.percent/100, "generating palette files");
-                }, output => {
-                    api.show.progress(0);
-                    api.util.download(output, `${$('print-filename').value}.mafx`);
-                })
-            };
-        }
-
         // octoprint setup
         $('send-to-octohead').style.display = octo ? '' : 'none';
         $('send-to-octoprint').style.display = octo ? '' : 'none';

src/kiri/init.js

@@ -8,6 +8,7 @@
 // dep: kiri.lang
 // dep: kiri.stats
 // dep: kiri.consts
+// dep: kiri.devices
 // dep: kiri.platform
 // dep: kiri.selection
 // use: kiri.tools
@@ -15,8 +16,8 @@
 gapp.register("kiri.init", (root, exports) => {
 
     let { base, kiri } = root,
-        { api, catalog, conf, consts, space } = kiri,
+        { api, catalog, consts, space } = kiri,
-        { sdb, stats, js2o, platform, selection, ui, uc } = api,
+        { sdb, stats, platform, selection, ui, uc } = api,
         { VIEWS, MODES, SEED } = consts,
         { LANG, LOCAL, SETUP } = api.const,
         { CAM, SLA, FDM, LASER, DRAG, WJET, WEDM } = MODES,
@@ -47,13 +48,17 @@ gapp.register("kiri.init", (root, exports) => {
 
     // extend KIRI API with local functions
     api.show.devices = showDevices;
-    api.device.set = selectDevice;
+    // api.device.set = selectDevice;
-    api.device.clone = cloneDevice;
+    // api.device.clone = cloneDevice;
 
     function settings() {
         return api.conf.get();
     }
 
+    function showDevices() {
+        api.devices.show();
+    }
+
     function checkSeed(then) {
         // skip sample object load in onshape (or any script postload)
         if (!sdb[SEED]) {
@@ -94,25 +99,6 @@ gapp.register("kiri.init", (root, exports) => {
         }
     }
 
-    function filamentSourceEditUpdate() {
-        if (ui.filamentSource && ui.filamentSourceEdit) {
-            api.event.emit("filament.source");
-            const sel = ui.filamentSource.options[ui.filamentSource.selectedIndex];
-            if (sel) {
-                ui.filamentSourceEdit.style.display = sel.value === 'palette3' ? '' : 'none';
-            }
-        }
-    }
-
-    function filamentSourceSave() {
-        const sel = ui.filamentSource.options[ui.filamentSource.selectedIndex];
-        if (sel) {
-            settings().device.filamentSource = sel.value;
-            api.conf.save();
-        }
-        filamentSourceEditUpdate();
-    }
-
     function thinWallSave() {
         let opt = ui.sliceDetectThin;
         let level = opt.options[opt.selectedIndex];
@@ -656,341 +642,12 @@ gapp.register("kiri.init", (root, exports) => {
         api.conf.show();
     }
 
-    function putLocalDevice(devicename, obj) {
-        settings().devices[devicename] = obj;
-        api.conf.save();
-    }
-
-    function removeLocalDevice(devicename) {
-        delete settings().devices[devicename];
-        api.conf.save();
-        sync_put();
-    }
-
-    function isLocalDevice(devicename) {
-        return settings().devices[devicename] ? true : false;
-    }
-
-    function getSelectedDevice() {
-        return api.device.get();
-    }
-
-    function selectDevice(devicename) {
-        if (isLocalDevice(devicename)) {
-            setDeviceCode(settings().devices[devicename], devicename);
-        } else {
-            let code = devices[api.mode.get_lower()][devicename];
-            if (code) {
-                setDeviceCode(code, devicename);
-            }
-        }
-    }
-
-    // only for local filters
-    function cloneDevice() {
-        let name = `${getSelectedDevice().replace(/\./g,' ')}`;
-        let code = api.clone(settings().device);
-        code.mode = api.mode.get();
-        if (name.toLowerCase().indexOf('my ') >= 0) {
-            name = `${name} copy`;
-        } else {
-            name = `My ${name}`;
-        }
-        putLocalDevice(name, code);
-        setDeviceCode(code, name);
-        sync_put();
-    }
-
-    function updateLaserState() {
-        const dev = settings().device;
-        $('laser-on').style.display = dev.useLaser ? 'flex' : 'none';
-        $('laser-off').style.display = dev.useLaser ? 'flex' : 'none';
-    }
-
-    function setDeviceCode(code, devicename) {
-        api.event.emit('device.select', devicename);
-        try {
-            if (typeof(code) === 'string') code = js2o(code) || {};
-
-            let mode = api.mode.get(),
-                lmode = mode.toLowerCase(),
-                current = settings(),
-                local = isLocalDevice(devicename),
-                dev = current.device = conf.device_from_code(code,mode),
-                dproc = current.devproc[devicename], // last process name for this device
-                newdev = dproc === undefined,   // first time device is selected
-                predev = current.filter[mode],  // previous device selection
-                chgdev = predev !== devicename; // device is changing
-
-            // fill missing device fields
-            conf.fill_cull_once(dev, conf.defaults[lmode].d);
-
-            // first time device use, add any print profiles and set to default if present
-            if (code.profiles) {
-                for (let profile of code.profiles) {
-                    let profname = profile.processName;
-                    // if no saved profile by that name for this mode...
-                    if (!current.sproc[mode][profname]) {
-                        console.log('adding profile', profname, 'to', mode);
-                        current.sproc[mode][profname] = profile;
-                    }
-                    // if it's a new device, seed the new profile name as last profile
-                    if (newdev && !current.devproc[devicename]) {
-                        console.log('setting default profile for new device', devicename, 'to', profname);
-                        current.devproc[devicename] = dproc = profname;
-                    }
-                }
-            }
-
-            dev.new = false;
-            dev.deviceName = devicename;
-
-            // ui.deviceName.value = devicename;
-            ui.deviceBelt.checked = dev.bedBelt;
-            ui.deviceRound.checked = dev.bedRound;
-            ui.deviceOrigin.checked = dev.ctOriginCenter || dev.originCenter || dev.bedRound;
-            ui.fwRetract.checked = dev.fwRetract;
-            if (!dev.filamentSource) ui.filamentSource.selectedIndex = 0;
-
-            // add extruder selection buttons
-            if (dev.extruders) {
-                let ext = api.lists.extruders = [];
-                dev.internal = 0;
-                for (let i=0; i<dev.extruders.length; i++) {
-                    ext.push({id:i, name:i});
-                }
-            }
-
-            // disable editing for non-local devices
-            [
-                // ui.deviceName,
-                ui.gcodePre,
-                ui.gcodePost,
-                ui.bedDepth,
-                ui.bedWidth,
-                ui.maxHeight,
-                ui.useLaser,
-                ui.resolutionX,
-                ui.resolutionY,
-                ui.deviceOrigin,
-                ui.deviceRound,
-                ui.deviceBelt,
-                ui.fwRetract,
-                ui.filamentSource,
-                ui.deviceZMax,
-                ui.gcodeTime,
-                ui.gcodeFan,
-                ui.gcodeFeature,
-                ui.gcodeTrack,
-                ui.gcodeLayer,
-                ui.extFilament,
-                ui.extNozzle,
-                ui.spindleMax,
-                ui.gcodeSpindle,
-                ui.gcodeDwell,
-                ui.gcodeChange,
-                ui.gcodeFExt,
-                ui.gcodeSpace,
-                ui.gcodeStrip,
-                ui.gcodeLaserOn,
-                ui.gcodeLaserOff,
-                ui.extPrev,
-                ui.extNext,
-                ui.extAdd,
-                ui.extDel,
-                ui.extOffsetX,
-                ui.extOffsetY,
-                ui.extSelect,
-                ui.extDeselect
-            ].forEach(function(e) {
-                e.disabled = !local;
-            });
-
-            ui.deviceSave.disabled = !local;
-            ui.deviceDelete.disabled = !local;
-            ui.deviceRename.disabled = !local;
-            ui.deviceExport.disabled = !local;
-            ui.deviceAdd.style.display = mode === 'SLA' ? 'none' : '';
-
-            if (local) {
-                ui.deviceAdd.innerText = "copy";
-                ui.deviceDelete.style.display = '';
-                ui.deviceRename.style.display = '';
-                ui.deviceExport.style.display = '';
-            } else {
-                ui.deviceAdd.innerText = "customize";
-                ui.deviceDelete.style.display = 'none';
-                ui.deviceRename.style.display = 'none';
-                ui.deviceExport.style.display = 'none';
-            }
-            ui.deviceAdd.disabled = dev.noclone;
-
-            api.conf.update_fields();
-            space.platform.setBelt(isBelt());
-            platform.update_size();
-            platform.update_origin();
-            platform.update();
-            updateLaserState();
-
-            // store current device name for this mode
-            current.filter[mode] = devicename;
-            // cache device record for this mode (restored in setMode)
-            current.cdev[mode] = dev;
-
-            if (dproc) {
-                // restore last process associated with this device
-                api.conf.load(null, dproc);
-            } else {
-                api.conf.update();
-            }
-
-            api.conf.save();
-
-            if (isBelt()) {
-                // space.view.setHome(dev.bedBelt ? Math.PI/2 : 0, Math.PI / 2.5);
-                space.view.setHome(0, Math.PI / 2.5);
-            } else {
-                space.view.setHome(0);
-            }
-            // when changing devices, update focus on widgets
-            if (chgdev) {
-                setTimeout(api.space.set_focus, 0);
-            }
-
-            uc.refresh(1);
-            filamentSourceEditUpdate();
-        } catch (e) {
-            console.log({error:e, device:code, devicename});
-            api.show.alert(`invalid or deprecated device: "${devicename}"`, 10);
-            api.show.alert(`please select a new device`, 10);
-            throw e;
-            showDevices();
-        }
-        api.function.clear();
-        api.event.settings();
-    }
-
-    function updateDeviceName(newname) {
-        let selected = api.device.get(),
-            devs = settings().devices;
-        if (newname !== selected) {
-            devs[newname] = devs[selected];
-            delete devs[selected];
-            selectDevice(newname);
-            updateDeviceList();
-        }
-    }
-
     function updateDeviceSize() {
         api.conf.update();
         platform.update_size();
         platform.update_origin();
     }
 
-    function renderDevices(devices) {
-        let selected = api.device.get() || devices[0],
-            features = api.feature,
-            devs = settings().devices,
-            dfilter = typeof(features.device_filter) === 'function' ? features.device_filter : undefined;
-
-        for (let local in devs) {
-            if (!(devs.hasOwnProperty(local) && devs[local])) {
-                continue;
-            }
-            let dev = devs[local],
-                fdmCode = dev.cmd,
-                fdmMode = (api.mode.get() === 'FDM');
-            if (dev.mode ? (dev.mode === api.mode.get()) : (fdmCode ? fdmMode : !fdmMode)) {
-                devices.push(local);
-            }
-        };
-
-        devices = devices.sort();
-
-        api.event.emit('devices.render', devices);
-
-        ui.deviceSave.onclick = function() {
-            api.event.emit('device.save');
-            api.function.clear();
-            api.conf.save();
-            sync_put();
-            showDevices();
-            api.modal.hide();
-        };
-        ui.deviceAdd.onclick = function() {
-            api.function.clear();
-            cloneDevice();
-            showDevices();
-        };
-        ui.deviceDelete.onclick = function() {
-            api.function.clear();
-            removeLocalDevice(getSelectedDevice());
-            selectDevice(getModeDevices()[0]);
-            showDevices();
-        };
-        ui.deviceRename.onclick = function() {
-            api.uc.prompt(`Rename "${selected}`, selected).then(newname => {
-                if (newname) {
-                    updateDeviceName(newname);
-                    api.conf.save();
-                    sync_put();
-                    showDevices();
-                } else {
-                    showDevices();
-                }
-            });
-        };
-        ui.deviceExport.onclick = function(event) {
-            const record = {
-                version: kiri.version,
-                device: selected,
-                process: api.process.code(),
-                profiles: event.altKey ? api.settings.prof() : undefined,
-                code: devs[selected],
-                time: Date.now()
-            };
-            let exp = api.util.b64enc(record);
-            api.device.export(exp, selected, { event, record });
-        };
-
-        let dedup = {};
-        let list_cdev = [];
-        let list_mdev = [];
-        devices.forEach(function(device, index) {
-            // prevent device from appearing twice
-            // such as local name = standard device name
-            if (dedup[device]) {
-                return;
-            }
-            dedup[device] = device;
-            let loc = isLocalDevice(device);
-            if (dfilter && dfilter(device) === false) {
-                return;
-            }
-            if (loc) {
-                list_mdev.push(h.option(device));
-            } else {
-                list_cdev.push(h.option(device));
-            }
-        });
-
-        let dev_list = $('dev-list');
-        h.bind(dev_list, [
-            h.option({ _: '-- My Devices --', disabled: true }),
-            ...list_mdev,
-            h.option({ _: '-- Stock Devices --', disabled: true }),
-            ...list_cdev
-        ]);
-        let dev_opts = [...dev_list.options].map(o => o.innerText);
-        dev_list.selectedIndex = dev_opts.indexOf(selected);
-        dev_list.onchange = ev => {
-            const seldev = dev_list.options[dev_list.selectedIndex];
-            selectDevice(seldev.innerText);
-            api.platform.layout();
-        }
-        selectDevice(selected);
-    }
-
     function renderTools() {
         ui.toolSelect.innerHTML = '';
         maxTool = 0;
@@ -1161,7 +818,7 @@ gapp.register("kiri.init", (root, exports) => {
 
     function showTools() {
         if (api.mode.get_id() !== MODES.CAM) return;
-        sync_get().then(_showTools);
+        api.settings.sync.get().then(_showTools);
     }
 
     function _showTools() {
@@ -1257,33 +914,10 @@ gapp.register("kiri.init", (root, exports) => {
     // not the best way to do this, but main decl of api.show is broken
     api.show.tools = showTools;
 
-    function getModeDevices() {
-        // devices are injected into self scope by
-        // app.js generateDevices()
-        return Object.keys(devices[api.mode.get_lower()]).sort();
-    }
-
-    function updateDeviceList() {
-        renderDevices(getModeDevices());
-    }
-
-    async function sync_get() {
-        await api.settings.sync.get();
-    }
-
     async function sync_put() {
         await api.settings.sync.put();
     }
 
-    function showDevices() {
-        sync_get().then(_showDevices);
-    }
-
-    function _showDevices() {
-        updateDeviceList();
-        api.modal.show('setup');
-    }
-
     function dragOverHandler(evt) {
         evt.stopPropagation();
         evt.preventDefault();
@@ -1403,7 +1037,7 @@ gapp.register("kiri.init", (root, exports) => {
     }
 
     function isBelt() {
-        return ui.deviceBelt.checked;
+        return api.device.isBelt;
     }
 
     function isNotBelt() {
@@ -1626,7 +1260,6 @@ gapp.register("kiri.init", (root, exports) => {
             spindleMax:       newInput(LANG.dv_spmx_s, {title:LANG.dv_spmx_l, convert:toInt, size:5, modes:CAM, trigger:1}),
             deviceZMax:       newInput(LANG.dv_zmax_s, {title:LANG.dv_zmax_l, convert:toInt, size:5, modes:FDM}),
             gcodeTime:        newInput(LANG.dv_time_s, {title:LANG.dv_time_l, convert:toFloat, size:5, modes:FDM}),
-            filamentSource:   newSelect(LANG.dv_fsrc_s, {title: LANG.dv_fsrc_l, action: filamentSourceSave, modes:FDM, show:() => false}, "filasrc"),
             _____:            newDiv({ class: "f-col t-body t-inset", addto: $('dev-config'), set:true, modes:FDM }),
             extruder:         newGroup(LANG.dv_gr_ext, null, {group:"dext", inline}),
             extFilament:      newInput(LANG.dv_fila_s, {title:LANG.dv_fila_l, convert:toFloat, modes:FDM}),
@@ -1644,17 +1277,6 @@ gapp.register("kiri.init", (root, exports) => {
                 ui.extDel  = newButton(undefined, undefined, {icon:'<i class="fas fa-minus"></i>'}),
                 ui.extNext = newButton(undefined, undefined, {icon:'<i class="fas fa-greater-than"></i>'})
             ], {class:"dev-buttons ext-buttons", modes:FDM}),
-            _____:            newDiv({ class: "f-col t-body t-inset", addto: $('dev-config'), set:true, modes:FDM, show: () => false && ui.filamentSource.selectedOptions[0].value === 'palette3' }),
-            palette:          newGroup(LANG.dv_gr_pal, null, {group:"dext2", inline, modes:FDM}),
-            paletteId:        newInput(LANG.dv_paid_s, {title:LANG.dv_paid_l, modes:FDM, size:15, text:true}),
-            palettePing:      newInput(LANG.dv_paps_s, {title:LANG.dv_paps_l, modes:FDM, convert:toInt}),
-            paletteFeed:      newInput(LANG.dv_pafe_s, {title:LANG.dv_pafe_l, modes:FDM, convert:toInt}),
-            palettePush:      newInput(LANG.dv_papl_s, {title:LANG.dv_papl_l, modes:FDM, convert:toInt}),
-            paletteOffset:    newInput(LANG.dv_paof_s, {title:LANG.dv_paof_l, modes:FDM, convert:toInt}),
-            paletteSep:       newBlank({class:"pop-sep", modes:FDM}),
-            paletteHeat:      newInput(LANG.dv_pahe_s, {title:LANG.dv_pahe_l, modes:FDM, convert:toInt}),
-            paletteCool:      newInput(LANG.dv_paco_s, {title:LANG.dv_paco_l, modes:FDM, convert:toInt}),
-            palettePress:     newInput(LANG.dv_pacm_s, {title:LANG.dv_pacm_l, modes:FDM, convert:toInt}),
             _____:            newDiv({ class: "f-col t-body t-inset", addto: $('dev-config'), set:true, modes:CAM_LZR }),
             _____:            newGroup(LANG.dv_gr_out, null, {group:"dgco", inline}),
             gcodeStrip:       newBoolean(LANG.dv_strc_s, onBooleanClick, {title:LANG.dv_strc_l, modes:CAM}),
@@ -2533,7 +2155,7 @@ gapp.register("kiri.init", (root, exports) => {
             api.mode.set(SETMODE || STARTMODE || current.mode, SETMODE);
 
             // fill device list
-            updateDeviceList();
+            api.devices.refresh();
 
             // update ui fields from settings
             api.conf.update_fields();
@@ -2677,69 +2299,6 @@ gapp.register("kiri.init", (root, exports) => {
             api.show.alert("and may not function properly");
             sdb.kiri_beta = kiri.beta;
         }
-
-        // add palette3 edit button after filament source selector
-        {
-            let randomId = Math.round(Math.random() * 0xffffffffffff).toString(16);
-            let fsp = ui.filamentSource.parentNode;
-            let btn = ui.filamentSourceEdit = DOC.createElement('button');
-            btn.setAttribute('id', 'fs-edit');
-            btn.appendChild(DOC.createTextNode('edit'));
-            fsp.insertBefore(btn, ui.filamentSource);
-            let editDone = () => {
-                let device = api.conf.get().device;
-                let extra = device.extras = device.extras || {};
-                btn.onclick = edit;
-                btn.innerText = 'edit';
-                ui.extruder.parentNode.style.display = 'flex';
-                ui.palette.parentNode.style.display = 'none';
-                // save settings
-                extra.palette = {
-                    printer: ui.paletteId.value || randomId,
-                    ping: ui.palettePing.convert(),
-                    feed: ui.paletteFeed.convert(),
-                    push: ui.palettePush.convert(),
-                    offset: ui.paletteOffset.convert(),
-                    heat: ui.paletteHeat.convert(),
-                    cool: ui.paletteCool.convert(),
-                    press: ui.palettePress.convert()
-                };
-            };
-            let edit = btn.onclick = () => {
-                let device = api.conf.get().device;
-                let extra = device.extras = device.extras || {};
-                let pinfo = extra.palette;
-                if (!pinfo) {
-                    pinfo = extra.palette = {
-                        printer: randomId,
-                        feed: 570,
-                        push: 600,
-                        heat: 0,
-                        cool: 0,
-                        press: 0
-                    };
-                }
-                ui.paletteId.value = pinfo.printer;
-                ui.palettePing.value = pinfo.ping || 0;
-                ui.paletteFeed.value = pinfo.feed || 0;
-                ui.palettePush.value = pinfo.push || 0;
-                ui.paletteOffset.value = pinfo.offset || 0;
-                ui.paletteHeat.value = pinfo.heat || 0;
-                ui.paletteCool.value = pinfo.cool || 0;
-                ui.palettePress.value = pinfo.press || 0;
-                ui.extruder.parentNode.style.display = 'none';
-                ui.palette.parentNode.style.display = 'flex';
-                btn.innerText = 'done';
-                btn.onclick = editDone;
-            };
-            api.event.on(["device.select", "filament.source"], () => {
-                ui.extruder.parentNode.style.display = 'flex';
-                ui.palette.parentNode.style.display = 'none';
-                btn.innerText = 'edit';
-                btn.onclick = edit;
-            });
-            api.event.on("device.save", editDone);
-        }
     }
 
     // update static html elements with language overrides

src/kiri/main.js

@@ -15,6 +15,7 @@
 // dep: kiri.widget
 // dep: kiri.stats
 // dep: kiri.stacks
+// dep: kiri.devices
 // dep: kiri.function
 // dep: kiri.platform
 // dep: kiri.selection
@@ -71,12 +72,6 @@ gapp.register("kiri.main", (root, exports) => {
             SECURE,
             STACKS,
         },
-        device: {
-            code: currentDeviceCode,
-            get: currentDeviceName,
-            set: noop, // set during init
-            clone: noop // set during init
-        },
         dialog: {
             show: showModal,
             hide: hideModal,
@@ -938,7 +933,7 @@ gapp.register("kiri.main", (root, exports) => {
         // restore cached device profile for this mode
         if (current.cdev[mode]) {
             current.device = clone(current.cdev[mode]);
-            api.event.emit('device.select', currentDeviceName());
+            api.event.emit('device.select', api.device.get());
         }
         // hide/show
         api.uc.setVisible($('set-tools'), mode === 'CAM');
@@ -964,14 +959,6 @@ gapp.register("kiri.main", (root, exports) => {
         }
     }
 
-    function currentDeviceName() {
-        return settings.get().filter[getMode()];
-    }
-
-    function currentDeviceCode() {
-        return settings.get().devices[currentDeviceName()];
-    }
-
     function currentProcessName() {
         return settings.get().cproc[getMode()];
     }