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
commitlog-requ...@lists.openmoko.org
You can reach the person managing the list at
commitlog-ow...@lists.openmoko.org
When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:
1. r5425 - trunk/eda/fped (wer...@docs.openmoko.org)
2. r5426 - developers/werner/myroot (wer...@docs.openmoko.org)
3. r5427 - trunk/eda/fped (wer...@docs.openmoko.org)
4. r5428 - trunk/eda/fped (wer...@docs.openmoko.org)
5. r5429 - in trunk/gta02-core: expanded scripts
(wer...@docs.openmoko.org)
6. r5430 - trunk/gta02-core/kicad-patches (wer...@docs.openmoko.org)
--- Begin Message ---
Author: werner
Date: 2009-08-12 16:44:17 +0200 (Wed, 12 Aug 2009)
New Revision: 5425
Modified:
trunk/eda/fped/README
trunk/eda/fped/gui_canvas.c
trunk/eda/fped/gui_frame.c
trunk/eda/fped/gui_frame.h
trunk/eda/fped/inst.c
Log:
- when selecting an object via the item list, make its frame active
- having variables and items on the screen at the same time was too much. We
can now toggle with "/" while the canvas has the focus. (This needs better
controls.)
Modified: trunk/eda/fped/README
===================================================================
--- trunk/eda/fped/README 2009-08-12 11:26:59 UTC (rev 5424)
+++ trunk/eda/fped/README 2009-08-12 14:44:17 UTC (rev 5425)
@@ -402,6 +402,7 @@
* zoom and center to extents
# zoom and center to currently active frame instance
U undelete the previously deleted object
+/ Switch between variable and item display.
Canvas
Modified: trunk/eda/fped/gui_canvas.c
===================================================================
--- trunk/eda/fped/gui_canvas.c 2009-08-12 11:26:59 UTC (rev 5424)
+++ trunk/eda/fped/gui_canvas.c 2009-08-12 14:44:17 UTC (rev 5425)
@@ -349,6 +349,13 @@
if (undelete())
change_world();
break;
+ case '/':
+{
+/* @@@ find a better place for this */
+extern int show_vars;
+ show_vars = !show_vars;
+change_world();
+}
}
return TRUE;
}
Modified: trunk/eda/fped/gui_frame.c
===================================================================
--- trunk/eda/fped/gui_frame.c 2009-08-12 11:26:59 UTC (rev 5424)
+++ trunk/eda/fped/gui_frame.c 2009-08-12 14:44:17 UTC (rev 5425)
@@ -30,6 +30,9 @@
#include "gui_frame.h"
+int show_vars = 1;
+
+
/* ----- popup dispatcher -------------------------------------------------- */
@@ -1003,7 +1006,7 @@
static GtkWidget *build_items(struct frame *frame)
{
- GtkWidget *hbox, *tab;
+ GtkWidget *vbox, *hbox, *tab;
struct order *order, *item;
struct vec *vec;
struct obj *obj;
@@ -1017,7 +1020,11 @@
if (obj->type != ot_meas)
n++;
+ vbox = gtk_vbox_new(FALSE, 0);
+ add_sep(vbox, 3);
+
hbox = gtk_hbox_new(FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
tab = gtk_table_new(n, 2, FALSE);
gtk_box_pack_start(GTK_BOX(hbox), tab, FALSE, FALSE, 0);
@@ -1043,13 +1050,13 @@
}
free(order);
- return hbox;
+ return vbox;
}
static GtkWidget *build_meas(struct frame *frame)
{
- GtkWidget *hbox, *tab;
+ GtkWidget *vbox, *hbox, *tab;
struct obj *obj;
int n;
char *s;
@@ -1059,7 +1066,11 @@
if (obj->type == ot_meas)
n++;
+ vbox = gtk_vbox_new(FALSE, 0);
+ add_sep(vbox, 3);
+
hbox = gtk_hbox_new(FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
tab = gtk_table_new(n, 2, FALSE);
gtk_box_pack_start(GTK_BOX(hbox), tab, FALSE, FALSE, 0);
@@ -1074,7 +1085,7 @@
n++;
}
- return hbox;
+ return vbox;
}
@@ -1277,7 +1288,7 @@
hbox = gtk_hbox_new(FALSE, 0);
- tab = gtk_table_new(n*2+3, 3, FALSE);
+ tab = gtk_table_new(n*2+3, 2, FALSE);
gtk_table_set_row_spacings(GTK_TABLE(tab), 1);
gtk_table_set_col_spacings(GTK_TABLE(tab), 1);
@@ -1297,24 +1308,24 @@
gtk_table_attach_defaults(GTK_TABLE(tab), refs,
1, 2, n*2+1, n*2+2);
- vars = build_vars(frame);
- gtk_table_attach_defaults(GTK_TABLE(tab), vars,
- 1, 2, n*2+2, n*2+3);
+ if (show_vars) {
+ vars = build_vars(frame);
+ gtk_table_attach_defaults(GTK_TABLE(tab), vars,
+ 1, 2, n*2+2, n*2+3);
+ } else {
+ items = build_items(frame);
+ gtk_table_attach_defaults(GTK_TABLE(tab), items,
+ 1, 2, n*2+2, n*2+3);
+ }
- items = build_items(frame);
- gtk_table_attach_defaults(GTK_TABLE(tab), items,
- 2, 3, n*2+2, n*2+3);
-
n++;
}
- label = label_in_box_new(" ");
- gtk_table_attach_defaults(GTK_TABLE(tab), box_of_label(label),
- 2, 3, n*2+1, n*2+2);
-
- meas = build_meas(root_frame);
- gtk_table_attach_defaults(GTK_TABLE(tab), meas,
- 2, 3, n*2+2, n*2+3);
+ if (!show_vars) {
+ meas = build_meas(root_frame);
+ gtk_table_attach_defaults(GTK_TABLE(tab), meas,
+ 1, 2, n*2+2, n*2+3);
+ }
gtk_widget_show_all(hbox);
}
Modified: trunk/eda/fped/gui_frame.h
===================================================================
--- trunk/eda/fped/gui_frame.h 2009-08-12 11:26:59 UTC (rev 5424)
+++ trunk/eda/fped/gui_frame.h 2009-08-12 14:44:17 UTC (rev 5425)
@@ -17,6 +17,9 @@
#include <gtk/gtk.h>
+extern int show_vars;
+
+
void make_popups(void);
void select_frame(struct frame *frame);
Modified: trunk/eda/fped/inst.c
===================================================================
--- trunk/eda/fped/inst.c 2009-08-12 11:26:59 UTC (rev 5424)
+++ trunk/eda/fped/inst.c 2009-08-12 14:44:17 UTC (rev 5425)
@@ -303,6 +303,8 @@
{
struct inst *inst;
+ if (vec->frame != active_frame)
+ select_frame(vec->frame);
for (inst = insts[ip_vec]; inst; inst = inst->next)
if (inst->vec == vec && inst->active) {
inst_deselect();
@@ -318,6 +320,8 @@
enum inst_prio prio;
struct inst *inst;
+ if (obj->frame != active_frame)
+ select_frame(obj->frame);
FOR_INSTS_DOWN(prio, inst)
if (inst->obj && inst->obj == obj && inst->active) {
inst_deselect();
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2009-08-12 17:42:43 +0200 (Wed, 12 Aug 2009)
New Revision: 5426
Modified:
developers/werner/myroot/README
Log:
Call Qemu by its real name.
Modified: developers/werner/myroot/README
===================================================================
--- developers/werner/myroot/README 2009-08-12 14:44:17 UTC (rev 5425)
+++ developers/werner/myroot/README 2009-08-12 15:42:43 UTC (rev 5426)
@@ -159,4 +159,4 @@
Ideally, myroot would run a proper chroot'ed environment for the
post-processing script, and maybe even enlist the help of something like
-qmu to run ARM binaries.
+Qemu to run ARM binaries.
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2009-08-12 19:01:40 +0200 (Wed, 12 Aug 2009)
New Revision: 5427
Modified:
trunk/eda/fped/dump.c
trunk/eda/fped/fbga.fpd
trunk/eda/fped/gui_frame.c
trunk/eda/fped/sc89.fpd
Log:
- reduced padding around item lines
- item ordering heuristics failed to properly use "."
- updated description of "need" in dump.c
- saved fbga.fpd and sc89.fpd with new ordering
Modified: trunk/eda/fped/dump.c
===================================================================
--- trunk/eda/fped/dump.c 2009-08-12 15:42:43 UTC (rev 5426)
+++ trunk/eda/fped/dump.c 2009-08-12 17:01:40 UTC (rev 5427)
@@ -45,27 +45,22 @@
/*
- * "need" operates in two modes:
+ * If "prev" is non-NULL, we're looking for objects that need to be put after
+ * the current vector (in "prev"). Only those objects need to be put there
+ * that have at least one base that isn't the frame's origin.
*
- * - if "prev" is non-NULL, we're looking for objects that need to be put after
- * the current vector (in "prev"). Only those objects need to be put there
- * that have at least one base that isn't the frame's origin or already has a
- * name.
- *
- * - if "prev" is NULL, we're at the end of the frame. We have already used all
- * the . references we could, so now we have to find out which objects
- * haven't been dumped yet. "need" still returns the ones that had a need to
- * be dumped. Again, that's those that have at least one possible "." base.
- * Since this "." base will have been used by now, the object must have been
- * dumped.
+ * We could also make an exception for manually named vectors, but we get
+ * better clustering without.
*/
static int need(const struct vec *base, const struct vec *prev)
{
if (!base)
return 0;
- if (base->name)
+#if 0
+ if (base->name && *base->name != '_')
return 0;
+#endif
if (prev)
return base == prev;
return 1;
@@ -79,10 +74,12 @@
static int later(const struct vec *base, const struct vec *prev)
{
- while (prev) {
+ while (1) {
+ prev = prev->next;
+ if (!prev)
+ break;
if (base == prev)
return 1;
- prev = prev->next;
}
return 0;
}
Modified: trunk/eda/fped/fbga.fpd
===================================================================
--- trunk/eda/fped/fbga.fpd 2009-08-12 15:42:43 UTC (rev 5426)
+++ trunk/eda/fped/fbga.fpd 2009-08-12 17:01:40 UTC (rev 5427)
@@ -12,7 +12,7 @@
__0: vec @(col*e-Px/2, row*-e-Py/2)
__1: vec .(0mm, Py)
__2: vec __0(Px, 0mm)
- pad "$rname$cname" __1 __2
+ pad "$rname$cname" __1 .
}
frame inner {
Modified: trunk/eda/fped/gui_frame.c
===================================================================
--- trunk/eda/fped/gui_frame.c 2009-08-12 15:42:43 UTC (rev 5426)
+++ trunk/eda/fped/gui_frame.c 2009-08-12 17:01:40 UTC (rev 5427)
@@ -989,6 +989,7 @@
GtkWidget *label;
label = label_in_box_new(s);
+ gtk_misc_set_padding(GTK_MISC(label), 0, 0);
gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
gtk_widget_modify_font(label, item_list_font);
gtk_table_attach_defaults(GTK_TABLE(tab), box_of_label(label),
Modified: trunk/eda/fped/sc89.fpd
===================================================================
--- trunk/eda/fped/sc89.fpd 2009-08-12 15:42:43 UTC (rev 5426)
+++ trunk/eda/fped/sc89.fpd 2009-08-12 17:01:40 UTC (rev 5427)
@@ -4,28 +4,28 @@
_pad_0: vec @(-Px/2, -Py/2)
_pad_1: vec .(Px, 0mm)
_pad_2: vec _pad_0(0mm, Py)
- pad "$pad" _pad_2 _pad_1
+ pad "$pad" . _pad_1
}
frame pad_ne {
set pad = 2
_pad_ne_0: vec @(-Px/2, -Py/2)
- frame pad _pad_ne_0
+ frame pad .
}
frame pad_nw {
set pad = 1
_pad_nw_0: vec @(Px/2, -Py/2)
- frame pad _pad_nw_0
+ frame pad .
}
frame pad_sc {
set pad = 3
_pad_sc_0: vec @(0mm, Py/2)
- frame pad _pad_sc_0
+ frame pad .
}
frame outline {
@@ -33,21 +33,21 @@
__5: vec @(0mm, -Oy/2)
__6: vec .(Ox/2, 0mm)
__7: vec __5(-Ox/2, 0mm)
+ line . __6 5mil
__8: vec __4(Ow/2, 0mm)
__9: vec __4(-Ow/2, 0mm)
+ line . __8 5mil
_outline_6: vec @(0mm, Oh)
_outline_7: vec .(Ox/2, 0mm)
+ line . __6 5mil
_outline_8: vec _outline_6(-Ox/2, 0mm)
+ line . __7 5mil
_outline_9: vec _outline_6(Ow/2, 0mm)
+ line __8 . 5mil
+ line . _outline_7 5mil
_outline_10: vec _outline_6(-Ow/2, 0mm)
- line __7 __6 5mil
- line _outline_7 __6 5mil
- line _outline_8 __7 5mil
- line _outline_8 _outline_10 5mil
- line __9 _outline_10 5mil
- line __9 __8 5mil
- line __8 _outline_9 5mil
- line _outline_9 _outline_7 5mil
+ line _outline_8 . 5mil
+ line __9 . 5mil
}
part "SC89"
@@ -60,13 +60,13 @@
{ 2mm, 2.2mm, 0.6mm, 0.85mm }
__0: vec @(0mm, Gy/2)
+frame pad_sc .
__1: vec @(0mm, -Gy/2)
__2: vec .(Wx/2, 0mm)
+frame pad_ne .
__3: vec __1(-Wx/2, 0mm)
+frame pad_nw .
dummy: vec @(0.2mm, 0mm)
-frame pad_sc __0
-frame pad_nw __3
-frame pad_ne __2
frame outline @
measx pad._pad_0 >> pad._pad_1 -0.6mm
measy pad._pad_0 >> pad._pad_2 0.8mm
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2009-08-12 19:56:55 +0200 (Wed, 12 Aug 2009)
New Revision: 5428
Modified:
trunk/eda/fped/README
trunk/eda/fped/fbga.fpd
trunk/eda/fped/sc89.fpd
Log:
- named vectors in sc89.fpd
- README: described use of "loop" as "if" and change fbga.fpd to use this
Modified: trunk/eda/fped/README
===================================================================
--- trunk/eda/fped/README 2009-08-12 17:01:40 UTC (rev 5427)
+++ trunk/eda/fped/README 2009-08-12 17:56:55 UTC (rev 5428)
@@ -331,6 +331,15 @@
loop n = 1, 0
+This can be used to implement conditional execution. For example,
+the items in the following frame would be instantiated if the
+variable "enable" is set to 1 but not it is set to 0:
+
+frame ... {
+ loop dummy = 1, enable
+ ...
+}
+
When a loop is executed, the objects contained in the body of the
enclosing frame are generated for each value of the variable. If
a frame contains multiple loops, all possible combinations of the
Modified: trunk/eda/fped/fbga.fpd
===================================================================
--- trunk/eda/fped/fbga.fpd 2009-08-12 17:01:40 UTC (rev 5427)
+++ trunk/eda/fped/fbga.fpd 2009-08-12 17:56:55 UTC (rev 5428)
@@ -16,8 +16,10 @@
}
frame inner {
- loop col = c0, c1
+ loop col = 2, 3
+ loop enable = 1, inner
+
frame pad @
}
@@ -35,13 +37,13 @@
part "Fake_BGA"
table
- { row, rname, c0, c1 }
- { 0, "A", 2, 3 }
- { 1, "B", 2, 3 }
- { 2, "C", 9, 0 }
- { 3, "D", 9, 0 }
- { 4, "E", 2, 3 }
- { 5, "F", 2, 3 }
+ { row, rname, inner }
+ { 0, "A", 1 }
+ { 1, "B", 1 }
+ { 2, "C", 0 }
+ { 3, "D", 0 }
+ { 4, "E", 1 }
+ { 5, "F", 1 }
frame last @
frame first @
Modified: trunk/eda/fped/sc89.fpd
===================================================================
--- trunk/eda/fped/sc89.fpd 2009-08-12 17:01:40 UTC (rev 5427)
+++ trunk/eda/fped/sc89.fpd 2009-08-12 17:56:55 UTC (rev 5428)
@@ -1,10 +1,10 @@
/* MACHINE-GENERATED ! */
frame pad {
- _pad_0: vec @(-Px/2, -Py/2)
- _pad_1: vec .(Px, 0mm)
- _pad_2: vec _pad_0(0mm, Py)
- pad "$pad" . _pad_1
+ corner: vec @(-Px/2, -Py/2)
+ x: vec .(Px, 0mm)
+ y: vec corner(0mm, Py)
+ pad "$pad" . x
}
frame pad_ne {
@@ -29,25 +29,25 @@
}
frame outline {
- __4: vec @(0mm, Oy/2)
- __5: vec @(0mm, -Oy/2)
- __6: vec .(Ox/2, 0mm)
- __7: vec __5(-Ox/2, 0mm)
- line . __6 5mil
- __8: vec __4(Ow/2, 0mm)
- __9: vec __4(-Ow/2, 0mm)
- line . __8 5mil
- _outline_6: vec @(0mm, Oh)
- _outline_7: vec .(Ox/2, 0mm)
- line . __6 5mil
- _outline_8: vec _outline_6(-Ox/2, 0mm)
- line . __7 5mil
- _outline_9: vec _outline_6(Ow/2, 0mm)
- line __8 . 5mil
- line . _outline_7 5mil
- _outline_10: vec _outline_6(-Ow/2, 0mm)
- line _outline_8 . 5mil
- line __9 . 5mil
+ top: vec @(0mm, Oy/2)
+ bottom: vec @(0mm, -Oy/2)
+ bot_right: vec .(Ox/2, 0mm)
+ bot_left: vec bottom(-Ox/2, 0mm)
+ line . bot_right 5mil
+ top_right: vec top(Ow/2, 0mm)
+ top_left: vec top(-Ow/2, 0mm)
+ line . top_right 5mil
+ middle: vec @(0mm, Oh)
+ mid_rightmost: vec .(Ox/2, 0mm)
+ line . bot_right 5mil
+ mid_leftmost: vec middle(-Ox/2, 0mm)
+ line . bot_left 5mil
+ mid_right: vec middle(Ow/2, 0mm)
+ line top_right . 5mil
+ line . mid_rightmost 5mil
+ mid_left: vec middle(-Ow/2, 0mm)
+ line mid_leftmost . 5mil
+ line top_left . 5mil
}
part "SC89"
@@ -59,22 +59,22 @@
{ Ox, Oy, Oh, Ow }
{ 2mm, 2.2mm, 0.6mm, 0.85mm }
-__0: vec @(0mm, Gy/2)
+ref_up: vec @(0mm, Gy/2)
frame pad_sc .
-__1: vec @(0mm, -Gy/2)
-__2: vec .(Wx/2, 0mm)
+ref_down_c: vec @(0mm, -Gy/2)
+ref_down_r: vec .(Wx/2, 0mm)
frame pad_ne .
-__3: vec __1(-Wx/2, 0mm)
+ref_down_l: vec ref_down_c(-Wx/2, 0mm)
frame pad_nw .
dummy: vec @(0.2mm, 0mm)
frame outline @
-measx pad._pad_0 >> pad._pad_1 -0.6mm
-measy pad._pad_0 >> pad._pad_2 0.8mm
-measy __3 >> pad._pad_0 0.5mm
-measx pad._pad_0 -> pad._pad_1 -0.3mm
-measy pad._pad_0 >> __3 0.5mm
-measy dummy >> outline.__6 1.1mm
-measy outline._outline_7 >> dummy 0.3mm
-measy outline.__8 >> outline.__6 1.2mm
-measx outline.__9 >> outline.__8 0.3mm
-measx outline.__7 >> outline.__6 -0.8mm
+measx pad.corner >> pad.x -0.6mm
+measy pad.corner >> pad.y 0.8mm
+measy ref_down_l >> pad.corner 0.5mm
+measx pad.corner -> pad.x -0.3mm
+measy pad.corner >> ref_down_l 0.5mm
+measy dummy >> outline.bot_right 1.1mm
+measy outline.mid_rightmost >> dummy 0.3mm
+measy outline.top_right >> outline.bot_right 1.2mm
+measx outline.top_left >> outline.top_right 0.3mm
+measx outline.bot_left >> outline.bot_right -0.8mm
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2009-08-13 02:16:43 +0200 (Thu, 13 Aug 2009)
New Revision: 5429
Added:
trunk/gta02-core/expanded/modem.sch
Removed:
trunk/gta02-core/expanded/wlan.sch
Modified:
trunk/gta02-core/expanded/bt.sch
trunk/gta02-core/expanded/gta02-core-expanded.pro
trunk/gta02-core/expanded/gta02-core-expanded.sch
trunk/gta02-core/scripts/all-sheets
Log:
- gta02-core-expanded.pro: fixed path to gta02-core-expanded.lib
- moved XGTA02_WLAN_S from wlan.sch to bt.sch, like in the main schematics
- added modem.sch with the GE865 to the expanded symbols
- scripts/all-sheets: replaced WLAN with MODEM
Modified: trunk/gta02-core/expanded/bt.sch
===================================================================
--- trunk/gta02-core/expanded/bt.sch 2009-08-12 17:56:55 UTC (rev 5428)
+++ trunk/gta02-core/expanded/bt.sch 2009-08-13 00:16:43 UTC (rev 5429)
@@ -1,5 +1,5 @@
-EESchema Schematic File Version 2 date Thu Jun 11 11:02:04 2009
-LIBS:,powerdeviceconngta02-core-expandedgta02-core-expanded-cache
+EESchema Schematic File Version 2 date Wed Aug 12 21:10:04 2009
+LIBS:power,device,conn,gta02-core-expanded,gta02-core-expanded-cache
EELAYER 24 0
EELAYER END
$Descr A4 11700 8267
@@ -13,7 +13,18 @@
Comment3 ""
Comment4 ""
$EndDescr
+Text Notes 7500 1250 0 120 ~ 24
+WLAN
$Comp
+L XGTA02_WLAN_S CON?
+U 1 1 4A8359B6
+P 8850 2800
+F 0 "CON?" H 8850 3400 60 0000 C CNN
+F 1 "XGTA02_WLAN_S" H 8850 2200 60 0000 C CNN
+ 1 8850 2800
+ 1 0 0 -1
+$EndComp
+$Comp
L XANTENNA ANT?
U 1 1 4A310E59
P 2250 2000
Modified: trunk/gta02-core/expanded/gta02-core-expanded.pro
===================================================================
--- trunk/gta02-core/expanded/gta02-core-expanded.pro 2009-08-12 17:56:55 UTC
(rev 5428)
+++ trunk/gta02-core/expanded/gta02-core-expanded.pro 2009-08-13 00:16:43 UTC
(rev 5429)
@@ -116,4 +116,4 @@
LibName1=power
LibName2=device
LibName3=conn
-LibName4=gta02-core-expanded
+LibName4=../components/gta02-core-expanded
Modified: trunk/gta02-core/expanded/gta02-core-expanded.sch
===================================================================
--- trunk/gta02-core/expanded/gta02-core-expanded.sch 2009-08-12 17:56:55 UTC
(rev 5428)
+++ trunk/gta02-core/expanded/gta02-core-expanded.sch 2009-08-13 00:16:43 UTC
(rev 5429)
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2 date Fri Jun 19 18:37:09 2009
+EESchema Schematic File Version 2 date Wed Aug 12 21:12:21 2009
LIBS:power,device,conn,gta02-core-expanded,gta02-core-expanded-cache
EELAYER 24 0
EELAYER END
@@ -13,15 +13,15 @@
Comment3 ""
Comment4 ""
$EndDescr
+$Sheet
+S 8400 5800 2000 1150
+U 4A835A26
+F0 "MODEM" 60
+F1 "modem.sch" 60
+$EndSheet
Text Notes 750 1300 0 300 ~ 60
EXPANDED VIEW - FOR COMPONENT REVIEW
$Sheet
-S 8400 5800 1850 1050
-U 4A2ED3B1
-F0 "WLAN" 60
-F1 "wlan.sch" 60
-$EndSheet
-$Sheet
S 6000 5800 1850 1150
U 4A2ED395
F0 "BT" 60
Added: trunk/gta02-core/expanded/modem.sch
===================================================================
--- trunk/gta02-core/expanded/modem.sch (rev 0)
+++ trunk/gta02-core/expanded/modem.sch 2009-08-13 00:16:43 UTC (rev 5429)
@@ -0,0 +1,25 @@
+EESchema Schematic File Version 2 date Wed Aug 12 21:12:15 2009
+LIBS:power,device,conn,gta02-core-expanded,gta02-core-expanded-cache
+EELAYER 24 0
+EELAYER END
+$Descr A4 11700 8267
+Sheet 2 13
+Title ""
+Date ""
+Rev ""
+Comp ""
+Comment1 ""
+Comment2 ""
+Comment3 ""
+Comment4 ""
+$EndDescr
+$Comp
+L XGE865 U?
+U 1 1 4A835A50
+P 5650 3850
+F 0 "U?" H 5650 3750 60 0000 C CNN
+F 1 "XGE865" H 5650 3950 60 0000 C CNN
+ 1 5650 3850
+ 1 0 0 -1
+$EndComp
+$EndSCHEMATC
Deleted: trunk/gta02-core/expanded/wlan.sch
===================================================================
--- trunk/gta02-core/expanded/wlan.sch 2009-08-12 17:56:55 UTC (rev 5428)
+++ trunk/gta02-core/expanded/wlan.sch 2009-08-13 00:16:43 UTC (rev 5429)
@@ -1,27 +0,0 @@
-EESchema Schematic File Version 2 date Tue Jun 9 21:09:11 2009
-LIBS:,powerdeviceconngta02-core-expandedgta02-core-expanded-cache
-EELAYER 24 0
-EELAYER END
-$Descr A4 11700 8267
-Sheet 2 13
-Title ""
-Date ""
-Rev ""
-Comp ""
-Comment1 ""
-Comment2 ""
-Comment3 ""
-Comment4 ""
-$EndDescr
-Text Notes 1100 1100 0 120 ~ 24
-WLAN
-$Comp
-L XGTA02_WLAN_S CON?
-U 1 1 4A2ED533
-P 6100 3850
-F 0 "CON?" H 6100 4450 60 0000 C CNN
-F 1 "XGTA02_WLAN_S" H 6100 3250 60 0000 C CNN
- 1 6100 3850
- 1 0 0 -1
-$EndComp
-$EndSCHEMATC
Modified: trunk/gta02-core/scripts/all-sheets
===================================================================
--- trunk/gta02-core/scripts/all-sheets 2009-08-12 17:56:55 UTC (rev 5428)
+++ trunk/gta02-core/scripts/all-sheets 2009-08-13 00:16:43 UTC (rev 5429)
@@ -42,7 +42,7 @@
OUT=$B-all
SHEETS="$B $B-CPU $B-CPU-POWER $B-PMU $B-MEMORY"
SHEETS="$SHEETS $B-AUDIO $B-USB $B-IO $B-LCM $B-SD-SIM"
-SHEETS="$SHEETS $B-GPS $B-BT $B-WLAN"
+SHEETS="$SHEETS $B-GPS $B-BT $B-MODEM"
if $ps; then
{
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2009-08-13 02:29:47 +0200 (Thu, 13 Aug 2009)
New Revision: 5430
Removed:
trunk/gta02-core/kicad-patches/eeschema-fix-relative-path.patch
trunk/gta02-core/kicad-patches/gerbview-export-arcs.patch
trunk/gta02-core/kicad-patches/make-junctions-larger-in-plots.patch
trunk/gta02-core/kicad-patches/make-junctions-larger-on-plotps.patch
Modified:
trunk/gta02-core/kicad-patches/series
Log:
- removed patches that have already made it upstream
Deleted: trunk/gta02-core/kicad-patches/eeschema-fix-relative-path.patch
===================================================================
--- trunk/gta02-core/kicad-patches/eeschema-fix-relative-path.patch
2009-08-13 00:16:43 UTC (rev 5429)
+++ trunk/gta02-core/kicad-patches/eeschema-fix-relative-path.patch
2009-08-13 00:29:47 UTC (rev 5430)
@@ -1,121 +0,0 @@
-make command-line invocation with relative paths work
-
-When eeschema et al. are invoked with a file name, they change the current
-directory to where this file lives. However, this only works reliably if
-an absolute path is given.
-
-Relative paths may or may not work. The reason for this is that GetSettings
-always sets the current directory to the last recorded location, which in
-turn affects how the relative paths are interpreted.
-
-This patch suppresses directory changes in GetSettings if a file name is
-given on the command line.
-
-This patch is only lightly tested. Please let me know if this is going in
-the right direction.
-
-- Werner
-
----
-
-Index: kicad/common/edaappl.cpp
-===================================================================
---- kicad.orig/common/edaappl.cpp 2009-07-01 23:14:33.000000000 -0300
-+++ kicad/common/edaappl.cpp 2009-07-01 23:14:44.000000000 -0300
-@@ -594,7 +594,7 @@
- *
- * @return none
- */
--void WinEDA_App::GetSettings()
-+void WinEDA_App::GetSettings( bool change_cwd )
- {
- wxASSERT( m_EDA_Config != NULL && m_EDA_CommonConfig != NULL );
-
-@@ -613,7 +613,8 @@
-
- m_EDA_Config->Read( wxT( "ShowPageLimits" ), &g_ShowPageLimits );
-
-- if( m_EDA_Config->Read( wxT( "WorkingDir" ), &Line ) && wxDirExists( Line
) )
-+ if( change_cwd && m_EDA_Config->Read( wxT( "WorkingDir" ), &Line ) &&
-+ wxDirExists( Line ) )
- {
- wxSetWorkingDirectory( Line );
- }
-Index: kicad/cvpcb/cvpcb.cpp
-===================================================================
---- kicad.orig/cvpcb/cvpcb.cpp 2009-07-01 23:14:33.000000000 -0300
-+++ kicad/cvpcb/cvpcb.cpp 2009-07-01 23:14:44.000000000 -0300
-@@ -54,7 +54,7 @@
- return false;
- }
-
-- GetSettings(); // read current setup
-+ GetSettings( argc == 1); // read current setup
-
- wxSetWorkingDirectory( currCWD ); // mofifie par GetSetting
-
-Index: kicad/eeschema/eeschema.cpp
-===================================================================
---- kicad.orig/eeschema/eeschema.cpp 2009-07-01 23:14:33.000000000 -0300
-+++ kicad/eeschema/eeschema.cpp 2009-07-01 23:14:44.000000000 -0300
-@@ -151,7 +151,7 @@
-
- /* init EESCHEMA */
- SeedLayers();
-- GetSettings();
-+ GetSettings( !fn.IsOk() );
- Read_Hotkey_Config( frame, false ); /* Must be called before creating
- * the main frame in order to
- * display the real hotkeys in menus
-Index: kicad/gerbview/gerbview.cpp
-===================================================================
---- kicad.orig/gerbview/gerbview.cpp 2009-07-01 23:14:33.000000000 -0300
-+++ kicad/gerbview/gerbview.cpp 2009-07-01 23:14:44.000000000 -0300
-@@ -45,7 +45,7 @@
- ScreenPcb->m_CurrentSheetDesc = &g_Sheet_GERBER;
-
- ActiveScreen = ScreenPcb;
-- GetSettings();
-+ GetSettings( argc == 1);
- extern PARAM_CFG_BASE* ParamCfgList[];
- wxGetApp().ReadCurrentSetupValues( ParamCfgList );
-
-Index: kicad/include/appl_wxstruct.h
-===================================================================
---- kicad.orig/include/appl_wxstruct.h 2009-07-01 23:14:33.000000000 -0300
-+++ kicad/include/appl_wxstruct.h 2009-07-01 23:14:44.000000000 -0300
-@@ -115,7 +115,7 @@
- void InitOnLineHelp();
-
- // Sauvegarde de configurations et options:
-- void GetSettings();
-+ void GetSettings( bool change_cwd );
- void SaveSettings();
-
- void WriteProjectConfig( const wxString& local_config_filename,
-Index: kicad/kicad/kicad.cpp
-===================================================================
---- kicad.orig/kicad/kicad.cpp 2009-07-01 23:14:33.000000000 -0300
-+++ kicad/kicad/kicad.cpp 2009-07-01 23:14:44.000000000 -0300
-@@ -372,7 +372,7 @@
- InitEDA_Appl( wxT( "KiCad" ), APP_TYPE_KICAD );
-
- /* init kicad */
-- GetSettings(); // read current setup
-+ GetSettings( argc == 1 ); // read current setup
-
- /* Make nameless project translatable */
- wxFileName namelessProject( wxGetCwd(), _( "noname" ),
ProjectFileExtension );
-Index: kicad/pcbnew/pcbnew.cpp
-===================================================================
---- kicad.orig/pcbnew/pcbnew.cpp 2009-07-01 23:14:33.000000000 -0300
-+++ kicad/pcbnew/pcbnew.cpp 2009-07-01 23:14:44.000000000 -0300
-@@ -83,7 +83,7 @@
- }
-
- ScreenPcb = new PCB_SCREEN();
-- GetSettings();
-+ GetSettings( argc == 1 );
-
- if( argc > 1 )
- {
Deleted: trunk/gta02-core/kicad-patches/gerbview-export-arcs.patch
===================================================================
--- trunk/gta02-core/kicad-patches/gerbview-export-arcs.patch 2009-08-13
00:16:43 UTC (rev 5429)
+++ trunk/gta02-core/kicad-patches/gerbview-export-arcs.patch 2009-08-13
00:29:47 UTC (rev 5430)
@@ -1,30 +0,0 @@
-Add support for exporting arcs in non-copper layers to gerbview.
-
-- Werner
-
----
-
-Index: kicad/gerbview/export_to_pcbnew.cpp
-===================================================================
---- kicad.orig/gerbview/export_to_pcbnew.cpp 2009-05-22 01:42:54.000000000
-0300
-+++ kicad/gerbview/export_to_pcbnew.cpp 2009-05-22 03:18:00.000000000
-0300
-@@ -165,6 +165,19 @@
- drawitem->m_End = track->m_End;
- drawitem->m_Width = track->m_Width;
-
-+ if( track->m_Shape == S_ARC )
-+ {
-+ double cx = track->m_Param;
-+ double cy = track->GetSubNet();
-+ double a = atan2( track->m_Start.y-cy, track->m_Start.x-cx );
-+ double b = atan2( track->m_End.y-cy, track->m_End.x-cx );
-+
-+ drawitem->m_Shape = S_ARC;
-+ drawitem->m_Angle = fmod( (a-b)/M_PI*1800.0+3600.0, 3600.0 );
-+ drawitem->m_Start.x = cx;
-+ drawitem->m_Start.y = cy;
-+ }
-+
- pcb->Add( drawitem );
- }
- else
Deleted: trunk/gta02-core/kicad-patches/make-junctions-larger-in-plots.patch
===================================================================
--- trunk/gta02-core/kicad-patches/make-junctions-larger-in-plots.patch
2009-08-13 00:16:43 UTC (rev 5429)
+++ trunk/gta02-core/kicad-patches/make-junctions-larger-in-plots.patch
2009-08-13 00:29:47 UTC (rev 5430)
@@ -1,21 +0,0 @@
-plotter->circle expects the diameter, but DRAWJUNCTION_SIZE is just the
-radius. This fix is originally by Alvaro Lopes <alvie...@alvie.com>
-For SVN revsion 1853.
-
-- Werner
-
----
-
-Index: kicad/eeschema/plot.cpp
-===================================================================
---- kicad.orig/eeschema/plot.cpp 2009-06-29 23:14:22.000000000 -0300
-+++ kicad/eeschema/plot.cpp 2009-06-29 23:14:47.000000000 -0300
-@@ -761,7 +761,7 @@
- #undef STRUCT
- #define STRUCT ( (DrawJunctionStruct*) drawlist )
- plotter->set_color( ReturnLayerColor( STRUCT->GetLayer() ) );
-- plotter->circle( STRUCT->m_Pos, DRAWJUNCTION_SIZE, FILLED_SHAPE );
-+ plotter->circle( STRUCT->m_Pos, DRAWJUNCTION_SIZE*2, FILLED_SHAPE
);
- break;
-
- case TYPE_SCH_TEXT:
Deleted: trunk/gta02-core/kicad-patches/make-junctions-larger-on-plotps.patch
===================================================================
--- trunk/gta02-core/kicad-patches/make-junctions-larger-on-plotps.patch
2009-08-13 00:16:43 UTC (rev 5429)
+++ trunk/gta02-core/kicad-patches/make-junctions-larger-on-plotps.patch
2009-08-13 00:29:47 UTC (rev 5430)
@@ -1,17 +0,0 @@
-Enlarge junction circles in Postscript "Plot" of schematics.
-
-From: Alvaro Lopes <alvie...@alvie.com>
-
----
-
---- kicad.orig/eeschema/plotps.cpp.orig 2009-06-18 09:04:51.779811920
+0100
-+++ kicad/eeschema/plotps.cpp 2009-06-18 09:05:24.726650982 +0100
-@@ -515,7 +515,7 @@
- #define STRUCT ( (DrawJunctionStruct*) DrawList )
- if( g_PlotPSColorOpt )
- SetColorMapPS( ReturnLayerColor( STRUCT->GetLayer() ) );
-- PlotCercle( STRUCT->m_Pos, DRAWJUNCTION_SIZE, 1 );
-+ PlotCercle( STRUCT->m_Pos, DRAWJUNCTION_SIZE*2, 1 );
- break;
-
- case TYPE_SCH_TEXT:
Modified: trunk/gta02-core/kicad-patches/series
===================================================================
--- trunk/gta02-core/kicad-patches/series 2009-08-13 00:16:43 UTC (rev
5429)
+++ trunk/gta02-core/kicad-patches/series 2009-08-13 00:29:47 UTC (rev
5430)
@@ -1,26 +1,15 @@
# Based on SVN revision 1857
-# tentative fix for making command-line invocation with relative paths work
-# functionality has been added into 1857
-#eeschema-fix-relative-path.patch
-
# eeschema --plot extension, pending
eeschema-plot-only-mode.patch
# under discussion
fix-pinedit-collision.patch
-# accepted as of r1783
-##gerbview-export-arcs.patch
-
# Work in progress
#drag-override.patch
#pcbnew-plot-only-mode.patch
-# accepted as of r1854
-#make-junctions-larger-in-plots.patch
-#make-junctions-larger-on-plotps.patch
-
# ERC pin exceptions
streamline-erc.patch
erc-exceptions.patch
--- End Message ---
_______________________________________________
commitlog mailing list
commitlog@lists.openmoko.org
http://lists.openmoko.org/mailman/listinfo/commitlog
