Send commitlog mailing list submissions to
[email protected]
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. r4179 - developers/werner/neocon ([EMAIL PROTECTED])
2. r4180 - developers/werner/ahrt/host/usbtmc
([EMAIL PROTECTED])
3. r4181 - developers/werner/ahrt/host/usbtmc
([EMAIL PROTECTED])
4. r4182 -
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src
([EMAIL PROTECTED])
5. r4183 - developers/werner/bin ([EMAIL PROTECTED])
--- Begin Message ---
Author: werner
Date: 2008-03-08 20:41:39 +0100 (Sat, 08 Mar 2008)
New Revision: 4179
Modified:
developers/werner/neocon/neocon.c
Log:
neocon.c (main, bps_to_speed): the "-b bps" option was broken because we didn't
translate the data rate to a speed_t value. Now we do.
Modified: developers/werner/neocon/neocon.c
===================================================================
--- developers/werner/neocon/neocon.c 2008-03-07 10:28:09 UTC (rev 4178)
+++ developers/werner/neocon/neocon.c 2008-03-08 19:41:39 UTC (rev 4179)
@@ -32,10 +32,37 @@
static char *const *ttys;
static int num_ttys;
-static int bps = B115200;
+static speed_t speed = B115200;
static struct termios console, tty;
+static struct bps {
+ speed_t speed;
+ int bps;
+} bps_tab[] = {
+ { B300, 300 },
+ { B1200, 1200 },
+ { B2400, 2400 },
+ { B9600, 9600 },
+ { B19200, 19200 },
+ { B38400, 38400 },
+ { B115200, 115200 },
+ { 0, 0 }
+};
+
+
+static speed_t bps_to_speed(int bps)
+{
+ const struct bps *p;
+
+ for (p = bps_tab; p->bps; p++)
+ if (p->bps == bps)
+ return p->speed;
+ fprintf(stderr, "no such speed: %d bps\n", bps);
+ exit(1);
+}
+
+
static void make_raw(int fd, struct termios *old)
{
struct termios t;
@@ -52,11 +79,11 @@
t.c_iflag &= ~(IXON | IXOFF);
t.c_cflag |= CLOCAL;
t.c_cflag &= ~CRTSCTS;
- if (cfsetispeed(&t, bps) < 0) {
+ if (cfsetispeed(&t, speed) < 0) {
perror("cfsetispeed");
exit(1);
}
- if (cfsetospeed(&t, bps) < 0) {
+ if (cfsetospeed(&t, speed) < 0) {
perror("cfsetospeed");
exit(1);
}
@@ -168,7 +195,7 @@
int main(int argc, char *const *argv)
{
char *end;
- int c;
+ int c, bps;
int fd = -1;
int throttle_us = 0;
int throttle = 0;
@@ -179,6 +206,7 @@
bps = strtoul(optarg, &end, 0);
if (*end)
usage(*argv);
+ speed = bps_to_speed(bps);
break;
case 't':
throttle_us = strtoul(optarg, &end, 0)*1000;
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2008-03-08 22:00:02 +0100 (Sat, 08 Mar 2008)
New Revision: 4180
Modified:
developers/werner/ahrt/host/usbtmc/README
Log:
Fixed a few silly typos.
Modified: developers/werner/ahrt/host/usbtmc/README
===================================================================
--- developers/werner/ahrt/host/usbtmc/README 2008-03-08 19:41:39 UTC (rev
4179)
+++ developers/werner/ahrt/host/usbtmc/README 2008-03-08 21:00:02 UTC (rev
4180)
@@ -45,7 +45,7 @@
The option "-t seconds" sets a timeout for responses. If the timeout is
-exceeded, usbtmc will print and error and exit. This can be changed with
+exceeded, usbtmc will print an error and exit. This can be changed with
the option -r, which makes usbtmc resend the last command and wait again
for a response.
@@ -62,7 +62,7 @@
"foo""foo"
-The option -D enabled debugging output.
+The option -D enables debugging output.
Data copy bug
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2008-03-08 22:35:40 +0100 (Sat, 08 Mar 2008)
New Revision: 4181
Modified:
developers/werner/ahrt/host/usbtmc/README
developers/werner/ahrt/host/usbtmc/usbtmc.c
Log:
README: described multiple trigger bug (?) and work-around
README: corrected description of -r (it only repeats the last command, not the
entire sequence)
usbtmc.c (main): new option -e to repeat the last command indefinitely
Modified: developers/werner/ahrt/host/usbtmc/README
===================================================================
--- developers/werner/ahrt/host/usbtmc/README 2008-03-08 21:00:02 UTC (rev
4180)
+++ developers/werner/ahrt/host/usbtmc/README 2008-03-08 21:35:40 UTC (rev
4181)
@@ -52,9 +52,13 @@
By default, usbtmc waits forever for a response.
-Reponses normally end with a newline. This can be suppressed with the
-option -n. Note that this applies to all responses. E.g.,
+The option -e repeats the last command indefinitely. (See below.)
+
+Reponses are normally printed with a newline at their end. This can be
+suppressed with the option -n. Note that this applies to all responses.
+E.g.,
+
usbtmc -n 'DISP:TEXT "foo"' 'DISP:TEXT?' 'DISP:TEXT?'
will yield
@@ -76,10 +80,21 @@
transactions. Executing commands does not seem to be affected, e.g., a
loop of SYST:BEEP will not have pauses.
-As a work-around, we have the option -r that retries the entire command
-sequence if a timeout occurs.
+As a work-around, we have the option -r that retries the last command if
+a timeout occurs.
+Multiple trigger bug
+--------------------
+
+The PicoTest M3500 does not seem to respond to multiple triggers
+(TRIG:COUN <n> or TRIG:COUN INF) like a Fluke 8845A does, i.e., it only
+executes the trigger once.
+
+As a work-around, the last command can be repeated indefinitely with the
+option -e. E.g., usbtmc -e ... 'READ?'
+
+
Known problems and missing features
-----------------------------------
Modified: developers/werner/ahrt/host/usbtmc/usbtmc.c
===================================================================
--- developers/werner/ahrt/host/usbtmc/usbtmc.c 2008-03-08 21:00:02 UTC (rev
4180)
+++ developers/werner/ahrt/host/usbtmc/usbtmc.c 2008-03-08 21:35:40 UTC (rev
4181)
@@ -426,10 +426,11 @@
static void usage(const char *name)
{
fprintf(stderr,
-"usage: %s [-D] [-r] [-n] [-f] [-t timeout] [-v vendor_id]\n"
+"usage: %s [-D] [-r] [-n] [-e] [-f] [-t timeout] [-v vendor_id]\n"
" %*s [-p product_id] [-b bus_number] [-d device_number] command ...\n\n"
" -b bus_number USB bus number (8 bit)\n"
" -d device_number USB device number (8 bit)\n"
+" -e repeat last command endlessly\n"
" -D enable debug output\n"
" -n do not end reponses with a newline\n"
" -p product_id USB product identifier (16 bit)\n"
@@ -449,9 +450,9 @@
int c, i;
char *end;
unsigned long tmp;
- int nl = 1, retry = 0;
+ int nl = 1, retry = 0, endless = 0;
- while ((c = getopt(argc, argv, "b:d:Dnp:rt:v:")) != EOF)
+ while ((c = getopt(argc, argv, "b:d:eDnp:rt:v:")) != EOF)
switch (c) {
case 'b':
tmp = strtoul(optarg, &end, 0);
@@ -468,6 +469,9 @@
case 'D':
debug = 1;
break;
+ case 'e':
+ endless = 1;
+ break;
case 'n':
nl = 0;
break;
@@ -515,6 +519,10 @@
buf[got] = 0;
printf("%s%s", buf, nl ? "\n" : "");
}
+ if (endless && i == argc-1) {
+ fflush(stdout);
+ goto again;
+ }
}
return 0;
--- End Message ---
--- Begin Message ---
Author: erin_yueh
Date: 2008-03-09 05:50:55 +0100 (Sun, 09 Mar 2008)
New Revision: 4182
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c
Log:
openmoko-messages2: fix the category filter for bug#1246 (Erin Yueh)
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c
2008-03-08 21:35:40 UTC (rev 4181)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c
2008-03-09 04:50:55 UTC (rev 4182)
@@ -754,7 +754,7 @@
moko_search_bar_get_combo_box (MOKO_SEARCH_BAR (
data->notes_search)));
- if ((type <= ALL_NOTES) || (!data->author_uid)) return TRUE;
+ if ((type <= ALL_NOTES)/* || (!data->author_uid)*/) return TRUE;
gtk_tree_model_get (model, iter,
JANA_GTK_NOTE_STORE_COL_CATEGORIES, &categories, -1);
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2008-03-09 11:53:36 +0100 (Sun, 09 Mar 2008)
New Revision: 4183
Modified:
developers/werner/bin/layout4
Log:
layout4: added a layout for the 1024x600 resolution
Modified: developers/werner/bin/layout4
===================================================================
--- developers/werner/bin/layout4 2008-03-09 04:50:55 UTC (rev 4182)
+++ developers/werner/bin/layout4 2008-03-09 10:53:36 UTC (rev 4183)
@@ -7,6 +7,14 @@
RES="`xdpyinfo | awk '/dimensions:/{print $2}' | sed 1q`"
case $RES in
+ 1024x600)
+ X1=80x27+0+0
+ X2=80x27+0-0
+ X3=80x26+430+7
+ X4=80x27+428-0
+ X5=80x24-0+58
+ X6=80x24-0-0
+ ;;
1280x1024)
FONT=5x7
X1=80x57+0+157
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
