diff --git a/src/kiri/conf.js b/src/kiri/conf.js index 771bd7bf..d937d885 100644 --- a/src/kiri/conf.js +++ b/src/kiri/conf.js @@ -346,7 +346,6 @@ firstLayerBrim: 0, firstLayerBrimIn: 0, firstLayerBrimTrig: 0, - firstLayerBrimComb: 0, firstLayerBrimGap: 0, firstLayerBeltLead: 3, firstLayerBeltBump: 0, diff --git a/src/kiri/init.js b/src/kiri/init.js index c818c8d8..796786cc 100644 --- a/src/kiri/init.js +++ b/src/kiri/init.js @@ -1759,7 +1759,6 @@ fdmSep: UC.newBlank({class:"pop-sep", modes:FDM, show:isBelt}), firstLayerBrim: UC.newInput(LANG.fl_brim_s, {title:LANG.fl_brim_l, convert:UC.toInt, modes:FDM, show:isBelt}), firstLayerBrimIn: UC.newInput(LANG.fl_brin_s, {title:LANG.fl_brin_l, convert:UC.toInt, modes:FDM, show:isBelt}), - firstLayerBrimComb: UC.newInput(LANG.fl_brco_s, {title:LANG.fl_brco_l, convert:UC.toInt, modes:FDM, show:isBelt}), firstLayerBrimTrig: UC.newInput(LANG.fl_brmn_s, {title:LANG.fl_brmn_l, convert:UC.toInt, modes:FDM, show:isBelt}), firstLayerBrimGap: UC.newInput(LANG.fl_brgp_s, {title:LANG.fl_brgp_l, convert:UC.toFloat, modes:FDM, show:isBelt}), fdmSep: UC.newBlank({class:"pop-sep", modes:FDM, show:isBelt}), diff --git a/src/mode/fdm/client.js b/src/mode/fdm/client.js index 9f82da83..a9cfa7d2 100644 --- a/src/mode/fdm/client.js +++ b/src/mode/fdm/client.js @@ -56,7 +56,6 @@ "sliceLayerStart": LANG.sl_strt_s, "firstLayerBrim": LANG.fl_brim_s, "firstLayerBrimIn": LANG.fl_brin_s, - "firstLayerBrimComb": LANG.fl_brco_s, "firstLayerBrimTrig": LANG.fl_brmn_s, "firstLayerBrimGap": LANG.fl_brgp_s, // export diff --git a/src/mode/fdm/prepare.js b/src/mode/fdm/prepare.js index 40029d42..513d077d 100644 --- a/src/mode/fdm/prepare.js +++ b/src/mode/fdm/prepare.js @@ -587,8 +587,6 @@ // post-process for base extrusions (touching the bed) if (isBelt) { - // correct y offset to desired layer offset - let seqn = 0; // tune base threshold let thresh = Infinity; for (let layer of output) { @@ -608,7 +606,6 @@ let firstLayerBrim = Math.abs(params.firstLayerBrim); let firstLayerBrimIn = params.firstLayerBrimIn || 0; let firstLayerBrimTrig = params.firstLayerBrimTrig || 0; - let firstLayerBrimComb = params.firstLayerBrimComb || 0; let firstLayerBrimGap = params.firstLayerBrimGap || 0; let lastout, first = false; let minz = Infinity, maxy = -Infinity, minx = Infinity, maxx = -Infinity; @@ -649,14 +646,13 @@ } // do not add brims to anchor layers if (!first || layer.anchor) { - seqn = 0; continue; } let tmpout = []; let trigmet = firstLayerBrimTrig === 0 || (firstLayerBrimTrig && mins <= firstLayerBrimTrig); let brimax = Math.max(firstLayerBrim, firstLayerBrimIn); // add brim when all conditions met - if (brimax && seqn <= firstLayerBrimComb && trigmet) { + if (brimax && trigmet) { let { emit, tool } = first; let y = maxy; let z = minz; @@ -695,14 +691,10 @@ print.addOutput(tmpout, newPoint(minx - b, y, z), 0, firstLayerSeek, tool); print.addOutput(tmpout, newPoint(minx - g, y, z), emit, firstLayerRate, tool).retract = false; } - if (firstLayerBrimComb) { - seqn++; - } } else { // for any layer touching belt, ensure start point is nearest origin // print.addOutput(tmpout, newPoint(minx, maxy, minz), 0, firstLayerSeek, first.tool); // print.lastPoint = newPoint(minx, maxy, minz); - seqn = 0; } layer.splice(0,0,...tmpout); }