summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Buesch <m@bues.ch>2012-04-12 10:02:19 +0200
committerMichael Buesch <m@bues.ch>2012-04-12 10:02:19 +0200
commit5982f338f62f2b581d68ac579f2185f0a4535682 (patch)
treea9fe4598b96b3ca2ff08d0b2139b75dc4d160eee
parent031078d37a6bc5b21c7ff5b16c972b2deb77a5ba (diff)
downloadtoprammer-5982f338f62f2b581d68ac579f2185f0a4535682.tar.xz
toprammer-5982f338f62f2b581d68ac579f2185f0a4535682.zip
Move .bit files to libtoprammer/fpga/bin/
Signed-off-by: Michael Buesch <m@bues.ch>
-rw-r--r--README-DEVELOPERS.lyx12
-rw-r--r--README-DEVELOPERS.ps185
-rw-r--r--libtoprammer/bitfile.py4
-rw-r--r--libtoprammer/fpga/bin/at27c256r.bit (renamed from libtoprammer/fpga/at27c256r.bit)bin24786 -> 24786 bytes
-rw-r--r--libtoprammer/fpga/bin/at89c2051dip20.bit (renamed from libtoprammer/fpga/at89c2051dip20.bit)bin24791 -> 24791 bytes
-rw-r--r--libtoprammer/fpga/bin/atmega32dip40.bit (renamed from libtoprammer/fpga/atmega32dip40.bit)bin24790 -> 24790 bytes
-rw-r--r--libtoprammer/fpga/bin/atmega8dip28.bit (renamed from libtoprammer/fpga/atmega8dip28.bit)bin24789 -> 24789 bytes
-rw-r--r--libtoprammer/fpga/bin/attiny13dip8.bit (renamed from libtoprammer/fpga/attiny13dip8.bit)bin24789 -> 24789 bytes
-rw-r--r--libtoprammer/fpga/bin/attiny26dip20.bit (renamed from libtoprammer/fpga/attiny26dip20.bit)bin24790 -> 24790 bytes
-rw-r--r--libtoprammer/fpga/bin/hm62256dip28.bit (renamed from libtoprammer/fpga/hm62256dip28.bit)bin24789 -> 24789 bytes
-rw-r--r--libtoprammer/fpga/bin/m24c16dip8.bit (renamed from libtoprammer/fpga/m24c16dip8.bit)bin24787 -> 24787 bytes
-rw-r--r--libtoprammer/fpga/bin/m2764a.bit (renamed from libtoprammer/fpga/m2764a.bit)bin24783 -> 24783 bytes
-rw-r--r--libtoprammer/fpga/bin/m8c-issp.bit (renamed from libtoprammer/fpga/m8c-issp.bit)bin24785 -> 24785 bytes
-rw-r--r--libtoprammer/fpga/bin/unitest.bit (renamed from libtoprammer/fpga/unitest.bit)bin24784 -> 24784 bytes
-rw-r--r--libtoprammer/fpga/bin/w29ee011dip32.bit (renamed from libtoprammer/fpga/w29ee011dip32.bit)bin24790 -> 24790 bytes
-rwxr-xr-xlibtoprammer/fpga/build.sh23
-rwxr-xr-xsetup.py2
17 files changed, 113 insertions, 113 deletions
diff --git a/README-DEVELOPERS.lyx b/README-DEVELOPERS.lyx
index 4ee393a..bad2952 100644
--- a/README-DEVELOPERS.lyx
+++ b/README-DEVELOPERS.lyx
@@ -679,7 +679,17 @@ Where "bitfile_name" is the name of the new chip's bitfile.
\end_layout
\begin_layout Standard
-(if you omit the bitfile_name, all bitfiles will be rebuilt).
+If you omit the
+\begin_inset Quotes eld
+\end_inset
+
+bitfile_name
+\begin_inset Quotes erd
+\end_inset
+
+, all bitfiles will be rebuilt.
+ The resulting .BIT file will be copied to the libtoprammer/fpga/bin/ directory,
+ after build finished successfully.
\end_layout
\begin_layout Section
diff --git a/README-DEVELOPERS.ps b/README-DEVELOPERS.ps
index a00237d..b3fc936 100644
--- a/README-DEVELOPERS.ps
+++ b/README-DEVELOPERS.ps
@@ -1,7 +1,7 @@
%!PS-Adobe-2.0
%%Creator: dvips(k) 5.991 Copyright 2011 Radical Eye Software
%%Title: README-DEVELOPERS.dvi
-%%CreationDate: Sat Apr 7 00:00:34 2012
+%%CreationDate: Thu Apr 12 09:57:10 2012
%%Pages: 7
%%PageOrder: Ascend
%%BoundingBox: 0 0 612 792
@@ -11,7 +11,7 @@
%DVIPSWebPage: (www.radicaleye.com)
%DVIPSCommandLine: dvips -o README-DEVELOPERS.ps README-DEVELOPERS.dvi
%DVIPSParameters: dpi=600
-%DVIPSSource: TeX output 2012.04.07:0000
+%DVIPSSource: TeX output 2012.04.12:0957
%%BeginProcSet: tex.pro 0 0
%!
/TeXDict 300 dict def TeXDict begin/N{def}def/B{bind def}N/S{exch}N/X{S
@@ -2971,8 +2971,8 @@ F80000000000003FF00000000000003FF00000000000001FE00000000000001FE0000000
000000000FFFF0000000000003FFC0000000000000FE0000000000003E4D7DB445>121
D E
%EndDVIPSBitmapFont
-%DVIPSBitmapFont: Fg ecrm1200 12 10
-/Fg 10 115 df<1E007F80FF80FFC0FFC0FFE0FFE0FFE07FE01E60006000600060006000
+%DVIPSBitmapFont: Fg ecrm1200 12 9
+/Fg 9 115 df<1E007F80FF80FFC0FFC0FFE0FFE0FFE07FE01E60006000600060006000
E000C000C000C001C0018003800300070006000E001C003800700060000B1D78891B>44
D<0000FF00000007FFE000001F81F800003E007C0000FC003F0001F8001F8001F0000F80
03E00007C007C00003E007C00003E00FC00003F00F800001F01F800001F81F800001F83F
@@ -3000,65 +3000,53 @@ FFC00003FC7F800007FC3F000007FC00000007FC00000007F800000007F80000000FF800
800000003F000000007C00000000F800000000F000000001E000000003C0000000078000
00000F00000C001E00000C003C00000C0038000018007000001800E000001801C0000018
038000003807000000300E000000701FFFFFFFF01FFFFFFFF03FFFFFFFF07FFFFFFFF0FF
-FFFFFFE0FFFFFFFFE0FFFFFFFFE026427BC131>I<1C00000000001C00000000001F8000
-0000001FFFFFFFFFC01FFFFFFFFFC01FFFFFFFFFC03FFFFFFFFF803FFFFFFFFF803FFFFF
-FFFF003FFFFFFFFE00380000000C00300000001C00700000003800600000003000600000
-00700060000000E00060000000C000C0000001C000C00000038000C00000070000000000
-0600000000000E00000000001C0000000000180000000000380000000000700000000000
-600000000000E00000000001C00000000001C00000000003800000000007800000000007
-00000000000F00000000000F00000000001F00000000001E00000000003E00000000003E
-00000000007E00000000007C00000000007C0000000000FC0000000000FC0000000001FC
-0000000001FC0000000001FC0000000003F80000000003F80000000003F80000000003F8
-0000000007F80000000007F80000000007F80000000007F80000000007F80000000007F8
-000000000FF8000000000FF8000000000FF8000000000FF8000000000FF8000000000FF8
-000000000FF8000000000FF8000000000FF8000000000FF80000000007F00000000001C0
-0000002A457BC231>55 D<00000000C00000000000000001E00000000000000001E00000
-000000000001E00000000000000003F00000000000000003F00000000000000003F00000
-000000000007F80000000000000007F80000000000000007F8000000000000000FFC0000
-00000000000FFC000000000000000FFC0000000000000019FE0000000000000019FE0000
-000000000019FE0000000000000030FF0000000000000030FF0000000000000070FF8000
-0000000000607F80000000000000607F80000000000000E07FC0000000000000C03FC000
-0000000000C03FC0000000000001C03FE0000000000001801FE0000000000001801FE000
-0000000003001FF0000000000003000FF0000000000003000FF0000000000006000FF800
-00000000060007F80000000000060007F800000000000C0003FC00000000000C0003FC00
-000000000C0003FC0000000000180001FE0000000000180001FE0000000000180001FE00
-00000000300000FF0000000000300000FF0000000000700000FF80000000006000007F80
-000000006000007F8000000000E000007FC000000000FFFFFFFFC000000000FFFFFFFFC0
-00000001FFFFFFFFE0000000018000001FE0000000018000001FE0000000030000001FF0
-000000030000000FF0000000030000000FF0000000060000000FF80000000600000007F8
-0000000600000007F80000000C00000003FC0000000C00000003FC0000000C00000003FC
-0000001800000001FE0000001800000001FE0000001800000001FE0000003000000000FF
-0000003000000000FF0000007800000000FF800000F800000000FF800001FC00000000FF
-C0000FFF00000003FFE000FFFFE000007FFFFFC0FFFFE000007FFFFFC0FFFFE000007FFF
-FFC042477DC649>65 D<01E00007F80007F8000FFC000FFC000FFC000FFC0007F80007F8
-0001E0000000000000000000000000000000000000000000000000000000000000000000
-0000000000000001FC00FFFC00FFFC00FFFC0007FC0003FC0001FC0001FC0001FC0001FC
-0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC
-0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC
-0001FC0001FC0001FC0001FC0001FC0001FC0003FE00FFFFF8FFFFF8FFFFF815437DC21C
->105 D<01FC00FFFC00FFFC00FFFC0007FC0003FC0001FC0001FC0001FC0001FC0001FC
-0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC
-0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC
-0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC
-0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC
-0001FC0001FC0001FC0001FC0001FC0001FC0003FE00FFFFF8FFFFF8FFFFF815457DC41C
->108 D<01FC03FC0000FFFC0FFF8000FFFC3C07E000FFFC7001F80007FDE000FE0001FD
-80007F0001FF80003F8001FF00001FC001FE00001FE001FC00000FE001FC00000FF001FC
-000007F001FC000007F801FC000003F801FC000003FC01FC000003FC01FC000003FC01FC
-000001FE01FC000001FE01FC000001FE01FC000001FE01FC000001FE01FC000001FE01FC
-000001FE01FC000001FE01FC000001FE01FC000001FE01FC000001FE01FC000003FC01FC
-000003FC01FC000003FC01FC000007F801FC000007F801FC000007F001FC00000FF001FE
-00000FE001FE00001FC001FF00003FC001FF00003F8001FF80007E0001FDC000FC0001FC
-F003F80001FC3C0FE00001FC1FFF800001FC03FC000001FC0000000001FC0000000001FC
-0000000001FC0000000001FC0000000001FC0000000001FC0000000001FC0000000001FC
-0000000001FC0000000001FC0000000001FC0000000001FC0000000001FC0000000003FE
-00000000FFFFF8000000FFFFF8000000FFFFF80000002F3F7DAB36>112
-D<03F803F0FFF81FFCFFF83C3EFFF8707F07F8E0FF03F9C0FF01F980FF01FB80FF01FB00
-7E01FB003C01FF000001FE000001FE000001FE000001FE000001FC000001FC000001FC00
+FFFFFFE0FFFFFFFFE0FFFFFFFFE026427BC131>I<00000000C00000000000000001E000
+00000000000001E00000000000000001E00000000000000003F00000000000000003F000
+00000000000003F00000000000000007F80000000000000007F80000000000000007F800
+0000000000000FFC000000000000000FFC000000000000000FFC0000000000000019FE00
+00000000000019FE0000000000000019FE0000000000000030FF0000000000000030FF00
+00000000000070FF80000000000000607F80000000000000607F80000000000000E07FC0
+000000000000C03FC0000000000000C03FC0000000000001C03FE0000000000001801FE0
+000000000001801FE0000000000003001FF0000000000003000FF0000000000003000FF0
+000000000006000FF80000000000060007F80000000000060007F800000000000C0003FC
+00000000000C0003FC00000000000C0003FC0000000000180001FE0000000000180001FE
+0000000000180001FE0000000000300000FF0000000000300000FF0000000000700000FF
+80000000006000007F80000000006000007F8000000000E000007FC000000000FFFFFFFF
+C000000000FFFFFFFFC000000001FFFFFFFFE0000000018000001FE0000000018000001F
+E0000000030000001FF0000000030000000FF0000000030000000FF0000000060000000F
+F80000000600000007F80000000600000007F80000000C00000003FC0000000C00000003
+FC0000000C00000003FC0000001800000001FE0000001800000001FE0000001800000001
+FE0000003000000000FF0000003000000000FF0000007800000000FF800000F800000000
+FF800001FC00000000FFC0000FFF00000003FFE000FFFFE000007FFFFFC0FFFFE000007F
+FFFFC0FFFFE000007FFFFFC042477DC649>65 D<01E00007F80007F8000FFC000FFC000F
+FC000FFC0007F80007F80001E00000000000000000000000000000000000000000000000
+000000000000000000000000000000000001FC00FFFC00FFFC00FFFC0007FC0003FC0001
+FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001
+FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001
+FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0003FE00FFFFF8FF
+FFF8FFFFF815437DC21C>105 D<01FC00FFFC00FFFC00FFFC0007FC0003FC0001FC0001
+FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001
+FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001
+FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001
+FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001
+FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0001FC0003FE00FFFFF8FF
+FFF8FFFFF815457DC41C>108 D<01FC03FC0000FFFC0FFF8000FFFC3C07E000FFFC7001
+F80007FDE000FE0001FD80007F0001FF80003F8001FF00001FC001FE00001FE001FC0000
+0FE001FC00000FF001FC000007F001FC000007F801FC000003F801FC000003FC01FC0000
+03FC01FC000003FC01FC000001FE01FC000001FE01FC000001FE01FC000001FE01FC0000
+01FE01FC000001FE01FC000001FE01FC000001FE01FC000001FE01FC000001FE01FC0000
+01FE01FC000003FC01FC000003FC01FC000003FC01FC000007F801FC000007F801FC0000
+07F001FC00000FF001FE00000FE001FE00001FC001FF00003FC001FF00003F8001FF8000
+7E0001FDC000FC0001FCF003F80001FC3C0FE00001FC1FFF800001FC03FC000001FC0000
+000001FC0000000001FC0000000001FC0000000001FC0000000001FC0000000001FC0000
+000001FC0000000001FC0000000001FC0000000001FC0000000001FC0000000001FC0000
+000001FC0000000003FE00000000FFFFF8000000FFFFF8000000FFFFF80000002F3F7DAB
+36>112 D<03F803F0FFF81FFCFFF83C3EFFF8707F07F8E0FF03F9C0FF01F980FF01FB80
+FF01FB007E01FB003C01FF000001FE000001FE000001FE000001FE000001FC000001FC00
0001FC000001FC000001FC000001FC000001FC000001FC000001FC000001FC000001FC00
0001FC000001FC000001FC000001FC000001FC000001FC000001FC000001FC000001FC00
-0001FC000001FC000001FC000001FC000003FF0000FFFFFE00FFFFFE00FFFFFE00202C7D
-AB26>114 D E
+0001FC000001FC000001FC000001FC000001FC000003FF0000FFFFFE00FFFFFE00FFFFFE
+00202C7DAB26>114 D E
%EndDVIPSBitmapFont
%DVIPSBitmapFont: Fh ecrm1728 17.28 16
/Fh 16 119 df<FFFFFFFFF0FFFFFFFFF0FFFFFFFFF0FFFFFFFFF0FFFFFFFFF0FFFFFFFF
@@ -3349,11 +3337,11 @@ ifelse
%%EndSetup
%%Page: 1 1
TeXDict begin 1 0 bop 1038 872 a Fh(T)-11 b(oprammer)45
-b(-)g(Dev)l(elop)t(ers)h(guide)1669 1307 y Fg(April)31
-b(7,)h(2012)515 1665 y Ff(1)131 b(De\034nitions)515 1847
-y Fe(DUT)42 b Fd(Device)19 b(Under)f(T)-7 b(est.)34 b(The)18
-b(device)h(put)g(in)n(to)f(the)h(ZIF)f(so)r(c)n(k)n(et)f(of)i(the)g
-(programmer)515 2013 y Fe(VPP)42 b Fd(Programming)26
+b(-)g(Dev)l(elop)t(ers)h(guide)1645 1307 y Fg(April)31
+b(12,)h(2012)515 1665 y Ff(1)131 b(De\034nitions)515
+1847 y Fe(DUT)42 b Fd(Device)19 b(Under)f(T)-7 b(est.)34
+b(The)18 b(device)h(put)g(in)n(to)f(the)h(ZIF)f(so)r(c)n(k)n(et)f(of)i
+(the)g(programmer)515 2013 y Fe(VPP)42 b Fd(Programming)26
b(v)n(oltage)f(for)j(the)f(DUT)i(\(usually)e(12V\))515
2179 y Fe(V)m(CC)42 b Fd(Supply)28 b(v)n(oltage)e(for)h(the)g(DUT)515
2345 y Fe(GND)41 b Fd(Ground)27 b(for)g(the)h(DUT)515
@@ -3596,61 +3584,64 @@ b(top-half)g(algorithms)515 676 y Fd(The)f(Python)h(class)f
(\020GenericAlgorithms\021)42 b(in)36 b(the)h(generic_algorithms.p)n(y)
c(\034le)k(pro-)515 776 y(vides)j(sev)n(eral)e(generic)i(c)n(hip)g
(access)f(algorithms)g(that)i(can)f(b)r(e)h(used)f(in)h(the)g
-(\020Chip\021)515 876 y(metho)r(ds.)515 1108 y Fb(5.3)112
-b(FPGA)37 b(b)s(ottom-half)g(implemen)m(tation)515 1261
+(\020Chip\021)515 876 y(metho)r(ds.)515 1104 y Fb(5.3)112
+b(FPGA)37 b(b)s(ottom-half)g(implemen)m(tation)515 1257
y Fd(F)-7 b(or)25 b(the)i(FPGA)h(part)e(y)n(ou)f(need)i(to)f(get)g(the)
h(Xilinx)g(dev)n(elopmen)n(t)f(suite)g(\(ISE\))i(v)n(ersion)515
-1361 y(10.1)d(service)g(pac)n(k)h(3.)36 b(The)26 b("W)-7
+1357 y(10.1)d(service)g(pac)n(k)h(3.)36 b(The)26 b("W)-7
b(ebP)g(A)n(CK",)26 b(whic)n(h)h(is)f(su\036cien)n(t)g(for)g(our)g
-(purp)r(oses,)f(can)515 1460 y(b)r(e)j(do)n(wnloaded)e(for)h(free)g
+(purp)r(oses,)f(can)515 1456 y(b)r(e)j(do)n(wnloaded)e(for)h(free)g
(\(as)g(in)h(b)r(eer\))g(from)f(the)h(Xilinx)g(homepage:)722
-1643 y Fa(http://www.xilinx)o(.c)o(om)o(/su)o(pp)o(or)o(t/d)o(ow)o(nl)o
-(oad)o(/i)o(nd)o(ex.)o(ht)o(m)515 1826 y Fd(T)-7 b(o)24
+1616 y Fa(http://www.xilinx)o(.c)o(om)o(/su)o(pp)o(or)o(t/d)o(ow)o(nl)o
+(oad)o(/i)o(nd)o(ex.)o(ht)o(m)515 1776 y Fd(T)-7 b(o)24
b(create)f(a)g(new)i(sourceco)r(de)d(template)j(\034leset)f(for)f(a)h
-(new)g(c)n(hip,)h(go)e(to)i(the)f(libtopram-)515 1925
+(new)g(c)n(hip,)h(go)e(to)i(the)f(libtopram-)515 1875
y(mer/fpga/src/)g(sub)r(directory)j(and)g(execute)g(the)h("create.sh")e
-(script:)722 2108 y Fa(./create.sh)39 b(bitfile_name)515
-2291 y Fd(Where)20 b("bit\034le_name")g(is)h(the)g(name)f(of)h(the)g
+(script:)722 2035 y Fa(./create.sh)39 b(bitfile_name)515
+2194 y Fd(Where)20 b("bit\034le_name")g(is)h(the)g(name)f(of)h(the)g
(new)g(c)n(hip's)g(bit\034le.)35 b(\(That)21 b(often)g(matc)n(hes)515
-2390 y(the)30 b(c)n(hip-ID\).)g(No)n(w)f(go)g(to)g
+2294 y(the)30 b(c)n(hip-ID\).)g(No)n(w)f(go)g(to)g
(libtoprammer/fpga/src/bit\034le_name/)c(and)30 b(implemen)n(t)515
-2490 y(the)d(b)r(ottom-half)f(algorithm)g(in)g(the)h(bit\034le_name.v)g
+2394 y(the)d(b)r(ottom-half)f(algorithm)g(in)g(the)h(bit\034le_name.v)g
(V)-7 b(erilog)25 b(\034le.)37 b(T)-7 b(o)26 b(build)h(the)g(.BIT)515
-2589 y(\034le)j(from)f(the)i(V)-7 b(erilog)28 b(sources,)h(go)g(to)h
+2493 y(\034le)j(from)f(the)i(V)-7 b(erilog)28 b(sources,)h(go)g(to)h
(the)g(libtoprammer/fpga/)e(directory)g(and)i(exe-)515
-2689 y(cute:)722 2872 y Fa(./build.sh)40 b(bitfile_name)515
-3054 y Fd(\(if)28 b(y)n(ou)f(omit)h(the)f(bit\034le_name,)h(all)f
-(bit\034les)h(will)g(b)r(e)g(rebuilt\).)515 3329 y Ff(6)131
-b(Automatic)44 b(la)l(y)l(out)h(generator)515 3511 y
-Fd(The)39 b(automatic)f(la)n(y)n(out)g(generator)f(\(la)n(y)n
+2593 y(cute:)722 2752 y Fa(./build.sh)40 b(bitfile_name)515
+2912 y Fd(If)33 b(y)n(ou)g(omit)g(the)g(\020bit\034le_name\021,)h(all)f
+(bit\034les)g(will)h(b)r(e)f(rebuilt.)54 b(The)33 b(resulting)f(.BIT)
+515 3012 y(\034le)26 b(will)h(b)r(e)f(copied)g(to)h(the)f
+(libtoprammer/fpga/bin/)e(directory)-7 b(,)25 b(after)h(build)h
+(\034nished)515 3111 y(successfully)-7 b(.)515 3382 y
+Ff(6)131 b(Automatic)44 b(la)l(y)l(out)h(generator)515
+3564 y Fd(The)39 b(automatic)f(la)n(y)n(out)g(generator)f(\(la)n(y)n
(out_generator.p)n(y\))e(can)k(b)r(e)g(used)g(to)g(auto-)515
-3610 y(matically)27 b(generate)f(a)i(V)n(CC/VPP/GND)h(la)n(y)n(out.)36
+3663 y(matically)27 b(generate)f(a)i(V)n(CC/VPP/GND)h(la)n(y)n(out.)36
b(The)28 b(generator)d(will)j(then)h(tell)f(y)n(ou)515
-3710 y(ho)n(w)j(to)i(insert)f(the)g(c)n(hip)h(in)n(to)f(the)g(ZIF)h(so)
+3763 y(ho)n(w)j(to)i(insert)f(the)g(c)n(hip)h(in)n(to)f(the)g(ZIF)h(so)
r(c)n(k)n(et.)50 b(The)32 b(adv)-5 b(an)n(tage)31 b(of)h(using)g(the)h
-(auto-)515 3810 y(generator)d(instead)j(of)f(hardco)r(ding)g(the)h(V)n
-(CC/VPP/GND)g(connections)f(in)h(the)g(c)n(hip)515 3909
+(auto-)515 3862 y(generator)d(instead)j(of)f(hardco)r(ding)g(the)h(V)n
+(CC/VPP/GND)g(connections)f(in)h(the)g(c)n(hip)515 3962
y(implemen)n(tation)26 b(is)f(that)h(the)h(autogenerated)d(la)n(y)n
(out)g(is)i(p)r(ortable)f(b)r(et)n(w)n(een)h(TOPxxxx)515
-4009 y(programmers)c(and)i(it)h(is)g(m)n(uc)n(h)f(easier)f(to)i
+4062 y(programmers)c(and)i(it)h(is)g(m)n(uc)n(h)f(easier)f(to)i
(implemen)n(t.)36 b(Y)-7 b(ou)25 b(do)f(not)h(ha)n(v)n(e)e(to)i(searc)n
-(h)e(for)515 4109 y(a)k(c)n(hip)g(p)r(osition)g(in)h(the)f(ZIF)h(so)r
+(h)e(for)515 4161 y(a)k(c)n(hip)g(p)r(osition)g(in)h(the)f(ZIF)h(so)r
(c)n(k)n(et)e(that)h(\034ts)h(the)g(device)f(constrain)n(ts.)35
-b(The)27 b(autogen-)515 4208 y(erator)f(will)h(do)h(it)g(for)f(y)n(ou.)
-639 4308 y(The)20 b(c)n(hip)g(in)n(terface)f(of)h(the)g(autogenerator)e
+b(The)27 b(autogen-)515 4261 y(erator)f(will)h(do)h(it)g(for)f(y)n(ou.)
+639 4361 y(The)20 b(c)n(hip)g(in)n(terface)f(of)h(the)g(autogenerator)e
(is)h(em)n(b)r(edded)i(in)n(to)e(\020class)g(Chip\021.)34
-b(So)20 b(y)n(ou)515 4407 y(don't)28 b(ha)n(v)n(e)f(to)h(w)n(ork)f
+b(So)20 b(y)n(ou)515 4460 y(don't)28 b(ha)n(v)n(e)f(to)h(w)n(ork)f
(with)i(\020class)e(La)n(y)n(outGenerator\021)k(directly)-7
-b(.)39 b(Y)-7 b(ou'll)28 b(do)g(it)h(through)515 4507
+b(.)39 b(Y)-7 b(ou'll)28 b(do)g(it)h(through)515 4560
y(\020class)d(Chip\021)34 b(instead.)j(So)27 b(let's)h(lo)r(ok)f(at)g
(\020class)g(Chip\021s)g(autogenerator)e(in)n(terface.)639
-4607 y(The)j(constructor)e(\(__init__\(\)\))h(has)g(some)g
-(autogenerator)e(related)i(parameters:)515 4773 y Fe(c)m(hipP)m(ac)m(k)
+4659 y(The)j(constructor)e(\(__init__\(\)\))h(has)g(some)g
+(autogenerator)e(related)i(parameters:)515 4807 y Fe(c)m(hipP)m(ac)m(k)
-5 b(age)43 b Fd(This)36 b(parameter)e(is)i(a)f(string)h(iden)n
(tifying)g(the)g(pac)n(k)-5 b(age)34 b(t)n(yp)r(e)i(of)g(the)722
-4872 y(DUT)26 b(c)n(hip.)36 b(It)25 b(is)g(something)g(lik)n(e)f
+4907 y(DUT)26 b(c)n(hip.)36 b(It)25 b(is)g(something)g(lik)n(e)f
(\020DIP28\021)31 b(or)25 b(\020DIP40\021,)f(etc...)37
-b(.)f(If)25 b(this)h(param-)722 4972 y(eter)i(is)f(passed)g(to)g(the)h
+b(.)f(If)25 b(this)h(param-)722 5006 y(eter)i(is)f(passed)g(to)g(the)h
(constructor,)e(the)i(autogenerator)d(is)i(enabled.)1926
5255 y(6)p eop end
%%Page: 7 7
diff --git a/libtoprammer/bitfile.py b/libtoprammer/bitfile.py
index 0745b15..6f79502 100644
--- a/libtoprammer/bitfile.py
+++ b/libtoprammer/bitfile.py
@@ -139,13 +139,13 @@ def bitfileFind(filename):
if filename.startswith("/"):
if __probeFile(filename):
return filename
- paths = ( ".", "./libtoprammer/fpga", )
+ paths = ( ".", "./libtoprammer/fpga/bin", )
for path in paths:
fullpath = path + "/" + filename
if __probeFile(fullpath):
return fullpath
fullpath = pkg_resources.resource_filename("libtoprammer",
- "fpga/" + filename)
+ "fpga/bin/" + filename)
if __probeFile(fullpath):
return fullpath
return None
diff --git a/libtoprammer/fpga/at27c256r.bit b/libtoprammer/fpga/bin/at27c256r.bit
index 32a8c88..32a8c88 100644
--- a/libtoprammer/fpga/at27c256r.bit
+++ b/libtoprammer/fpga/bin/at27c256r.bit
Binary files differ
diff --git a/libtoprammer/fpga/at89c2051dip20.bit b/libtoprammer/fpga/bin/at89c2051dip20.bit
index e7d0b7e..e7d0b7e 100644
--- a/libtoprammer/fpga/at89c2051dip20.bit
+++ b/libtoprammer/fpga/bin/at89c2051dip20.bit
Binary files differ
diff --git a/libtoprammer/fpga/atmega32dip40.bit b/libtoprammer/fpga/bin/atmega32dip40.bit
index 8a9ff73..8a9ff73 100644
--- a/libtoprammer/fpga/atmega32dip40.bit
+++ b/libtoprammer/fpga/bin/atmega32dip40.bit
Binary files differ
diff --git a/libtoprammer/fpga/atmega8dip28.bit b/libtoprammer/fpga/bin/atmega8dip28.bit
index 445f63c..445f63c 100644
--- a/libtoprammer/fpga/atmega8dip28.bit
+++ b/libtoprammer/fpga/bin/atmega8dip28.bit
Binary files differ
diff --git a/libtoprammer/fpga/attiny13dip8.bit b/libtoprammer/fpga/bin/attiny13dip8.bit
index 9278a35..9278a35 100644
--- a/libtoprammer/fpga/attiny13dip8.bit
+++ b/libtoprammer/fpga/bin/attiny13dip8.bit
Binary files differ
diff --git a/libtoprammer/fpga/attiny26dip20.bit b/libtoprammer/fpga/bin/attiny26dip20.bit
index 4b5780b..4b5780b 100644
--- a/libtoprammer/fpga/attiny26dip20.bit
+++ b/libtoprammer/fpga/bin/attiny26dip20.bit
Binary files differ
diff --git a/libtoprammer/fpga/hm62256dip28.bit b/libtoprammer/fpga/bin/hm62256dip28.bit
index 9a74c4f..9a74c4f 100644
--- a/libtoprammer/fpga/hm62256dip28.bit
+++ b/libtoprammer/fpga/bin/hm62256dip28.bit
Binary files differ
diff --git a/libtoprammer/fpga/m24c16dip8.bit b/libtoprammer/fpga/bin/m24c16dip8.bit
index e30149c..e30149c 100644
--- a/libtoprammer/fpga/m24c16dip8.bit
+++ b/libtoprammer/fpga/bin/m24c16dip8.bit
Binary files differ
diff --git a/libtoprammer/fpga/m2764a.bit b/libtoprammer/fpga/bin/m2764a.bit
index cf1f8b5..cf1f8b5 100644
--- a/libtoprammer/fpga/m2764a.bit
+++ b/libtoprammer/fpga/bin/m2764a.bit
Binary files differ
diff --git a/libtoprammer/fpga/m8c-issp.bit b/libtoprammer/fpga/bin/m8c-issp.bit
index c4c95c3..c4c95c3 100644
--- a/libtoprammer/fpga/m8c-issp.bit
+++ b/libtoprammer/fpga/bin/m8c-issp.bit
Binary files differ
diff --git a/libtoprammer/fpga/unitest.bit b/libtoprammer/fpga/bin/unitest.bit
index 88ae77c..88ae77c 100644
--- a/libtoprammer/fpga/unitest.bit
+++ b/libtoprammer/fpga/bin/unitest.bit
Binary files differ
diff --git a/libtoprammer/fpga/w29ee011dip32.bit b/libtoprammer/fpga/bin/w29ee011dip32.bit
index 6a6e6cb..6a6e6cb 100644
--- a/libtoprammer/fpga/w29ee011dip32.bit
+++ b/libtoprammer/fpga/bin/w29ee011dip32.bit
Binary files differ
diff --git a/libtoprammer/fpga/build.sh b/libtoprammer/fpga/build.sh
index 8149afc..a67c880 100755
--- a/libtoprammer/fpga/build.sh
+++ b/libtoprammer/fpga/build.sh
@@ -7,7 +7,7 @@ basedir="$(dirname "$0")"
[ "$(echo -n "$basedir" | cut -c1)" = "/" ] || basedir="$PWD/$basedir"
srcdir="$basedir/src"
-bindir="$basedir"
+bindir="$basedir/bin"
die()
@@ -48,8 +48,7 @@ while [ $# -gt 0 ]; do
shift
continue
}
- target="$1"
- target="${target%.bit}" # strip .bit suffix
+ target="$(basename "$1" .bit)"
# Add to list
targets="${targets}${target}/"
shift
@@ -84,21 +83,21 @@ for src in $srcdir/*; do
[ -d "$src" ] || continue
srcname="$(basename $src)"
- logfile="$bindir/$srcname.build.log"
+ logfile="$basedir/$srcname.build.log"
- should_build $srcname || continue
+ should_build "$srcname" || continue
echo "Building $srcname..."
- make -C $src/ clean >/dev/null ||\
+ make -C "$src/" clean >/dev/null ||\
die "FAILED to clean $srcname."
if [ $verbose -eq 0 ]; then
- make -C $src/ all >$logfile || {
- cat $logfile
+ make -C "$src/" all > "$logfile" || {
+ cat "$logfile"
die "FAILED to build $srcname."
}
- cat $logfile | grep WARNING
+ cat "$logfile" | grep WARNING
else
- make -C $src/ all ||\
+ make -C "$src/" all ||\
die "FAILED to build $srcname."
fi
@@ -109,9 +108,9 @@ for src in $srcdir/*; do
else
cp -f "$new" "$old"
fi
- make -C $src/ clean >/dev/null ||\
+ make -C "$src/" clean > /dev/null ||\
die "FAILED to clean $srcname."
- rm -f $logfile
+ rm -f "$logfile"
done
echo "Successfully built all images."
diff --git a/setup.py b/setup.py
index fd573c7..e90b638 100755
--- a/setup.py
+++ b/setup.py
@@ -10,6 +10,6 @@ setup( name = "toprammer",
author_email = "m@bues.ch",
url = "http://bues.ch/cms/hacking/toprammer.html",
packages = [ "libtoprammer", "libtoprammer/top2049", "libtoprammer/chips" ],
- package_data = { "libtoprammer" : [ "fpga/*.bit", "icons/*.png", ], },
+ package_data = { "libtoprammer" : [ "fpga/bin/*.bit", "icons/*.png", ], },
scripts = [ "toprammer", "toprammer-gui", "toprammer-layout", ],
)
bues.ch cgit interface