2 files changed, 4 insertions, 1 deletions

diff --git a/Makefile b/Makefile
index 6393033..5753a68 100644
--- a/Makefile
+++ b/Makefile
@@ -1,42 +1,44 @@
 -include Makefile.local
 
 OPENSCAD_APP?=/Applications/OpenSCAD.app
 OPENSCAD_BIN?=${OPENSCAD_APP}/Contents/MacOS/OpenSCAD
 OPENSCAD_FLAGS=-D draft=false -D debug=false
 SED?=sed
 ECHO?=/bin/echo
 AWK?=awk
 
 default:
         @echo "And?"
 
 clean:
         rm -f *.stl *.gcode
 
 stl-another-%:
-        $(MAKE) another-$*-{body,body-label,lever,knob,springpad}.stl
+        $(MAKE) another-$*-{body,body-label,lever,knob,knob-label,springpad}.stl
 
 another-%-body.stl: another-%.scad another.scad
         $(OPENSCAD_BIN) $(OPENSCAD_FLAGS) -D 'what="body"' -o "$@" "$<"
 another-%-body-label.stl: another-%.scad another.scad
         $(OPENSCAD_BIN) $(OPENSCAD_FLAGS) -D 'what="body.label"' -o "$@" "$<"
 another-%-lever.stl: another-%.scad another.scad
         $(OPENSCAD_BIN) $(OPENSCAD_FLAGS) -D 'what="lever"' -o "$@" "$<"
 another-%-knob.stl: another-%.scad another.scad
         $(OPENSCAD_BIN) $(OPENSCAD_FLAGS) -D 'what="knob"' -o "$@" "$<"
+another-%-knob-label.stl: another-%.scad another.scad
+        $(OPENSCAD_BIN) $(OPENSCAD_FLAGS) -D 'what="knob.label"' -o "$@" "$<"
 another-%-springpad.stl: another-%.scad another.scad
         $(OPENSCAD_BIN) $(OPENSCAD_FLAGS) -D 'what="springpad"' -o "$@" "$<"
 
 multiswitch: multiswitch.c8r.scad $(addsuffix .stl,$(addprefix multiswitch-embeddest-,2 3 4 5 6))
 multiswitch-embeddest-%.stl: multiswitch-embeddest.scad
         $(OPENSCAD_BIN) $(OPENSCAD_FLAGS) -D inputs=$* -o "$@" "$<"
 
 multiswitch.c8r.scad: multiswitch-c8r.scad threads.scad  pushfit_data.scad pushfittery.scad multiswitch.scad
         @echo "Preprocessing into $@…"
         @( \
          $(ECHO) "/* DO NOT. JUST DO NOT. FORGET THIS FILE, IT'S PREPROCESSED, GET THE SOURCE. */" ;\
          $(AWK) '/^\/\/CUSTOMIZERCUTOFF/ {nextfile} {print}' $^ | $(SED) -Ee 's,^(use|include),//\1,g' \
         ) > $@
 
 %.stl: %.scad
         ${OPENSCAD_BIN} ${OPENSCAD_FLAGS} -o "$@" "$<"
