X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=packages%2FusbAmale.py;h=f97bbc6beb6db77d2fb2de091a3346477cc03bca;hb=3034dc83f6095f1df20523b07cdba7f252341c3f;hp=58f29a4d65c4d3c0ba66fc7ee8be1c28e5e63f83;hpb=42b38d3b686b764547d6a8468749e8bc49bad50c;p=hw%2Faltusmetrum

diff --git a/packages/usbAmale.py b/packages/usbAmale.py
old mode 100755
new mode 100644
index 58f29a4..f97bbc6
--- a/packages/usbAmale.py
+++ b/packages/usbAmale.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # Copyright 2014 by Bdale Garbee <bdale@gag.com>.  GPLv2
 #
 # Program to emit PCB footprint for Keystone model 931 USB A male connector,
@@ -11,8 +11,10 @@
 				# holes for the tabs in a USB key form factor,
 				# in which case just delete the features in
 				# the PCB layout and make board width right
-TabDiam = 2.50
+TabDiam = 1.00
+TabLen = 2.50
 TabSpacing = 11.70
+TabMetal = 0.5
 
 PinDiam = 1.10
 PinSpacing = 4.50		# keystone wants 4.6 here .. really?
@@ -30,14 +32,14 @@ import sys
 def mm2mils100( mm ):
 	return int( mm / 25.4 * 1000.0 * 100.0 + 0.5 )
 
-print '# author: Bdale Garbee'
-print '# email: bdale@gag.com'
-print '# dist-license: GPL 2'
-print '# use-license: unlimited'
+print('# author: Bdale Garbee')
+print('# email: bdale@gag.com')
+print('# dist-license: GPL 3')
+print('# use-license: unlimited')
 
-print 'Element[0x0 "usbAmale" "" "" 0 0 0 0 0 100 0x0]'
-print "("
-print '   Pad[',\
+print('Element[0x0 "usbAmale" "" "" 0 0 0 0 0 100 0x0]')
+print("(")
+print('   Pad[',\
  	mm2mils100(Pad14/2), \
 	mm2mils100(PadRowOffset - PadHeight / 2 + PadWidth/2), \
  	mm2mils100(Pad14/2), \
@@ -45,9 +47,9 @@ print '   Pad[',\
 	mm2mils100(PadWidth), \
 	mm2mils100(0), \
   	mm2mils100(PadWidth)+600, \
-	'"pin4" "4" 0x0100]'
+	'"pin4" "4" 0x0100]')
 
-print '   Pad[',\
+print('   Pad[',\
  	mm2mils100(-Pad14/2), \
 	mm2mils100(PadRowOffset - PadHeight / 2 + PadWidth/2), \
  	mm2mils100(-Pad14/2), \
@@ -55,9 +57,9 @@ print '   Pad[',\
 	mm2mils100(PadWidth), \
 	mm2mils100(0), \
   	mm2mils100(PadWidth)+600, \
-	'"pin1" "1" 0x0100]'
+	'"pin1" "1" 0x0100]')
 
-print '   Pad[',\
+print('   Pad[',\
  	mm2mils100(Pad23/2), \
 	mm2mils100(PadRowOffset - PadHeight / 2 + PadWidth/2), \
  	mm2mils100(Pad23/2), \
@@ -65,9 +67,9 @@ print '   Pad[',\
 	mm2mils100(PadWidth), \
 	mm2mils100(0), \
   	mm2mils100(PadWidth)+600, \
-	'"pin3" "3" 0x0100]'
+	'"pin3" "3" 0x0100]')
 
-print '   Pad[',\
+print('   Pad[',\
  	mm2mils100(-Pad23/2), \
 	mm2mils100(PadRowOffset - PadHeight / 2 + PadWidth/2), \
  	mm2mils100(-Pad23/2), \
@@ -75,49 +77,107 @@ print '   Pad[',\
 	mm2mils100(PadWidth), \
 	mm2mils100(0), \
   	mm2mils100(PadWidth)+600, \
-	'"pin2" "2" 0x0100]'
+	'"pin2" "2" 0x0100]')
 
-print '   Pin[',\
+print('   Pin[',\
         mm2mils100(-PinSpacing/2), \
         mm2mils100(0), \
         mm2mils100(PinDiam+0.3556), \
         mm2mils100(0.31), \
         mm2mils100(PinDiam+0.66), \
         mm2mils100(PinDiam), \
-        '"mnt" "G" 0x0000]'
+        '"mnt" "G" 0x0000]')
 
