diff --git a/dibond/views/bed_fan_assembly.png b/dibond/views/bed_fan_assembly.png index 341b969..89c3bd5 100644 Binary files a/dibond/views/bed_fan_assembly.png and b/dibond/views/bed_fan_assembly.png differ diff --git a/dibond/views/extruder_assembled.png b/dibond/views/extruder_assembled.png index 36c79bd..bcfa5f4 100644 Binary files a/dibond/views/extruder_assembled.png and b/dibond/views/extruder_assembled.png differ diff --git a/dibond/views/extruder_assembly.png b/dibond/views/extruder_assembly.png index bbaaae2..8ed0a52 100644 Binary files a/dibond/views/extruder_assembly.png and b/dibond/views/extruder_assembly.png differ diff --git a/dibond/views/extruder_hot_end_assembly.png b/dibond/views/extruder_hot_end_assembly.png index 539f4f6..c7d0ca9 100644 Binary files a/dibond/views/extruder_hot_end_assembly.png and b/dibond/views/extruder_hot_end_assembly.png differ diff --git a/dibond/views/extruder_motor_assembled.png b/dibond/views/extruder_motor_assembled.png index 5c26f56..a0c4d65 100644 Binary files a/dibond/views/extruder_motor_assembled.png and b/dibond/views/extruder_motor_assembled.png differ diff --git a/dibond/views/extruder_motor_assembly.png b/dibond/views/extruder_motor_assembly.png index ca637c9..217461a 100644 Binary files a/dibond/views/extruder_motor_assembly.png and b/dibond/views/extruder_motor_assembly.png differ diff --git a/dibond/views/frame_assembly_bar_front.png b/dibond/views/frame_assembly_bar_front.png index 5b68de4..1b184b6 100644 Binary files a/dibond/views/frame_assembly_bar_front.png and b/dibond/views/frame_assembly_bar_front.png differ diff --git a/huxley/render/direct_idler_lever.png b/huxley/render/direct_idler_lever.png index d01b9d3..caab0db 100644 Binary files a/huxley/render/direct_idler_lever.png and b/huxley/render/direct_idler_lever.png differ diff --git a/huxley/render/printed/direct_extruder.png b/huxley/render/printed/direct_extruder.png index abe0c37..4cfa4a4 100644 Binary files a/huxley/render/printed/direct_extruder.png and b/huxley/render/printed/direct_extruder.png differ diff --git a/huxley/stls/direct_idler_lever.stl b/huxley/stls/direct_idler_lever.stl index a81fbe3..d01d9ce 100644 --- a/huxley/stls/direct_idler_lever.stl +++ b/huxley/stls/direct_idler_lever.stl @@ -274,51 +274,51 @@ solid OpenSCAD_Model endfacet facet normal 0 0 -1 outer loop - vertex -2.57286 16.921 0 + vertex -2.40883 17.1 0 vertex -2.21335 17.3133 0 vertex 1.18397 14.5866 0 endloop endfacet - facet normal -0.737286 0.67558 0 + facet normal -0.737288 0.675579 0 outer loop - vertex -2.57286 16.921 0 - vertex -2.21335 17.3133 11.1 + vertex -2.40883 17.1 0 + vertex -2.40883 17.1 8.5 vertex -2.21335 17.3133 0 endloop endfacet - facet normal -0.737286 0.67558 0 - outer loop - vertex -2.57286 16.921 0 - vertex -2.57286 16.921 11.1 - vertex -2.21335 17.3133 11.1 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex -2.57286 16.921 11.1 - vertex 1.18397 14.5866 11.1 - vertex -2.21335 17.3133 11.1 - endloop - endfacet facet normal 0 0 -1 outer loop - vertex -2.89682 16.4988 0 - vertex -2.57286 16.921 0 + vertex -2.40883 17.1 0 vertex 1.18397 14.5866 0 + vertex 0.267949 13 0 endloop endfacet - facet normal -0.793345 0.608772 0 + facet normal -0.737288 0.675579 0 outer loop - vertex -2.89682 16.4988 0 - vertex -2.57286 16.921 11.1 - vertex -2.57286 16.921 0 + vertex -2.40883 17.1 8.5 + vertex -2.21335 17.3133 11.1 + vertex -2.21335 17.3133 0 endloop endfacet - facet normal -0.793345 0.608772 0 + facet normal -0.737286 0.67558 -2.77108e-007 outer loop - vertex -2.89682 16.4988 0 - vertex -2.89682 16.4988 11.1 vertex -2.57286 16.921 11.1 + vertex -2.21335 17.3133 11.1 + vertex -2.40883 17.1 8.5 + endloop + endfacet + facet normal -0 0 1 + outer loop + vertex -2.57286 16.921 11.1 + vertex 1.18397 14.5866 11.1 + vertex -2.21335 17.3133 11.1 + endloop + endfacet + facet normal -0.737284 0.675583 0 + outer loop + vertex -2.57286 16.921 8.5 + vertex -2.57286 16.921 11.1 + vertex -2.40883 17.1 8.5 endloop endfacet facet normal -0 0 1 @@ -328,6 +328,839 @@ solid OpenSCAD_Model vertex -2.57286 16.921 11.1 endloop endfacet + facet normal -0.793345 0.608772 0 + outer loop + vertex -2.89682 16.4988 8.5 + vertex -2.57286 16.921 11.1 + vertex -2.57286 16.921 8.5 + endloop + endfacet + facet normal -0.793345 0.608772 0 + outer loop + vertex -2.89682 16.4988 8.5 + vertex -2.89682 16.4988 11.1 + vertex -2.57286 16.921 11.1 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex -23.9 17.1 0 + vertex -2.40883 17.1 0 + vertex -4.70059 8.9 0 + endloop + endfacet + facet normal 0 1 0 + outer loop + vertex -23.9 17.1 0 + vertex -23.9 17.1 8.5 + vertex -2.40883 17.1 0 + endloop + endfacet + facet normal 0 1 -0 + outer loop + vertex -23.9 17.1 8.5 + vertex -2.40883 17.1 8.5 + vertex -2.40883 17.1 0 + endloop + endfacet + facet normal -0 0 1 + outer loop + vertex -23.9 17.1 8.5 + vertex -2.57286 16.921 8.5 + vertex -2.40883 17.1 8.5 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex -23.9 17.1 8.5 + vertex -2.89682 16.4988 8.5 + vertex -2.57286 16.921 8.5 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex -23.9 17.1 8.5 + vertex -3.18275 16.05 8.5 + vertex -2.89682 16.4988 8.5 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex -23.9 17.1 8.5 + vertex -3.42847 15.578 8.5 + vertex -3.18275 16.05 8.5 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex -23.9 17.1 8.5 + vertex -3.63211 15.0863 8.5 + vertex -3.42847 15.578 8.5 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex -23.9 17.1 8.5 + vertex -3.79214 14.5788 8.5 + vertex -3.63211 15.0863 8.5 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex -23.9 17.1 8.5 + vertex -3.90732 14.0592 8.5 + vertex -3.79214 14.5788 8.5 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex -23.9 17.1 8.5 + vertex -4.70059 8.9 8.5 + vertex -3.90732 14.0592 8.5 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex -23.9 8.9 0 + vertex -23.9 17.1 0 + vertex -4.70059 8.9 0 + endloop + endfacet + facet normal 0 -1 -0 + outer loop + vertex -23.9 8.9 0 + vertex -4.70059 8.9 0 + vertex -4.70059 8.9 8.5 + endloop + endfacet + facet normal 0 -1 0 + outer loop + vertex -23.9 8.9 0 + vertex -4.70059 8.9 8.5 + vertex -23.9 8.9 8.5 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex -23.9 8.9 8.5 + vertex -4.70059 8.9 8.5 + vertex -23.9 17.1 8.5 + endloop + endfacet + facet normal -0.0603753 0.998176 0 + outer loop + vertex -24.3942 17.0701 0 + vertex -24.3942 17.0701 8.5 + vertex -23.9 17.1 0 + endloop + endfacet + facet normal -0.0603753 0.998176 0 + outer loop + vertex -24.3942 17.0701 8.5 + vertex -23.9 17.1 8.5 + vertex -23.9 17.1 0 + endloop + endfacet + facet normal -0 0 1 + outer loop + vertex -24.3942 17.0701 8.5 + vertex -23.9 8.9 8.5 + vertex -23.9 17.1 8.5 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex -24.3942 8.92989 0 + vertex -23.9 17.1 0 + vertex -23.9 8.9 0 + endloop + endfacet + facet normal -0.0603791 -0.998176 -0 + outer loop + vertex -24.3942 8.92989 0 + vertex -23.9 8.9 0 + vertex -23.9 8.9 8.5 + endloop + endfacet + facet normal -0.0603791 -0.998176 0 + outer loop + vertex -24.3942 8.92989 0 + vertex -23.9 8.9 8.5 + vertex -24.3942 8.92989 8.5 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex -24.3942 8.92989 0 + vertex -24.3942 17.0701 0 + vertex -23.9 17.1 0 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex -24.3942 8.92989 8.5 + vertex -23.9 8.9 8.5 + vertex -24.3942 17.0701 8.5 + endloop + endfacet + facet normal -0.180254 0.98362 0 + outer loop + vertex -24.8812 16.9809 0 + vertex -24.8812 16.9809 8.5 + vertex -24.3942 17.0701 0 + endloop + endfacet + facet normal -0.180254 0.98362 0 + outer loop + vertex -24.8812 16.9809 8.5 + vertex -24.3942 17.0701 8.5 + vertex -24.3942 17.0701 0 + endloop + endfacet + facet normal -0 0 1 + outer loop + vertex -24.8812 16.9809 8.5 + vertex -24.3942 8.92989 8.5 + vertex -24.3942 17.0701 8.5 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex -24.8812 9.01914 0 + vertex -24.3942 17.0701 0 + vertex -24.3942 8.92989 0 + endloop + endfacet + facet normal -0.180254 -0.98362 -0 + outer loop + vertex -24.8812 9.01914 0 + vertex -24.3942 8.92989 0 + vertex -24.3942 8.92989 8.5 + endloop + endfacet + facet normal -0.180254 -0.98362 0 + outer loop + vertex -24.8812 9.01914 0 + vertex -24.3942 8.92989 8.5 + vertex -24.8812 9.01914 8.5 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex -24.8812 9.01914 0 + vertex -24.8812 16.9809 0 + vertex -24.3942 17.0701 0 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex -24.8812 9.01914 8.5 + vertex -24.3942 8.92989 8.5 + vertex -24.8812 16.9809 8.5 + endloop + endfacet + facet normal -0.297507 0.95472 0 + outer loop + vertex -25.3539 16.8336 0 + vertex -25.3539 16.8336 8.5 + vertex -24.8812 16.9809 0 + endloop + endfacet + facet normal -0.297507 0.95472 0 + outer loop + vertex -25.3539 16.8336 8.5 + vertex -24.8812 16.9809 8.5 + vertex -24.8812 16.9809 0 + endloop + endfacet + facet normal -0 0 1 + outer loop + vertex -25.3539 16.8336 8.5 + vertex -24.8812 9.01914 8.5 + vertex -24.8812 16.9809 8.5 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex -25.3539 9.16643 0 + vertex -24.8812 16.9809 0 + vertex -24.8812 9.01914 0 + endloop + endfacet + facet normal -0.297504 -0.954721 -0 + outer loop + vertex -25.3539 9.16643 0 + vertex -24.8812 9.01914 0 + vertex -24.8812 9.01914 8.5 + endloop + endfacet + facet normal -0.297504 -0.954721 0 + outer loop + vertex -25.3539 9.16643 0 + vertex -24.8812 9.01914 8.5 + vertex -25.3539 9.16643 8.5 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex -25.3539 9.16643 0 + vertex -25.3539 16.8336 0 + vertex -24.8812 16.9809 0 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex -25.3539 9.16643 8.5 + vertex -24.8812 9.01914 8.5 + vertex -25.3539 16.8336 8.5 + endloop + endfacet + facet normal -0.410411 0.911901 0 + outer loop + vertex -25.8054 16.6304 0 + vertex -25.8054 16.6304 8.5 + vertex -25.3539 16.8336 0 + endloop + endfacet + facet normal -0.410411 0.911901 0 + outer loop + vertex -25.8054 16.6304 8.5 + vertex -25.3539 16.8336 8.5 + vertex -25.3539 16.8336 0 + endloop + endfacet + facet normal -0 0 1 + outer loop + vertex -25.8054 16.6304 8.5 + vertex -25.3539 9.16643 8.5 + vertex -25.3539 16.8336 8.5 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex -25.8054 9.36963 0 + vertex -25.3539 16.8336 0 + vertex -25.3539 9.16643 0 + endloop + endfacet + facet normal -0.410412 -0.9119 -0 + outer loop + vertex -25.8054 9.36963 0 + vertex -25.3539 9.16643 0 + vertex -25.3539 9.16643 8.5 + endloop + endfacet + facet normal -0.410412 -0.9119 0 + outer loop + vertex -25.8054 9.36963 0 + vertex -25.3539 9.16643 8.5 + vertex -25.8054 9.36963 8.5 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex -25.8054 9.36963 0 + vertex -25.8054 16.6304 0 + vertex -25.3539 16.8336 0 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex -25.8054 9.36963 8.5 + vertex -25.3539 9.16643 8.5 + vertex -25.8054 16.6304 8.5 + endloop + endfacet + facet normal -0.517338 0.855781 0 + outer loop + vertex -26.2291 16.3742 0 + vertex -26.2291 16.3742 8.5 + vertex -25.8054 16.6304 0 + endloop + endfacet + facet normal -0.517338 0.855781 0 + outer loop + vertex -26.2291 16.3742 8.5 + vertex -25.8054 16.6304 8.5 + vertex -25.8054 16.6304 0 + endloop + endfacet + facet normal -0 0 1 + outer loop + vertex -26.2291 16.3742 8.5 + vertex -25.8054 9.36963 8.5 + vertex -25.8054 16.6304 8.5 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex -26.2291 9.62577 0 + vertex -25.8054 16.6304 0 + vertex -25.8054 9.36963 0 + endloop + endfacet + facet normal -0.517338 -0.855781 -0 + outer loop + vertex -26.2291 9.62577 0 + vertex -25.8054 9.36963 0 + vertex -25.8054 9.36963 8.5 + endloop + endfacet + facet normal -0.517338 -0.855781 0 + outer loop + vertex -26.2291 9.62577 0 + vertex -25.8054 9.36963 8.5 + vertex -26.2291 9.62577 8.5 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex -26.2291 9.62577 0 + vertex -26.2291 16.3742 0 + vertex -25.8054 16.6304 0 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex -26.2291 9.62577 8.5 + vertex -25.8054 9.36963 8.5 + vertex -26.2291 16.3742 8.5 + endloop + endfacet + facet normal -0.61672 0.787182 0 + outer loop + vertex -26.6188 16.0689 0 + vertex -26.6188 16.0689 8.5 + vertex -26.2291 16.3742 0 + endloop + endfacet + facet normal -0.61672 0.787182 0 + outer loop + vertex -26.6188 16.0689 8.5 + vertex -26.2291 16.3742 8.5 + vertex -26.2291 16.3742 0 + endloop + endfacet + facet normal -0 0 1 + outer loop + vertex -26.6188 16.0689 8.5 + vertex -26.2291 9.62577 8.5 + vertex -26.2291 16.3742 8.5 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex -26.6188 9.93111 0 + vertex -26.2291 16.3742 0 + vertex -26.2291 9.62577 0 + endloop + endfacet + facet normal -0.61672 -0.787182 -0 + outer loop + vertex -26.6188 9.93111 0 + vertex -26.2291 9.62577 0 + vertex -26.2291 9.62577 8.5 + endloop + endfacet + facet normal -0.61672 -0.787182 0 + outer loop + vertex -26.6188 9.93111 0 + vertex -26.2291 9.62577 8.5 + vertex -26.6188 9.93111 8.5 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex -26.6188 9.93111 0 + vertex -26.6188 16.0689 0 + vertex -26.2291 16.3742 0 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex -26.6188 9.93111 8.5 + vertex -26.2291 9.62577 8.5 + vertex -26.6188 16.0689 8.5 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex -26.9689 10.2812 0 + vertex -26.6188 16.0689 0 + vertex -26.6188 9.93111 0 + endloop + endfacet + facet normal -0.707104 -0.70711 -0 + outer loop + vertex -26.9689 10.2812 0 + vertex -26.6188 9.93111 0 + vertex -26.6188 9.93111 8.5 + endloop + endfacet + facet normal -0.707104 -0.70711 0 + outer loop + vertex -26.9689 10.2812 0 + vertex -26.6188 9.93111 8.5 + vertex -26.9689 10.2812 8.5 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex -26.9689 10.2812 0 + vertex -26.9689 15.7188 0 + vertex -26.6188 16.0689 0 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex -26.9689 10.2812 8.5 + vertex -26.6188 9.93111 8.5 + vertex -26.9689 15.7188 8.5 + endloop + endfacet + facet normal -0.707104 0.70711 0 + outer loop + vertex -26.9689 15.7188 0 + vertex -26.9689 15.7188 8.5 + vertex -26.6188 16.0689 0 + endloop + endfacet + facet normal -0.707104 0.70711 0 + outer loop + vertex -26.9689 15.7188 8.5 + vertex -26.6188 16.0689 8.5 + vertex -26.6188 16.0689 0 + endloop + endfacet + facet normal -0 0 1 + outer loop + vertex -26.9689 15.7188 8.5 + vertex -26.6188 9.93111 8.5 + vertex -26.6188 16.0689 8.5 + endloop + endfacet + facet normal -0.787183 -0.616719 0 + outer loop + vertex -27.2742 10.6709 0 + vertex -26.9689 10.2812 0 + vertex -27.2742 10.6709 8.5 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex -27.2742 10.6709 0 + vertex -26.9689 15.7188 0 + vertex -26.9689 10.2812 0 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex -27.2742 10.6709 0 + vertex -27.2742 15.3291 0 + vertex -26.9689 15.7188 0 + endloop + endfacet + facet normal -0.787183 -0.616719 0 + outer loop + vertex -27.2742 10.6709 8.5 + vertex -26.9689 10.2812 0 + vertex -26.9689 10.2812 8.5 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex -27.2742 10.6709 8.5 + vertex -26.9689 10.2812 8.5 + vertex -27.2742 15.3291 8.5 + endloop + endfacet + facet normal -0.787183 0.616719 0 + outer loop + vertex -27.2742 15.3291 0 + vertex -26.9689 15.7188 8.5 + vertex -26.9689 15.7188 0 + endloop + endfacet + facet normal -0.787183 0.616719 0 + outer loop + vertex -27.2742 15.3291 0 + vertex -27.2742 15.3291 8.5 + vertex -26.9689 15.7188 8.5 + endloop + endfacet + facet normal -0 0 1 + outer loop + vertex -27.2742 15.3291 8.5 + vertex -26.9689 10.2812 8.5 + vertex -26.9689 15.7188 8.5 + endloop + endfacet + facet normal -0.855783 -0.517335 0 + outer loop + vertex -27.5304 11.0946 0 + vertex -27.2742 10.6709 0 + vertex -27.5304 11.0946 8.5 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex -27.5304 11.0946 0 + vertex -27.2742 15.3291 0 + vertex -27.2742 10.6709 0 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex -27.5304 11.0946 0 + vertex -27.5304 14.9054 0 + vertex -27.2742 15.3291 0 + endloop + endfacet + facet normal -0.855783 -0.517335 0 + outer loop + vertex -27.5304 11.0946 8.5 + vertex -27.2742 10.6709 0 + vertex -27.2742 10.6709 8.5 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex -27.5304 11.0946 8.5 + vertex -27.2742 10.6709 8.5 + vertex -27.5304 14.9054 8.5 + endloop + endfacet + facet normal -0.855783 0.517335 0 + outer loop + vertex -27.5304 14.9054 0 + vertex -27.2742 15.3291 8.5 + vertex -27.2742 15.3291 0 + endloop + endfacet + facet normal -0.855783 0.517335 0 + outer loop + vertex -27.5304 14.9054 0 + vertex -27.5304 14.9054 8.5 + vertex -27.2742 15.3291 8.5 + endloop + endfacet + facet normal -0 0 1 + outer loop + vertex -27.5304 14.9054 8.5 + vertex -27.2742 10.6709 8.5 + vertex -27.2742 15.3291 8.5 + endloop + endfacet + facet normal -0.9119 -0.410413 0 + outer loop + vertex -27.7336 11.5461 0 + vertex -27.5304 11.0946 0 + vertex -27.7336 11.5461 8.5 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex -27.7336 11.5461 0 + vertex -27.5304 14.9054 0 + vertex -27.5304 11.0946 0 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex -27.7336 11.5461 0 + vertex -27.7336 14.4539 0 + vertex -27.5304 14.9054 0 + endloop + endfacet + facet normal -0.9119 -0.410413 0 + outer loop + vertex -27.7336 11.5461 8.5 + vertex -27.5304 11.0946 0 + vertex -27.5304 11.0946 8.5 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex -27.7336 11.5461 8.5 + vertex -27.5304 11.0946 8.5 + vertex -27.7336 14.4539 8.5 + endloop + endfacet + facet normal -0.9119 0.410413 0 + outer loop + vertex -27.7336 14.4539 0 + vertex -27.5304 14.9054 8.5 + vertex -27.5304 14.9054 0 + endloop + endfacet + facet normal -0.9119 0.410413 0 + outer loop + vertex -27.7336 14.4539 0 + vertex -27.7336 14.4539 8.5 + vertex -27.5304 14.9054 8.5 + endloop + endfacet + facet normal -0 0 1 + outer loop + vertex -27.7336 14.4539 8.5 + vertex -27.5304 11.0946 8.5 + vertex -27.5304 14.9054 8.5 + endloop + endfacet + facet normal -0.954721 -0.297503 0 + outer loop + vertex -27.8809 12.0188 0 + vertex -27.7336 11.5461 0 + vertex -27.8809 12.0188 8.5 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex -27.8809 12.0188 0 + vertex -27.7336 14.4539 0 + vertex -27.7336 11.5461 0 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex -27.8809 12.0188 0 + vertex -27.8809 13.9812 0 + vertex -27.7336 14.4539 0 + endloop + endfacet + facet normal -0.954721 -0.297503 0 + outer loop + vertex -27.8809 12.0188 8.5 + vertex -27.7336 11.5461 0 + vertex -27.7336 11.5461 8.5 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex -27.8809 12.0188 8.5 + vertex -27.7336 11.5461 8.5 + vertex -27.8809 13.9812 8.5 + endloop + endfacet + facet normal -0.954721 0.297503 0 + outer loop + vertex -27.8809 13.9812 0 + vertex -27.7336 14.4539 8.5 + vertex -27.7336 14.4539 0 + endloop + endfacet + facet normal -0.954721 0.297503 0 + outer loop + vertex -27.8809 13.9812 0 + vertex -27.8809 13.9812 8.5 + vertex -27.7336 14.4539 8.5 + endloop + endfacet + facet normal -0 0 1 + outer loop + vertex -27.8809 13.9812 8.5 + vertex -27.7336 11.5461 8.5 + vertex -27.7336 14.4539 8.5 + endloop + endfacet + facet normal -0.98362 -0.180255 0 + outer loop + vertex -27.9701 12.5058 0 + vertex -27.8809 12.0188 0 + vertex -27.9701 12.5058 8.5 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex -27.9701 12.5058 0 + vertex -27.8809 13.9812 0 + vertex -27.8809 12.0188 0 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex -27.9701 12.5058 0 + vertex -27.9701 13.4942 0 + vertex -27.8809 13.9812 0 + endloop + endfacet + facet normal -0.98362 -0.180255 0 + outer loop + vertex -27.9701 12.5058 8.5 + vertex -27.8809 12.0188 0 + vertex -27.8809 12.0188 8.5 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex -27.9701 12.5058 8.5 + vertex -27.8809 12.0188 8.5 + vertex -27.9701 13.4942 8.5 + endloop + endfacet + facet normal -0.98362 0.180255 0 + outer loop + vertex -27.9701 13.4942 0 + vertex -27.8809 13.9812 8.5 + vertex -27.8809 13.9812 0 + endloop + endfacet + facet normal -0.98362 0.180255 0 + outer loop + vertex -27.9701 13.4942 0 + vertex -27.9701 13.4942 8.5 + vertex -27.8809 13.9812 8.5 + endloop + endfacet + facet normal -0 0 1 + outer loop + vertex -27.9701 13.4942 8.5 + vertex -27.8809 12.0188 8.5 + vertex -27.8809 13.9812 8.5 + endloop + endfacet + facet normal -0.998176 -0.0603791 0 + outer loop + vertex -28 13 0 + vertex -27.9701 12.5058 0 + vertex -28 13 8.5 + endloop + endfacet + facet normal 0 -0 -1 + outer loop + vertex -28 13 0 + vertex -27.9701 13.4942 0 + vertex -27.9701 12.5058 0 + endloop + endfacet + facet normal -0.998176 0.060379 0 + outer loop + vertex -28 13 0 + vertex -27.9701 13.4942 8.5 + vertex -27.9701 13.4942 0 + endloop + endfacet + facet normal -0.998176 0.060379 0 + outer loop + vertex -28 13 0 + vertex -28 13 8.5 + vertex -27.9701 13.4942 8.5 + endloop + endfacet + facet normal -0.998176 -0.0603791 0 + outer loop + vertex -28 13 8.5 + vertex -27.9701 12.5058 0 + vertex -27.9701 12.5058 8.5 + endloop + endfacet + facet normal 0 -0 1 + outer loop + vertex -28 13 8.5 + vertex -27.9701 12.5058 8.5 + vertex -27.9701 13.4942 8.5 + endloop + endfacet facet normal 0.330279 0.943883 -0 outer loop vertex -3.09979 -6.43678 11.1 @@ -370,34 +1203,6 @@ solid OpenSCAD_Model vertex -1.58975 6.96517 6.7 endloop endfacet - facet normal 0 0 -1 - outer loop - vertex -3.18275 16.05 0 - vertex -2.89682 16.4988 0 - vertex 1.18397 14.5866 0 - endloop - endfacet - facet normal -0.843389 0.537304 0 - outer loop - vertex -3.18275 16.05 0 - vertex -2.89682 16.4988 11.1 - vertex -2.89682 16.4988 0 - endloop - endfacet - facet normal -0.843389 0.537304 0 - outer loop - vertex -3.18275 16.05 0 - vertex -3.18275 16.05 11.1 - vertex -2.89682 16.4988 11.1 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -3.18275 16.05 0 - vertex 1.18397 14.5866 0 - vertex 0.267949 13 0 - endloop - endfacet facet normal 0 0 1 outer loop vertex -3.18275 16.05 11.1 @@ -412,25 +1217,18 @@ solid OpenSCAD_Model vertex -2.89682 16.4988 11.1 endloop endfacet - facet normal 0 0 -1 + facet normal -0.843389 0.537304 0 outer loop - vertex -3.42847 15.578 0 - vertex -3.18275 16.05 0 - vertex 0.267949 13 0 + vertex -3.18275 16.05 8.5 + vertex -2.89682 16.4988 11.1 + vertex -2.89682 16.4988 8.5 endloop endfacet - facet normal -0.88702 0.461732 0 + facet normal -0.843389 0.537304 0 outer loop - vertex -3.42847 15.578 0 - vertex -3.18275 16.05 11.1 - vertex -3.18275 16.05 0 - endloop - endfacet - facet normal -0.88702 0.461732 0 - outer loop - vertex -3.42847 15.578 0 - vertex -3.42847 15.578 11.1 + vertex -3.18275 16.05 8.5 vertex -3.18275 16.05 11.1 + vertex -2.89682 16.4988 11.1 endloop endfacet facet normal -0 0 1 @@ -440,6 +1238,20 @@ solid OpenSCAD_Model vertex -3.18275 16.05 11.1 endloop endfacet + facet normal -0.88702 0.461732 0 + outer loop + vertex -3.42847 15.578 8.5 + vertex -3.18275 16.05 11.1 + vertex -3.18275 16.05 8.5 + endloop + endfacet + facet normal -0.88702 0.461732 0 + outer loop + vertex -3.42847 15.578 8.5 + vertex -3.42847 15.578 11.1 + vertex -3.18275 16.05 11.1 + endloop + endfacet facet normal 0 0 -1 outer loop vertex -3.53877 -2.05689 3.99 @@ -608,48 +1420,6 @@ solid OpenSCAD_Model vertex -3.53877 2.05689 4 endloop endfacet - facet normal 0 -0 -1 - outer loop - vertex -3.63211 15.0863 0 - vertex -3.42847 15.578 0 - vertex 0.267949 13 0 - endloop - endfacet - facet normal -0.923879 0.382684 0 - outer loop - vertex -3.63211 15.0863 0 - vertex -3.42847 15.578 11.1 - vertex -3.42847 15.578 0 - endloop - endfacet - facet normal -0.923879 0.382684 0 - outer loop - vertex -3.63211 15.0863 0 - vertex -3.63211 15.0863 11.1 - vertex -3.42847 15.578 11.1 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -3.63211 15.0863 0 - vertex 0 4.1 0 - vertex -3.5507 2.05 0 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -3.63211 15.0863 0 - vertex 0.267949 13 0 - vertex 1.18397 11.4134 0 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -3.63211 15.0863 0 - vertex 1.18397 11.4134 0 - vertex 0 4.1 0 - endloop - endfacet facet normal -0 0 1 outer loop vertex -3.63211 15.0863 11.1 @@ -657,18 +1427,18 @@ solid OpenSCAD_Model vertex -3.42847 15.578 11.1 endloop endfacet - facet normal -0.953713 0.30072 0 + facet normal -0.923879 0.382684 0 outer loop - vertex -3.79214 14.5788 0 - vertex -3.63211 15.0863 11.1 - vertex -3.63211 15.0863 0 + vertex -3.63211 15.0863 8.5 + vertex -3.42847 15.578 11.1 + vertex -3.42847 15.578 8.5 endloop endfacet - facet normal -0.953713 0.30072 0 + facet normal -0.923879 0.382684 0 outer loop - vertex -3.79214 14.5788 0 - vertex -3.79214 14.5788 11.1 + vertex -3.63211 15.0863 8.5 vertex -3.63211 15.0863 11.1 + vertex -3.42847 15.578 11.1 endloop endfacet facet normal -0 0 1 @@ -678,32 +1448,18 @@ solid OpenSCAD_Model vertex -3.63211 15.0863 11.1 endloop endfacet - facet normal 0 0 -1 + facet normal -0.953713 0.30072 0 outer loop - vertex -3.90732 14.0592 0 - vertex -3.63211 15.0863 0 - vertex -3.5507 2.05 0 + vertex -3.79214 14.5788 8.5 + vertex -3.63211 15.0863 11.1 + vertex -3.63211 15.0863 8.5 endloop endfacet - facet normal 0 0 -1 + facet normal -0.953713 0.30072 0 outer loop - vertex -3.90732 14.0592 0 - vertex -3.79214 14.5788 0 - vertex -3.63211 15.0863 0 - endloop - endfacet - facet normal -0.976298 0.216433 0 - outer loop - vertex -3.90732 14.0592 0 - vertex -3.79214 14.5788 11.1 - vertex -3.79214 14.5788 0 - endloop - endfacet - facet normal -0.976298 0.216433 0 - outer loop - vertex -3.90732 14.0592 0 - vertex -3.90732 14.0592 11.1 + vertex -3.79214 14.5788 8.5 vertex -3.79214 14.5788 11.1 + vertex -3.63211 15.0863 11.1 endloop endfacet facet normal 0 -0 1 @@ -727,6 +1483,20 @@ solid OpenSCAD_Model vertex -3.79214 14.5788 11.1 endloop endfacet + facet normal -0.976298 0.216433 0 + outer loop + vertex -3.90732 14.0592 8.5 + vertex -3.79214 14.5788 11.1 + vertex -3.79214 14.5788 8.5 + endloop + endfacet + facet normal -0.976298 0.216433 0 + outer loop + vertex -3.90732 14.0592 8.5 + vertex -3.90732 14.0592 11.1 + vertex -3.79214 14.5788 11.1 + endloop + endfacet facet normal -1 0 0 outer loop vertex -4 -10.1455 4.16788 @@ -1511,6 +2281,41 @@ solid OpenSCAD_Model vertex -1.60144 -1.60144 6.7 endloop endfacet + facet normal -0 0 -1 + outer loop + vertex -4.70059 8.9 0 + vertex -2.40883 17.1 0 + vertex 0.267949 13 0 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex -4.70059 8.9 0 + vertex 0 4.1 0 + vertex -3.5507 2.05 0 + endloop + endfacet + facet normal -0 0 -1 + outer loop + vertex -4.70059 8.9 0 + vertex 0.267949 13 0 + vertex 1.18397 11.4134 0 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex -4.70059 8.9 0 + vertex 1.18397 11.4134 0 + vertex 0 4.1 0 + endloop + endfacet + facet normal -0.988385 0.151972 0 + outer loop + vertex -4.70059 8.9 8.5 + vertex -3.90732 14.0592 11.1 + vertex -3.90732 14.0592 8.5 + endloop + endfacet facet normal 0 0 -1 outer loop vertex -4.9149 -3.44145 0 @@ -1567,6 +2372,13 @@ solid OpenSCAD_Model vertex -1.60144 -1.60144 6.7 endloop endfacet + facet normal -0.988385 0.151972 4.15395e-008 + outer loop + vertex -5.34753 4.69249 11.1 + vertex -3.90732 14.0592 11.1 + vertex -4.70059 8.9 8.5 + endloop + endfacet facet normal 0 -0 1 outer loop vertex -5.34753 4.69249 11.1 @@ -1588,13 +2400,6 @@ solid OpenSCAD_Model vertex -4.45439 5.58563 6.7 endloop endfacet - facet normal -0.988385 0.151972 0 - outer loop - vertex -5.34753 4.69249 6.7 - vertex -3.90732 14.0592 11.1 - vertex -3.90732 14.0592 0 - endloop - endfacet facet normal 0.707107 -0.707107 0 outer loop vertex -5.34753 4.69249 6.7 @@ -1602,11 +2407,18 @@ solid OpenSCAD_Model vertex -5.34753 4.69249 11.1 endloop endfacet + facet normal -0.988385 0.151972 0 + outer loop + vertex -5.34753 4.69249 6.7 + vertex -4.70059 8.9 8.5 + vertex -4.70059 8.9 0 + endloop + endfacet facet normal -0.988385 0.151972 0 outer loop vertex -5.34753 4.69249 6.7 vertex -5.34753 4.69249 11.1 - vertex -3.90732 14.0592 11.1 + vertex -4.70059 8.9 8.5 endloop endfacet facet normal -0.998993 0.0448651 0 @@ -1868,11 +2680,11 @@ solid OpenSCAD_Model vertex -1.60144 1.60144 6.7 endloop endfacet - facet normal -0.988385 0.151972 7.67303e-009 + facet normal -0.988385 0.151972 1.4091e-008 outer loop vertex -5.76629 1.96902 3 vertex -5.34753 4.69249 6.7 - vertex -3.90732 14.0592 0 + vertex -4.70059 8.9 0 endloop endfacet facet normal -0.919529 -0.393022 0 @@ -1976,15 +2788,15 @@ solid OpenSCAD_Model facet normal -0 0 -1 outer loop vertex -5.90884 1.04189 0 - vertex -3.90732 14.0592 0 + vertex -4.70059 8.9 0 vertex -3.5507 2.05 0 endloop endfacet - facet normal -0.988385 0.151972 5.95499e-008 + facet normal -0.988385 0.151972 6.00719e-008 outer loop vertex -5.90884 1.04189 0 vertex -5.76629 1.96902 3 - vertex -3.90732 14.0592 0 + vertex -4.70059 8.9 0 endloop endfacet facet normal -0.988385 0.151972 0 diff --git a/huxley/stls/printed/direct_extruder.stl b/huxley/stls/printed/direct_extruder.stl index c3adcae..0b5ce22 100644 --- a/huxley/stls/printed/direct_extruder.stl +++ b/huxley/stls/printed/direct_extruder.stl @@ -12557,6 +12557,111 @@ solid OpenSCAD_Model vertex 10.4558 7.81 3.30244 endloop endfacet + facet normal 0 0 -1 + outer loop + vertex 10.1 45.9 0 + vertex 10.1 54.1 0 + vertex 29.2994 45.9 0 + endloop + endfacet + facet normal 0 -1 -0 + outer loop + vertex 10.1 45.9 0 + vertex 29.2994 45.9 0 + vertex 29.2994 45.9 8.5 + endloop + endfacet + facet normal 0 -1 0 + outer loop + vertex 10.1 45.9 0 + vertex 29.2994 45.9 8.5 + vertex 10.1 45.9 8.5 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 10.1 45.9 8.5 + vertex 29.2994 45.9 8.5 + vertex 10.1 54.1 8.5 + endloop + endfacet + facet normal 0 1 0 + outer loop + vertex 10.1 54.1 0 + vertex 10.1 54.1 8.5 + vertex 31.5912 54.1 0 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex 10.1 54.1 0 + vertex 31.5912 54.1 0 + vertex 29.2994 45.9 0 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 10.1 54.1 8.5 + vertex 29.2994 45.9 8.5 + vertex 30.0927 51.0592 8.5 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 10.1 54.1 8.5 + vertex 30.0927 51.0592 8.5 + vertex 30.2079 51.5788 8.5 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 10.1 54.1 8.5 + vertex 30.2079 51.5788 8.5 + vertex 30.3679 52.0863 8.5 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 10.1 54.1 8.5 + vertex 30.3679 52.0863 8.5 + vertex 30.5715 52.578 8.5 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 10.1 54.1 8.5 + vertex 30.5715 52.578 8.5 + vertex 30.8172 53.05 8.5 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 10.1 54.1 8.5 + vertex 30.8172 53.05 8.5 + vertex 31.1032 53.4988 8.5 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 10.1 54.1 8.5 + vertex 31.1032 53.4988 8.5 + vertex 31.4271 53.921 8.5 + endloop + endfacet + facet normal -0 0 1 + outer loop + vertex 10.1 54.1 8.5 + vertex 31.4271 53.921 8.5 + vertex 31.5912 54.1 8.5 + endloop + endfacet + facet normal 0 1 -0 + outer loop + vertex 10.1 54.1 8.5 + vertex 31.5912 54.1 8.5 + vertex 31.5912 54.1 0 + endloop + endfacet facet normal 0 -1 0 outer loop vertex 10.4558 -6.89 14.0524 @@ -16603,17 +16708,17 @@ solid OpenSCAD_Model vertex 28.2337 38.969 3 endloop endfacet - facet normal -0.988385 0.151972 -2.36533e-007 + facet normal -0.988385 0.151972 -2.61681e-007 outer loop vertex 28.0912 38.0419 0 vertex 28.2337 38.969 3 - vertex 30.0927 51.0592 0 + vertex 29.2994 45.9 0 endloop endfacet facet normal -0 0 -1 outer loop vertex 28.0912 38.0419 0 - vertex 30.0927 51.0592 0 + vertex 29.2994 45.9 0 vertex 30.4493 39.05 0 endloop endfacet @@ -16680,11 +16785,11 @@ solid OpenSCAD_Model vertex 28.2337 38.969 6.7 endloop endfacet - facet normal -0.988385 0.151972 -8.35952e-008 + facet normal -0.988385 0.151972 -1.50866e-007 outer loop vertex 28.2337 38.969 3 vertex 28.6525 41.6925 6.7 - vertex 30.0927 51.0592 0 + vertex 29.2994 45.9 0 endloop endfacet facet normal -0.919523 -0.393037 0 @@ -17002,11 +17107,25 @@ solid OpenSCAD_Model vertex 30.0927 51.0592 11.1 endloop endfacet - facet normal -0.988385 0.151972 0 + facet normal -0.988385 0.151972 -4.39902e-007 + outer loop + vertex 28.6525 41.6925 11.1 + vertex 30.0927 51.0592 11.1 + vertex 29.2994 45.9 8.5 + endloop + endfacet + facet normal -0.988385 0.151973 0 outer loop vertex 28.6525 41.6925 6.7 vertex 28.6525 41.6925 11.1 - vertex 30.0927 51.0592 11.1 + vertex 29.2994 45.9 8.5 + endloop + endfacet + facet normal -0.988385 0.151973 0 + outer loop + vertex 28.6525 41.6925 6.7 + vertex 29.2994 45.9 8.5 + vertex 29.2994 45.9 0 endloop endfacet facet normal 0.707106 -0.707108 0 @@ -17023,13 +17142,6 @@ solid OpenSCAD_Model vertex 29.5456 42.5856 11.1 endloop endfacet - facet normal -0.988385 0.151972 0 - outer loop - vertex 28.6525 41.6925 6.7 - vertex 30.0927 51.0592 11.1 - vertex 30.0927 51.0592 0 - endloop - endfacet facet normal -0 0 1 outer loop vertex 28.6525 41.6925 6.7 @@ -17163,6 +17275,41 @@ solid OpenSCAD_Model vertex 31.4597 8 9.07616 endloop endfacet + facet normal -0 0 -1 + outer loop + vertex 29.2994 45.9 0 + vertex 31.5912 54.1 0 + vertex 34.2679 50 0 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex 29.2994 45.9 0 + vertex 34 41.1 0 + vertex 30.4493 39.05 0 + endloop + endfacet + facet normal -0 0 -1 + outer loop + vertex 29.2994 45.9 0 + vertex 34.2679 50 0 + vertex 35.184 48.4134 0 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex 29.2994 45.9 0 + vertex 35.184 48.4134 0 + vertex 34 41.1 0 + endloop + endfacet + facet normal -0.988385 0.151972 0 + outer loop + vertex 29.2994 45.9 8.5 + vertex 30.0927 51.0592 11.1 + vertex 30.0927 51.0592 8.5 + endloop + endfacet facet normal -0.737276 -0.675591 0 outer loop vertex 29.4037 33.1433 0 @@ -18486,34 +18633,6 @@ solid OpenSCAD_Model vertex 30.5069 0 5.52025 endloop endfacet - facet normal -0.976298 0.216433 0 - outer loop - vertex 30.0927 51.0592 0 - vertex 30.0927 51.0592 11.1 - vertex 30.2079 51.5788 11.1 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 30.0927 51.0592 0 - vertex 30.2079 51.5788 0 - vertex 30.3679 52.0863 0 - endloop - endfacet - facet normal -0.976298 0.216433 0 - outer loop - vertex 30.0927 51.0592 0 - vertex 30.2079 51.5788 11.1 - vertex 30.2079 51.5788 0 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 30.0927 51.0592 0 - vertex 30.3679 52.0863 0 - vertex 30.4493 39.05 0 - endloop - endfacet facet normal 0 0 1 outer loop vertex 30.0927 51.0592 11.1 @@ -18535,18 +18654,18 @@ solid OpenSCAD_Model vertex 30.2079 51.5788 11.1 endloop endfacet - facet normal -0.953713 0.30072 0 + facet normal -0.976298 0.216433 0 outer loop - vertex 30.2079 51.5788 0 + vertex 30.0927 51.0592 8.5 + vertex 30.0927 51.0592 11.1 vertex 30.2079 51.5788 11.1 - vertex 30.3679 52.0863 11.1 endloop endfacet - facet normal -0.953713 0.30072 0 + facet normal -0.976298 0.216433 0 outer loop - vertex 30.2079 51.5788 0 - vertex 30.3679 52.0863 11.1 - vertex 30.3679 52.0863 0 + vertex 30.0927 51.0592 8.5 + vertex 30.2079 51.5788 11.1 + vertex 30.2079 51.5788 8.5 endloop endfacet facet normal -0 0 1 @@ -18556,46 +18675,18 @@ solid OpenSCAD_Model vertex 30.3679 52.0863 11.1 endloop endfacet - facet normal -0.923879 0.382684 0 + facet normal -0.953713 0.30072 0 outer loop - vertex 30.3679 52.0863 0 + vertex 30.2079 51.5788 8.5 + vertex 30.2079 51.5788 11.1 vertex 30.3679 52.0863 11.1 - vertex 30.5715 52.578 11.1 endloop endfacet - facet normal 0 -0 -1 + facet normal -0.953713 0.30072 0 outer loop - vertex 30.3679 52.0863 0 - vertex 30.5715 52.578 0 - vertex 34.2679 50 0 - endloop - endfacet - facet normal -0.923879 0.382684 0 - outer loop - vertex 30.3679 52.0863 0 - vertex 30.5715 52.578 11.1 - vertex 30.5715 52.578 0 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 30.3679 52.0863 0 - vertex 34 41.1 0 - vertex 30.4493 39.05 0 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 30.3679 52.0863 0 - vertex 34.2679 50 0 - vertex 35.184 48.4134 0 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 30.3679 52.0863 0 - vertex 35.184 48.4134 0 - vertex 34 41.1 0 + vertex 30.2079 51.5788 8.5 + vertex 30.3679 52.0863 11.1 + vertex 30.3679 52.0863 8.5 endloop endfacet facet normal -0 0 1 @@ -18605,6 +18696,20 @@ solid OpenSCAD_Model vertex 30.5715 52.578 11.1 endloop endfacet + facet normal -0.923879 0.382684 0 + outer loop + vertex 30.3679 52.0863 8.5 + vertex 30.3679 52.0863 11.1 + vertex 30.5715 52.578 11.1 + endloop + endfacet + facet normal -0.923879 0.382684 0 + outer loop + vertex 30.3679 52.0863 8.5 + vertex 30.5715 52.578 11.1 + vertex 30.5715 52.578 8.5 + endloop + endfacet facet normal 0.49989 0.866089 0 outer loop vertex 30.4493 34.95 0 @@ -18801,27 +18906,6 @@ solid OpenSCAD_Model vertex 30.8607 0 6.37459 endloop endfacet - facet normal -0.88702 0.461732 0 - outer loop - vertex 30.5715 52.578 0 - vertex 30.5715 52.578 11.1 - vertex 30.8172 53.05 11.1 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 30.5715 52.578 0 - vertex 30.8172 53.05 0 - vertex 34.2679 50 0 - endloop - endfacet - facet normal -0.88702 0.461732 0 - outer loop - vertex 30.5715 52.578 0 - vertex 30.8172 53.05 11.1 - vertex 30.8172 53.05 0 - endloop - endfacet facet normal -0 0 1 outer loop vertex 30.5715 52.578 11.1 @@ -18829,32 +18913,18 @@ solid OpenSCAD_Model vertex 30.8172 53.05 11.1 endloop endfacet - facet normal -0.843389 0.537304 0 + facet normal -0.88702 0.461732 0 outer loop - vertex 30.8172 53.05 0 + vertex 30.5715 52.578 8.5 + vertex 30.5715 52.578 11.1 vertex 30.8172 53.05 11.1 - vertex 31.1032 53.4988 11.1 endloop endfacet - facet normal 0 0 -1 + facet normal -0.88702 0.461732 0 outer loop - vertex 30.8172 53.05 0 - vertex 31.1032 53.4988 0 - vertex 35.184 51.5866 0 - endloop - endfacet - facet normal -0.843389 0.537304 0 - outer loop - vertex 30.8172 53.05 0 - vertex 31.1032 53.4988 11.1 - vertex 31.1032 53.4988 0 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 30.8172 53.05 0 - vertex 35.184 51.5866 0 - vertex 34.2679 50 0 + vertex 30.5715 52.578 8.5 + vertex 30.8172 53.05 11.1 + vertex 30.8172 53.05 8.5 endloop endfacet facet normal 0 0 1 @@ -18871,6 +18941,20 @@ solid OpenSCAD_Model vertex 31.1032 53.4988 11.1 endloop endfacet + facet normal -0.843389 0.537304 0 + outer loop + vertex 30.8172 53.05 8.5 + vertex 30.8172 53.05 11.1 + vertex 31.1032 53.4988 11.1 + endloop + endfacet + facet normal -0.843389 0.537304 0 + outer loop + vertex 30.8172 53.05 8.5 + vertex 31.1032 53.4988 11.1 + vertex 31.1032 53.4988 8.5 + endloop + endfacet facet normal 0.953721 0 0.300691 outer loop vertex 30.8607 0 13.6254 @@ -18941,27 +19025,6 @@ solid OpenSCAD_Model vertex 32.4102 43.9652 6.7 endloop endfacet - facet normal -0.793345 0.608772 0 - outer loop - vertex 31.1032 53.4988 0 - vertex 31.1032 53.4988 11.1 - vertex 31.4271 53.921 11.1 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 31.1032 53.4988 0 - vertex 31.4271 53.921 0 - vertex 35.184 51.5866 0 - endloop - endfacet - facet normal -0.793345 0.608772 0 - outer loop - vertex 31.1032 53.4988 0 - vertex 31.4271 53.921 11.1 - vertex 31.4271 53.921 0 - endloop - endfacet facet normal -0 0 1 outer loop vertex 31.1032 53.4988 11.1 @@ -18969,6 +19032,20 @@ solid OpenSCAD_Model vertex 31.4271 53.921 11.1 endloop endfacet + facet normal -0.793345 0.608772 0 + outer loop + vertex 31.1032 53.4988 8.5 + vertex 31.1032 53.4988 11.1 + vertex 31.4271 53.921 11.1 + endloop + endfacet + facet normal -0.793345 0.608772 0 + outer loop + vertex 31.1032 53.4988 8.5 + vertex 31.4271 53.921 11.1 + vertex 31.4271 53.921 8.5 + endloop + endfacet facet normal 0.976295 0 0.216443 outer loop vertex 31.1388 0 12.7435 @@ -19025,25 +19102,11 @@ solid OpenSCAD_Model vertex 31.4597 0 9.07616 endloop endfacet - facet normal -0.737286 0.67558 0 + facet normal -0.737286 0.67558 -4.12326e-007 outer loop - vertex 31.4271 53.921 0 vertex 31.4271 53.921 11.1 vertex 31.7867 54.3133 11.1 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 31.4271 53.921 0 - vertex 31.7867 54.3133 0 - vertex 35.184 51.5866 0 - endloop - endfacet - facet normal -0.737286 0.67558 0 - outer loop - vertex 31.4271 53.921 0 - vertex 31.7867 54.3133 11.1 - vertex 31.7867 54.3133 0 + vertex 31.5912 54.1 8.5 endloop endfacet facet normal -0 0 1 @@ -19053,6 +19116,13 @@ solid OpenSCAD_Model vertex 31.7867 54.3133 11.1 endloop endfacet + facet normal -0.737283 0.675584 0 + outer loop + vertex 31.4271 53.921 8.5 + vertex 31.4271 53.921 11.1 + vertex 31.5912 54.1 8.5 + endloop + endfacet facet normal 0.999049 0 0.0436119 outer loop vertex 31.4597 0 10.9238 @@ -19081,6 +19151,34 @@ solid OpenSCAD_Model vertex 31.5 0 10 endloop endfacet + facet normal -0.737289 0.675578 0 + outer loop + vertex 31.5912 54.1 0 + vertex 31.5912 54.1 8.5 + vertex 31.7867 54.3133 0 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex 31.5912 54.1 0 + vertex 31.7867 54.3133 0 + vertex 35.184 51.5866 0 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex 31.5912 54.1 0 + vertex 35.184 51.5866 0 + vertex 34.2679 50 0 + endloop + endfacet + facet normal -0.737289 0.675578 0 + outer loop + vertex 31.5912 54.1 8.5 + vertex 31.7867 54.3133 11.1 + vertex 31.7867 54.3133 0 + endloop + endfacet facet normal 0.92388 0.382683 0 outer loop vertex 31.7352 37 4.39 @@ -21461,6 +21559,160 @@ solid OpenSCAD_Model vertex 14.7849 37.762 5 endloop endfacet + facet normal -0.998176 0.0603789 0 + outer loop + vertex 6 50 0 + vertex 6 50 8.5 + vertex 6.02989 50.4942 8.5 + endloop + endfacet + facet normal -0.998176 -0.0603789 0 + outer loop + vertex 6 50 0 + vertex 6.02989 49.5058 0 + vertex 6 50 8.5 + endloop + endfacet + facet normal 0 -0 -1 + outer loop + vertex 6 50 0 + vertex 6.02989 50.4942 0 + vertex 6.02989 49.5058 0 + endloop + endfacet + facet normal -0.998176 0.0603789 0 + outer loop + vertex 6 50 0 + vertex 6.02989 50.4942 8.5 + vertex 6.02989 50.4942 0 + endloop + endfacet + facet normal -0.998176 -0.0603789 0 + outer loop + vertex 6 50 8.5 + vertex 6.02989 49.5058 0 + vertex 6.02989 49.5058 8.5 + endloop + endfacet + facet normal 0 -0 1 + outer loop + vertex 6 50 8.5 + vertex 6.02989 49.5058 8.5 + vertex 6.02989 50.4942 8.5 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex 6.02989 49.5058 0 + vertex 6.02989 50.4942 0 + vertex 6.11914 50.9812 0 + endloop + endfacet + facet normal -0.98362 -0.180256 0 + outer loop + vertex 6.02989 49.5058 0 + vertex 6.11914 49.0188 0 + vertex 6.02989 49.5058 8.5 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex 6.02989 49.5058 0 + vertex 6.11914 50.9812 0 + vertex 6.11914 49.0188 0 + endloop + endfacet + facet normal -0.98362 -0.180256 0 + outer loop + vertex 6.02989 49.5058 8.5 + vertex 6.11914 49.0188 0 + vertex 6.11914 49.0188 8.5 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 6.02989 49.5058 8.5 + vertex 6.11914 49.0188 8.5 + vertex 6.02989 50.4942 8.5 + endloop + endfacet + facet normal -0.98362 0.180256 0 + outer loop + vertex 6.02989 50.4942 0 + vertex 6.02989 50.4942 8.5 + vertex 6.11914 50.9812 8.5 + endloop + endfacet + facet normal -0.98362 0.180256 0 + outer loop + vertex 6.02989 50.4942 0 + vertex 6.11914 50.9812 8.5 + vertex 6.11914 50.9812 0 + endloop + endfacet + facet normal -0 0 1 + outer loop + vertex 6.02989 50.4942 8.5 + vertex 6.11914 49.0188 8.5 + vertex 6.11914 50.9812 8.5 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex 6.11914 49.0188 0 + vertex 6.11914 50.9812 0 + vertex 6.26643 51.4539 0 + endloop + endfacet + facet normal -0.954721 -0.297503 0 + outer loop + vertex 6.11914 49.0188 0 + vertex 6.26643 48.5461 0 + vertex 6.11914 49.0188 8.5 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex 6.11914 49.0188 0 + vertex 6.26643 51.4539 0 + vertex 6.26643 48.5461 0 + endloop + endfacet + facet normal -0.954721 -0.297503 0 + outer loop + vertex 6.11914 49.0188 8.5 + vertex 6.26643 48.5461 0 + vertex 6.26643 48.5461 8.5 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 6.11914 49.0188 8.5 + vertex 6.26643 48.5461 8.5 + vertex 6.11914 50.9812 8.5 + endloop + endfacet + facet normal -0.954721 0.297503 0 + outer loop + vertex 6.11914 50.9812 0 + vertex 6.11914 50.9812 8.5 + vertex 6.26643 51.4539 8.5 + endloop + endfacet + facet normal -0.954721 0.297503 0 + outer loop + vertex 6.11914 50.9812 0 + vertex 6.26643 51.4539 8.5 + vertex 6.26643 51.4539 0 + endloop + endfacet + facet normal -0 0 1 + outer loop + vertex 6.11914 50.9812 8.5 + vertex 6.26643 48.5461 8.5 + vertex 6.26643 51.4539 8.5 + endloop + endfacet facet normal -0.79336 0 -0.608753 outer loop vertex 6.20496 -2.8 15.2066 @@ -21517,6 +21769,62 @@ solid OpenSCAD_Model vertex 7.55977 -6.89 4.625 endloop endfacet + facet normal 0 0 -1 + outer loop + vertex 6.26643 48.5461 0 + vertex 6.26643 51.4539 0 + vertex 6.46963 51.9054 0 + endloop + endfacet + facet normal -0.911899 -0.410414 0 + outer loop + vertex 6.26643 48.5461 0 + vertex 6.46963 48.0946 0 + vertex 6.26643 48.5461 8.5 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex 6.26643 48.5461 0 + vertex 6.46963 51.9054 0 + vertex 6.46963 48.0946 0 + endloop + endfacet + facet normal -0.911899 -0.410414 0 + outer loop + vertex 6.26643 48.5461 8.5 + vertex 6.46963 48.0946 0 + vertex 6.46963 48.0946 8.5 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 6.26643 48.5461 8.5 + vertex 6.46963 48.0946 8.5 + vertex 6.26643 51.4539 8.5 + endloop + endfacet + facet normal -0.911899 0.410414 0 + outer loop + vertex 6.26643 51.4539 0 + vertex 6.26643 51.4539 8.5 + vertex 6.46963 51.9054 8.5 + endloop + endfacet + facet normal -0.911899 0.410414 0 + outer loop + vertex 6.26643 51.4539 0 + vertex 6.46963 51.9054 8.5 + vertex 6.46963 51.9054 0 + endloop + endfacet + facet normal -0 0 1 + outer loop + vertex 6.26643 51.4539 8.5 + vertex 6.46963 48.0946 8.5 + vertex 6.46963 51.9054 8.5 + endloop + endfacet facet normal 1 -0 0 outer loop vertex 6.45189 16.075 10.256 @@ -21979,6 +22287,62 @@ solid OpenSCAD_Model vertex 6.45189 8 20 endloop endfacet + facet normal 0 0 -1 + outer loop + vertex 6.46963 48.0946 0 + vertex 6.46963 51.9054 0 + vertex 6.72577 52.3291 0 + endloop + endfacet + facet normal -0.855783 -0.517335 0 + outer loop + vertex 6.46963 48.0946 0 + vertex 6.72577 47.6709 0 + vertex 6.46963 48.0946 8.5 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex 6.46963 48.0946 0 + vertex 6.72577 52.3291 0 + vertex 6.72577 47.6709 0 + endloop + endfacet + facet normal -0.855783 -0.517335 0 + outer loop + vertex 6.46963 48.0946 8.5 + vertex 6.72577 47.6709 0 + vertex 6.72577 47.6709 8.5 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 6.46963 48.0946 8.5 + vertex 6.72577 47.6709 8.5 + vertex 6.46963 51.9054 8.5 + endloop + endfacet + facet normal -0.855781 0.517338 0 + outer loop + vertex 6.46963 51.9054 0 + vertex 6.46963 51.9054 8.5 + vertex 6.72577 52.3291 8.5 + endloop + endfacet + facet normal -0.855781 0.517338 0 + outer loop + vertex 6.46963 51.9054 0 + vertex 6.72577 52.3291 8.5 + vertex 6.72577 52.3291 0 + endloop + endfacet + facet normal -0 0 1 + outer loop + vertex 6.46963 51.9054 8.5 + vertex 6.72577 47.6709 8.5 + vertex 6.72577 52.3291 8.5 + endloop + endfacet facet normal 0 0 -1 outer loop vertex 6.53849 3.31 0 @@ -22266,6 +22630,62 @@ solid OpenSCAD_Model vertex 7.0148 -6.89 5.95001 endloop endfacet + facet normal 0 0 -1 + outer loop + vertex 6.72577 47.6709 0 + vertex 6.72577 52.3291 0 + vertex 7.03111 52.7188 0 + endloop + endfacet + facet normal -0.787182 -0.61672 0 + outer loop + vertex 6.72577 47.6709 0 + vertex 7.03111 47.2812 0 + vertex 6.72577 47.6709 8.5 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex 6.72577 47.6709 0 + vertex 7.03111 52.7188 0 + vertex 7.03111 47.2812 0 + endloop + endfacet + facet normal -0.787182 -0.61672 0 + outer loop + vertex 6.72577 47.6709 8.5 + vertex 7.03111 47.2812 0 + vertex 7.03111 47.2812 8.5 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 6.72577 47.6709 8.5 + vertex 7.03111 47.2812 8.5 + vertex 6.72577 52.3291 8.5 + endloop + endfacet + facet normal -0.787185 0.616716 0 + outer loop + vertex 6.72577 52.3291 0 + vertex 6.72577 52.3291 8.5 + vertex 7.03111 52.7188 8.5 + endloop + endfacet + facet normal -0.787185 0.616716 0 + outer loop + vertex 6.72577 52.3291 0 + vertex 7.03111 52.7188 8.5 + vertex 7.03111 52.7188 0 + endloop + endfacet + facet normal -0 0 1 + outer loop + vertex 6.72577 52.3291 8.5 + vertex 7.03111 47.2812 8.5 + vertex 7.03111 52.7188 8.5 + endloop + endfacet facet normal -0.887014 0 -0.461743 outer loop vertex 7.0148 -2.8 14.05 @@ -22385,6 +22805,62 @@ solid OpenSCAD_Model vertex 7.02534 36.3729 2.4 endloop endfacet + facet normal 0 0 -1 + outer loop + vertex 7.03111 47.2812 0 + vertex 7.03111 52.7188 0 + vertex 7.3812 53.0689 0 + endloop + endfacet + facet normal -0.707105 -0.707109 -0 + outer loop + vertex 7.03111 47.2812 0 + vertex 7.3812 46.9311 0 + vertex 7.3812 46.9311 8.5 + endloop + endfacet + facet normal -0.707105 -0.707109 0 + outer loop + vertex 7.03111 47.2812 0 + vertex 7.3812 46.9311 8.5 + vertex 7.03111 47.2812 8.5 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex 7.03111 47.2812 0 + vertex 7.3812 53.0689 0 + vertex 7.3812 46.9311 0 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 7.03111 47.2812 8.5 + vertex 7.3812 46.9311 8.5 + vertex 7.03111 52.7188 8.5 + endloop + endfacet + facet normal -0.707105 0.707109 0 + outer loop + vertex 7.03111 52.7188 0 + vertex 7.03111 52.7188 8.5 + vertex 7.3812 53.0689 0 + endloop + endfacet + facet normal -0 0 1 + outer loop + vertex 7.03111 52.7188 8.5 + vertex 7.3812 46.9311 8.5 + vertex 7.3812 53.0689 8.5 + endloop + endfacet + facet normal -0.707105 0.707109 0 + outer loop + vertex 7.03111 52.7188 8.5 + vertex 7.3812 53.0689 8.5 + vertex 7.3812 53.0689 0 + endloop + endfacet facet normal -0.866025 0.5 0 outer loop vertex 7.10198 22.5986 2.8 @@ -22511,6 +22987,62 @@ solid OpenSCAD_Model vertex 7.6115 -6.89 7.22964 endloop endfacet + facet normal 0 0 -1 + outer loop + vertex 7.3812 46.9311 0 + vertex 7.3812 53.0689 0 + vertex 7.77094 53.3742 0 + endloop + endfacet + facet normal -0.616719 -0.787183 -0 + outer loop + vertex 7.3812 46.9311 0 + vertex 7.77094 46.6258 0 + vertex 7.77094 46.6258 8.5 + endloop + endfacet + facet normal -0.616719 -0.787183 0 + outer loop + vertex 7.3812 46.9311 0 + vertex 7.77094 46.6258 8.5 + vertex 7.3812 46.9311 8.5 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex 7.3812 46.9311 0 + vertex 7.77094 53.3742 0 + vertex 7.77094 46.6258 0 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 7.3812 46.9311 8.5 + vertex 7.77094 46.6258 8.5 + vertex 7.3812 53.0689 8.5 + endloop + endfacet + facet normal -0.616719 0.787183 0 + outer loop + vertex 7.3812 53.0689 0 + vertex 7.3812 53.0689 8.5 + vertex 7.77094 53.3742 0 + endloop + endfacet + facet normal -0 0 1 + outer loop + vertex 7.3812 53.0689 8.5 + vertex 7.77094 46.6258 8.5 + vertex 7.77094 53.3742 8.5 + endloop + endfacet + facet normal -0.616719 0.787183 0 + outer loop + vertex 7.3812 53.0689 8.5 + vertex 7.77094 53.3742 8.5 + vertex 7.77094 53.3742 0 + endloop + endfacet facet normal 0.98982 0 -0.142326 outer loop vertex 7.55977 -6.89 15.375 @@ -22868,6 +23400,62 @@ solid OpenSCAD_Model vertex 7.83759 7.81 5.57112 endloop endfacet + facet normal 0 0 -1 + outer loop + vertex 7.77094 46.6258 0 + vertex 7.77094 53.3742 0 + vertex 8.19464 53.6304 0 + endloop + endfacet + facet normal -0.517341 -0.855779 -0 + outer loop + vertex 7.77094 46.6258 0 + vertex 8.19464 46.3696 0 + vertex 8.19464 46.3696 8.5 + endloop + endfacet + facet normal -0.517341 -0.855779 0 + outer loop + vertex 7.77094 46.6258 0 + vertex 8.19464 46.3696 8.5 + vertex 7.77094 46.6258 8.5 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex 7.77094 46.6258 0 + vertex 8.19464 53.6304 0 + vertex 8.19464 46.3696 0 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 7.77094 46.6258 8.5 + vertex 8.19464 46.3696 8.5 + vertex 7.77094 53.3742 8.5 + endloop + endfacet + facet normal -0.517341 0.855779 0 + outer loop + vertex 7.77094 53.3742 0 + vertex 7.77094 53.3742 8.5 + vertex 8.19464 53.6304 0 + endloop + endfacet + facet normal -0 0 1 + outer loop + vertex 7.77094 53.3742 8.5 + vertex 8.19464 46.3696 8.5 + vertex 8.19464 53.6304 8.5 + endloop + endfacet + facet normal -0.517341 0.855779 0 + outer loop + vertex 7.77094 53.3742 8.5 + vertex 8.19464 53.6304 8.5 + vertex 8.19464 53.6304 0 + endloop + endfacet facet normal -0.976297 0 -0.216434 outer loop vertex 7.82399 -2.8 12.0964 @@ -23512,6 +24100,62 @@ solid OpenSCAD_Model vertex 16.0952 36.7171 5 endloop endfacet + facet normal 0 0 -1 + outer loop + vertex 8.19464 46.3696 0 + vertex 8.19464 53.6304 0 + vertex 8.64612 53.8336 0 + endloop + endfacet + facet normal -0.410408 -0.911902 -0 + outer loop + vertex 8.19464 46.3696 0 + vertex 8.64612 46.1664 0 + vertex 8.64612 46.1664 8.5 + endloop + endfacet + facet normal -0.410408 -0.911902 0 + outer loop + vertex 8.19464 46.3696 0 + vertex 8.64612 46.1664 8.5 + vertex 8.19464 46.3696 8.5 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex 8.19464 46.3696 0 + vertex 8.64612 53.8336 0 + vertex 8.64612 46.1664 0 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 8.19464 46.3696 8.5 + vertex 8.64612 46.1664 8.5 + vertex 8.19464 53.6304 8.5 + endloop + endfacet + facet normal -0.410408 0.911902 0 + outer loop + vertex 8.19464 53.6304 0 + vertex 8.19464 53.6304 8.5 + vertex 8.64612 53.8336 0 + endloop + endfacet + facet normal -0 0 1 + outer loop + vertex 8.19464 53.6304 8.5 + vertex 8.64612 46.1664 8.5 + vertex 8.64612 53.8336 8.5 + endloop + endfacet + facet normal -0.410408 0.911902 0 + outer loop + vertex 8.19464 53.6304 8.5 + vertex 8.64612 53.8336 8.5 + vertex 8.64612 53.8336 0 + endloop + endfacet facet normal 0 0 -1 outer loop vertex 8.49058 15.419 0 @@ -23764,6 +24408,62 @@ solid OpenSCAD_Model vertex 10.0346 7.81 6.375 endloop endfacet + facet normal 0 0 -1 + outer loop + vertex 8.64612 46.1664 0 + vertex 8.64612 53.8336 0 + vertex 9.11881 53.9809 0 + endloop + endfacet + facet normal -0.297507 -0.95472 -0 + outer loop + vertex 8.64612 46.1664 0 + vertex 9.11881 46.0191 0 + vertex 9.11881 46.0191 8.5 + endloop + endfacet + facet normal -0.297507 -0.95472 0 + outer loop + vertex 8.64612 46.1664 0 + vertex 9.11881 46.0191 8.5 + vertex 8.64612 46.1664 8.5 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex 8.64612 46.1664 0 + vertex 9.11881 53.9809 0 + vertex 9.11881 46.0191 0 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 8.64612 46.1664 8.5 + vertex 9.11881 46.0191 8.5 + vertex 8.64612 53.8336 8.5 + endloop + endfacet + facet normal -0.297507 0.95472 0 + outer loop + vertex 8.64612 53.8336 0 + vertex 8.64612 53.8336 8.5 + vertex 9.11881 53.9809 0 + endloop + endfacet + facet normal -0 0 1 + outer loop + vertex 8.64612 53.8336 8.5 + vertex 9.11881 46.0191 8.5 + vertex 9.11881 53.9809 8.5 + endloop + endfacet + facet normal -0.297507 0.95472 0 + outer loop + vertex 8.64612 53.8336 8.5 + vertex 9.11881 53.9809 8.5 + vertex 9.11881 53.9809 0 + endloop + endfacet facet normal 0 0 1 outer loop vertex 9.06073 -6.89 13.6428 @@ -23862,6 +24562,62 @@ solid OpenSCAD_Model vertex 10.0367 7.81 3.03316 endloop endfacet + facet normal 0 0 -1 + outer loop + vertex 9.11881 46.0191 0 + vertex 9.11881 53.9809 0 + vertex 9.6058 54.0701 0 + endloop + endfacet + facet normal -0.180255 -0.98362 -0 + outer loop + vertex 9.11881 46.0191 0 + vertex 9.6058 45.9299 0 + vertex 9.6058 45.9299 8.5 + endloop + endfacet + facet normal -0.180255 -0.98362 0 + outer loop + vertex 9.11881 46.0191 0 + vertex 9.6058 45.9299 8.5 + vertex 9.11881 46.0191 8.5 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex 9.11881 46.0191 0 + vertex 9.6058 54.0701 0 + vertex 9.6058 45.9299 0 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 9.11881 46.0191 8.5 + vertex 9.6058 45.9299 8.5 + vertex 9.11881 53.9809 8.5 + endloop + endfacet + facet normal -0.180255 0.98362 0 + outer loop + vertex 9.11881 53.9809 0 + vertex 9.11881 53.9809 8.5 + vertex 9.6058 54.0701 0 + endloop + endfacet + facet normal -0 0 1 + outer loop + vertex 9.11881 53.9809 8.5 + vertex 9.6058 45.9299 8.5 + vertex 9.6058 54.0701 8.5 + endloop + endfacet + facet normal -0.180255 0.98362 0 + outer loop + vertex 9.11881 53.9809 8.5 + vertex 9.6058 54.0701 8.5 + vertex 9.6058 54.0701 0 + endloop + endfacet facet normal 0 1 0 outer loop vertex 9.30977 3.31 12.075 @@ -24009,6 +24765,62 @@ solid OpenSCAD_Model vertex 10.0367 7.81 3.03316 endloop endfacet + facet normal -0.0603751 -0.998176 -0 + outer loop + vertex 9.6058 45.9299 0 + vertex 10.1 45.9 0 + vertex 10.1 45.9 8.5 + endloop + endfacet + facet normal -0.0603751 -0.998176 0 + outer loop + vertex 9.6058 45.9299 0 + vertex 10.1 45.9 8.5 + vertex 9.6058 45.9299 8.5 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex 9.6058 45.9299 0 + vertex 10.1 54.1 0 + vertex 10.1 45.9 0 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex 9.6058 45.9299 0 + vertex 9.6058 54.0701 0 + vertex 10.1 54.1 0 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 9.6058 45.9299 8.5 + vertex 10.1 45.9 8.5 + vertex 9.6058 54.0701 8.5 + endloop + endfacet + facet normal -0.0603751 0.998176 0 + outer loop + vertex 9.6058 54.0701 0 + vertex 9.6058 54.0701 8.5 + vertex 10.1 54.1 0 + endloop + endfacet + facet normal -0 0 1 + outer loop + vertex 9.6058 54.0701 8.5 + vertex 10.1 45.9 8.5 + vertex 10.1 54.1 8.5 + endloop + endfacet + facet normal -0.0603751 0.998176 0 + outer loop + vertex 9.6058 54.0701 8.5 + vertex 10.1 54.1 8.5 + vertex 10.1 54.1 0 + endloop + endfacet facet normal 0 0 -1 outer loop vertex 9.85917 16.2092 0 diff --git a/make_machine.py b/make_machine.py index 16758f7..b906851 100755 --- a/make_machine.py +++ b/make_machine.py @@ -5,11 +5,13 @@ from bom import boms from sheets import sheets from stls import stls from plates import plates +from accessories import accessories def make_machine(machine): boms(machine) sheets(machine) stls(machine) + accessories(machine) plates(machine) if __name__ == '__main__': diff --git a/scad/direct.scad b/scad/direct.scad index 3a9f412..78420d0 100644 --- a/scad/direct.scad +++ b/scad/direct.scad @@ -304,21 +304,19 @@ module direct_block_stl(include_support = true) { } } -module extruder_motor_assembly(show_connector = true, exploded = exploded) { +module direct_motor_assembly(show_connector = true, exploded = exploded) { assembly("extruder_motor_assembly"); // motor and gear - translate([-motor_x, motor_z - width / 2, motor_y]) - rotate([90,0,180]) { - rotate([0, 0, 180]) { - NEMA(motor); + rotate([0, 0, 180]) { + NEMA(motor); + + translate([0, 0, filament_z - hobbed_offset(pulley) + exploded * 20]) + rotate([0, 0, -90]) + hobbed_pulley_assembly(pulley); + } + if(show_connector) + d_motor_bracket_assembly(); - translate([0, 0, filament_z - hobbed_offset(pulley)]) - rotate([0, 0, -90]) - hobbed_pulley_assembly(pulley); - } - if(show_connector) - d_motor_bracket_assembly(); - } end("extruder_motor_assembly"); } @@ -348,7 +346,7 @@ module direct_idler_lever_stl() { } } } - *linear_extrude(height = h4) // release handle + linear_extrude(height = h4) // release handle hull() { translate([idler_x - idler_pivot_x, idler_pivot_y - idler_y]) circle(w / 2 - 2); @@ -360,9 +358,6 @@ module direct_idler_lever_stl() { translate([0, 0, h2]) poly_cylinder(r = ball_bearing_diameter(idler) / 2 + 0.5, h = 10); // bearing socket - *translate([idler_x - idler_pivot_x - w / 2 - 1, lever_bottom_y - idler_y - 1, h3]) - cube([w + 2, 2 * (motor_y - motor_screw_offset - lever_bottom_y) + 1, 10]); // miss the bottom motor screw - rotate([0, 0, 90]) nut_trap(2, nut_trap_radius(M4_nut, horizontal = false, snug = false), nut_trap_depth(M4_nut), supported = true); // nut trap for axle @@ -382,15 +377,16 @@ module direct_idler_lever_stl() { } module direct_idler_assembly() { - translate([-idler_x, idler_z - width / 2, idler_y]) { + translate([-idler_x, idler_z - width / 2 + exploded * 50, idler_y]) { rotate([90, 0, 0]) { translate([0, 0, idler_z - width]) color("lime") render() direct_idler_lever_stl(); - ball_bearing(idler) - screw(M4_hex_screw, 16); + explode([0, 0, 20]) + ball_bearing(idler) + screw(M4_hex_screw, 16); - translate([0, 0, -ball_bearing_width(idler) / 2]) + translate([0, 0, -ball_bearing_width(idler) / 2 + exploded * 10]) rotate([180, 0, 0]) washer(M4_washer); @@ -399,7 +395,6 @@ module direct_idler_assembly() { nut(M4_nut, true); } } - translate([-spring_x, spring_z - width / 2, spring_y]) rotate([0, 90, 0]) washer(M4_washer) @@ -429,22 +424,32 @@ module direct_assembly(show_connector = true, show_drive = true) { screw(M4_hex_screw, 20); // motor - translate([0, 0, 50 * exploded]) - extruder_motor_assembly(show_connector, 0); + translate([0, -40 * exploded, 0]) + translate([-motor_x, motor_z - width / 2, motor_y]) + rotate([90,0,180]) + direct_motor_assembly(show_connector, 0); - translate([-motor_x, -width / 2 + motor_thickness, motor_y]) { + // motor screws + translate([-motor_x, -width / 2 + motor_thickness, motor_y]) rotate([-90, 0, 0]) NEMA_screws(motor, 3, 8, M3_pan_screw); - } + + // idler axle translate([-idler_pivot_x, width / 2, idler_pivot_y]) rotate([-90, 0, 0]) { - screw_and_washer(M3_cap_screw, 25); - translate([0, 0, -(width - motor_thickness)]) + explode([0, 0, 50]) + screw_and_washer(M3_cap_screw, 25); + + translate([0, 0, -width + motor_thickness]) + explode([0, 0, 5]) washer(M3_washer) - star_washer(M3_washer) - nut(M3_nut) - washer(M3_washer); - } + explode([0, 0, 2]) + star_washer(M3_washer) + explode([0, 0, 2]) + nut(M3_nut) + explode([0, 0, 2]) + washer(M3_washer); + } // // Filament // @@ -456,10 +461,9 @@ module direct_assembly(show_connector = true, show_drive = true) { translate([-bulkhead_x - bulkhead_depth, spring_z - width / 2, spring_y]) rotate([0, 90, 0]) - nut(M4_nut); + explode([0, 0, -5]) + nut(M4_nut); } - - // // Hot end // @@ -487,10 +491,8 @@ module direct_assembly(show_connector = true, show_drive = true) { screw_and_washer(jhead_screw, jhead_screw_length, true); translate([jhead_screw_pitch, 0, jhead_nut_pos - jhead_nut_slot / 2 + nut_thickness(screw_nut(jhead_screw)) / 2]) - explode([ [ 10 * cos(a), 10 * sin(a), 0], - [ 10 * sin(a), -10 * cos(a), 0], - [-10 * sin(a), 10 * cos(a), 0] ][i]) - rotate([180, 0, -a + 90]) + explode( [ 15 * sin(-a), 15 * cos(-a), 0] * [-1,1,-1,1][i]) + rotate([180, 0, -a + 90]) nut(screw_nut(jhead_screw)); } } @@ -508,6 +510,6 @@ module direct_extruder_stl() { if(1) - direct_assembly(true); + direct_assembly(true, true); else direct_extruder_stl(); diff --git a/scad/extruder.scad b/scad/extruder.scad new file mode 100644 index 0000000..c618ac8 --- /dev/null +++ b/scad/extruder.scad @@ -0,0 +1,26 @@ +// +// Mendel90 +// +// GNU GPL v2 +// nop.head@gmail.com +// hydraraptor.blogspot.com +// +// Virual extruder +// +include +use +use + +function extruder_connector_offset() = extruder == Wades ? wades_extruder_connector_offset() : direct_extruder_connector_offset(); + +module extruder_motor_assembly(show_connector = true, exploded = exploded) + if(extruder == Wades) + wades_motor_assembly(show_connector, exploded); + else + direct_motor_assembly(show_connector, exploded); + +module extruder_assembly(show_connector = true, show_drive = true) + if(extruder == Wades) + wades_assembly(show_connector, show_drive); + else + direct_assembly(show_connector, show_drive); diff --git a/scad/main.scad b/scad/main.scad index 70cf27f..896d528 100644 --- a/scad/main.scad +++ b/scad/main.scad @@ -19,7 +19,7 @@ use use use use -use +use use use use diff --git a/scad/spool_holder.scad b/scad/spool_holder.scad index bba6bba..463489e 100644 --- a/scad/spool_holder.scad +++ b/scad/spool_holder.scad @@ -9,7 +9,6 @@ // include include -use small_bearing = false; diff --git a/scad/wade.scad b/scad/wade.scad index 4896955..30b889c 100644 --- a/scad/wade.scad +++ b/scad/wade.scad @@ -17,6 +17,7 @@ spring = false; // use two nuts or one nut and a spring screw_depth = 5; +motor = extruder_motor(extruder); motor_y = 28; driven_y = 31.5; motor_min = 26 + 5; @@ -171,10 +172,10 @@ module wades_block_stl() { // holes for motor // translate([motor_x, motor_y, -1]) { - slot(r = NEMA_big_hole(NEMA17), l = motor_leeway, h = 10, center = false); // motor hub slot + slot(r = NEMA_big_hole(motor), l = motor_leeway, h = 10, center = false); // motor hub slot - for(x = NEMA_holes(NEMA17)) // motor screw slots - for(y = NEMA_holes(NEMA17)) + for(x = NEMA_holes(motor)) // motor screw slots + for(y = NEMA_holes(motor)) translate([x,y,0]) slot(r = M3_clearance_radius, l = motor_leeway, h = 10, center = false); } @@ -182,7 +183,7 @@ module wades_block_stl() { // // remove fourth motor slot // - translate([motor_x - 40 + motor_leeway / 2, motor_y - NEMA_big_hole(NEMA17), -1]) + translate([motor_x - 40 + motor_leeway / 2, motor_y - NEMA_big_hole(motor), -1]) cube([40, 32, 7]); translate([motor_x - 40 + motor_leeway / 2 + 6, motor_y, -1]) @@ -193,7 +194,7 @@ module wades_block_stl() { translate([11, 0, -1]) fillet(4, 30); - translate([11, motor_y - NEMA_big_hole(NEMA17), -1]) + translate([11, motor_y - NEMA_big_hole(motor), -1]) rotate([0, 0, -90]) fillet(4, 30); @@ -361,21 +362,19 @@ module wade_idler_assembly() { } } -module extruder_motor_assembly(show_connector = true, exploded = exploded) { +module wades_motor_assembly(show_connector = true, exploded = exploded) { assembly("extruder_motor_assembly"); // motor and gear - translate([motor_x, motor_y, thickness + eta]) - rotate([0,180,0]) { - rotate([0, 0, 180]) - NEMA(NEMA17); + rotate([0, 0, 180]) + NEMA(motor); - translate([0,0, 2.5 + 30 * exploded]) - rotate([0, 0, 11]) - small_gear_assembly(); + translate([0,0, 2.5 + 30 * exploded]) + rotate([0, 0, 11]) + small_gear_assembly(); + + if(show_connector) + d_motor_bracket_assembly(); - if(show_connector) - d_motor_bracket_assembly(); - } end("extruder_motor_assembly"); } @@ -385,133 +384,138 @@ module wades_assembly(show_connector = true, show_drive = true) { assembly("extruder_assembly"); - color(wades_block_color) render() - difference() { - wades_block_stl(); - *translate([-1,-10, filament_z]) // cross section - cube([200,100,100]); - } + translate([-filament_x, width / 2, eta]) + rotate([90,0,0]) { - if(show_drive) { - // idler screws, washers and springs - for(i = [0,1]) - translate([pscrew_x, pscrew_y[i], pscrew_z[i]]) - rotate([90, 90, 90]) { - screw(M4_hex_screw, pscrew_length); - - translate([0,0, -pscrew_length + nut_inset]) - explode([12 - 24 * i, 0, 0]) - nut(M4_nut); - - translate([0, 0, -spring_total + 53 * exploded]) { - washer(M4_washer) - comp_spring(extruder_spring, spring_length) - washer(M4_washer); - } + color(wades_block_color) render() + difference() { + wades_block_stl(); + *translate([-1,-10, filament_z]) // cross section + cube([200,100,100]); } - // mounting screws - for(side = [-1, 1]) - translate([filament_x + mount_pitch * side, base_thickness - 3, filament_z]) - rotate([-90,0,0]) - screw(M4_hex_screw, 20); + if(show_drive) { + // idler screws, washers and springs + for(i = [0,1]) + translate([pscrew_x, pscrew_y[i], pscrew_z[i]]) + rotate([90, 90, 90]) { + screw(M4_hex_screw, pscrew_length); - //idler - translate([filament_x + 22 + 39 * exploded, driven_y, filament_z]) - rotate([90, 0, -90]) - wade_idler_assembly(); + translate([0,0, -pscrew_length + nut_inset]) + explode([12 - 24 * i, 0, 0]) + nut(M4_nut); - // motor - translate([0, 0, 50 * exploded]) - extruder_motor_assembly(show_connector, 0); + translate([0, 0, -spring_total + 53 * exploded]) { + washer(M4_washer) + comp_spring(extruder_spring, spring_length) + washer(M4_washer); + } + } - translate([motor_x, motor_y, 0]) - rotate([0, 180, -90]) - NEMA_screws(NEMA17, 3, 10, M3_hex_screw); - } + // mounting screws + for(side = [-1, 1]) + translate([filament_x + mount_pitch * side, base_thickness - 3, filament_z]) + rotate([-90,0,0]) + screw(M4_hex_screw, 20); - // hobbed bolt and gear - translate([driven_x, driven_y, 0]) { - translate([0, 0, width - ball_bearing_width(bearing) / 2 + (!show_drive ? exploded * 20 : 0)]) - ball_bearing(bearing); + //idler + translate([filament_x + 22 + 39 * exploded, driven_y, filament_z]) + rotate([90, 0, -90]) + wade_idler_assembly(); - translate([0, 0, ball_bearing_width(bearing) / 2 - (!show_drive ? exploded * 20 : 0)]) - ball_bearing(bearing); + // motor + translate([0, 0, 50 * exploded]) + translate([motor_x, motor_y, thickness + eta]) + rotate([0,180,0]) + wades_motor_assembly(show_connector, 0); + + translate([motor_x, motor_y, 0]) + rotate([0, 180, -90]) + NEMA_screws(motor, 3, 10, M3_hex_screw); + } + + // hobbed bolt and gear + translate([driven_x, driven_y, 0]) { + translate([0, 0, width - ball_bearing_width(bearing) / 2 + (!show_drive ? exploded * 20 : 0)]) + ball_bearing(bearing); + + translate([0, 0, ball_bearing_width(bearing) / 2 - (!show_drive ? exploded * 20 : 0)]) + ball_bearing(bearing); - if(show_drive) { + if(show_drive) { - translate([0, 0, - 30 * exploded]) - rotate([180, 0, 0]) - color(wades_gear_spacer_color) render() wades_gear_spacer_stl(); + translate([0, 0, - 30 * exploded]) + rotate([180, 0, 0]) + color(wades_gear_spacer_color) render() wades_gear_spacer_stl(); - translate([0, 0, -spacer_length - 50 * exploded]) - rotate([180, 0, 0]) - wades_big_gear_stl(); + translate([0, 0, -spacer_length - 50 * exploded]) + rotate([180, 0, 0]) + wades_big_gear_stl(); - translate([0,0, -spacer_length - gear_thickness]) - rotate([180, 0, 0]) - screw(M8_hex_screw, 60, spacer_length + gear_thickness + filament_z); + translate([0,0, -spacer_length - gear_thickness]) + rotate([180, 0, 0]) + screw(M8_hex_screw, 60, spacer_length + gear_thickness + filament_z); - translate([0,0, width]) { - if(spring) { - comp_spring(hob_spring, 8); - translate([0, 0, 8]) - nut(M8_nut); - } - else explode([0, 0, 35]) group() { - translate([0, 0, -15 * exploded]) - nut(M8_nut); + translate([0,0, width]) { + if(spring) { + comp_spring(hob_spring, 8); + translate([0, 0, 8]) + nut(M8_nut); + } + else explode([0, 0, 35]) group() { + translate([0, 0, -15 * exploded]) + nut(M8_nut); - translate([0, 0, nut_thickness(M8_nut) - 10 * exploded]) { - star_washer(M8_washer); + translate([0, 0, nut_thickness(M8_nut) - 10 * exploded]) { + star_washer(M8_washer); - translate([0, 0, washer_thickness(M8_washer) + 5 * exploded]) - nut(M8_nut); + translate([0, 0, washer_thickness(M8_washer) + 5 * exploded]) + nut(M8_nut); + } + } } } } - } + + // + // Hot end + // + assembly("hot_end_assembly"); + translate([filament_x, -extension, filament_z]) + rotate([-90, 0, 0]) { + if(hot_end_style(hot_end) == m90) + m90_hot_end(hot_end); + if(hot_end_style(hot_end) == Stoffel) + stoffel_hot_end(hot_end); + if(hot_end_style(hot_end) == jhead) + jhead_hot_end(hot_end, exploded = 0); + } + end("hot_end_assembly"); + + if(!hot_end_groove_mount(hot_end)) + for(side = [-1, 1]) + translate([filament_x + hot_end_screw_pitch(hot_end) * side, screw_depth - extension, width]) + screw(M3_cap_screw, 30); + else + translate([filament_x, -extension, filament_z]) + for(i = [0:2]) { + a = i * 120 - jhead_screw_angle; + rotate([90, a, 0]) { + translate([jhead_screw_pitch, 0, 0]) + washer(jhead_washer) + star_washer(screw_washer(jhead_screw)) + screw(jhead_screw, jhead_screw_length); + + translate([jhead_screw_pitch, 0, -extension - base_thickness - jhead_nut_slot / 2 - nut_thickness(screw_nut(jhead_screw)) / 2]) + explode([ [ 10 * cos(a), 10 * sin(a), 0], + [ 10 * sin(a), -10 * cos(a), 0], + [-10 * sin(a), 10 * cos(a), 0] ][i]) + rotate([0, 0, [0, 30, 30][i]]) + nut(screw_nut(jhead_screw)); + } + } } - - // - // Hot end - // - assembly("hot_end_assembly"); - translate([filament_x, -extension, filament_z]) - rotate([-90, 0, 0]) { - if(hot_end_style(hot_end) == m90) - m90_hot_end(hot_end); - if(hot_end_style(hot_end) == Stoffel) - stoffel_hot_end(hot_end); - if(hot_end_style(hot_end) == jhead) - jhead_hot_end(hot_end, exploded = 0); - } - end("hot_end_assembly"); - - if(!hot_end_groove_mount(hot_end)) - for(side = [-1, 1]) - translate([filament_x + hot_end_screw_pitch(hot_end) * side, screw_depth - extension, width]) - screw(M3_cap_screw, 30); - else - translate([filament_x, -extension, filament_z]) - for(i = [0:2]) { - a = i * 120 - jhead_screw_angle; - rotate([90, a, 0]) { - translate([jhead_screw_pitch, 0, 0]) - washer(jhead_washer) - star_washer(screw_washer(jhead_screw)) - screw(jhead_screw, jhead_screw_length); - - translate([jhead_screw_pitch, 0, -extension - base_thickness - jhead_nut_slot / 2 - nut_thickness(screw_nut(jhead_screw)) / 2]) - explode([ [ 10 * cos(a), 10 * sin(a), 0], - [ 10 * sin(a), -10 * cos(a), 0], - [-10 * sin(a), 10 * cos(a), 0] ][i]) - rotate([0, 0, [0, 30, 30][i]]) - nut(screw_nut(jhead_screw)); - } - } - end("extruder_assembly"); } @@ -537,8 +541,7 @@ module wades_big_gear_x5_stl(){ if(1) - rotate([90, 0, 0]) - wades_assembly(true); + wades_assembly(true); else if(1) wades_extruder_stl(); diff --git a/scad/x-carriage.scad b/scad/x-carriage.scad index 4488cc0..0dc626d 100644 --- a/scad/x-carriage.scad +++ b/scad/x-carriage.scad @@ -10,10 +10,7 @@ include use -use -use - -function extruder_connector_offset() = extruder == Wades ? wades_extruder_connector_offset() : direct_extruder_connector_offset(); +use hole = extruder_hole(extruder); width = hole[1] + 2 * bearing_holder_width(X_bearings); diff --git a/scad/x-carriage_assembly.scad b/scad/x-carriage_assembly.scad index f4fa98b..97629cb 100644 --- a/scad/x-carriage_assembly.scad +++ b/scad/x-carriage_assembly.scad @@ -7,19 +7,12 @@ // // X carriage, carries the extruder // - include module x_carriage_assembly(show_extruder = true, show_fan = true) { if(show_extruder) { - if(extruder == Wades) - translate([75, extruder_width / 2, eta]) - rotate([-90,0,180]) - wades_assembly(); - - if(extruder == Direct14) - rotate([180, 0, 180]) - direct_assembly(); + rotate([0, 180, 0]) + extruder_assembly(); for(end = [-1, 1]) translate([extruder_mount_pitch / 2 * end, 0, nut_trap_thickness]) diff --git a/scad/x-end.scad b/scad/x-end.scad index 92f34e1..fdac382 100644 --- a/scad/x-end.scad +++ b/scad/x-end.scad @@ -12,7 +12,6 @@ include use use use -use bwall = 2.3; diff --git a/views.py b/views.py index f2ec418..69bf7c5 100644 --- a/views.py +++ b/views.py @@ -4,6 +4,7 @@ import os import sys import shutil import openscad +import re from set_machine import * @@ -28,23 +29,45 @@ def views(machine): scad_name = scad_dir + os.sep + scad png_name = render_dir + os.sep + scad[:-4] + "png" + dx = None + rx = None + d = None for line in open(scad_name, "r").readlines(): + m = re.match(r'\$vpt *= *\[ *(.*) *, *(.*) *, *(.*) *\].*', line[:-1]) + if m: + dx = float(m.group(1)) + dy = float(m.group(2)) + dz = float(m.group(3)) + m = re.match(r'\$vpr *= *\[ *(.*) *, *(.*) *, *(.*) *\].*', line[:-1]) + if m: + rx = float(m.group(1)) + ry = float(m.group(2)) + rz = float(m.group(3)) + m = re.match(r'\$vpd *= * *(.*) *;.*', line[:-1]) + if m: + d = float(m.group(1)) words = line.split() - if len(words) > 10 and words[0] == "//": + if len(words) > 3 and words[0] == "//": cmd = words[1] if cmd == "view" or cmd == "assembled" or cmd == "assembly": w = int(words[2]) * 2 h = int(words[3]) * 2 - dx = float(words[4]) - dy = float(words[5]) - dz = float(words[6]) + if len(words) > 10: + dx = float(words[4]) + dy = float(words[5]) + dz = float(words[6]) - rx = float(words[7]) - ry = float(words[8]) - rz = float(words[9]) + rx = float(words[7]) + ry = float(words[8]) + rz = float(words[9]) + + d = float(words[10]) + + if dx == None or rx == None or d == None: + print "Missing camera data in " + scad_name + sys.exit(1) - d = float(words[10]) camera = "%.2f,%.2f,%.2f,%.2f,%.2f,%.2f,%.2f" % (dx, dy, dz, rx, ry, rz, d) exploded = "0" diff --git a/views/bed_fan_assembly.scad b/views/bed_fan_assembly.scad index a406a4f..43ebc51 100644 --- a/views/bed_fan_assembly.scad +++ b/views/bed_fan_assembly.scad @@ -7,9 +7,18 @@ // // Bed fan assembly view // -// assembly 958 958 -175 101 85 62 0 214 326 +$vpt = [-99, 147, 85]; +$vpr = [63, 0, 215]; +$vpd = 115; // +// assembly 958 958 +// +include <../scad/conf/config.scad> +include <../scad/positions.scad> + use <../scad/main.scad> -bed_fan_assembly(show_fan = true); +translate([-left_stay_x, -fan_y, -fan_z]) + bed_fan_assembly(show_fan = true); + $exploded = 1; diff --git a/views/extruder_assembled.scad b/views/extruder_assembled.scad index 074140d..20580cc 100644 --- a/views/extruder_assembled.scad +++ b/views/extruder_assembled.scad @@ -7,8 +7,14 @@ // // Wade's assembly view // -// view 929 904 51.73 40.12 18.31 55.00 0.00 26.40 425 +$vpt = [-21, 23, 11]; +$vpr = [55, 0, 26]; +$vpd = 380; // -use <../scad/wade.scad> +// view 929 904 +// +include <../scad/conf/config.scad> +use <../scad/extruder.scad> -wades_assembly(show_connector = true); +rotate(extruder == Wades ? [-90, 0, 0] : [0, 0, 180]) + extruder_assembly(show_connector = true); diff --git a/views/extruder_assembly.scad b/views/extruder_assembly.scad index 23956eb..9c29206 100644 --- a/views/extruder_assembly.scad +++ b/views/extruder_assembly.scad @@ -7,9 +7,12 @@ // // Wade's assembly view // -// assembly 929 904 66 39 -6 241 0 38 450 +// assembly 929 904 -9 39 -19 241 0 38 450 // -use <../scad/wade.scad> +include <../scad/conf/config.scad> +use <../scad/extruder.scad> + +rotate(extruder == Wades ? [-90, 0, 0] : [0, 180, 0]) + extruder_assembly(show_connector = false); -wades_assembly(show_connector = false); $exploded = 1; diff --git a/views/extruder_hot_end_assembly.scad b/views/extruder_hot_end_assembly.scad index cfdd8fa..2e0942c 100644 --- a/views/extruder_hot_end_assembly.scad +++ b/views/extruder_hot_end_assembly.scad @@ -7,9 +7,13 @@ // // Wade's assembly view // -// assembly 910 904 61.89 7.66 0.30 13.70 25.90 348.60 300 +$vpt = [-10, 6, 3]; +$vpr = [107, 12, 24]; +$vpd = 300; // -use <../scad/wade.scad> +// assembly 910 904 +// +use <../scad/extruder.scad> include <../scad/conf/config.scad> -wades_assembly(show_connector = !exploded, show_drive = false); +extruder_assembly(show_connector = !exploded, show_drive = false); diff --git a/views/extruder_motor_assembly.scad b/views/extruder_motor_assembly.scad index 285543f..0a241d0 100644 --- a/views/extruder_motor_assembly.scad +++ b/views/extruder_motor_assembly.scad @@ -7,12 +7,12 @@ // // Wade's motor assembly view // -// assembly 1141 965 51.27 13.11 -39.31 57.80 2.10 5.40 350 -// assembled 1141 965 51.27 13.11 -39.31 57.80 2.10 5.40 250 +// assembly 1141 965 -24 26 13 226 0 108 350 +// assembled 1141 965 -24 26 13 226 0 108 250 // $exploded = 1; -use <../scad/wade.scad> +use <../scad/extruder.scad> rotate([0, 90, -30]) extruder_motor_assembly(); diff --git a/views/frame_assembly_bar_front.scad b/views/frame_assembly_bar_front.scad index 46122f0..8854e07 100644 --- a/views/frame_assembly_bar_front.scad +++ b/views/frame_assembly_bar_front.scad @@ -7,10 +7,18 @@ // // Frame front bar detail // -// assembly 958 842 171 -154 -26 65.5 0 314 290 +$vpt = [18, 13, -11]; +$vpr = [65.5, 0, 314]; +$vpd = 261; // +// assembly 958 842 +// +include <../scad/conf/config.scad> +include <../scad/positions.scad> + use <../scad/main.scad> -frame_assembly(); +translate([-right_stay_x + fixing_block_height() / 2 + sheet_thickness(frame) / 2, (base_depth / 2 - fixing_block_width() / 2 - base_clearance), 0]) + frame_assembly(); $exploded = 1;