summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Buesch <m@bues.ch>2012-04-06 23:31:12 +0200
committerMichael Buesch <m@bues.ch>2012-04-06 23:31:12 +0200
commit6c1ebab053c2e5264f561b88403ec03c6b03557d (patch)
tree5af25c6846ad0423d935195fd6481e4da54b503d
parentc9b74898f30ba1218e2e683151fb082d3bc35fd5 (diff)
downloadtoprammer-6c1ebab053c2e5264f561b88403ec03c6b03557d.tar.xz
toprammer-6c1ebab053c2e5264f561b88403ec03c6b03557d.zip
Rename "toprammer_main" to "main"
Signed-off-by: Michael Buesch <m@bues.ch>
-rw-r--r--README-DEVELOPERS.lyx2
-rw-r--r--README-DEVELOPERS.ps48
-rw-r--r--libtoprammer/main.py (renamed from libtoprammer/toprammer_main.py)0
-rwxr-xr-xmakerelease.sh4
-rw-r--r--reverse-engineering/vccx-sniffer.patch7
-rw-r--r--reverse-engineering/vpp-sniffer.patch7
-rwxr-xr-xsetup.py2
-rwxr-xr-xtoprammer2
-rwxr-xr-xtoprammer-gui2
-rwxr-xr-xtoprammer-layout2
10 files changed, 37 insertions, 39 deletions
diff --git a/README-DEVELOPERS.lyx b/README-DEVELOPERS.lyx
index d322402..b86b675 100644
--- a/README-DEVELOPERS.lyx
+++ b/README-DEVELOPERS.lyx
@@ -128,7 +128,7 @@ In the
\begin_inset Quotes eld
\end_inset
-toprammer_main
+main
\begin_inset Quotes erd
\end_inset
diff --git a/README-DEVELOPERS.ps b/README-DEVELOPERS.ps
index d9d21d5..50491ee 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: Fri Apr 6 23:20:54 2012
+%%CreationDate: Fri Apr 6 23:26:54 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.06:2320
+%DVIPSSource: TeX output 2012.04.06:2326
%%BeginProcSet: tex.pro 0 0
%!
/TeXDict 300 dict def TeXDict begin/N{def}def/B{bind def}N/S{exch}N/X{S
@@ -3348,35 +3348,35 @@ ifelse
%%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(6,)h(2012)515 1659 y Ff(1)131 b(De\034nitions)515 1841
+b(6,)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 2004 y Fe(VPP)42 b Fd(Programming)26
+(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
-2168 y Fe(V)m(CC)42 b Fd(Supply)28 b(v)n(oltage)e(for)h(the)g(DUT)515
-2332 y Fe(GND)41 b Fd(Ground)27 b(for)g(the)h(DUT)515
-2496 y Fe(ZIF)42 b Fd(Zero)26 b(Insert)h(F)-7 b(orce)27
-b(so)r(c)n(k)n(et)f(of)i(the)g(programmer.)515 2770 y
-Ff(2)131 b(TOP2049)43 b(device)h(hardw)l(are)515 2952
+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
+2511 y Fe(ZIF)42 b Fd(Zero)26 b(Insert)h(F)-7 b(orce)27
+b(so)r(c)n(k)n(et)f(of)i(the)g(programmer.)515 2785 y
+Ff(2)131 b(TOP2049)43 b(device)h(hardw)l(are)515 2967
y Fd(The)27 b(TOP2049)f(consists)h(of)g(four)g(basic)g(hardw)n(are)f
-(parts)639 3114 y Fc(\017)41 b Fd(USB)28 b(in)n(terface)f(\(PDIUSBD12)h
-(c)n(hip\))639 3278 y Fc(\017)41 b Fd(Micro)r(con)n(troller)25
-b(\(Mega)n(win)i(MPC89E52A\))639 3442 y Fc(\017)41 b
-Fd(FPGA)29 b(\(Xilinx)f(Spartan2)f(X)n(C2S15\))639 3606
+(parts)639 3133 y Fc(\017)41 b Fd(USB)28 b(in)n(terface)f(\(PDIUSBD12)h
+(c)n(hip\))639 3299 y Fc(\017)41 b Fd(Micro)r(con)n(troller)25
+b(\(Mega)n(win)i(MPC89E52A\))639 3465 y Fc(\017)41 b
+Fd(FPGA)29 b(\(Xilinx)f(Spartan2)f(X)n(C2S15\))639 3631
y Fc(\017)41 b Fd(V)n(CC/GND/VPP)29 b(supply)e(circuitry)515
-3768 y(The)35 b(micro)r(con)n(troller's)e(job)j(is)g(to)f(initialize)h
-(and)f(comm)n(unicate)g(to)h(the)g(FPGA)g(and)515 3867
+3797 y(The)35 b(micro)r(con)n(troller's)e(job)j(is)g(to)f(initialize)h
+(and)f(comm)n(unicate)g(to)h(the)g(FPGA)g(and)515 3897
y(set)31 b(up)h(the)g(V)n(CC/GND/VPP)h(supply)f(circuitry)-7
b(.)48 b(The)32 b(micro)r(con)n(troller)d(can)i(receiv)n(e)515
-3967 y(commands)c(via)g(USB)g(in)n(terface)g(to)h(do)f(these)h(things.)
-515 4240 y Ff(3)131 b(Comm)l(unicating)34 b(with)h(the)f(programmer)f
-(via)h(USB)515 4422 y Fd(In)g(the)g(\020toprammer_main\021)k(mo)r(dule)
-c(there)g(is)f(the)i(\020class)d(TOP\021)40 b(whic)n(h)34
-b(is)g(used)g(for)515 4522 y(comm)n(unication)23 b(with)h(the)h
-(programmer)c(device.)36 b(The)24 b(class)f(has)h(v)-5
-b(arious)22 b(metho)r(ds)j(for)515 4622 y(hardw)n(are)g(access:)515
-4853 y Fb(3.1)112 b(cmdRequestV)-9 b(ersion\(\))515 5006
-y Fd(Reads)27 b(the)h(programmer)d(iden)n(ti\034cation)i(and)g(v)n
+3997 y(commands)c(via)g(USB)g(in)n(terface)g(to)h(do)f(these)h(things.)
+515 4271 y Ff(3)131 b(Comm)l(unicating)34 b(with)h(the)f(programmer)f
+(via)h(USB)515 4453 y Fd(In)25 b(the)g(\020main\021)30
+b(mo)r(dule)25 b(there)g(is)f(the)h(\020class)f(TOP\021)31
+b(whic)n(h)25 b(is)f(used)h(for)f(comm)n(unication)515
+4553 y(with)c(the)f(programmer)e(device.)34 b(The)19
+b(class)g(has)g(v)-5 b(arious)18 b(metho)r(ds)h(for)g(hardw)n(are)e
+(access:)515 4785 y Fb(3.1)112 b(cmdRequestV)-9 b(ersion\(\))515
+4938 y Fd(Reads)27 b(the)h(programmer)d(iden)n(ti\034cation)i(and)g(v)n
(ersioning)f(string)h(and)g(returns)g(it.)1926 5255 y(1)p
eop end
%%Page: 2 2
diff --git a/libtoprammer/toprammer_main.py b/libtoprammer/main.py
index 0a0cc3d..0a0cc3d 100644
--- a/libtoprammer/toprammer_main.py
+++ b/libtoprammer/main.py
diff --git a/makerelease.sh b/makerelease.sh
index df027c2..d24655b 100755
--- a/makerelease.sh
+++ b/makerelease.sh
@@ -10,8 +10,8 @@ origin="$(dirname "$0")"
do_git_tag=1
[ "$1" = "--notag" ] && do_git_tag=0
-version_major="$(cat $origin/libtoprammer/toprammer_main.py | grep -e VERSION_MAJOR | head -n1 | cut -d'=' -f2)"
-version_minor="$(cat $origin/libtoprammer/toprammer_main.py | grep -e VERSION_MINOR | head -n1 | cut -d'=' -f2)"
+version_major="$(cat $origin/libtoprammer/main.py | grep -e VERSION_MAJOR | head -n1 | cut -d'=' -f2)"
+version_minor="$(cat $origin/libtoprammer/main.py | grep -e VERSION_MINOR | head -n1 | cut -d'=' -f2)"
if [ -z "$version_major" -o -z "$version_minor" ]; then
echo "Could not determine version!"
exit 1
diff --git a/reverse-engineering/vccx-sniffer.patch b/reverse-engineering/vccx-sniffer.patch
index 79b2b51..38675e8 100644
--- a/reverse-engineering/vccx-sniffer.patch
+++ b/reverse-engineering/vccx-sniffer.patch
@@ -1,7 +1,6 @@
-diff --git a/libtoprammer/toprammer_main.py b/libtoprammer/toprammer_main.py
-index 3962d44..4b00100 100644
---- a/libtoprammer/toprammer_main.py
-+++ b/libtoprammer/toprammer_main.py
+diff -u a/libtoprammer/main.py b/libtoprammer/main.py
+--- a/libtoprammer/main.py
++++ b/libtoprammer/main.py
@@ -204,7 +204,34 @@ class TOP:
raise TOPException("Init: Unexpected status register (b): 0x%08X" % stat)
diff --git a/reverse-engineering/vpp-sniffer.patch b/reverse-engineering/vpp-sniffer.patch
index fc0f1ae..0fbc1b9 100644
--- a/reverse-engineering/vpp-sniffer.patch
+++ b/reverse-engineering/vpp-sniffer.patch
@@ -1,7 +1,6 @@
-diff --git a/libtoprammer/toprammer_main.py b/libtoprammer/toprammer_main.py
-index 3962d44..b9e41ff 100644
---- a/libtoprammer/toprammer_main.py
-+++ b/libtoprammer/toprammer_main.py
+diff -u a/libtoprammer/main.py b/libtoprammer/main.py
+--- a/libtoprammer/main.py
++++ b/libtoprammer/main.py
@@ -204,7 +204,34 @@ class TOP:
raise TOPException("Init: Unexpected status register (b): 0x%08X" % stat)
diff --git a/setup.py b/setup.py
index d728e31..ab3c133 100755
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
from distutils.core import setup
-import libtoprammer.toprammer_main as toprammer_main
+import libtoprammer.main as toprammer_main
setup( name = "toprammer",
version = toprammer_main.VERSION,
diff --git a/toprammer b/toprammer
index 6ffc3f9..b71639d 100755
--- a/toprammer
+++ b/toprammer
@@ -21,7 +21,7 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
"""
-from libtoprammer.toprammer_main import *
+from libtoprammer.main import *
from libtoprammer.util import *
import getopt
diff --git a/toprammer-gui b/toprammer-gui
index 4acef46..9f298a9 100755
--- a/toprammer-gui
+++ b/toprammer-gui
@@ -21,7 +21,7 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
"""
-from libtoprammer.toprammer_main import *
+from libtoprammer.main import *
from libtoprammer.util import *
import sys
import time
diff --git a/toprammer-layout b/toprammer-layout
index 6d5a0e1..69a6a35 100755
--- a/toprammer-layout
+++ b/toprammer-layout
@@ -22,7 +22,7 @@
"""
from libtoprammer.layout_generator import *
-from libtoprammer.toprammer_main import *
+from libtoprammer.main import *
from libtoprammer.chip import *
import getopt
import sys
bues.ch cgit interface