poster-tube-lid: change top_minthick_* to top_thick_* which is what they are now

[reprap-play.git] / poster-tube-lid.scad

diff --git a/poster-tube-lid.scad b/poster-tube-lid.scad
index c5b1e8fc45e5cf84b2ff21838b97f31f0e873107..e0735787138b5fb961b2e706390963ecfea741bd 100644 (file)
--- a/poster-tube-lid.scad
+++ b/poster-tube-lid.scad
@@ -1,7 +1,9 @@
 // -*- C -*-
 
 main_dia = 71.2 + 0.50 - 2.26;
-top_thick = 4;
+top_thick_middle = 4;
+top_thick_by_oring = 2.5;
+top_middle_dr = 11;
 
 main_cnr = 4.0;
 
@@ -61,8 +63,13 @@ seal_thick = oring_y_rad * (1 + cos(oring_upper_embed_angle));
 side_height = rivet_posn + bayo_behind + rivet_thick/2;
 side_thick = rivet_tall + over_rivet_wall;
 
+top_thick = max(top_thick_middle,
+               top_thick_by_oring + oring_y_rad);
+
 top_z = top_thick + seal_thick;
 
+middle_bot_z = top_z - top_thick_middle;
+
 bayo_entry = bayo_behind / 3.0;
 bayo_top_z = bayo_behind + rivet_thick + bayo_above_gap;
 bayo_entry_ramp = bayo_entry + bayo_interf;
@@ -126,14 +133,15 @@ module MainProfile(){
          square([10,10]);
        }
       }
-      polygon([[ -11,                   seal_thick        ],
-              [ -11,                   top_z             ],
+      polygon([[ -top_middle_dr,        middle_bot_z      ],
+              [ -top_middle_dr,        top_z             ],
               [ main_cnr_pos[0],       top_z             ],
               [ side_thick,            main_cnr_pos[1]   ],
               [ side_thick,            -side_height      ],
               [ side_taper,            -side_height      ],
               [ 0,                     -rivet_posn       ],
               [ 0,                     seal_thick        ],
+              [ -oring_x_rad,          seal_thick        ],
               ],
              convexity=10);
     }
@@ -185,8 +193,8 @@ module BayonetCutout(){
 }
 
 module ProfilesDemo(){ ////toplevel
-  translate([-20,0]) MainProfile();
-  polygon(bayo_polygon, convexity=10);
+  translate([-10,0]) MainProfile();
+  translate([+10,0]) polygon(bayo_polygon, convexity=10);
 }
 
 module Cover(){ ////toplevel
@@ -195,8 +203,8 @@ module Cover(){ ////toplevel
       rotate_extrude(convexity=10)
        translate([main_dia/2, 0])
        MainProfile();
-      translate([0,0, seal_thick])
-       cylinder(h= top_thick, r = main_dia/2 - 10);
+      translate([0,0, middle_bot_z])
+       cylinder(h= top_thick_middle, r = main_dia/2 - top_middle_dr + 1);
     }
     for (r=[0,180])
       rotate([0,0, r])
@@ -205,7 +213,7 @@ module Cover(){ ////toplevel
     for (r=[0 : 60 : 179]) {
       rotate([0,0, r]) {
        height = top_thick - brace_above_below*2;
-       translate([0,0, seal_thick + brace_above_below + height/2 ])
+       translate([0,0, middle_bot_z + brace_above_below + height/2 ])
        cube(center=true, [ oring_bore - brace_end_shorter,
                            brace_hole_width, height ]);
       }