From 1e7ff399634c3c002d8c73d3a179830ccb159941 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Wed, 24 Jan 2024 23:36:41 -0700 Subject: [PATCH] update to python3 --- packages/molex/Makefile | 6 +-- packages/molex/miniusb.py | 54 ++++++++++++------------- packages/molex/pico-ezmate.py | 23 ++++++----- packages/molex/picoblade-smt-ra.py | 30 +++++++------- packages/molex/picoblade-th-v.py | 40 +++++++++---------- packages/molex/picoflex-th-v.py | 64 +++++++++++++++--------------- packages/molex/ufl.py | 30 +++++++------- 7 files changed, 124 insertions(+), 123 deletions(-) diff --git a/packages/molex/Makefile b/packages/molex/Makefile index 5993635..ae812e7 100644 --- 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 - python2 pico-ezmate.py 6 >$@ + python3 pico-ezmate.py 6 >$@ pico-ezmate-4.fp: pico-ezmate.py - python2 pico-ezmate.py 4 >$@ + python3 pico-ezmate.py 4 >$@ pico-ezmate-2.fp: pico-ezmate.py - python2 pico-ezmate.py 2 >$@ + python3 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 6fa80a5..717b204 100755 --- a/packages/molex/miniusb.py +++ b/packages/molex/miniusb.py @@ -1,5 +1,5 @@ -#!/usr/bin/python2 -# Copyright 2007 by Bdale Garbee . GPLv2 +#!/usr/bin/python3 +# Copyright 2007,2024 by Bdale Garbee . GPLv2 # # Program to emit PCB footprint for # Molex MiniUSB R/A 5 pos SMD connector 54819-0572, DigiKey WM17116CT-ND @@ -25,14 +25,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 2') +print('# use-license: unlimited') -print 'Element[0x0 "MiniUSB" "" "" 0 0 -10161 -12011 0 100 0x0]' -print "(" -print ' Pad[', \ +print('Element[0x0 "MiniUSB" "" "" 0 0 -10161 -12011 0 100 0x0]') +print("(") +print(' Pad[', \ mm2mils100(CenterLine), \ mm2mils100(PinStart + PinWidth/2), \ mm2mils100(CenterLine), \ @@ -40,9 +40,9 @@ print ' Pad[', \ mm2mils100(PinWidth), \ mm2mils100(PinSpacing - PinWidth), \ mm2mils100(PinWidth + 0.2), \ - '"D+" "3" 0x0100]' + '"D+" "3" 0x0100]') -print ' Pad[', \ +print(' Pad[', \ mm2mils100(CenterLine + PinSpacing), \ mm2mils100(PinStart + PinWidth/2), \ mm2mils100(CenterLine + PinSpacing), \ @@ -50,9 +50,9 @@ print ' Pad[', \ mm2mils100(PinWidth), \ mm2mils100(PinSpacing - PinWidth), \ mm2mils100(PinWidth + 0.2), \ - '"D-" "2" 0x0100]' + '"D-" "2" 0x0100]') -print ' Pad[', \ +print(' Pad[', \ mm2mils100(CenterLine - PinSpacing), \ mm2mils100(PinStart + PinWidth/2), \ mm2mils100(CenterLine - PinSpacing), \ @@ -60,9 +60,9 @@ print ' Pad[', \ mm2mils100(PinWidth), \ mm2mils100(PinSpacing - PinWidth), \ mm2mils100(PinWidth + 0.2), \ - '"HS" "4" 0x0100]' + '"HS" "4" 0x0100]') -print ' Pad[', \ +print(' Pad[', \ mm2mils100(CenterLine + PinSpacing*2), \ mm2mils100(PinStart + PinWidth/2), \ mm2mils100(CenterLine + PinSpacing*2), \ @@ -70,9 +70,9 @@ print ' Pad[', \ mm2mils100(PinWidth), \ mm2mils100(PinSpacing - PinWidth), \ mm2mils100(PinWidth + 0.2), \ - '"VBUS" "1" 0x0100]' + '"VBUS" "1" 0x0100]') -print ' Pad[', \ +print(' Pad[', \ mm2mils100(CenterLine - PinSpacing*2), \ mm2mils100(PinStart + PinWidth/2), \ mm2mils100(CenterLine - PinSpacing*2), \ @@ -80,12 +80,12 @@ print ' Pad[', \ mm2mils100(PinWidth), \ mm2mils100(PinSpacing - PinWidth), \ mm2mils100(PinWidth + 0.2), \ - '"GND" "5" 0x0100]' + '"GND" "5" 0x0100]') TabRowTwo = Tab1Height/2 + TabCenters - Tab2Height/2 TabColTwo = TabWidth + BetweenTabs -print ' Pad[', \ +print(' Pad[', \ mm2mils100(TabWidth/2), \ mm2mils100(TabWidth/2), \ mm2mils100(TabWidth/2), \ @@ -93,9 +93,9 @@ print ' Pad[', \ mm2mils100(TabWidth), \ mm2mils100(PinSpacing - PinWidth), \ mm2mils100(TabWidth + 0.2), \ - '"tab1" "G" 0x0100]' + '"tab1" "G" 0x0100]') -print ' Pad[', \ +print(' Pad[', \ mm2mils100(TabWidth/2), \ mm2mils100(TabRowTwo + TabWidth/2), \ mm2mils100(TabWidth/2), \ @@ -103,9 +103,9 @@ print ' Pad[', \ mm2mils100(TabWidth), \ mm2mils100(PinSpacing - PinWidth), \ mm2mils100(TabWidth + 0.2), \ - '"tab2" "G" 0x0100]' + '"tab2" "G" 0x0100]') -print ' Pad[', \ +print(' Pad[', \ mm2mils100(TabColTwo + TabWidth/2), \ mm2mils100(TabWidth/2), \ mm2mils100(TabColTwo + TabWidth/2), \ @@ -113,9 +113,9 @@ print ' Pad[', \ mm2mils100(TabWidth), \ mm2mils100(PinSpacing - PinWidth), \ mm2mils100(TabWidth + 0.2), \ - '"tab3" "G" 0x0100]' + '"tab3" "G" 0x0100]') -print ' Pad[', \ +print(' Pad[', \ mm2mils100(TabColTwo + TabWidth/2), \ mm2mils100(TabRowTwo + TabWidth/2), \ mm2mils100(TabColTwo + TabWidth/2), \ @@ -123,6 +123,6 @@ print ' Pad[', \ mm2mils100(TabWidth), \ mm2mils100(PinSpacing - PinWidth), \ mm2mils100(TabWidth + 0.2), \ - '"tab4" "G" 0x0100]' + '"tab4" "G" 0x0100]') -print ")" +print(")") diff --git a/packages/molex/pico-ezmate.py b/packages/molex/pico-ezmate.py index efb9e71..c3e82ab 100644 --- a/packages/molex/pico-ezmate.py +++ b/packages/molex/pico-ezmate.py @@ -1,3 +1,4 @@ +#!/usr/bin/python3 # author: Keith Packard # email: keithp@keithp.com # dist-license: GPL 2 @@ -23,13 +24,13 @@ OutlineYHold = OutlineYPad + 4.5 NumPad=int(sys.argv[1]) -print '# author: Keith Packard' -print '# email: keithp@keithp.com' -print '# dist-license: GPL 2' -print '# use-license: unlimited' +print('# author: Keith Packard') +print('# email: keithp@keithp.com') +print('# dist-license: GPL 2') +print('# use-license: unlimited') -print 'Element["" "pico-ezmate-%d" "" "" 0 0 0 0 0 100 ""]' % NumPad -print "(" +print('Element["" "pico-ezmate-%d" "" "" 0 0 0 0 0 100 ""]' % NumPad) +print("(") PadX = PadSpacing * NumPad / 2 @@ -56,7 +57,7 @@ def pad(cx, cy, w, h, name, num): x2 = cx y2 = cy + (h - w) / 2 mask = thickness + Clearance / 2 - print ' Pad[',\ + print(' Pad[',\ mm2mils100(x1), \ mm2mils100(y1), \ mm2mils100(x2), \ @@ -64,15 +65,15 @@ def pad(cx, cy, w, h, name, num): mm2mils100(thickness), \ mm2mils100(Clearance), \ mm2mils100(mask),\ - '"%s"' % name, '"%s"' % num, '"square"]' + '"%s"' % name, '"%s"' % num, '"square"]') def line(x1, y1, x2, y2): - print ' ElementLine[',\ + print(' ElementLine[',\ mm2mils100(x1), \ mm2mils100(y1), \ mm2mils100(x2), \ mm2mils100(y2), \ - '500]' + '500]') def rect(x, y, w, h): line(x,y,x+w,y) @@ -97,7 +98,7 @@ rect(padx(1) - OutlineX, OutlineYPad, PadSpacing * (NumPad-1) + OutlineX*2, 4.5) -print ' )' +print(' )') # 11000 2000 # ElementLine[-11000 -1000 -3600 -1000 100] # ElementLine[ 3600 -1000 11000 -1000 100] diff --git a/packages/molex/picoblade-smt-ra.py b/packages/molex/picoblade-smt-ra.py index a6b21e8..6257f60 100755 --- a/packages/molex/picoblade-smt-ra.py +++ b/packages/molex/picoblade-smt-ra.py @@ -1,5 +1,5 @@ -#!/usr/bin/python2 -# Copyright 2007 by Bdale Garbee . GPLv2 +#!/usr/bin/python3 +# Copyright 2007,2024 by Bdale Garbee . GPLv2 # # Program to emit PCB footprint for # Molex 1.25mm PicoBlade(tm), right angle SMT header 53261-XX71, 2-15 pins @@ -30,16 +30,16 @@ 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 "PicoBlade%i"' % pins,'"" "" 0 0 0 0 0 100 0x0]' -print "(" +print('Element[0x0 "PicoBlade%i"' % pins,'"" "" 0 0 0 0 0 100 0x0]') +print("(") for pin in range (1,pins+1): pinnum = pins + 1 - pin - print ' Pad[', \ + print(' Pad[', \ mm2mils100(FirstPin + (pin-1)*PinSpacing), \ mm2mils100(TabHeight+TabPinSpacing+PinWidth/2), \ mm2mils100(FirstPin + (pin-1)*PinSpacing), \ @@ -47,10 +47,10 @@ for pin in range (1,pins+1): mm2mils100(PinWidth), \ mm2mils100(PinSpacing - PinWidth), \ mm2mils100(PinWidth + 0.1), \ - '"pin%i"' % pinnum, '"%i"' % pinnum, '0x0100]' + '"pin%i"' % pinnum, '"%i"' % pinnum, '0x0100]') -print ' Pad[', \ +print(' Pad[', \ mm2mils100(TabWidth/2), \ mm2mils100(TabWidth/2), \ mm2mils100(TabWidth/2), \ @@ -58,9 +58,9 @@ print ' Pad[', \ mm2mils100(TabWidth), \ mm2mils100(PinSpacing - PinWidth), \ mm2mils100(TabWidth + 0.1), \ - '"tab1" "G" 0x0100]' + '"tab1" "G" 0x0100]') -print ' Pad[', \ +print(' Pad[', \ mm2mils100(FirstPin*2 + (pins-1)*PinSpacing - TabWidth/2), \ mm2mils100(TabWidth/2), \ mm2mils100(FirstPin*2 + (pins-1)*PinSpacing - TabWidth/2), \ @@ -68,6 +68,6 @@ print ' Pad[', \ mm2mils100(TabWidth), \ mm2mils100(PinSpacing - PinWidth), \ mm2mils100(TabWidth + 0.1), \ - '"tab2" "G" 0x0100]' + '"tab2" "G" 0x0100]') -print ")" +print(")") diff --git a/packages/molex/picoblade-th-v.py b/packages/molex/picoblade-th-v.py index 35261be..e9477e7 100755 --- a/packages/molex/picoblade-th-v.py +++ b/packages/molex/picoblade-th-v.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 # Copyright 2008 by Bdale Garbee . GPLv2 # # Program to emit PCB footprint for @@ -29,56 +29,56 @@ 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 "PicoBlade%i"' % pins,'"" "" 0 0 0 0 0 100 0x0]' -print "(" +print('Element[0x0 "PicoBlade%i"' % 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, \ 3500, \ 1200, \ 4100, \ mm2mils100(PinDiam), \ - '"pin%i"' % pinnum, '"%i"' % pinnum, Flags, ']' + '"pin%i"' % pinnum, '"%i"' % pinnum, Flags, ']') BoxWidth = (BoxEnd * 2) + ((pins - 1) * PinSpacing); -print ' ElementLine[', \ +print(' ElementLine[', \ mm2mils100(-BoxEnd), \ mm2mils100(-BoxOffset), \ mm2mils100(-BoxEnd), \ mm2mils100(BoxHeight-BoxOffset), \ - LineWidth, ']' + LineWidth, ']') -print ' ElementLine[', \ +print(' ElementLine[', \ mm2mils100(-BoxEnd), \ mm2mils100(BoxHeight-BoxOffset), \ mm2mils100(BoxWidth-BoxEnd), \ mm2mils100(BoxHeight-BoxOffset), \ - LineWidth, ']' + LineWidth, ']') -print ' ElementLine[', \ +print(' ElementLine[', \ mm2mils100(BoxWidth-BoxEnd), \ mm2mils100(BoxHeight-BoxOffset), \ mm2mils100(BoxWidth-BoxEnd), \ mm2mils100(-BoxOffset), \ - LineWidth, ']' + LineWidth, ']') -print ' ElementLine[', \ +print(' ElementLine[', \ mm2mils100(BoxWidth-BoxEnd), \ mm2mils100(-BoxOffset), \ mm2mils100(-BoxEnd), \ mm2mils100(-BoxOffset), \ - LineWidth, ']' + LineWidth, ']') -print ")" +print(")") diff --git a/packages/molex/picoflex-th-v.py b/packages/molex/picoflex-th-v.py index 8cb6422..a0d6e20 100755 --- a/packages/molex/picoflex-th-v.py +++ b/packages/molex/picoflex-th-v.py @@ -1,5 +1,5 @@ -#!/usr/bin/python2 -# Copyright 2008 by Bdale Garbee . GPLv2 +#!/usr/bin/python3 +# Copyright 2008,2024 by Bdale Garbee . GPLv2 # # Program to emit PCB footprint for # Molex 1.25mm PicoBlade, vertical through-hole header 53047-XX10, 2-15 pins @@ -33,82 +33,82 @@ if pins > 26: sys.stderr.write('Must be no more than 26 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 "PicoFlex%i"' % pins,'"" "" 0 0 0 0 0 100 0x0]' -print "(" -for col in range ((pins+1)/2): +print('Element[0x0 "PicoFlex%i"' % pins,'"" "" 0 0 0 0 0 100 0x0]') +print("(") +for col in range (int((pins+1)/2)): for row in range (2): - if row == 1: - offset=RowOffset - spacing=RowSpacing - else: - offset=0 - spacing=0 + if row == 1: + offset=RowOffset + spacing=RowSpacing + else: + offset=0 + spacing=0 pinnum = (col * 2) + row + 1 if pinnum == 1: - Flags = '0x0101' + Flags = '0x0101' else: - Flags = '0x0001' - print ' Pin[', \ + Flags = '0x0001' + print(' Pin[', \ mm2mils100(col*PinSpacing + offset), \ mm2mils100(spacing), \ mm2mils100(PinDiam*2), \ 600, \ mm2mils100(PinDiam*2)+1000, \ mm2mils100(PinDiam), \ - '"pin%i"' % pinnum, '"%i"' % pinnum, Flags, ']' + '"pin%i"' % pinnum, '"%i"' % pinnum, Flags, ']') -print ' Pin[', \ +print(' Pin[', \ mm2mils100(-MntX), \ mm2mils100(-MntY), \ mm2mils100(MntDiam), \ 0, \ mm2mils100(MntDiam), \ mm2mils100(MntDiam), \ - '"mnt" "0"', '0x0008', ']' + '"mnt" "0"', '0x0008', ']') -print ' Pin[', \ +print(' Pin[', \ mm2mils100(((pins+1)/2-1)*PinSpacing+RowOffset+MntX), \ mm2mils100(-MntY), \ mm2mils100(MntDiam), \ 0, \ mm2mils100(MntDiam), \ mm2mils100(MntDiam), \ - '"mnt" "0"', '0x0008', ']' + '"mnt" "0"', '0x0008', ']') BoxWidth = BoxEnd + ((pins/2-1) * PinSpacing + RowOffset); BoxYOff = MntY + MntDiam/2 + .1524 -print ' ElementLine[', \ +print(' ElementLine[', \ mm2mils100(-BoxEnd), \ mm2mils100(-BoxYOff), \ mm2mils100(-BoxEnd), \ mm2mils100(BoxHeight-BoxYOff), \ - LineWidth, ']' + LineWidth, ']') -print ' ElementLine[', \ +print(' ElementLine[', \ mm2mils100(-BoxEnd), \ mm2mils100(BoxHeight-BoxYOff), \ mm2mils100(BoxWidth), \ mm2mils100(BoxHeight-BoxYOff), \ - LineWidth, ']' + LineWidth, ']') -print ' ElementLine[', \ +print(' ElementLine[', \ mm2mils100(BoxWidth), \ mm2mils100(BoxHeight-BoxYOff), \ mm2mils100(BoxWidth), \ mm2mils100(-BoxYOff), \ - LineWidth, ']' + LineWidth, ']') -print ' ElementLine[', \ +print(' ElementLine[', \ mm2mils100(BoxWidth), \ mm2mils100(-BoxYOff), \ mm2mils100(-BoxEnd), \ mm2mils100(-BoxYOff), \ - LineWidth, ']' + LineWidth, ']') -print ")" +print(")") diff --git a/packages/molex/ufl.py b/packages/molex/ufl.py index db91d69..9de5af2 100755 --- a/packages/molex/ufl.py +++ b/packages/molex/ufl.py @@ -1,5 +1,5 @@ -#!/usr/bin/python2 -# Copyright 2009 by Bdale Garbee . GPLv2 +#!/usr/bin/python3 +# Copyright 2009,2024 by Bdale Garbee . GPLv2 # # Program to emit PCB footprint for Molex version of U.FL micro coax connector # @@ -19,15 +19,15 @@ 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 2') +print('# use-license: unlimited') -print 'Element[0x0 "UFL" "" "" 0 0 0 0 0 100 0x0]' -print "(" +print('Element[0x0 "UFL" "" "" 0 0 0 0 0 100 0x0]') +print("(") -print ' Pad[',\ +print(' Pad[',\ mm2mils100(-(GndOutside - GndInside)/4 - (GndInside / 2) ), \ mm2mils100(-(GndHeight / 2) + (GndWidth / 2)), \ mm2mils100(-(GndOutside - GndInside)/4 - (GndInside / 2) ), \ @@ -35,9 +35,9 @@ print ' Pad[',\ mm2mils100(GndWidth), \ mm2mils100(0.1), \ mm2mils100(GndWidth+0.2), \ - '"pin2"', '"2"', '0x0100]' + '"pin2"', '"2"', '0x0100]') -print ' Pad[',\ +print(' Pad[',\ 0, \ mm2mils100(PinOffset + PinWidth/2), \ 0, \ @@ -45,9 +45,9 @@ print ' Pad[',\ mm2mils100(PinWidth), \ mm2mils100(0.1), \ mm2mils100(PinWidth+0.2), \ - '"pin1"', '"1"', '0x0100]' + '"pin1"', '"1"', '0x0100]') -print ' Pad[',\ +print(' Pad[',\ mm2mils100((GndOutside - GndInside)/4 + (GndInside / 2) ), \ mm2mils100(-(GndHeight / 2) + (GndWidth / 2)), \ mm2mils100((GndOutside - GndInside)/4 + (GndInside / 2) ), \ @@ -55,7 +55,7 @@ print ' Pad[',\ mm2mils100(GndWidth), \ mm2mils100(0.1), \ mm2mils100(GndWidth+0.2), \ - '"pin2"', '"2"', '0x0100]' + '"pin2"', '"2"', '0x0100]') -print ")" +print(")") -- 2.30.2