remove confusing/unused fill speed parameters, rename other params for clarity

src/kiri/core/conf.js

@@ -318,7 +318,6 @@ export const conf = {
                 sliceFillAngle: 45,
                 sliceFillGrow: 0,
                 sliceFillOverlap: 0.35,
-                sliceFillRate: 0,
                 sliceFillRepeat: 1,
                 sliceFillSparse: 0.25,
                 sliceFillType: "hex",
@@ -332,7 +331,6 @@ export const conf = {
                 sliceShellOrder: "in-out",
                 sliceShells: 3,
                 sliceSolidMinArea: 1,
-                sliceSolidRate: 0,
                 sliceSupportAngle: 50,
                 sliceSupportArea: 0.1,
                 sliceSupportDensity: 0.1,

src/kiri/mode/fdm/client.js

@@ -34,9 +34,7 @@ export function init() {
         "sliceFillType": LANG.fi_type,
         "sliceFillWidth": LANG.fi_wdth_s,
         "sliceFillSparse": LANG.fi_pcnt_s,
-        "sliceFillRate": LANG.ou_feed_s,
         "sliceFillGrow": LANG.fi_grow_s,
-        "sliceSolidRate": LANG.ou_fini_s,
         "sliceSolidMinArea": LANG.ad_msol_s,
         "sliceTopLayers": LANG.sl_ltop_s,
         "sliceBottomLayers": LANG.sl_lbot_s,

src/kiri/mode/fdm/init-menu.js

@@ -79,6 +79,7 @@ export function menu() {
     _____:               newGroup(LANG.sw_menu, $('fdm-walls'), { modes:FDM, driven, hideable, separator, group:"fdm-walls" }),
     sliceShells:         newInput(LANG.sl_shel_s, { title:LANG.sl_shel_l, convert:toFloat }),
     sliceLineWidth:      newInput(LANG.sl_line_s, { title:LANG.sl_line_l, convert:toFloat, bound:bound(0,5) }),
+    sliceFillOverlap:    newInput(LANG.fi_over_s, {title:LANG.fi_over_l, convert:toFloat, bound:bound(0.0,1.0)}),
     separator:           newBlank({ class:"set-sep", driven }),
     sliceShellOrder:     newSelect(LANG.sl_ordr_s, { title:LANG.sl_ordr_l}, "shell"),
     sliceDetectThin:     newSelect(LANG.ad_thin_s, { title: LANG.ad_thin_l, action: thinWallSave }, "thin"),
@@ -86,16 +87,12 @@ export function menu() {
     sliceZInterleave:    newBoolean(LANG.ad_zint_s, onBooleanClick, {title:LANG.ad_zint_l, show:zIntShow}),
     _____:               newGroup(LANG.fs_menu, $('fdm-solid'), { modes:FDM, driven, hideable, separator, group:"fdm-solid" }),
     sliceFillAngle:      newInput(LANG.fi_angl_s, {title:LANG.fi_angl_l, convert:toFloat}),
-    sliceFillOverlap:    newInput(LANG.fi_over_s, {title:LANG.fi_over_l, convert:toFloat, bound:bound(0.0,2.0)}),
     sliceFillGrow:       newInput(LANG.fi_grow_s, {title:LANG.fi_grow_l, convert:toFloat}),
     sliceSolidMinArea:   newInput(LANG.ad_msol_s, {title:LANG.ad_msol_l, convert:toFloat}),
     _____:               newGroup(LANG.fi_menu, $('fdm-fill'), { modes:FDM, driven, hideable, separator, group:"fdm-fill" }),
     sliceFillType:       newSelect(LANG.fi_type, {trigger}, "infill"),
     sliceFillSparse:     newInput(LANG.fi_pcnt_s, {title:LANG.fi_pcnt_l, convert:toFloat, bound:bound(0.0,1.0), show:hasInfill}),
     sliceFillRepeat:     newInput(LANG.fi_rept_s, {title:LANG.fi_rept_l, convert:toInt,   bound:bound(1,10),    show:fillIsLinear}),
-    separator:           newBlank({ class:"set-sep", driven }),
-    sliceFillRate:       newInput(LANG.ou_feed_s, {title:LANG.ou_feed_l, convert:toInt,   bound:bound(0,500)}),
-    sliceSolidRate:      newInput(LANG.ou_fini_s, {title:LANG.ou_fini_l, convert:toInt,   bound:bound(0,500)}),
     _____:               newGroup(LANG.fh_menu, $('fdm-heat'), { modes:FDM, driven, hideable, separator, group:"fdm-heat" }),
     outputTemp:          newInput(LANG.ou_nozl_s, {title:LANG.ou_nozl_l, convert:toInt}),
     outputBedTemp:       newInput(LANG.ou_bedd_s, {title:LANG.ou_bedd_l, convert:toInt}),

src/kiri/mode/fdm/prepare.js

@@ -832,7 +832,7 @@ function slicePrintPath(print, slice, startPoint, offset, output, opt = {}) {
         finishSpeed = firstLayer ? firstShellSpeed : (opt.speed || process.outputFinishrate),
         printSpeed = opt.speed || (firstLayer ? firstShellSpeed : process.outputFeedrate),
         fillSpeed = opt.speed || opt.fillSpeed || (firstLayer ? firstFillSpeed || firstShellSpeed : process.outputFeedrate),
-        infillSpeed = process.sliceFillRate || opt.infillSpeed || fillSpeed || printSpeed,
+        infillSpeed = opt.infillSpeed || fillSpeed || printSpeed,
         moveSpeed = process.outputSeekrate,
         minSpeed = process.outputMinSpeed,
         origin = startPoint.add(offset),
@@ -863,11 +863,6 @@ function slicePrintPath(print, slice, startPoint, offset, output, opt = {}) {
         shellOrder = -shellOrder;
     }
 
-    // update fill speed when solids detected
-    if (slice.finishSolids) {
-        fillSpeed = process.sliceSolidRate || finishSpeed;
-    }
-
     // on flats layers also slow down shell print speed
     if (slice.isFlatsLayer) {
         printSpeed = finishSpeed || printSpeed;

web/kiri/lang/en.js

@@ -356,7 +356,7 @@ self.lang['en-us'] = {
     ad_thin_l:      ["detect and fill gaps","between shell walls"],
 
     // FDM SHELLS
-    sl_line_s:      "shell width",
+    sl_line_s:      "line width",
     sl_line_l:      ["extrusion width in millimeters","0 = nozzle diameter"],
     sl_ordr_s:      "shell order",
     sl_ordr_l:      ["output shell order","inside to outside","or outside to inside","affects surface quality"],
@@ -369,8 +369,8 @@ self.lang['en-us'] = {
 
     // FDM SOLID
     fs_menu:        "solid fill",
-    fi_over_s:      "shell overlap",
+    fi_over_s:      "fill overlap",
-    fi_over_l:      ["overlap with shell and other fill","for improved extrusion bonding","as fraction of nozzle diameter","0.0 - 2.0"],
+    fi_over_l:      ["overlap between shells and solid or sparse infill. can improve bonding to shells","as fraction of line width","0.0 - 1.0"],
     fi_angl_s:      "start angle",
     fi_angl_l:      ["starting angle in degrees","90 degrees added to ","each following layer","applies only to solid layers"],
     fi_grow_s:      "area expand",
@@ -393,7 +393,7 @@ self.lang['en-us'] = {
     fc_menu:        "cooling",
 
     // FDM FIRST LAYER
-    fl_menu:        "base",
+    fl_menu:        "base layer",
     fl_lahi_s:      "layer height",
     fl_lahi_l:      ["height of each slice","in millimeters","should be >= slice height"],
     fl_rate_s:      "shell speed",
@@ -864,8 +864,8 @@ self.lang['en-us'] = {
     ad_rdwl_l:      ["time between re-engaging","filament and movement","in milliseconds"],
     ad_scst_s:      "shell coast",
     ad_scst_l:      ["non-printing end","of perimeter shells","in millimeters"],
-    ad_msol_s:      "min area",
+    ad_msol_s:      "area filter",
-    ad_msol_l:      ["minimum area (mm^2)","required to keep solid","must be > 0.1"],
+    ad_msol_l:      ["minimum area (mm^2)","bridges and flats less than this are culled"],
     ad_mins_s:      "min speed",
     ad_mins_l:      ["minimum speed","for short segments"],
     ad_maxf_s:      "max flowrate",