From 69f7dbaea70875d4a8ad27f939714c2bf8c7b91d Mon Sep 17 00:00:00 2001
From: wholteza <zackarias@montell.se>
Date: Sun, 31 Aug 2025 16:26:43 +0200
Subject: [PATCH] Adjusted pico usb hole and shell height

---
 rev2/3d-models/top-dampener.scad | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/rev2/3d-models/top-dampener.scad b/rev2/3d-models/top-dampener.scad
index 8c68e4c..5d8c353 100644
--- a/rev2/3d-models/top-dampener.scad
+++ b/rev2/3d-models/top-dampener.scad
@@ -48,6 +48,7 @@ $pcbDampenerOffset = $pcbHeight + $dampenerHeight;
         [$switchDistance * 2, 0],
     ];
 
+    picoUsbBody = [8, 5.66, 2.65];
 
 module pin(){
     cylinder(h=$holes, r=1, center=false);
@@ -127,7 +128,7 @@ rightTopDampener();
 module case(){
     // Then adjust the shim, aux and pico.
     // Last add magnets, don't forget the clearance.
-    $baseHeight = 6.3;
+    $baseHeight = 7.6;
         
     module magnets(){
         $magnetWidth = 4;
@@ -166,17 +167,18 @@ module case(){
     //TODO: Continue aligning pico clearance
     module pico(){
         $topLeftEdgeOfPcbToCenterOfUsb = 27.7;
-        $usbHoleWidth = 12;
-        $usbHoleHeight = 9;
-        $usbOffsetFromPcb = 4 - $pcbDampenerOffset;
-        $picoPcbClearanceFromBase = 5.4 - $pcbDampenerOffset;
+        $usbHoleWidth =  11.15+($clearance*2);
+        $usbHoleHeight = 7 + ($clearance *2);
+        $usbOffsetFromPcb = 4.1 - $pcbHeight;
+        $picoPcbClearanceFromBase = 5.4 - $pcbHeight;
         $picoWidth = 25;
         $picoLength = 53;
         // Move to position along the wall the usb will be
+        // Hole should be centered on the pico usb
         translate([
             $topLeftEdgeOfPcbToCenterOfUsb - ($usbHoleWidth/2), 
             $switchDistance * $rows, 
-            -$usbOffsetFromPcb
+            -$usbOffsetFromPcb - (($usbHoleHeight - picoUsbBody.z )/2)
         ]){
             // Create a hole for the usb cable to go through
             cube([
@@ -201,7 +203,7 @@ module case(){
     module shim(){
         $shimPoints = [
             [0 - $shellWidth / 2, - $baseHeight],
-            [$switchDistance * $columns + $shellWidth/2 + $clearance, $clearance], 
+            [$switchDistance * $columns + $shellWidth/2 + $clearance, -$clearance], 
             [$switchDistance * $columns + $shellWidth/2 + $clearance, - ($baseHeight + $clearance)]
         ];
         // Face z/x-plane
@@ -238,7 +240,6 @@ module case(){
 module pcb() {
     jackBody = [15,6.15,5.3];
     picoBody = [21, 51.5, 1];
-    picoUsbBody = [8, 5.66, 2.65];
     module jack() {
         translate([0,jackBody.y/2, jackBody.z/2])
             rotate([0,90])
@@ -272,6 +273,6 @@ module pcb() {
     
 }
 
-    *%pcb();
-    *topDampeners();
+    %pcb();
+    %topDampeners();
     case();