Send commitlog mailing list submissions to
commitlog@lists.openmoko.org
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:
1. r4509 - developers/erin_yueh/pythonEFL-sudoku/src
([EMAIL PROTECTED])
2. r4510 - developers/erin_yueh/pythonEFL-sudoku/data/theme
([EMAIL PROTECTED])
3. Openmoko's OpenEmbedded repository. This is used to build the
Openmoko distribution: Changes to 'org.openmoko.asu.dev'
([EMAIL PROTECTED])
4. Openmoko's OpenEmbedded repository. This is used to build the
Openmoko distribution: Changes to 'org.openmoko.asu.dev'
([EMAIL PROTECTED])
5. Openmoko's OpenEmbedded repository. This is used to build the
Openmoko distribution: Changes to 'org.openmoko.asu.stable'
([EMAIL PROTECTED])
6. Holger's qtopia repo: Changes to 'master' ([EMAIL PROTECTED])
7. r4511 - in developers/werner: . mic ([EMAIL PROTECTED])
--- Begin Message ---
Author: erin_yueh
Date: 2008-07-07 12:40:01 +0200 (Mon, 07 Jul 2008)
New Revision: 4509
Modified:
developers/erin_yueh/pythonEFL-sudoku/src/sudoku_ui.py
Log:
add number keyboard, clear callback, button clicked callback (Erin Yueh)
Modified: developers/erin_yueh/pythonEFL-sudoku/src/sudoku_ui.py
===================================================================
--- developers/erin_yueh/pythonEFL-sudoku/src/sudoku_ui.py 2008-07-07
08:08:58 UTC (rev 4508)
+++ developers/erin_yueh/pythonEFL-sudoku/src/sudoku_ui.py 2008-07-07
10:40:01 UTC (rev 4509)
@@ -9,26 +9,88 @@
WINDOW_WIDTH = 455
WINDOW_HEIGHT = 640
-def button_cb(zoom_in, emission, source):
- print 'emission,source:',emission,source
+def checkRow(row,value):
+ isOK = True
+ return isOK
+
+def checkLine(line,value):
+ isOK = True
+
+ return isOK
+
+def checkGroup(group,value):
+ isOK = True
+
+ return isOK
+
+def analyze(button,value):
+ isOK = False
+ puzzle = ee.data["puzzle"]
+ # button40 2
+ addr = button[6:]
+ print addr, value
+ i = int(addr) / 9
+ j = int(addr) % 9
+ g = (i/3)*3 + (j/3)
+ print i,j,g
+ if not(checkRow(i,value) or checkLine(j,value) or checkGroup(g,value)):
+ isOK = True
+ return isOK
+
+def number_key_cb(zoom_in, emission, source):
+ print 'number_key_cb emission,source:',emission,source
+
+ if(source == 'clear'):
+ puzzle = ee.data["puzzle"]
+ for i in xrange (9):
+ for j in xrange(9):
+ value = puzzle[i][j]
+ addr = i + j *9
+ text_data = "button" + str(addr)
+ text = ee.data[text_data]
+ text.data["value"] = value
+ text.text_set(str(value))
+ if(value>0):
+ text.color_set(10,10,10,200)
+ elif(value==0):
+ text.color_set(0,255,255,255)
+ print 'clear all data!!'
+ elif(source =='undo' or source == 'redo'):
+ print 'undo or redo'
+ elif(source == 'solve'):
+ print 'solve'
+ else:
+ # fill in key number
+ if(ee.data["clicking"]):
+ text = ee.data[ee.data["clicking"]]
+ text.text_set(source)
+ text.data["value"] = int(source)
+ if(analyze(ee.data["clicking"],source) == False):
+ text.color_set(255,0,0,255)
+ else:
+ text.color_set(255,255,255,255)
return True
+def puzzle_key_cb(zoom_in, emission, source):
+ print 'puzzle_key_cb emission,source:',emission,source
-def puzzle_but_number_cb(zoom_in, emission, source):
- print 'emission,source:',emission,source
+ text = ee.data[source]
+ if(int(text.data["value"]) ==0 ):
+ text.color_set(255,255,255,255)
+ ee.data["clicking"] = source
return True
-
+
def get_puzzle():
-
+
file_name = "/usr/share/sudoku/puzzle/1000"
fIn = open(file_name, 'r')
fIn.seek(82*(random.randint(1, 1000)))
l = fIn.readline()
-
+
if (len(l) != 82):
- print "xxx"
+ print "the puzzle is wrong!!"
p = []
for i in xrange(9):
@@ -36,10 +98,9 @@
for j in xrange(9):
t.append(int(l[i * 9 + j]))
p.append(t)
-
-
+
return p
-
+
def main():
global ee
@@ -58,38 +119,40 @@
# create puzzle and icons
area = edje.Edje(canvas, file="/usr/share/sudoku/sudoku.edj",
group="pythonEFL-sudoku/panel")
+ area.signal_callback_add("mouse,clicked,*", "*", number_key_cb)
area.pos = (0, 0)
area.size = canvas.size
area.show()
area.data["area"] = area
- # set a signal callback for all buttons
- area.signal_callback_add("mouse,clicked,*", "*", button_cb)
# create puzzle and icons
board = edje.Edje(canvas, file="/usr/share/sudoku/sudoku.edj",
group="pythonEFL-sudoku/board")
- board.signal_callback_add("mouse,clicked,*", "*", puzzle_but_number_cb)
+ board.signal_callback_add("mouse,clicked,*", "*", puzzle_key_cb)
board.pos = (0, 0)
- #test.size = canvas.size
board.show()
puzzle = get_puzzle()
+ ee.data["puzzle"] = puzzle
print puzzle
- element_w = 480 / 9
- element_h = 480 / 9
+ element_w = 455 / 9
+ element_h = 455 / 9
# put all elements to Text objects
for i in xrange (9):
for j in xrange(9):
- x = 5 + (element_w * (i))
- y = 5 + (element_h * (j))
+ x = 15 + (element_w * (i))
+ y = 15 + (element_h * (j))
#print i,j
value = puzzle[i][j]
display = str(value)
- addr = i*9 + j
+ addr = i + j *9
text = canvas.Text(text=display, font=("sans serif", 16),
color=(0,255,255,255))
#print i,j,x,y
+ if(value>0):
+ text.color_set(10,10,10,200)
text.pos_set(x,y)
text.show()
+ text.data["value"] = value
text_data = "button" + str(addr)
ee.data[text_data] = text
print 'TRY:',text_data, ee.data[text_data]
--- End Message ---
--- Begin Message ---
Author: erin_yueh
Date: 2008-07-07 12:40:56 +0200 (Mon, 07 Jul 2008)
New Revision: 4510
Modified:
developers/erin_yueh/pythonEFL-sudoku/data/theme/sudoku.edc
Log:
modify number buttons (Erin Yueh)
Modified: developers/erin_yueh/pythonEFL-sudoku/data/theme/sudoku.edc
===================================================================
--- developers/erin_yueh/pythonEFL-sudoku/data/theme/sudoku.edc 2008-07-07
10:40:01 UTC (rev 4509)
+++ developers/erin_yueh/pythonEFL-sudoku/data/theme/sudoku.edc 2008-07-07
10:40:56 UTC (rev 4510)
@@ -187,7 +187,7 @@
}
/* key 1 */
part {
- name: "key1_area";
+ name: "1";
type: RECT;
mouse_events: 1;
description {
@@ -239,7 +239,7 @@
} /* end of key 1 */
/* key 2 */
part {
- name: "key2_area";
+ name: "2";
type: RECT;
mouse_events: 1;
description {
@@ -291,7 +291,7 @@
}/* end of key2 */
/* key 3 */
part {
- name: "key3_area";
+ name: "3";
type: RECT;
mouse_events: 1;
description {
@@ -343,7 +343,7 @@
}/* end of key3 */
/* key 4 */
part {
- name: "key4_area";
+ name: "4";
type: RECT;
mouse_events: 1;
description {
@@ -395,7 +395,7 @@
} /* end of key 4 */
/* key 5 */
part {
- name: "key5_area";
+ name: "5";
type: RECT;
mouse_events: 1;
description {
@@ -447,7 +447,7 @@
}/* end of key5 */
/* key 6 */
part {
- name: "key6_area";
+ name: "6";
type: RECT;
mouse_events: 1;
description {
@@ -499,7 +499,7 @@
}/* end of key6 */
/* key 7 */
part {
- name: "key7_area";
+ name: "7";
type: RECT;
mouse_events: 1;
description {
@@ -551,7 +551,7 @@
} /* end of key 7 */
/* key 8 */
part {
- name: "key8_area";
+ name: "8";
type: RECT;
mouse_events: 1;
description {
@@ -603,7 +603,7 @@
}/* end of key8 */
/* key 9 */
part {
- name: "key9_area";
+ name: "9";
type: RECT;
mouse_events: 1;
description {
--- End Message ---
--- Begin Message ---
conf/checksums.ini | 44 ++++++++++++++++----
conf/distro/include/sane-srcrevs.inc | 2 +-
.../diversity-maps-berlin_20080430.bb | 7 +++
.../diversity-maps-buenos-aires_20080430.bb | 7 +++
.../diversity-maps-london_20080430.bb | 7 +++
.../diversity-maps-new-york_20080430.bb | 7 +++
.../diversity-maps-paris_20080430.bb | 7 +++
.../diversity-maps-providence_20080430.bb | 4 +-
.../diversity-maps-san-francisco_20080430.bb | 7 +++
.../diversity-maps-sydney_20080430.bb | 7 +++
.../diversity-maps-taipei_20080430.bb | 4 +-
packages/tasks/task-openmoko-feed.bb | 8 ++++
12 files changed, 98 insertions(+), 13 deletions(-)
New commits:
commit 37b7995e6793e0c8834818ed2f8b18f9df3b51ab
Author: Chia-I Wu <[EMAIL PROTECTED]>
Date: Mon Jul 7 15:10:54 2008 +0800
add/update checksums of maps
Note that upstream modifies providence and taipei maps silently. The
checksums are updated to reflect the changes.
commit 4c041c70575951380adeacddf454999ac0332de9
Author: Chia-I Wu <[EMAIL PROTECTED]>
Date: Mon Jul 7 15:07:54 2008 +0800
add/update more maps
Add more maps to the repo. diversity-maps-providence and
diversity-maps-taipei are updated to reflect name changes.
commit 138725d818be7e48487f822c65013c5f1ae093a7
Author: Holger Hans Peter Freyther <[EMAIL PROTECTED]>
Date: Mon Jul 7 12:28:46 2008 +0200
[srcrev] Upgrade splinter as of Chia-I Wu's request
Upgrade splinter to deal better with multiple installed maps
--- End Message ---
--- Begin Message ---
packages/tasks/task-openmoko-feed.bb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
New commits:
commit ec39b3690513d00bd81bc845178607f446fe41a7
Author: Holger Hans Peter Freyther <[EMAIL PROTECTED]>
Date: Mon Jul 7 12:50:09 2008 +0200
[task] Bump the PR of task-openmoko-feed to force a rebuild
--- End Message ---
--- Begin Message ---
conf/checksums.ini | 44 ++++++++++++++++----
conf/distro/include/sane-srcrevs.inc | 8 ++--
packages/openmoko-projects/assassin_svn.bb | 4 +-
.../diversity-maps-berlin_20080430.bb | 7 +++
.../diversity-maps-buenos-aires_20080430.bb | 7 +++
.../diversity-maps-london_20080430.bb | 7 +++
.../diversity-maps-new-york_20080430.bb | 7 +++
.../diversity-maps-paris_20080430.bb | 7 +++
.../diversity-maps-providence_20080430.bb | 4 +-
.../diversity-maps-san-francisco_20080430.bb | 7 +++
.../diversity-maps-sydney_20080430.bb | 7 +++
.../diversity-maps-taipei_20080430.bb | 4 +-
packages/tasks/task-openmoko-feed.bb | 10 ++++-
13 files changed, 104 insertions(+), 19 deletions(-)
New commits:
commit 406b8308091f9cacfeb9c6b33c3ee23f85f2d14d
Author: Holger Hans Peter Freyther <[EMAIL PROTECTED]>
Date: Mon Jul 7 12:50:09 2008 +0200
[task] Bump the PR of task-openmoko-feed to force a rebuild
commit 852bbcc5bc67bec2d8ff41d854321d298101c1d2
Author: Chia-I Wu <[EMAIL PROTECTED]>
Date: Mon Jul 7 15:10:54 2008 +0800
add/update checksums of maps
Note that upstream modifies providence and taipei maps silently. The
checksums are updated to reflect the changes.
commit b0d4ef652fc85705e63a19628983a86da5dfffdc
Author: Chia-I Wu <[EMAIL PROTECTED]>
Date: Mon Jul 7 15:07:54 2008 +0800
add/update more maps
Add more maps to the repo. diversity-maps-providence and
diversity-maps-taipei are updated to reflect name changes.
commit 9fe976c3ec22ecb2ca7d1dddd5b612c4f36d2564
Author: Holger Hans Peter Freyther <[EMAIL PROTECTED]>
Date: Mon Jul 7 12:28:46 2008 +0200
[srcrev] Upgrade splinter as of Chia-I Wu's request
Upgrade splinter to deal better with multiple installed maps
commit 5859db9c1aa79053e286aa7aa0ddfdcb213aa576
Author: Carsten Haitzler <[EMAIL PROTECTED]>
Date: Thu Jul 3 18:30:46 2008 +1000
rev illume to 1 second after blank for suspend
commit 4edef25e43fa8ea609140d2e43272919822c5cb3
Author: Julian_chu <[EMAIL PROTECTED]>
Date: Wed Jul 2 14:06:10 2008 +0800
[Assassin] Add curl to assassin's depends.
Tick did a quick hack to assassin for access networking.
It's is a temporary solution.
After the real solution has been done, this dependency will
be remvoed.
commit 42e23c9c95cfd1f304f828c577a029ed0974aa7f
Author: Julian_chu <[EMAIL PROTECTED]>
Date: Tue Jul 1 17:53:37 2008 +0800
[assassin] Bump up the reversion of assassin to 174.
Adding a very ugly network check quick hack by accessing
downloads.openmoko.org directly This allow assassin detect
if it can access the repository directly.
--- End Message ---
--- Begin Message ---
.../phonevendors/ficgta01/vendor_ficgta01.cpp | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
New commits:
commit 4536af05deffc6af87991a9c3f57c2d92e29a9ca
Merge: 5befce0fdbad3424f000caf3057c84282a9ae880
ea42173147759e5ffb0008420de581cfc4805ac2
Author: Holger Freyther <[EMAIL PROTECTED]>
Date: Mon Jul 7 14:17:18 2008 +0200
Merge branch 'master' of git+ssh://[EMAIL PROTECTED]/var/cache/git/qtopia
commit 5befce0fdbad3424f000caf3057c84282a9ae880
Author: Holger Freyther <[EMAIL PROTECTED]>
Date: Mon Jul 7 14:13:53 2008 +0200
[gsm] Do not announce calls as incoming that were outgoing
Look at the direction parameter and only announce calls that are
incoming as incoming call. The dir parameter is optional according
to the TI document but we will need it to determine the direction
of the call. This patch was roughly tested and incoming calls still
work and outgoing calls when hang up before being connected are not
reported as incoming.
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2008-07-07 14:47:52 +0200 (Mon, 07 Jul 2008)
New Revision: 4511
Added:
developers/werner/mic/
developers/werner/mic/README
developers/werner/mic/SIMULATE
developers/werner/mic/a6.sch
developers/werner/mic/a7.sch
developers/werner/mic/dat2qdf
developers/werner/mic/out2dat
developers/werner/mic/wolfson.sch
Log:
Simulation of the GTA02 microphone input circuit.
Added: developers/werner/mic/README
===================================================================
--- developers/werner/mic/README (rev 0)
+++ developers/werner/mic/README 2008-07-07 12:47:52 UTC (rev 4511)
@@ -0,0 +1,79 @@
+Circuit models
+--------------
+
+This directory contails three Qucs models of the microphone input
+circuit:
+
+- a6.sch
+
+ Original GTA02v6 circuit and audio settings.
+
+- a7.sch
+
+ The settings and circuit proposed for GTA02v7. The changes are as
+ follows:
+
+ - swap MIC2 and MIC2N (so the single-ended microphone moves from
+ MIC2 to MIC2N)
+ - increase C3013 (do we go all the way to 4.7uF ?)
+ - Vmid voltage dividers set to 50k/50k
+
+- wolfson.sch
+
+ This is the circuit as Wolfson have intended it to be. Differences
+ from a6.sch:
+
+ - C4304 is increased from 100nF to 1uF
+ - C3013 is increased from 100nF to 4.7uF
+ - MIC2N is connected to VREF (I removed C4303, since it has no
+ function in this case)
+ - Vmid voltage dividers set to 50k/50k
+
+
+Frequency sweep
+---------------
+
+In http://people.openmoko.org/werner/mic/, the files a6.ps, a7.ps, and
+wolfson.ps show gain and phase difference for a frequency sweep from 10Hz
+to 10kHz (the human ear picks up frequencies from 20Hz to 20kHz). We can
+see that a6 and a7 both act like high-pass filters, while the Wolfson
+design is fairly linear.
+
+
+Audio simulation
+----------------
+
+The big question is of course: what does it sound like ? The simulation
+can also be used to process a real-life audio sample. See file SIMULATE
+for this.
+
+I used a short sequence from the FGTH's "Two Tribes", with the voice
+sample from Patrick Allen. To better approximate the sound quality we'll
+actually need for GSM (and to make the simulation a bit less CPU-hungry)
+I reduced the sample rate to 20ksamples/s.
+
+The results are in https://people.internal.openmoko.org/werner/mic/
+(to make comparison easier, I've adjusted the amplitudes so that they
+all have about the same volume).
+
+orig.ogg is the signal at its original sample rate of 44.1ksamples/s.
+in.ogg is the signal used for the "microphone" input. (Amplified to
+sound roughly as loud as the rest.)
+
+Findings: a faint reduction of lower frequencies can be heard when
+comparing a6 and a7 to the Wolfson design, but all this is dominated
+by the effects of downsampling to 20ksamples/s. There are no other
+audible distortions.
+
+
+Model details
+-------------
+
+This is how the parameters were chosen:
+
+- the overall gain is 18dB
+- R1: dimensioned to obtain a 18dB gain, as a function of R2
+- R2: 18kOhm at 18dB is from the WM8753L data sheet, page 7 (Rmic2n)
+- R3: 163kOhm is from the data sheet (Rmic2)
+- R4 and R5 are given by the Vmid settings. Note that we used to have an
+ incorrect setting of 500kOhm/500kOhm in the past, as Andy discovered.
Added: developers/werner/mic/SIMULATE
===================================================================
--- developers/werner/mic/SIMULATE (rev 0)
+++ developers/werner/mic/SIMULATE 2008-07-07 12:47:52 UTC (rev 4511)
@@ -0,0 +1,56 @@
+Simulating processing of an audio stream:
+
+- pick the source, e.g.,
+
+ F="Frankie Goes To Hollywood - Two Tribes (Carnage\ Mix).mp3"
+
+- extract example, apply restrictions, and convert to the SoX .dat format.
+ E.g.,
+
+ sox "$F" -r 20000 -c 1 test.dat vol 0.2 trim 460 10
+
+ Restrictions:
+ - sample rate 20ksamples/s (-r 20000)
+ - mono (-c 1)
+ - reduce amplitude to 20% to simulate microphone input (vol 0.2)
+ - start at 460 seconds and extract 10 seconds (trim 460 10)
+
+- convert to the Qucs input file format:
+
+ ./dat2qdf test.dat >test.qdf
+
+- in Qucs, set up the simulation and generate the netlist:
+
+ - load the .sch file
+ - make a transient simulation with at least 4 steps per sample
+ - add a file-based voltage source reading test.qdf
+ - start the simulation (just to generate the netlist)
+ - abort the simulation
+
+- get the netlist (let's call this experiment "wolfson"):
+
+ cp ~/.qucs/netlist.txt wolfson.net
+
+- run the circuit simulation:
+
+ qucsator -b -i wolfson.net -o wolfson.qdat
+
+- convert the simulation data to a SoX .dat file
+
+ ./out2dat -a -o 1.67 wolfson.qdat >wolfson.dat
+
+ The first number sets the amplification. The second number is how
+ many seconds of the input we skip. (To allow for the circuit to
+ settle.)
+
+- plat back with SoX:
+
+ play wolfson.dat
+
+ or, to adjust the volume, e.g.,
+
+ play wolfson.dat vol 2
+
+- convert to Ogg:
+
+ sox wolfson.dat wolfson.ogg
Added: developers/werner/mic/a6.sch
===================================================================
--- developers/werner/mic/a6.sch (rev 0)
+++ developers/werner/mic/a6.sch 2008-07-07 12:47:52 UTC (rev 4511)
@@ -0,0 +1,101 @@
+<Qucs Schematic 0.0.13>
+<Properties>
+ <View=-214,-40,1426,928,1,0,0>
+ <Grid=10,10,1>
+ <DataSet=a6.dat>
+ <DataDisplay=a6.dpl>
+ <OpenDisplay=1>
+ <showFrame=0>
+ <FrameText0=Title>
+ <FrameText1=Drawn By:>
+ <FrameText2=Date:>
+ <FrameText3=Revision:>
+</Properties>
+<Symbol>
+</Symbol>
+<Components>
+ <GND * 1 -40 600 0 0 0 0>
+ <R R2 1 390 380 -26 -59 0 2 "18 kOhm" 1 "26.85" 0 "0.0" 0 "0.0" 0 "26.85" 0
"european" 0>
+ <OpAmp OP2 1 700 400 -26 -86 1 0 "1e6" 1 "15 V" 0>
+ <Vac V1 1 -40 550 18 -26 0 1 "0.1 V" 1 "1 kHz" 0 "0" 0 "0" 0>
+ <R R1 1 710 280 -26 -59 1 0 "125 kOhm" 1 "26.85" 0 "0.0" 0 "0.0" 0 "26.85" 0
"european" 0>
+ <GND * 1 1220 290 0 0 0 0>
+ <Vdc V2 1 1220 210 18 -26 0 1 "3.3 V" 1>
+ <GND * 1 1100 300 0 0 0 0>
+ <OpAmp OP3 1 420 160 -26 42 1 2 "1e6" 1 "15 V" 0>
+ <GND * 1 880 260 0 0 0 0>
+ <R R3 1 520 230 15 -26 0 1 " 163 kOhm" 1 "26.85" 0 "0.0" 0 "0.0" 0 "26.85" 0
"european" 0>
+ <Eqn Eqn1 1 -130 700 -31 17 0 0 "db=dB(Vout.v/V1.U)" 1 "ph=phase(Vout.v)" 1
"yes" 0>
+ <C C4304 1 70 420 -26 17 1 2 "100 nF" 1 "1.66" 1 "polar" 0>
+ <C C3013 1 1100 210 17 -26 1 3 "100 nF" 1 "1.67" 1 "polar" 0>
+ <C C4305 1 70 380 -26 -83 0 2 "100 nF" 1 "1.66" 1 "polar" 0>
+ <GND * 1 -140 600 0 0 0 0>
+ <R R4 1 880 90 15 -26 0 1 "500 kOhm" 1 "26.85" 0 "0.0" 0 "0.0" 0 "26.85" 0
"european" 0>
+ <R R5 1 880 190 15 -26 0 1 "500 kOhm" 1 "26.85" 0 "0.0" 0 "0.0" 0 "26.85" 0
"european" 0>
+ <.AC AC1 1 20 70 0 44 0 0 "log" 1 "10 Hz" 1 "10 kHz" 1 "1000" 1 "no" 0>
+ <.DC DC1 1 -160 -20 0 44 0 0 "26.85" 0 "0.001" 0 "1 pA" 0 "1 uV" 0 "no" 0
"150" 0 "no" 0 "none" 0 "CroutLU" 0>
+ <Vfile V3 0 80 550 18 -26 0 1
"/home/moko/svn.openmoko.org/developers/werner/mic/test.qdf" 1 "cubic" 0 "no" 0
"1" 0 "0" 0>
+ <.TR TR1 0 -160 60 0 73 0 0 "lin" 1 "0" 1 "10 s" 1 "80000" 1 "AdamsMoulton"
1 "6" 1 "1 ns" 0 "1e-16" 0 "150" 0 "0.001" 0 "1 pA" 0 "1 uV" 0 "26.85" 0 "1e-3"
0 "1e-6" 0 "1" 0 "CroutLU" 0 "no" 0 "yes" 0 "0" 0>
+</Components>
+<Wires>
+ <-40 600 -40 620 "" 0 0 0 "">
+ <-40 580 -40 600 "" 0 0 0 "">
+ <610 380 670 380 "" 0 0 0 "">
+ <610 280 610 380 "" 0 0 0 "">
+ <610 280 680 280 "" 0 0 0 "">
+ <740 280 800 280 "" 0 0 0 "">
+ <740 400 800 400 "" 0 0 0 "">
+ <800 400 850 400 "" 0 0 0 "">
+ <800 280 800 400 "" 0 0 0 "">
+ <-40 420 -40 520 "" 0 0 0 "">
+ <-40 420 40 420 "" 0 0 0 "">
+ <100 420 520 420 "" 0 0 0 "">
+ <1220 240 1220 290 "" 0 0 0 "">
+ <1100 240 1100 300 "" 0 0 0 "">
+ <1100 140 1100 180 "" 0 0 0 "">
+ <180 160 340 160 "" 0 0 0 "">
+ <340 160 340 260 "" 0 0 0 "">
+ <340 260 480 260 "" 0 0 0 "">
+ <480 180 480 260 "" 0 0 0 "">
+ <450 180 480 180 "" 0 0 0 "">
+ <450 140 520 140 "" 0 0 0 "">
+ <520 140 880 140 "" 0 0 0 "">
+ <520 140 520 200 "" 0 0 0 "">
+ <420 380 610 380 "" 0 0 0 "">
+ <1220 20 1220 180 "" 0 0 0 "">
+ <880 20 1220 20 "" 0 0 0 "">
+ <880 140 1100 140 "" 0 0 0 "">
+ <880 120 880 140 "" 0 0 0 "">
+ <880 20 880 60 "" 0 0 0 "">
+ <520 420 670 420 "" 0 0 0 "">
+ <520 260 520 420 "" 0 0 0 "">
+ <880 140 880 160 "" 0 0 0 "">
+ <880 220 880 260 "" 0 0 0 "">
+ <100 380 360 380 "" 0 0 0 "">
+ <-140 380 -140 600 "" 0 0 0 "">
+ <-140 380 40 380 "" 0 0 0 "">
+ <340 160 380 160 "" 0 0 0 "">
+ <-40 580 80 580 "" 0 0 0 "">
+ <-40 520 80 520 "" 0 0 0 "">
+ <850 400 850 400 "Vout" 870 350 0 "">
+ <520 140 520 140 "Vmid" 560 80 0 "">
+</Wires>
+<Diagrams>
+ <Rect 118 781 362 184 3 #c0c0c0 1 10 1 0 1000 10000 1 10 1 30 1 -1 0.5 1 315
0 225 "" "" "">
+ <"db" #0000ff 0 3 0 0 0>
+ </Rect>
+ <Rect 540 784 357 184 3 #c0c0c0 1 10 1 0 2000 10000 1 -6.02409 20 68.6681 1
-1 0.5 1 315 0 225 "" "" "">
+ <"ph" #0000ff 0 3 0 0 0>
+ </Rect>
+ <Rect 976 784 362 184 3 #c0c0c0 1 10 0 10 2000 10000 1 -0.00106631 0.005
0.012901 1 -1 1 1 315 0 225 "" "" "">
+ <"Vmid.v" #0000ff 0 3 0 0 0>
+ </Rect>
+</Diagrams>
+<Paintings>
+ <Text 240 350 12 #000000 0 "MIC2N">
+ <Text 250 430 12 #000000 0 "MIC2">
+ <Text 250 130 12 #000000 0 "VREF">
+ <Text 1030 110 12 #000000 0 "VMID">
+ <Text 1030 -10 12 #000000 0 "AVDD">
+ <Rectangle 300 -20 720 500 #00aa00 2 2 #c0c0c0 1 0>
+</Paintings>
Added: developers/werner/mic/a7.sch
===================================================================
--- developers/werner/mic/a7.sch (rev 0)
+++ developers/werner/mic/a7.sch 2008-07-07 12:47:52 UTC (rev 4511)
@@ -0,0 +1,101 @@
+<Qucs Schematic 0.0.13>
+<Properties>
+ <View=-214,-40,1426,928,1,0,0>
+ <Grid=10,10,1>
+ <DataSet=a7.dat>
+ <DataDisplay=a7.dpl>
+ <OpenDisplay=1>
+ <showFrame=0>
+ <FrameText0=Title>
+ <FrameText1=Drawn By:>
+ <FrameText2=Date:>
+ <FrameText3=Revision:>
+</Properties>
+<Symbol>
+</Symbol>
+<Components>
+ <GND * 1 -40 600 0 0 0 0>
+ <R R2 1 390 380 -26 -59 0 2 "18 kOhm" 1 "26.85" 0 "0.0" 0 "0.0" 0 "26.85" 0
"european" 0>
+ <OpAmp OP2 1 700 400 -26 -86 1 0 "1e6" 1 "15 V" 0>
+ <Vac V1 1 -40 550 18 -26 0 1 "0.1 V" 1 "1 kHz" 0 "0" 0 "0" 0>
+ <R R1 1 710 280 -26 -59 1 0 "125 kOhm" 1 "26.85" 0 "0.0" 0 "0.0" 0 "26.85" 0
"european" 0>
+ <GND * 1 1220 290 0 0 0 0>
+ <Vdc V2 1 1220 210 18 -26 0 1 "3.3 V" 1>
+ <GND * 1 1100 300 0 0 0 0>
+ <OpAmp OP3 1 420 160 -26 42 1 2 "1e6" 1 "15 V" 0>
+ <GND * 1 880 260 0 0 0 0>
+ <R R3 1 520 230 15 -26 0 1 " 163 kOhm" 1 "26.85" 0 "0.0" 0 "0.0" 0 "26.85" 0
"european" 0>
+ <Eqn Eqn1 1 -130 700 -31 17 0 0 "db=dB(Vout.v/V1.U)" 1 "ph=phase(Vout.v)" 1
"yes" 0>
+ <C C4305 1 70 380 -26 -83 0 2 "100 nF" 1 "1.66" 1 "polar" 0>
+ <GND * 1 -140 600 0 0 0 0>
+ <.AC AC1 1 20 70 0 44 0 0 "log" 1 "10 Hz" 1 "10 kHz" 1 "1000" 1 "no" 0>
+ <.DC DC1 1 -160 -20 0 44 0 0 "26.85" 0 "0.001" 0 "1 pA" 0 "1 uV" 0 "no" 0
"150" 0 "no" 0 "none" 0 "CroutLU" 0>
+ <Vfile V3 0 80 550 18 -26 0 1
"/home/moko/svn.openmoko.org/developers/werner/mic/test.qdf" 1 "cubic" 0 "no" 0
"1" 0 "0" 0>
+ <.TR TR1 0 -160 60 0 73 0 0 "lin" 1 "0" 1 "10 s" 1 "800000" 1 "AdamsMoulton"
1 "6" 1 "1 ns" 0 "1e-16" 0 "150" 0 "0.001" 0 "1 pA" 0 "1 uV" 0 "26.85" 0 "1e-3"
0 "1e-6" 0 "1" 0 "CroutLU" 0 "no" 0 "yes" 0 "0" 0>
+ <R R5 1 880 190 15 -26 0 1 "50 kOhm" 1 "26.85" 0 "0.0" 0 "0.0" 0 "26.85" 0
"european" 0>
+ <R R4 1 880 90 15 -26 0 1 "50 kOhm" 1 "26.85" 0 "0.0" 0 "0.0" 0 "26.85" 0
"european" 0>
+ <C C3013 1 1100 210 17 -26 1 3 "4.7 uF" 1 "1.67" 1 "polar" 0>
+ <C C4304 1 70 420 -26 17 1 2 "100 nF" 1 "1.66" 1 "polar" 0>
+</Components>
+<Wires>
+ <-40 600 -40 620 "" 0 0 0 "">
+ <-40 580 -40 600 "" 0 0 0 "">
+ <610 380 670 380 "" 0 0 0 "">
+ <610 280 610 380 "" 0 0 0 "">
+ <610 280 680 280 "" 0 0 0 "">
+ <740 280 800 280 "" 0 0 0 "">
+ <740 400 800 400 "" 0 0 0 "">
+ <800 400 850 400 "" 0 0 0 "">
+ <800 280 800 400 "" 0 0 0 "">
+ <100 420 520 420 "" 0 0 0 "">
+ <1220 240 1220 290 "" 0 0 0 "">
+ <1100 240 1100 300 "" 0 0 0 "">
+ <1100 140 1100 180 "" 0 0 0 "">
+ <180 160 340 160 "" 0 0 0 "">
+ <340 160 340 260 "" 0 0 0 "">
+ <340 260 480 260 "" 0 0 0 "">
+ <480 180 480 260 "" 0 0 0 "">
+ <450 180 480 180 "" 0 0 0 "">
+ <450 140 520 140 "" 0 0 0 "">
+ <520 140 880 140 "" 0 0 0 "">
+ <520 140 520 200 "" 0 0 0 "">
+ <420 380 610 380 "" 0 0 0 "">
+ <1220 20 1220 180 "" 0 0 0 "">
+ <880 20 1220 20 "" 0 0 0 "">
+ <880 140 1100 140 "" 0 0 0 "">
+ <880 120 880 140 "" 0 0 0 "">
+ <880 20 880 60 "" 0 0 0 "">
+ <520 420 670 420 "" 0 0 0 "">
+ <520 260 520 420 "" 0 0 0 "">
+ <880 140 880 160 "" 0 0 0 "">
+ <880 220 880 260 "" 0 0 0 "">
+ <340 160 380 160 "" 0 0 0 "">
+ <-40 580 80 580 "" 0 0 0 "">
+ <-40 520 80 520 "" 0 0 0 "">
+ <100 380 360 380 "" 0 0 0 "">
+ <-40 380 -40 520 "" 0 0 0 "">
+ <-40 380 40 380 "" 0 0 0 "">
+ <-140 420 -140 600 "" 0 0 0 "">
+ <-140 420 40 420 "" 0 0 0 "">
+ <850 400 850 400 "Vout" 870 350 0 "">
+ <520 140 520 140 "Vmid" 560 80 0 "">
+</Wires>
+<Diagrams>
+ <Rect 118 781 362 184 3 #c0c0c0 1 10 1 0 1000 10000 1 10 1 30 1 -1 0.5 1 315
0 225 "" "" "">
+ <"db" #0000ff 0 3 0 0 0>
+ </Rect>
+ <Rect 540 784 357 184 3 #c0c0c0 1 10 1 0 2000 10000 1 -6.02409 20 68.6681 1
-1 0.5 1 315 0 225 "" "" "">
+ <"ph" #0000ff 0 3 0 0 0>
+ </Rect>
+ <Rect 976 784 362 184 3 #c0c0c0 1 10 0 10 2000 10000 1 -0.00106631 0.005
0.012901 1 -1 1 1 315 0 225 "" "" "">
+ <"Vmid.v" #0000ff 0 3 0 0 0>
+ </Rect>
+</Diagrams>
+<Paintings>
+ <Text 240 350 12 #000000 0 "MIC2N">
+ <Text 250 430 12 #000000 0 "MIC2">
+ <Text 250 130 12 #000000 0 "VREF">
+ <Text 1030 110 12 #000000 0 "VMID">
+ <Text 1030 -10 12 #000000 0 "AVDD">
+ <Rectangle 300 -20 720 500 #00aa00 2 2 #c0c0c0 1 0>
+</Paintings>
Added: developers/werner/mic/dat2qdf
===================================================================
--- developers/werner/mic/dat2qdf (rev 0)
+++ developers/werner/mic/dat2qdf 2008-07-07 12:47:52 UTC (rev 4511)
@@ -0,0 +1,2 @@
+#!/usr/bin/awk -f
+!/^;/ { print $1 "," $2 }
Property changes on: developers/werner/mic/dat2qdf
___________________________________________________________________
Name: svn:executable
+ *
Added: developers/werner/mic/out2dat
===================================================================
--- developers/werner/mic/out2dat (rev 0)
+++ developers/werner/mic/out2dat 2008-07-07 12:47:52 UTC (rev 4511)
@@ -0,0 +1,71 @@
+#!/usr/bin/perl
+
+
+sub usage
+{
+ print STDERR "usage: $0 [-a] [-f factor] [-o offset] [-s skip] file ...\n";
+ print STDERR " -a autoscale\n";
+ print STDERR " -f factor multiply with factor\n";
+ print STDERR " -o offset subtract DC offset\n";
+ print STDERR " -s skip skip that many seconds\n";
+ exit(1);
+}
+
+
+while ($ARGV[0] =~ /^-/) {
+ $opt = shift @ARGV;
+ if ($opt eq "-a") {
+ $auto = 1;
+ }
+ elsif ($opt eq "-f") {
+ $f = shift @ARGV;
+ }
+ elsif ($opt eq "-o") {
+ $offset = shift @ARGV;
+ }
+ elsif ($opt eq "-s") {
+ $skip = shift @ARGV;
+ }
+ else {
+ &usage;
+ }
+}
+
+&usage if $auto && defined $factor;
+
+while (<>) {
+ chop;
+ if (/<indep time \d+>/) {
+ *a = *t;
+ next;
+ }
+ elsif (/<dep Vout.Vt time>/) {
+ *a = *v;
+ next;
+ }
+ elsif (/</) {
+ undef *a;
+ }
+ next unless defined *a;
+ s/^\s*//;
+ push(@a, $_);
+}
+print "; Sample Rate ", 1/($t[1]-$t[0]), "\n";
+if (defined $skip) {
+ while ($t[0] < $skip) {
+ pop(@t);
+ pop(@v);
+ }
+}
+if ($auto) {
+ $f = 0;
+ for (@v) {
+ $f = abs($_-$offset) if $f < abs($_-$offset);
+ }
+ $f = 1/$f;
+ print STDERR "f=$f\n";
+}
+print "; Channels 1\n";
+for ($i = 0; $i != @t; $i++) {
+ print $t[$i], " ", ($v[$i]-$offset)*$f, "\n";
+}
Property changes on: developers/werner/mic/out2dat
___________________________________________________________________
Name: svn:executable
+ *
Added: developers/werner/mic/wolfson.sch
===================================================================
--- developers/werner/mic/wolfson.sch (rev 0)
+++ developers/werner/mic/wolfson.sch 2008-07-07 12:47:52 UTC (rev 4511)
@@ -0,0 +1,103 @@
+<Qucs Schematic 0.0.13>
+<Properties>
+ <View=-214,-40,1426,928,1,0,0>
+ <Grid=10,10,1>
+ <DataSet=wolfson.dat>
+ <DataDisplay=wolfson.dpl>
+ <OpenDisplay=1>
+ <showFrame=0>
+ <FrameText0=Title>
+ <FrameText1=Drawn By:>
+ <FrameText2=Date:>
+ <FrameText3=Revision:>
+</Properties>
+<Symbol>
+</Symbol>
+<Components>
+ <GND * 1 -40 600 0 0 0 0>
+ <R R2 1 390 380 -26 -59 0 2 "18 kOhm" 1 "26.85" 0 "0.0" 0 "0.0" 0 "26.85" 0
"european" 0>
+ <OpAmp OP2 1 700 400 -26 -86 1 0 "1e6" 1 "15 V" 0>
+ <Vac V1 1 -40 550 18 -26 0 1 "0.1 V" 1 "1 kHz" 0 "0" 0 "0" 0>
+ <R R1 1 710 280 -26 -59 1 0 "125 kOhm" 1 "26.85" 0 "0.0" 0 "0.0" 0 "26.85" 0
"european" 0>
+ <GND * 1 1220 290 0 0 0 0>
+ <Vdc V2 1 1220 210 18 -26 0 1 "3.3 V" 1>
+ <GND * 1 1100 300 0 0 0 0>
+ <OpAmp OP3 1 420 160 -26 42 1 2 "1e6" 1 "15 V" 0>
+ <GND * 1 880 260 0 0 0 0>
+ <R R3 1 520 230 15 -26 0 1 " 163 kOhm" 1 "26.85" 0 "0.0" 0 "0.0" 0 "26.85" 0
"european" 0>
+ <Eqn Eqn1 1 -130 700 -31 17 0 0 "db=dB(Vout.v/V1.U)" 1 "ph=phase(Vout.v)" 1
"yes" 0>
+ <C C4305 0 70 380 -26 -83 0 2 "100 nF" 1 "1.66" 1 "polar" 0>
+ <GND * 1 -140 600 0 0 0 0>
+ <.AC AC1 1 20 70 0 44 0 0 "log" 1 "10 Hz" 1 "10 kHz" 1 "1000" 1 "no" 0>
+ <.DC DC1 1 -160 -20 0 44 0 0 "26.85" 0 "0.001" 0 "1 pA" 0 "1 uV" 0 "no" 0
"150" 0 "no" 0 "none" 0 "CroutLU" 0>
+ <Vfile V3 0 80 550 18 -26 0 1
"/home/moko/svn.openmoko.org/developers/werner/mic/test.qdf" 1 "cubic" 0 "no" 0
"1" 0 "0" 0>
+ <R R5 1 880 190 15 -26 0 1 "50 kOhm" 1 "26.85" 0 "0.0" 0 "0.0" 0 "26.85" 0
"european" 0>
+ <R R4 1 880 90 15 -26 0 1 "50 kOhm" 1 "26.85" 0 "0.0" 0 "0.0" 0 "26.85" 0
"european" 0>
+ <C C3013 1 1100 210 17 -26 1 3 "4.7 uF" 1 "1.67" 1 "polar" 0>
+ <C C4304 1 70 420 -26 17 1 2 "1 uF" 1 "1.66" 1 "polar" 0>
+ <.TR TR1 0 -160 60 0 73 0 0 "lin" 1 "0" 1 "10 s" 1 "800000" 1 "AdamsMoulton"
1 "6" 1 "1 ns" 0 "1e-16" 0 "150" 0 "0.001" 0 "1 pA" 0 "1 uV" 0 "26.85" 0 "1e-3"
0 "1e-6" 0 "1" 0 "CroutLU" 0 "no" 0 "yes" 0 "0" 0>
+</Components>
+<Wires>
+ <-40 600 -40 620 "" 0 0 0 "">
+ <-40 580 -40 600 "" 0 0 0 "">
+ <610 380 670 380 "" 0 0 0 "">
+ <610 280 610 380 "" 0 0 0 "">
+ <610 280 680 280 "" 0 0 0 "">
+ <740 280 800 280 "" 0 0 0 "">
+ <740 400 800 400 "" 0 0 0 "">
+ <800 400 850 400 "" 0 0 0 "">
+ <800 280 800 400 "" 0 0 0 "">
+ <-40 420 -40 520 "" 0 0 0 "">
+ <-40 420 40 420 "" 0 0 0 "">
+ <100 420 520 420 "" 0 0 0 "">
+ <1220 240 1220 290 "" 0 0 0 "">
+ <1100 240 1100 300 "" 0 0 0 "">
+ <1100 140 1100 180 "" 0 0 0 "">
+ <180 160 340 160 "" 0 0 0 "">
+ <340 160 340 260 "" 0 0 0 "">
+ <340 260 480 260 "" 0 0 0 "">
+ <480 180 480 260 "" 0 0 0 "">
+ <450 180 480 180 "" 0 0 0 "">
+ <450 140 520 140 "" 0 0 0 "">
+ <520 140 880 140 "" 0 0 0 "">
+ <520 140 520 200 "" 0 0 0 "">
+ <420 380 610 380 "" 0 0 0 "">
+ <1220 20 1220 180 "" 0 0 0 "">
+ <880 20 1220 20 "" 0 0 0 "">
+ <880 140 1100 140 "" 0 0 0 "">
+ <880 120 880 140 "" 0 0 0 "">
+ <880 20 880 60 "" 0 0 0 "">
+ <520 420 670 420 "" 0 0 0 "">
+ <520 260 520 420 "" 0 0 0 "">
+ <880 140 880 160 "" 0 0 0 "">
+ <880 220 880 260 "" 0 0 0 "">
+ <-140 380 -140 600 "" 0 0 0 "">
+ <-140 380 40 380 "" 0 0 0 "">
+ <340 160 380 160 "" 0 0 0 "">
+ <-40 580 80 580 "" 0 0 0 "">
+ <-40 520 80 520 "" 0 0 0 "">
+ <180 380 360 380 "" 0 0 0 "">
+ <180 160 180 380 "" 0 0 0 "">
+ <100 380 180 380 "" 0 0 0 "">
+ <850 400 850 400 "Vout" 870 350 0 "">
+ <520 140 520 140 "Vmid" 560 80 0 "">
+</Wires>
+<Diagrams>
+ <Rect 118 781 362 184 3 #c0c0c0 1 10 1 0 1000 10000 1 10 1 30 1 -1 0.5 1 315
0 225 "" "" "">
+ <"db" #0000ff 0 3 0 0 0>
+ </Rect>
+ <Rect 540 784 357 184 3 #c0c0c0 1 10 1 0 2000 10000 1 -6.02409 20 68.6681 1
-1 0.5 1 315 0 225 "" "" "">
+ <"ph" #0000ff 0 3 0 0 0>
+ </Rect>
+ <Rect 976 784 362 184 3 #c0c0c0 1 10 0 10 2000 10000 1 -0.00106631 0.005
0.012901 1 -1 1 1 315 0 225 "" "" "">
+ <"Vmid.v" #0000ff 0 3 0 0 0>
+ </Rect>
+</Diagrams>
+<Paintings>
+ <Text 240 350 12 #000000 0 "MIC2N">
+ <Text 250 430 12 #000000 0 "MIC2">
+ <Text 250 130 12 #000000 0 "VREF">
+ <Text 1030 110 12 #000000 0 "VMID">
+ <Text 1030 -10 12 #000000 0 "AVDD">
+ <Rectangle 300 -20 720 500 #00aa00 2 2 #c0c0c0 1 0>
+</Paintings>
--- End Message ---
_______________________________________________
commitlog mailing list
commitlog@lists.openmoko.org
http://lists.openmoko.org/mailman/listinfo/commitlog
