# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1390078329 -3600
# Node ID eecd06671d6a9bd5124082ec3189221f71e822e0
# Parent  3a3c5c3ff80ea7b58ffcc980fd7162870d474606
Added inner back cavities of the cartridge to the CAD specification.
Added missing inner wall to the side projection of the back of the cartridge in
the SVG diagram.

diff -r 3a3c5c3ff80e -r eecd06671d6a cartridge.scad
--- a/cartridge.scad	Sat Jan 11 02:00:47 2014 +0100
+++ b/cartridge.scad	Sat Jan 18 21:52:09 2014 +0100
@@ -46,6 +46,19 @@
 	back_cavity_inner_height = 12.0;
 	back_cavity_depth = 1.5;
 
+	inner_back_cavity_offset = back_cavity_depth;
+	inner_back_cavity_offset_from_left = 2.0;
+	inner_back_slope_offset_from_left = 10.0;
+	inner_back_slope_width = 2.5;
+	inner_back_slope_depth = 2.0;
+
+	inner_back_edge_offset = 2.0;
+	inner_back_edge_width = 69.0;
+	inner_back_edge_height = 3.0;
+	inner_back_edge_depth = 1.5;
+
+	bottom_from_base = 13.5;
+
 	/* Side thicknesses. */
 
 	front = 2;
@@ -53,6 +66,7 @@
 	top = 3;
 	left = 2;
 	right = 2;
+	bottom = 2;
 
 	difference() {
 
@@ -69,6 +83,8 @@
 				cube([right, depth, height], center = true);
 			translate([0, 0, height / 2 - top / 2])
 				cube([width, depth, top], center = true);
+			translate([0, 0, -height / 2 + bottom / 2 + bottom_from_base])
+				cube([width, depth, top], center = true);
 		}
 
 		/* Label insets. */
@@ -148,6 +164,46 @@
 							]);
 		}
 
+		/* Inner back cavities. */
+
+		translate([0, depth / 2 - inner_back_cavity_offset, -height / 2])
+			linear_extrude(height = bottom_from_base)
+				translate([-width / 2, 0, 0])
+					polygon([
+						[inner_back_cavity_offset_from_left, 0],
+						[inner_back_slope_offset_from_left, 0],
+						[inner_back_slope_offset_from_left +
+							inner_back_slope_width,
+							-inner_back_slope_depth],
+						[inner_back_cavity_offset_from_left,
+							-inner_back_slope_depth]
+						]);
+
+		translate([0, depth / 2 - inner_back_cavity_offset, -height / 2])
+			linear_extrude(height = bottom_from_base)
+				translate([-width / 2, 0, 0])
+					polygon([
+						[width - inner_back_slope_offset_from_left, 0],
+						[width - inner_back_cavity_offset_from_left, 0],
+						[width - inner_back_cavity_offset_from_left,
+							-inner_back_slope_depth],
+						[width - inner_back_slope_offset_from_left -
+							inner_back_slope_width,
+							-inner_back_slope_depth]
+						]);
+
+		translate([inner_back_edge_width / 2,
+			depth / 2 - inner_back_edge_offset, -height / 2])
+			rotate([0, -90, 0])
+				linear_extrude(height = inner_back_edge_width)
+					polygon([
+						[-extra, -inner_back_edge_depth],
+						[0, -inner_back_edge_depth],
+						[inner_back_edge_height, -inner_back_edge_depth],
+						[0, 0],
+						[-extra, 0]
+						]);
+
 		/* Fillets to round off the edges. */
 
 		union() {
diff -r 3a3c5c3ff80e -r eecd06671d6a cartridge.svg
--- a/cartridge.svg	Sat Jan 11 02:00:47 2014 +0100
+++ b/cartridge.svg	Sat Jan 18 21:52:09 2014 +0100
@@ -95,9 +95,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.97568255"
-     inkscape:cx="526.18109"
-     inkscape:cy="372.04724"
+     inkscape:zoom="2.4833006"
+     inkscape:cx="303.1002"
+     inkscape:cy="397.55748"
      inkscape:document-units="mm"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -845,9 +845,11 @@
      x="163.70898">8.9cm</tspan></tspan></textPath></text>
     <path
        style="fill:#e9c6af;fill-opacity:1;stroke:none"
-       d="M 510.25 106.3125 L 510.25 109.84375 L 483.65625 109.84375 L 483.65625 113.375 L 480.125 113.375 L 480.125 116.9375 L 506.6875 116.9375 L 506.6875 338.375 L 512 349 L 513.78125 349 L 513.78125 306.5 L 519.09375 301.1875 L 519.09375 106.3125 L 510.25 106.3125 z "
+       d="m 510.23622,106.29921 0,3.5433 -26.5748,0 0,3.54331 -3.54331,0 0,3.54331 26.5748,0 0,180.70866 -15.94488,0 0,3.54331 15.94488,0 0,37.20472 5.31496,10.62992 1.77166,0 0,-42.51968 5.31496,-5.31496 0,-194.88189 z"
        transform="translate(0,308.2677)"
-       id="front-1-3">
+       id="front-1-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccccccccccc">
       <title
          id="title6710">Front of cartridge</title>
     </path>
@@ -977,7 +979,7 @@
        sodipodi:cy="54.921238"
        sodipodi:rx="5.3149605"
        sodipodi:ry="5.3149605"
-       d="m 35.433071,54.921238 a 5.3149605,5.3149605 0 1 1 -10.629921,0 5.3149605,5.3149605 0 1 1 10.629921,0 z"
+       d="m 35.433071,54.921238 c 0,2.935372 -2.379589,5.31496 -5.31496,5.31496 -2.935372,0 -5.314961,-2.379588 -5.314961,-5.31496 0,-2.935372 2.379589,-5.314961 5.314961,-5.314961 2.935371,0 5.31496,2.379589 5.31496,5.314961 z"
        transform="translate(542.12601,364.96061)" />
     <path
        sodipodi:type="arc"
@@ -987,7 +989,7 @@
        sodipodi:cy="54.921238"
        sodipodi:rx="5.3149605"
        sodipodi:ry="5.3149605"
-       d="m 35.433071,54.921238 a 5.3149605,5.3149605 0 1 1 -10.629921,0 5.3149605,5.3149605 0 1 1 10.629921,0 z"
+       d="m 35.433071,54.921238 c 0,2.935372 -2.379589,5.31496 -5.31496,5.31496 -2.935372,0 -5.314961,-2.379588 -5.314961,-5.31496 0,-2.935372 2.379589,-5.314961 5.314961,-5.314961 2.935371,0 5.31496,2.379589 5.31496,5.314961 z"
        transform="translate(846.85041,364.96061)" />
     <text
        transform="translate(496.06302,-2.972485e-5)"
@@ -1053,5 +1055,14 @@
            x="918.59576"
            y="94.01133"
            style="fill:#ff0000" /></flowRegion><flowPara
-         id="flowPara3368">Back</flowPara></flowRoot>  </g>
+         id="flowPara3368">Back</flowPara></flowRoot>    <path
+       inkscape:connector-curvature="0"
+       style="fill:#d38d5f;fill-opacity:1;stroke:none"
+       d="m 480.11811,609.4488 0,-3.54331 10.62992,0 0,3.54331 z"
+       id="front-5-8-1-0-4-9-9"
+       sodipodi:nodetypes="ccccc">
+      <title
+         id="title3856-2-8-9-2-2-7-8">Front of cartridge</title>
+    </path>
+  </g>
 </svg>