# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1393079775 -3600
# Node ID 09bd2240669f00717c6cf85b40e4fc1eec8e29d9
# Parent  b72b2e0f6672fd795240501838d2e1af116ebe40
Incorporated measurements from Dave H's CAD file.

diff -r b72b2e0f6672 -r 09bd2240669f cartridge.scad
--- a/cartridge.scad	Mon Jan 20 22:34:05 2014 +0100
+++ b/cartridge.scad	Sat Feb 22 15:36:15 2014 +0100
@@ -24,7 +24,7 @@
 	material. The additional margin helps avoid geometry problems.
 	*/
 
-	rr = 1;
+	rr = 2;
 	ro = rr;
 	extra = 0.1;
 
@@ -69,8 +69,8 @@
 
 	/* Cartridge dimensions. */
 
-	width = 89.0;
-	height = 68.5;
+	width = 90.0;
+	height = 68.3;
 	depth = 16.5;
 	front_depth = 6.5;
 	back_depth = 11.0;
@@ -127,13 +127,13 @@
 	inner_front_edge_height = 3.0;
 	inner_front_edge_depth = 1.5;
 
-	bottom_from_base = 13.5;
+	bottom_from_base = 14.0;
 
 	edge_connector_cutout_front_offset = 1.0;
 	edge_connector_cutout_front_depth = 1.0;
 	edge_connector_cutout_front_width = 15.0;
 	edge_connector_cutout_back_depth = 3.0;
-	edge_connector_cutout_back_width = 57.0;
+	edge_connector_cutout_back_width = 57.5;
 
 	/*
 	Edge connectors are themselves 0.05" or approximately 1.27mm in
@@ -154,12 +154,12 @@
 
 	/* Extra internal features. */
 
-	pcb_back_support_width = 1.0;
+	pcb_back_support_width = 1.2;
 	pcb_back_support_depth = back_depth -
 		edge_connector_cutout_back_depth;
 	pcb_back_support_height = height - bottom_from_base - top - bottom;
 
-	pcb_front_support_width = 1.0;
+	pcb_front_support_width = 1.2;
 	pcb_front_support_depth = front_depth;
 	pcb_front_support_height = pcb_back_support_height;
 
@@ -170,10 +170,10 @@
 
 	pcb_back_support_bump_width = pcb_front_support_width;
 	pcb_back_support_bump_depth = 1.5;
-	pcb_back_support_left_bump_height = 14.3;
-	pcb_back_support_right_bump_height = 11.7;
-	pcb_back_support_left_bump_offset_from_bottom = 26.0 - 11.8;
-	pcb_back_support_right_bump_offset_from_bottom = 28.6 - 11.8;
+	pcb_back_support_left_bump_height = 13.2;
+	pcb_back_support_right_bump_height = 10.7;
+	pcb_back_support_left_bump_offset_from_bottom = 15.1;
+	pcb_back_support_right_bump_offset_from_bottom = 17.6;
 
 	translate([-width * 0.6, 0, 0])
 	difference() {