-print '   Pin[',\
+print('   Pin[',\
         mm2mils100(PinSpacing/2), \
         mm2mils100(0), \
         mm2mils100(PinDiam+0.3556), \
         mm2mils100(0.31), \
         mm2mils100(PinDiam+0.66), \
         mm2mils100(PinDiam), \
-        '"mnt" "G" 0x0000]'
+        '"mnt" "G" 0x0000]')
 
-print '   Pin[',\
+print('   Pin[',\
         mm2mils100(-TabSpacing/2), \
-        mm2mils100(0), \
-        mm2mils100(TabDiam+0.3556), \
+        mm2mils100(-(TabLen-TabDiam)/2), \
+        mm2mils100(TabDiam+TabMetal), \
+        mm2mils100(0.31), \
+        mm2mils100(TabDiam+0.66), \
+        mm2mils100(TabDiam), \
+        '"mnt" "G" 0x0000]')
+
+print('   Pin[',\
+        mm2mils100(-TabSpacing/2), \
+        mm2mils100((TabLen-TabDiam)/2), \
+        mm2mils100(TabDiam+TabMetal), \
+        mm2mils100(0.31), \
+        mm2mils100(TabDiam+0.66), \
+        mm2mils100(TabDiam), \
+        '"mnt" "G" 0x0000]')
+
+print('   Pad[',\
+ 	mm2mils100(-TabSpacing/2), \
+	mm2mils100(-(TabLen - TabDiam)/2), \
+ 	mm2mils100(-TabSpacing/2), \
+	mm2mils100((TabLen - TabDiam)/2), \
+	mm2mils100(TabDiam + TabMetal), \
+	mm2mils100(0.31), \
+  	mm2mils100(PadWidth)+600, \
+	'"mnt" "G" ""]')
+
+print('   Pad[',\
+ 	mm2mils100(-TabSpacing/2), \
+	mm2mils100(-(TabLen - TabDiam)/2), \
+ 	mm2mils100(-TabSpacing/2), \
+	mm2mils100((TabLen - TabDiam)/2), \
+	mm2mils100(TabDiam + TabMetal), \
+	mm2mils100(0.31), \
+  	mm2mils100(PadWidth)+600, \
+	'"mnt" "G" "onsolder"]')
+
+print('   Pin[',\
+        mm2mils100(TabSpacing/2), \
+        mm2mils100(-(TabLen-TabDiam)/2), \
+        mm2mils100(TabDiam+TabMetal), \
         mm2mils100(0.31), \
         mm2mils100(TabDiam+0.66), \
         mm2mils100(TabDiam), \
-        '"mnt" "G" 0x0000]'
+        '"mnt" "G" 0x0000]')
 
-print '   Pin[',\
+print('   Pin[',\
         mm2mils100(TabSpacing/2), \
-        mm2mils100(0), \
-        mm2mils100(TabDiam+0.3556), \
+        mm2mils100((TabLen-TabDiam)/2), \
+        mm2mils100(TabDiam+TabMetal), \
         mm2mils100(0.31), \
         mm2mils100(TabDiam+0.66), \
         mm2mils100(TabDiam), \
-        '"mnt" "G" 0x0000]'
+        '"mnt" "G" 0x0000]')
+
+print('   Pad[',\
+ 	mm2mils100(TabSpacing/2), \
+	mm2mils100(-(TabLen - TabDiam)/2), \
+ 	mm2mils100(TabSpacing/2), \
+	mm2mils100((TabLen - TabDiam)/2), \
+	mm2mils100(TabDiam + TabMetal), \
+	mm2mils100(0.31), \
+  	mm2mils100(PadWidth)+600, \
+	'"mnt" "G" ""]')
+
+print('   Pad[',\
+ 	mm2mils100(TabSpacing/2), \
+	mm2mils100(-(TabLen - TabDiam)/2), \
+ 	mm2mils100(TabSpacing/2), \
+	mm2mils100((TabLen - TabDiam)/2), \
+	mm2mils100(TabDiam + TabMetal), \
+	mm2mils100(0.31), \
+  	mm2mils100(PadWidth)+600, \
+	'"mnt" "G" "onsolder"]')
 
-print '   ElementLine[',\
+print('   ElementLine[',\
        mm2mils100(-TabSpacing/2), \
        mm2mils100(-EdgeOffset)+500, \
        mm2mils100(TabSpacing/2), \
        mm2mils100(-EdgeOffset)+500, \
-       '1000 ]'
+       '1000 ]')
 
-print ")"
+print(")")