add g1_8 option to connector

cell_measure_robot/pneumatics/tconnector

@@ -7,24 +7,38 @@ from ocp_vscode import show, show_object
 from cadquery.occ_impl.exporters import ExportTypes
 
 MM = 1
-IN = 25.4 * MM
+IN = 25.4 *MM
 
-distance = 10 * MM
+distance = 15 *MM
 
-seal_diam = 8.2 * MM
-seal_depth = 5.4 * MM
-seal_torus_diam = 1.5 * MM
-cartridge_small_diam = 7.7 * MM
-cartridge_small_depth = 7 * MM
-cartridge_large_diam = 8.9 * MM
-cartridge_large_depth = 3.7 * MM
+seal_diam = 8.2 *MM
+seal_depth = 3.4 *MM
+seal_torus_diam = 1.5 *MM
+cartridge_small_diam = 7.7 *MM
+cartridge_small_depth = 5.2 *MM
+cartridge_large_diam = 8.9 *MM
+cartridge_large_depth = 2.7 *MM
 
-eps = 0.1 * MM
+# version = "G1_8"
+version = "M7"
+
+if version == "G1_8":
+    major_diam = 9.6 * MM
+    pitch=0.907 * MM
+    length=10 * MM
+
+elif version == "M7":
+    major_diam = 7 * MM
+    pitch=1 * MM
+    length=8 * MM
+
+else:
+    raise ValueError("Invalid version")
 
 iso_external_thread = IsoThread(
-    major_diameter=7 * MM,
-    pitch=1 * MM,
-    length=8 * MM,
+    major_diameter=major_diam,
+    pitch=pitch,
+    length=length,
     external=True,
     end_finishes=("chamfer", "chamfer"),
 )
@@ -95,6 +109,7 @@ sweep = (
     .loft(combine=False)
 )
 housing = housing.cut(sweep)
+housing = housing.faces("<Y or >Y").edges("not (>Z or <Z)").fillet(2)
 
 
 # show_object(iso_external_thread.cq_object, name="iso_external_thread")
@@ -103,5 +118,5 @@ housing = housing.cut(sweep)
 show_object(housing, name="housing")
 
 
-with open(r"t_connector.step", "w") as fp:
+with open(f"t_connector_{version}.step", "w") as fp:
    cq.exporters.exportShape(housing, ExportTypes.STEP, fp)