From 7b1a9160434f5b000c83f03d39305f73b0bbf646 Mon Sep 17 00:00:00 2001
From: Chris Palmer <nop.head@gmail.com>
Date: Sun, 29 Jan 2023 06:20:35 +0000
Subject: [PATCH] Fixed vAx1 dimensions, removed flange and repositioned the
 tongue.

---
 vitamins/pcb.scad  | 26 +++++++++++++-------------
 vitamins/pcbs.scad |  3 ---
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/vitamins/pcb.scad b/vitamins/pcb.scad
index 72851f9..4c1ec64 100644
--- a/vitamins/pcb.scad
+++ b/vitamins/pcb.scad
@@ -115,12 +115,12 @@ module usb_A_tongue() {
                 }
 }
 
-module usb_vAx1(cutout = false) { //! Draw USB type A single socket
-    translate([0,6.5/2,13.25/2]) {
-      rotate([90,0,0]) {
-        usb_A(h = 6.5, v_flange_l = 0, bar = 0, cutout = cutout, 14);
-      }
-    }
+module usb_vAx1(cutout = false) { //! Draw a vertical USB type A single socket
+    h = 5.8;
+    w = 13.8;
+    translate([0, h / 2, w / 2])
+        rotate([90, 0, 0])
+            usb_A(h = h, v_flange_l = 0, bar = 0, cutout = cutout, l = 14, h_flange_l = 0, flange_t = 0.3, w = w);
 }
 
 module usb_Ax1(cutout = false) { //! Draw USB type A single socket
@@ -131,11 +131,8 @@ module usb_Ax2(cutout = false) { //! Draw USB type A dual socket
     usb_A(h = 15.6, v_flange_l = 12.15, bar = 3.4, cutout = cutout);
 }
 
-module usb_A(h, v_flange_l, bar, cutout, l=17) {
-    w = 13.25;
-    flange_t = 0.4;
+module usb_A(h, v_flange_l, bar, cutout, l=17, h_flange_l = 11, flange_t = 0.4, w = 13.25) {
     h_flange_h = 0.8;
-    h_flange_l = 11;
     v_flange_h = 1;
     socket_h = (h - 2 * flange_t - bar) / 2;
 
@@ -161,9 +158,11 @@ module usb_A(h, v_flange_l, bar, cutout, l=17) {
                 translate_z(l / 2 - flange_t)
                     linear_extrude(flange_t) difference() {
                         union() {
-                            square([h + 2 * h_flange_h, h_flange_l], center = true);
+                            if(h_flange_l)
+                                square([h + 2 * h_flange_h, h_flange_l], center = true);
 
-                            square([v_flange_l, w + 2 * v_flange_h], center = true);
+                            if(v_flange_l)
+                                square([v_flange_l, w + 2 * v_flange_h], center = true);
                         }
                         square([h - eps, w - eps], center = true);
                     }
@@ -171,7 +170,8 @@ module usb_A(h, v_flange_l, bar, cutout, l=17) {
 
                 for(z = bar ?  [-1, 1] : [0])
                     translate_z(z * (bar / 2 + socket_h / 2))
-                        usb_A_tongue();
+                        translate([l - 17, 0])
+                            usb_A_tongue();
             }
 }
 
diff --git a/vitamins/pcbs.scad b/vitamins/pcbs.scad
index 6760cd9..f246f83 100644
--- a/vitamins/pcbs.scad
+++ b/vitamins/pcbs.scad
@@ -544,9 +544,6 @@ OPZ2 =  ["OPZ2", "Orange Pi Zero 2",     60,    53,    1.4, 1.75,    3, 5, "blue
      [6+16/2, -10.5+1, 90, "rj45"],
      [24+9/2, -3.6+1, 90, "usb_C"],
      [37+6.5/2,  -8.5/2+1, 90, "micro_hdmi"],
-     // FIXME: USB A connector is 5.8mm wide, ~13.8mm deep, ~13.8mm high
-     // FIXME: USB A socket tongue/tab is too long
-     // FIXME: USB A socket does not have flanges
      [-7-5.8/2, -7+1,    90, "usb_vAx1"],
      [-17,   18,  0, "chip",       13, 7.5, 1],
      [-17,   28,  0, "chip",       13, 7.5, 1],