diff --git a/another.scad b/another.scad
index 3c4f27a..1c6d836 100644
--- a/another.scad
+++ b/another.scad
@@ -386,112 +386,113 @@ module the_extruder(
   bigd = spring_d+spring_d_clearance/2;
   hf = (bigd-smalld)/2;
   h = hf*3.5;
   translate([-gearbox_d/2+st_thickshell+st_nut_h+st_nut_h_tolerance+st_thinshell+1,-longwing,filament_elevation])
   rotate([0,90,0]) difference() {
    union() {
     cylinder(d1=smalld,d2=bigd,h=hf,$fn=fnd*bigd);
     translate([0,0,hf-epsilon])
     cylinder(d=bigd,h=h-hf,$fn=fnd*bigd);
     translate([0,0,h])
     sphere(d=spring_d*3/4,$fn=fnd*spring_d*3/4);
     l = body_h-ls_z;
     w = st_split_w;
     hull() translate([0,-st_split_w/2,0]) mirror([1,0,0]) {
      translate([0,0,w])
      cube(size=[l,st_split_w,w]);
      cube(size=[l-w,st_split_w,2*w]);
     }
    }
    translate([0,0,-epsilon])
    cylinder(d=st_screw_d+st_screw_d_tolerance,h=2*hf+epsilon,$fn=fnd*(st_screw_d+st_screw_d_tolerance));
   }
  }
 
  module knob() {
   ch = knob_indent_d/2;
   knob_bore_l = body_h-protrusion_h-pulley_elevation-pulley_h-knob_v_clearance;
   translate([0,0,body_h+epsilon]) {
    mirror([0,0,1]) translate([0,0,-epsilon]) {
     difference() {
      cylinder(d=pulley_d,h=knob_bore_l,$fn=fnd*pulley_d);
      translate([0,0,-1]) difference() {
       cylinder(d=bore_d+knob_bore_d_tolerance,h=knob_bore_l+2);
       translate([-bore_d/2-1,bore_dd-bore_d/2+knob_bore_d_tolerance/2,-1])
       cube([bore_d+2,bore_d/2,knob_bore_l+4]);
      }
     }
    }
    difference() {
     hull() {
      cylinder(d=gearbox_d-2*ch,h=knob_h,$fn=fnd*gearbox_d);
      translate([0,0,ch])
      cylinder(d=gearbox_d,h=knob_h-2*ch,$fn=fnd*gearbox_d);
     }
     for(a=[0:360/knob_indents:359]) rotate([0,0,a])
      translate([0,gearbox_d/2,-1])
      cylinder(d=knob_indent_d,h=knob_h+2,$fn=fnd*knob_indent_d);
     translate([0,0,-body_h-epsilon]) knob_label();
    }
   }
  }//knob module
  module knob_label() {
   if(knob_label) {
    ll = len(knob_label);
    lsl = gearbox_d-knob_indent_d;
    ts = knob_label_size?knob_label_size:min(lsl/ll,gearbox_d/4);
    translate([0,0,body_h+epsilon+knob_h-knob_label_thickness])
    linear_extrude(height=knob_label_thickness+epsilon,convexity=64)
    mirror([left?0:1,0])
    text(text=knob_label,size=ts,halign="center",valign="center",font="Arial Black");
   }
  }
 
  module debug() {
   difference() {
    children();
    if(debug) {
     // spring tensioner debug cutout
     translate([-gearbox_d/2,-longwing,ls_z]) rotate([0,-90,0])
     translate([0,-lever_thickness/2-1,-gearbox_d])
     cube(size=[body_h/2+1,lever_thickness/2+1,gearbox_d+2]);
     // lever axis debug cutout
     translate([mount_d/2,0,-1])
     rotate([0,0,-45])
     cube(size=[gearbox_d-mount_d,gearbox_d-mount_d,body_h+knob_h+2]);
     // idler debug cutout
     translate([0,0,ls_z])
     place_idler()
     rotate([0,0,-45])
     translate([0,0,-lever_thickness/2-epsilon])
     cube(size=[lsd*sqrt(2)/2+1,lsd*sqrt(2)/2+1,
                lever_thickness+2*epsilon]);
     // pushfit debug cutout
     place_idler()
     translate([-idler_d/2+filament_offset,0,ls_z])
     cube(size=[gearbox_d/2,gearbox_d/2+pf_h(pf),body_h-ls_z+knob_h+1]);
    }//if debug
   }//difference
  }
 
  mirrorleft()
  debug()
  if(what=="lever") color("green",0.7) lever();
  else if(what=="body") color("yellow",0.7) body();
  else if(what=="body.label") color("brown",0.7) body_label();
  else if(what=="knob") color("red",0.7) knob();
+ else if(what=="knob.label") color("brown",0.7) knob_label();
  else if(what=="springpad") color("blue",0.7) springpad();
  else if(what=="both") {
   color("green",0.7) lever();
   color("yellow",0.7) body();
   color("brown",0.7) body_label();
  }else{
   color("green",0.7) lever();
   color("yellow",0.7) body();
   color("brown",0.7) body_label();
   color("red",0.7) knob();
   color("brown",0.7) knob_label();
   color("blue",0.7) springpad();
  }
 }
 
 the_extruder(what="*",left=false,debug=true);