Bläddra i källkod

Merge branch 'master' of https://tree.clementinecomputing.com/clementinecomputing/popufare

clementinecomputing 5 år sedan
förälder
incheckning
b1a33d66a1

+ 12 - 3
experiment/production/housing/v-acorn-squash/PopufareHousingCommon.scad

@@ -43,8 +43,12 @@ POPUFARE_HOUSING_HEIGHT = 135;
 _LIP_SCREW_D = 6.35;
 POPUFARE_HOUSING_BACK_LIP_HEIGHT = 49;
 POPUFARE_HOUSING_FRONT_LIP_HEIGHT = 7.25;
+
 POPUFARE_HOUSING_BACK_LIP_DEPTH = 23;
-POPUFARE_HOUSING_BACK_LIP_SCREW_DX = 147.25 + _LIP_SCREW_D;
+//POPUFARE_HOUSING_BACK_LIP_DEPTH = 33;
+
+//POPUFARE_HOUSING_BACK_LIP_SCREW_DX = 147.25 + _LIP_SCREW_D;
+POPUFARE_HOUSING_BACK_LIP_SCREW_DX = 145 + _LIP_SCREW_D;
 POPUFARE_HOUSING_BACK_LIP_SCREW_OFFSET_SIDE_X = 30 + _LIP_SCREW_D/2;
 POPUFARE_HOUSING_BACK_LIP_SCREW_OFFSET_BACK_Y = 13.75 + _LIP_SCREW_D/2;
 POPUFARE_HOUSING_BACK_LIP_SPACE = POPUFARE_HOUSING_BACK_LIP_DEPTH + 10;
@@ -141,9 +145,14 @@ POPUFARE_INNER_PLATE_HOLE_HEIGHT = 84;
 // diagonal screw: 62.5
 // length/width = sqrt(2)*62.5/2
 //
+// diagonal inner: 55.0
+// diagonal outer: 65.0
+// diagonal screw: 60.0
+// length/width = sqrt(2)*60/2
+//
 POPUFARE_SPEAKER_HOLE_R = 4.5/2;
-POPUFARE_SPEAKER_HOLE_WIDTH = sqrt(2)*62.5/2;
-POPUFARE_SPEAKER_HOLE_HEIGHT = sqrt(2)*62.5/2;
+POPUFARE_SPEAKER_HOLE_WIDTH = sqrt(2)*60.0/2;
+POPUFARE_SPEAKER_HOLE_HEIGHT = sqrt(2)*60.0/2;
 
 // hinge
 //

+ 2 - 1
experiment/production/housing/v-acorn-squash/PopufareHousingSideLeft.scad

@@ -37,7 +37,8 @@ module PopufareHousingSideLeftPlate() {
   back_lip_inset = POPUFARE_HOUSING_BACK_LIP_INSET;
   back_lip_screw_h = (h/2 - dh + bx);
 
-  overhang_w = POPUFARE_HOUSING_BACK_LIP_DEPTH;
+  //overhang_w = POPUFARE_HOUSING_BACK_LIP_DEPTH;
+  overhang_w = POPUFARE_HOUSING_BACK_LIP_SPACE;
   overhang_h = POPUFARE_HOUSING_BACK_LIP_HEIGHT;
 
   difference() {

+ 2 - 1
experiment/production/housing/v-acorn-squash/PopufareHousingSideRight.scad

@@ -33,7 +33,8 @@ module PopufareHousingSideRightPlate() {
   back_lip_inset = POPUFARE_HOUSING_BACK_LIP_INSET;
   back_lip_screw_h = (h/2 - dh + bx);
 
-  overhang_w = POPUFARE_HOUSING_BACK_LIP_DEPTH;
+//  overhang_w = POPUFARE_HOUSING_BACK_LIP_DEPTH;
+  overhang_w = POPUFARE_HOUSING_BACK_LIP_SPACE;
   overhang_h = POPUFARE_HOUSING_BACK_LIP_HEIGHT;
 
   difference() {

+ 1 - 1
experiment/production/housing/v-acorn-squash/export/export-all

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=2.2.1
+VERSION=2.2.5
 
 function ngc_position {
   ifn="$1"