update explicit references to /usr/bin/python -> /usr/bin/python2

diff --git a/packages/.gitignore b/packages/.gitignore
index 0881e44d52b13f52aa43f83dfd6b411f1c7efada..ffc6bd3625f2fea3ff8eee578f1e26ee8785da42 100644 (file)
--- a/packages/.gitignore
+++ b/packages/.gitignore
@@ -74,6 +74,7 @@ DR127.fp
 PowerPAD32.fp
 usb_onboard.fp
 u-pdfn-8.fp
+dfn-2x3-8.fp
 ufqfpn28.fp
 ufqfpn24.fp
 ufqfpn20.fp
@@ -124,7 +125,5 @@ VQFN-HR-12.fp
 wqfn-16.fp
 TSX-3225.fp
 ECX2236.fp
-norcomp/*.fp
-cui/*.fp
-dfn-2x3-8.fp
-*.pyc
+trapc5mx.fp
+SOIJ8.fp

diff --git a/packages/Makefile b/packages/Makefile
index 0c576b4a9b13a74beefb94f7a49df0f1d994c37f..662c1d17491af6edeafc461572a233f22cfcc497 100644 (file)
--- a/packages/Makefile
+++ b/packages/Makefile
@@ -141,16 +141,17 @@ FOOTPRINTS= \
        wqfn-16.fp \
        TSX-3225.fp \
        ECX2236.fp \
-       trapc5mx.fp
+       trapc5mx.fp \
+       SOIJ8.fp
 
 .5c.fp:
        nickle $*.5c -o $@
 
 .py.fp:
-       python $*.py > $@
+       python2 $*.py > $@
 
 .py.lht:
-       python $*.py > $@
+       python2 $*.py > $@
 
 BUILDDIRS=$(DIRS:%=build-%)
 CLEANDIRS=$(DIRS:%=clean-%)

diff --git a/packages/SOIJ8.fp b/packages/SOIJ8.fp
deleted file mode 100644 (file)
index 20ce7af..0000000
--- a/packages/SOIJ8.fp
+++ /dev/null
@@ -1,20 +0,0 @@
-# author: Bdale Garbee
-# email: bdale@gag.com
-# dist-license: GPL 2
-# use-license: unlimited
-Element[0x0 "SOIJ8" "" "" 0 0 -10161 -12011 0 100 0x0]
-(
-   Pad[ -7499 -11712 -7499 -15845 2559 2441 3159 "pin8" "8" 0x0100]
-   Pad[ -7499 11713 -7499 15846 2559 2441 3159 "pin1" "1" 0x0100]
-   Pad[ -2499 -11712 -2499 -15845 2559 2441 3159 "pin7" "7" 0x0100]
-   Pad[ -2499 11713 -2499 15846 2559 2441 3159 "pin2" "2" 0x0100]
-   Pad[ 2500 -11712 2500 -15845 2559 2441 3159 "pin6" "6" 0x0100]
-   Pad[ 2500 11713 2500 15846 2559 2441 3159 "pin3" "3" 0x0100]
-   Pad[ 7500 -11712 7500 -15845 2559 2441 3159 "pin5" "5" 0x0100]
-   Pad[ 7500 11713 7500 15846 2559 2441 3159 "pin4" "4" 0x0100]
-   ElementLine[ -10491 -10590 -10491 10591 1000 ]
-   ElementLine[ -10491 10591 10492 10591 1000 ]
-   ElementLine[ 10492 10591 10492 -10590 1000 ]
-   ElementLine[ 10492 -10590 -10491 -10590 1000 ]
-   ElementArc[ -7499 8760 500 500 0 360 1000 ]
-)

diff --git a/packages/SOIJ8.py b/packages/SOIJ8.py
new file mode 100755 (executable)
index 0000000..3dda6f0
--- /dev/null
+++ b/packages/SOIJ8.py
@@ -0,0 +1,85 @@
+#!/usr/bin/python3
+# Copyright 2007-2020 by Bdale Garbee <bdale@gag.com>.  GPLv2
+#
+# Program to emit PCB footprint for SOIJ8 package used by 24FC1025
+#
+
+# dimensions in mm from 22064B.pdf datasheet for Microchip 25LC1024
+
+BodyWidth = 5.38
+BodyHeight = 5.33
+
+PinWidth = 0.65
+PinHeight = 1.7
+PinSpacing = 1.27
+RowCenters = 7.0
+RowSpacing = RowCenters - PinHeight
+
+import sys
+
+# we're going to use the 1/100 of a mil fundamental unit form
+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 ('Element[0x0 "SOIJ8" "" "" 0 0 -10161 -12011 0 100 0x0]')
+print ("(")
+for pin in range (0,4):
+    print ('   Pad[',\
+       mm2mils100((pin-1.5) * PinSpacing), \
+       mm2mils100(-(RowSpacing/2 + PinWidth/2)), \
+       mm2mils100((pin-1.5) * PinSpacing), \
+       mm2mils100(-(RowSpacing/2 + PinHeight - PinWidth/2)), \
+       mm2mils100(PinWidth), \
+       mm2mils100(PinSpacing - PinWidth), \
+       mm2mils100(PinWidth)+600, \
+       '"pin%i"' % (8 - pin), '"%i"' % (8 - pin), '0x0100]')
+
+    print ('   Pad[',\
+       mm2mils100((pin-1.5) * PinSpacing), \
+       mm2mils100(RowSpacing/2 + PinWidth/2), \
+       mm2mils100((pin-1.5) * PinSpacing), \
+       mm2mils100(RowSpacing/2 + PinHeight - PinWidth/2), \
+       mm2mils100(PinWidth), \
+       mm2mils100(PinSpacing - PinWidth), \
+       mm2mils100(PinWidth)+600, \
+       '"pin%i"' % (1 + pin), '"%i"' % (1 + pin), '0x0100]')
+
+print ('   ElementLine[',\
+       mm2mils100(-BodyHeight/2), \
+       mm2mils100(-BodyWidth/2), \
+       mm2mils100(-BodyHeight/2), \
+       mm2mils100( BodyWidth/2), \
+       '1000 ]')
+
+print ('   ElementLine[',\
+       mm2mils100(-BodyHeight/2), \
+       mm2mils100( BodyWidth/2), \
+       mm2mils100( BodyHeight/2), \
+       mm2mils100( BodyWidth/2), \
+       '1000 ]')
+
+print ('   ElementLine[',\
+       mm2mils100( BodyHeight/2), \
+       mm2mils100( BodyWidth/2), \
+       mm2mils100( BodyHeight/2), \
+       mm2mils100(-BodyWidth/2), \
+       '1000 ]')
+
+print ('   ElementLine[',\
+       mm2mils100( BodyHeight/2), \
+       mm2mils100(-BodyWidth/2), \
+       mm2mils100(-BodyHeight/2), \
+       mm2mils100(-BodyWidth/2), \
+       '1000 ]')
+
+print ('   ElementArc[',\
+       mm2mils100(-1.5 * PinSpacing), \
+       mm2mils100(RowSpacing/2-PinHeight/4), \
+       '500 500 0 360 1000 ]')
+
+print (")")

diff --git a/packages/diodes/0605.py b/packages/diodes/0605.py
index 69bc9db22fbb0b9cb3fd15021da93f4638e3a914..01c2101f40369b54bd2dbfd69962049af572fc9e 100755 (executable)
--- a/packages/diodes/0605.py
+++ b/packages/diodes/0605.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 # Copyright 2007 by Bdale Garbee <bdale@gag.com>.  GPLv2
 #
 # Program to emit PCB footprint for 0605 dual LED

diff --git a/packages/diodes/Makefile b/packages/diodes/Makefile
index e9ea782fe0d7c9f40673cc413d2ff9fc5e295067..fdb8c6900a1cf745ea40a0b69f55376ade10df1a 100644 (file)
--- a/packages/diodes/Makefile
+++ b/packages/diodes/Makefile
@@ -11,7 +11,7 @@ FOOTPRINTS = \
        nickle $*.5c -o $@
 
 .py.fp:
-       python $*.py > $@
+       python2 $*.py > $@
 
 all: $(FOOTPRINTS) .gitignore
 

diff --git a/packages/jst/PH-smt-ra.py b/packages/jst/PH-smt-ra.py
index a7d1b422af922490eb208902351d2128c002702f..7d32ca9e691afce4298c11dd71a81ec36f7d9fd8 100755 (executable)
--- a/packages/jst/PH-smt-ra.py
+++ b/packages/jst/PH-smt-ra.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 # Copyright 2007 by Bdale Garbee <bdale@gag.com>.  GPLv2
 #
 # Program to emit PCB footprint for

diff --git a/packages/jst/PH-th-ra.py b/packages/jst/PH-th-ra.py
index 494e11ce305bd83c71343f5bc0c4938682f1ef01..22b4c088d420c925a4ea83db2c279f18c1042902 100755 (executable)
--- a/packages/jst/PH-th-ra.py
+++ b/packages/jst/PH-th-ra.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 # Copyright 2007 by Bdale Garbee <bdale@gag.com>.  GPLv2
 #
 # Program to emit PCB footprint for

diff --git a/packages/jst/PH-th-v.py b/packages/jst/PH-th-v.py
index 407f3d2ce882d2c940483ed88b7fc8fdfcb1cb92..a4ac8cb6718336bf09d391a3888c34ce1e719434 100755 (executable)
--- a/packages/jst/PH-th-v.py
+++ b/packages/jst/PH-th-v.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 # Copyright 2007 by Bdale Garbee <bdale@gag.com>.  GPLv2
 #
 # Program to emit PCB footprint for

diff --git a/packages/molex/Makefile b/packages/molex/Makefile
index 036587da260c844b029b17ea1c687317c36b0264..59936353159597fb3008e2235e7fb381fe7615b3 100644 (file)
--- a/packages/molex/Makefile
+++ b/packages/molex/Makefile
@@ -16,13 +16,13 @@ ufl.fp:     ufl.py
        ./ufl.py > ufl.fp
 
 pico-ezmate-6.fp: pico-ezmate.py
-       python pico-ezmate.py 6 >$@
+       python2 pico-ezmate.py 6 >$@
 
 pico-ezmate-4.fp: pico-ezmate.py
-       python pico-ezmate.py 4 >$@
+       python2 pico-ezmate.py 4 >$@
 
 pico-ezmate-2.fp: pico-ezmate.py
-       python pico-ezmate.py 2 >$@
+       python2 pico-ezmate.py 2 >$@
 
 clean:
        rm -f 53261* 53047* 90325* 548190572.fp ufl.fp pico-ezmate-*.fp

diff --git a/packages/molex/miniusb.py b/packages/molex/miniusb.py
index 380e1a2a21914fcf218f24a65bcb561018be1c30..6fa80a5a36fa20613c52022efb90bca31a248361 100755 (executable)
--- a/packages/molex/miniusb.py
+++ b/packages/molex/miniusb.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 # Copyright 2007 by Bdale Garbee <bdale@gag.com>.  GPLv2
 #
 # Program to emit PCB footprint for

diff --git a/packages/molex/picoblade-smt-ra.py b/packages/molex/picoblade-smt-ra.py
index 04205bbceb9a1cec4989ecb002fd67eb83799ffc..a6b21e8df14d7dc6955bf5381e399d6b79eb8087 100755 (executable)
--- a/packages/molex/picoblade-smt-ra.py
+++ b/packages/molex/picoblade-smt-ra.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 # Copyright 2007 by Bdale Garbee <bdale@gag.com>.  GPLv2
 #
 # Program to emit PCB footprint for

diff --git a/packages/molex/picoblade-th-v.py b/packages/molex/picoblade-th-v.py
index a25f1615bba03c7f5c65f85105ade6f74930a131..35261be078e6d16232c24d20c5b7506186558098 100755 (executable)
--- a/packages/molex/picoblade-th-v.py
+++ b/packages/molex/picoblade-th-v.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 # Copyright 2008 by Bdale Garbee <bdale@gag.com>.  GPLv2
 #
 # Program to emit PCB footprint for

diff --git a/packages/molex/picoflex-th-v.py b/packages/molex/picoflex-th-v.py
index 9d64c059e831ee5e80550f53bc482fa5f86ea3ba..8cb6422688aedf599db07e3a31b34634e2f2f8ca 100755 (executable)
--- a/packages/molex/picoflex-th-v.py
+++ b/packages/molex/picoflex-th-v.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 # Copyright 2008 by Bdale Garbee <bdale@gag.com>.  GPLv2
 #
 # Program to emit PCB footprint for

diff --git a/packages/molex/ufl.py b/packages/molex/ufl.py
index b910f27f9868afc884567bd62c980b4a657ced72..db91d69593bbe834c6e7e958b4324790f67dd5bd 100755 (executable)
--- a/packages/molex/ufl.py
+++ b/packages/molex/ufl.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 # Copyright 2009 by Bdale Garbee <bdale@gag.com>.  GPLv2
 #
 # Program to emit PCB footprint for Molex version of U.FL micro coax connector

diff --git a/packages/norcomp/181-female.py b/packages/norcomp/181-female.py
index 0357a75860eff8e2977fb59676ffa469137a9f46..d143029dc31a0cb3b8bd83f1e952d6d92b386a9d 100755 (executable)
--- a/packages/norcomp/181-female.py
+++ b/packages/norcomp/181-female.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 # Copyright 2016 by Bdale Garbee <bdale@gag.com>.  GPLv3+
 #
 # Program to emit PCB footprint for Norcomp 181-YYY-213RYY1 connectors

diff --git a/packages/norcomp/182-female.py b/packages/norcomp/182-female.py
index b23fbbba5bd17c43b569d074e355ebe80548866f..d82e8041fb833b85ddf7d224ccc920dc15e748ba 100755 (executable)
--- a/packages/norcomp/182-female.py
+++ b/packages/norcomp/182-female.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 # Copyright 2011 by Bdale Garbee <bdale@gag.com>.  GPLv2
 #
 # Program to emit PCB footprint for Norcomp 182-YYY-213RYY1 connectors

diff --git a/packages/norcomp/182-male.py b/packages/norcomp/182-male.py
index 0059580d26703cf53665d00b6bed78f836150cd4..3f1c9db6ec2cf296832af81be6f77f72b2bef0e4 100755 (executable)
--- a/packages/norcomp/182-male.py
+++ b/packages/norcomp/182-male.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 # Copyright 2016 by Bdale Garbee <bdale@gag.com>.  GPLv3+
 #
 # Program to emit PCB footprint for Norcomp 182-YYY-113RYY1 connectors

diff --git a/packages/norcomp/189.py b/packages/norcomp/189.py
index 46be29b5f2fff0fc243d0e720a7ba24d01556308..6f74ce583d6c9443acf63cc1001c0540c1f17305 100755 (executable)
--- a/packages/norcomp/189.py
+++ b/packages/norcomp/189.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 # Copyright 2011 by Bdale Garbee <bdale@gag.com>.  GPLv2
 #
 # Program to emit PCB footprint for Norcomp 182-YYY-213RYY1 connectors

diff --git a/packages/pinheader/50milpitch.py b/packages/pinheader/50milpitch.py
index 76b1b78414860747973500fdba2a5dad93965699..7897ac918189ac364e217ca5e5c6abee52cf5e7d 100755 (executable)
--- a/packages/pinheader/50milpitch.py
+++ b/packages/pinheader/50milpitch.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # Copyright 2011 by Bdale Garbee <bdale@gag.com>.  GPLv2
 #
 # Program to emit PCB footprint for
@@ -24,26 +24,26 @@ if pins > 15:
        sys.stderr.write('Must be no more than 15 pins\n')
        sys.exit(1)
 
-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 2')
+print ('# use-license: unlimited')
 
-print 'Element[0x0 "50mil%ipin"' % pins,'"" "" 0 0 0 0 0 100 0x0]'
-print "("
+print ('Element[0x0 "50mil%ipin"' % pins,'"" "" 0 0 0 0 0 100 0x0]')
+print ("(")
 for pin in range (1,pins+1):
     pinnum = pins + 1 - pin
     if pinnum == 1:
-       Flags = '0x0101'
+        Flags = '0x0101'
     else:
-       Flags = '0x0001'
-    print '   Pin[', \
+        Flags = '0x0001'
+    print ('   Pin[', \
        mm2mils100((pins-1)*PinSpacing - (pin-1)*PinSpacing), \
        0, \
        4200, \
        1200, \
        4800, \
        2800, \
-       '"pin%i"' % pinnum, '"%i"' % pinnum, Flags, ']'
+       '"pin%i"' % pinnum, '"%i"' % pinnum, Flags, ']')
 
-print ")"
+print (")")

diff --git a/packages/pinheader/Makefile b/packages/pinheader/Makefile
index 021187fe0aeedf0675a9ecee4df9c7f678369868..e4c1c7fa8e85aecc41f3948dc235dfe02037aa8f 100644 (file)
--- a/packages/pinheader/Makefile
+++ b/packages/pinheader/Makefile
@@ -1,4 +1,5 @@
 FOOTPRINTS = \
+       50mil2pin.fp \
        50mil4pin.fp \
        50mil5pin.fp \
        50mil6pin.fp \
@@ -10,6 +11,9 @@ FOOTPRINTS = \
 
 all: $(FOOTPRINTS) .gitignore
 
+50mil2pin.fp:  50milpitch.py
+       ./50milpitch.py 2 > 50mil2pin.fp
+
 50mil3pin.fp:  50milpitch.py
        ./50milpitch.py 3 > 50mil3pin.fp
 

diff --git a/packages/switches/Makefile b/packages/switches/Makefile
index 425bb432a9c57df04aef7803b9fb2ad5d9b4e0f1..930e0ac52e19b533538032b30929e6dce41347c6 100644 (file)
--- a/packages/switches/Makefile
+++ b/packages/switches/Makefile
@@ -11,7 +11,7 @@ FOOTPRINTS = \
        nickle $*.5c -o $@
 
 .py.fp:
-       python $*.py > $@
+       python2 $*.py > $@
 
 all: $(FOOTPRINTS) .gitignore
 

diff --git a/packages/switches/PNswitchDPDT.py b/packages/switches/PNswitchDPDT.py
index db4eb8a8bec7c69267f28825371454f1b7f77c98..2cbdd4f869321fe76c0c47c0e6f4992093e6e0a2 100755 (executable)
--- a/packages/switches/PNswitchDPDT.py
+++ b/packages/switches/PNswitchDPDT.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 # Copyright 2010 by Bdale Garbee <bdale@gag.com>.  GPLv2
 #
 # Program to emit PCB footprint for C&K PN22SJNA03QE DPDT switch

diff --git a/packages/te-connectivity/3.5mm-ra.py b/packages/te-connectivity/3.5mm-ra.py
index 2cd4d48dc0b88bd0ce0176652f9d034ee314fe20..20892b2ee7178d3a0a9fab854af6e577b35c21ea 100755 (executable)
--- a/packages/te-connectivity/3.5mm-ra.py
+++ b/packages/te-connectivity/3.5mm-ra.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 # Copyright 2014 by Bdale Garbee <bdale@gag.com>.  GPLv2
 #
 # Program to emit PCB footprint for

diff --git a/packages/te-connectivity/bnc-th.py b/packages/te-connectivity/bnc-th.py
index 80f7a0ce45cfdc666d133f5acd87363c046e93ca..f086a30793cd0ca0bba2e3565a0e4ebf38f69767 100755 (executable)
--- a/packages/te-connectivity/bnc-th.py
+++ b/packages/te-connectivity/bnc-th.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 # Copyright 2017 by Bdale Garbee <bdale@gag.com>.  GPLv2+
 #
 # Program to emit PCB footprint for

diff --git a/packages/te-connectivity/buchanan.py b/packages/te-connectivity/buchanan.py
index 272c7588a32e57d9720590f0733bd439b76fc380..19600850db96c974ad49d068f34c87e5b80a684b 100755 (executable)
--- a/packages/te-connectivity/buchanan.py
+++ b/packages/te-connectivity/buchanan.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 # Copyright 2007 by Bdale Garbee <bdale@gag.com>.  GPLv2
 #
 # Program to emit PCB footprint for

diff --git a/packages/te-connectivity/micromatch-smt-v.py b/packages/te-connectivity/micromatch-smt-v.py
index 517ef8434e6e8d7570f07e85cfbf042afc63292b..b9baf242c294ff025b8941fc8b788472154b42bf 100755 (executable)
--- a/packages/te-connectivity/micromatch-smt-v.py
+++ b/packages/te-connectivity/micromatch-smt-v.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 # Copyright 2015 by Bdale Garbee <bdale@gag.com>.  GPLv2
 #
 # Program to emit PCB footprint for

diff --git a/packages/te-connectivity/micromatch-th-v.py b/packages/te-connectivity/micromatch-th-v.py
index a18fb4702468231cfb336b9686847dab26eb31ee..7f3276597442c4914a402413a415706339242ad7 100755 (executable)
--- a/packages/te-connectivity/micromatch-th-v.py
+++ b/packages/te-connectivity/micromatch-th-v.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 # Copyright 2009 by Bdale Garbee <bdale@gag.com>.  GPLv2
 #
 # Program to emit PCB footprint for

diff --git a/packages/te-connectivity/tphybrid.py b/packages/te-connectivity/tphybrid.py
index babf03faef102bc801e69c9d127c1a51be4922a0..4a966eb5746cb70977e41a0452ed2b9c15f15937 100755 (executable)
--- a/packages/te-connectivity/tphybrid.py
+++ b/packages/te-connectivity/tphybrid.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 # Copyright 2011 by Bdale Garbee <bdale@gag.com>.  GPLv2
 #
 # Program to emit PCB footprint for a 16 pin