# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1417909752 -3600
# Node ID 2f5c52a0703d7fc9d7b203a871169273ff53e6af
# Parent  8aa91be70ce826355164cfbf8c0141f1385c8f89
Extended the floor of widened cartridges, also fixing connector outer surface
rounding for the front piece of the cartridge.

diff -r 8aa91be70ce8 -r 2f5c52a0703d cartridge.scad
--- a/cartridge.scad	Sat Dec 06 19:00:29 2014 +0100
+++ b/cartridge.scad	Sun Dec 07 00:49:12 2014 +0100
@@ -524,6 +524,15 @@
 						-height / 2 + int_connector_height);
 				}
 
+				/* Extended floor. */
+
+				if (payload_width > connector_width) {
+
+					cube_at(payload_width - connector_width, front_depth, bottom,
+						1, -1, 1,
+						payload_left_extent, 0, -height / 2 + int_connector_height);
+				}
+
 				/* PCB supports. */
 
 				cube_at(pcb_front_support_width,
@@ -637,12 +646,21 @@
 
 				/* Edge rounding. */
 			
-				translate([payload_left_extent + ro, -front_depth + ro, 0])
+				translate([payload_right_extent - ro, -front_depth + ro, int_payload_lower_extent - bottom - extra])
+					rotate([0, 0, 270])
+						fillet_justified(rr, payload_height + bottom + extra);
+
+				translate([payload_left_extent + ro, -front_depth + ro, int_payload_lower_extent - bottom - extra])
 					rotate([0, 0, 180])
-						fillet(rr, height);
-				translate([payload_right_extent - ro, -front_depth + ro, 0])
+						fillet_justified(rr, payload_height + bottom + extra);
+
+				translate([connector_width / 2 - ro, -front_depth + ro, -height / 2])
 					rotate([0, 0, 270])
-						fillet(rr, height);
+						fillet_partitioned(rr, connector_height - bottom);
+
+				translate([-connector_width / 2 + ro, -front_depth + ro, -height / 2])
+					rotate([0, 0, 180])
+						fillet_partitioned(rr, connector_height - bottom);
 			}
 		}
 
@@ -793,6 +811,22 @@
 						0, 0, -height / 2 + int_connector_height);
 				}
 
+				/* Extended floor. */
+
+				if (payload_width > connector_width) {
+
+					difference() {
+
+						cube_at(payload_width - connector_width, back_depth, bottom,
+							1, 1, 1,
+							payload_left_extent, 0, -height / 2 + int_connector_height);
+
+						cube_at(payload_width - connector_width, edge_connector_cutout_front_depth, bottom,
+							1, 1, 1,
+							payload_left_extent, 0, -height / 2 + int_connector_height);
+					}
+				}
+
 				/* PCB supports. */
 
 				pcb_support(-1, pcb_back_support_left_bump_height,
@@ -941,19 +975,19 @@
 			
 				/* Outer edge rounding. */
 			
-				translate([payload_right_extent - ro, back_depth - ro, int_payload_lower_extent - extra])
-					fillet_justified(rr, payload_height + extra);
+				translate([payload_right_extent - ro, back_depth - ro, int_payload_lower_extent - bottom - extra])
+					fillet_justified(rr, payload_height + bottom + extra);
 
-				translate([payload_left_extent + ro, back_depth - ro, int_payload_lower_extent - extra])
+				translate([payload_left_extent + ro, back_depth - ro, int_payload_lower_extent - bottom - extra])
 					rotate([0, 0, 90])
-						fillet_justified(rr, payload_height + extra);
+						fillet_justified(rr, payload_height + bottom + extra);
 
 				translate([connector_width / 2 - ro, back_depth - ro, -height / 2])
-					fillet_partitioned(rr, connector_height);
+					fillet_partitioned(rr, connector_height - bottom);
 
 				translate([-connector_width / 2 + ro, back_depth - ro, -height / 2])
 					rotate([0, 0, 90])
-						fillet_partitioned(rr, connector_height);
+						fillet_partitioned(rr, connector_height - bottom);
 
 				/*
 				Outer edge rounding of the back extension. This is done as a