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. r1546 - developers/werner ([EMAIL PROTECTED])
2. r1547 - in
trunk/src/target/OM-2007/applications/openmoko-appmanager: . src
([EMAIL PROTECTED])
3. r1548 -
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-gsm/src
([EMAIL PROTECTED])
--- Begin Message ---
Author: werner
Date: 2007-03-29 07:18:32 +0200 (Thu, 29 Mar 2007)
New Revision: 1546
Added:
developers/werner/libftdi-c56-strings-dirty-hack.patch
Log:
Partial fix (strings only) for
http://bugzilla.openmoko.org/cgi-bin/bugzilla/show_bug.cgi?id=321
Added: developers/werner/libftdi-c56-strings-dirty-hack.patch
===================================================================
--- developers/werner/libftdi-c56-strings-dirty-hack.patch 2007-03-29
03:55:51 UTC (rev 1545)
+++ developers/werner/libftdi-c56-strings-dirty-hack.patch 2007-03-29
05:18:32 UTC (rev 1546)
@@ -0,0 +1,38 @@
+--- ftdi.c.orig 2006-12-11 12:09:18.000000000 -0300
++++ ftdi.c 2007-03-29 02:07:47.000000000 -0300
+@@ -1185,6 +1185,15 @@ int ftdi_eeprom_build(struct ftdi_eeprom
+ // calculate checksum
+ checksum = 0xAAAA;
+
++#if 1
++ for (i = 0; i < 64; i++) {
++ value = output[i*2];
++ value += output[(i*2)+1] << 8;
++
++ checksum = value^checksum;
++ checksum = (checksum << 1) | (checksum >> 15);
++ }
++#endif
+ for (i = 0; i < 63; i++) {
+ value = output[i*2];
+ value += output[(i*2)+1] << 8;
+@@ -1237,9 +1246,19 @@ int ftdi_write_eeprom(struct ftdi_contex
+ for (i = 0; i < 64; i++) {
+ usb_val = eeprom[i*2];
+ usb_val += eeprom[(i*2)+1] << 8;
++ if (i == 63)
++ usb_val = 0;
+ if (usb_control_msg(ftdi->usb_dev, 0x40, 0x91, usb_val, i, NULL, 0,
ftdi->usb_write_timeout) != 0)
+ ftdi_error_return(-1, "unable to write eeprom");
+ }
++#if 1
++ for (i = 0; i < 64; i++) {
++ usb_val = eeprom[i*2];
++ usb_val += eeprom[(i*2)+1] << 8;
++ if (usb_control_msg(ftdi->usb_dev, 0x40, 0x91, usb_val, i+64, NULL,
0, ftdi->usb_write_timeout) != 0)
++ ftdi_error_return(-1, "unable to write eeprom");
++ }
++#endif
+
+ return 0;
+ }
--- End Message ---
--- Begin Message ---
Author: ken_zhao
Date: 2007-03-29 10:11:39 +0200 (Thu, 29 Mar 2007)
New Revision: 1547
Modified:
trunk/src/target/OM-2007/applications/openmoko-appmanager/ChangeLog
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/application-menu.c
Log:
Remove unnecessory setting a default size to the file chooser dialog.
After installing single package successfully, refresh the navigation.
http://bugzilla.openmoko.org/cgi-bin/bugzilla/show_bug.cgi?id=288
Use the "Exit" menuitem instead of the "Quit" menuitem in the application manu.
Followed the suggestion of:
http://bugzilla.openmoko.org/cgi-bin/bugzilla/show_bug.cgi?id=296
Modified: trunk/src/target/OM-2007/applications/openmoko-appmanager/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-appmanager/ChangeLog
2007-03-29 05:18:32 UTC (rev 1546)
+++ trunk/src/target/OM-2007/applications/openmoko-appmanager/ChangeLog
2007-03-29 08:11:39 UTC (rev 1547)
@@ -1,3 +1,12 @@
+2007-03-29 Chaowei Song <[EMAIL PROTECTED]>
+ * src/application-menu.c: (on_install_single_application_activate)
+ Remove unnecessory set a default size to the file chooser dialog.
+ It makes the file chooser dialog too ugly.
+ After installing single package successfully, refresh the navigation
+ area, and show the installed packages list.
+ * src/application-menu.c: (application_menu_new)
+ Use the "Exit" menuitem instead of the "Quit" menuitem.
+
2007-03-26 Chaowei Song <[EMAIL PROTECTED]>
* data/:
Add action buttons:
Modified:
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/application-menu.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/application-menu.c
2007-03-29 05:18:32 UTC (rev 1546)
+++
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/application-menu.c
2007-03-29 08:11:39 UTC (rev 1547)
@@ -19,6 +19,7 @@
*/
#include "application-menu.h"
+#include "filter-menu.h"
#include "appmanager-window.h"
#include "package-list.h"
#include "ipkgapi.h"
@@ -99,7 +100,6 @@
NULL);
gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(filechooser), FALSE);
gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(filechooser), FALSE);
- gtk_window_set_default_size (GTK_WINDOW (filechooser), 400, 300);
filter = gtk_file_filter_new();
gtk_file_filter_set_name(filter, _("Ipk files(*.ipk)"));
@@ -163,6 +163,7 @@
get_error_msg ());
break;
case INSTALL_SUCCESS:
+ filter_menu_show_install_list (appdata);
infodialog = gtk_message_dialog_new (NULL,
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_INFO,
@@ -261,7 +262,7 @@
g_signal_connect ((gpointer) showhelp, "activate",
G_CALLBACK (on_showhelp_activate), appdata);
- quit = gtk_menu_item_new_with_mnemonic (_("Quit"));
+ quit = gtk_menu_item_new_with_mnemonic (_("Exit"));
gtk_widget_show (quit);
gtk_container_add (GTK_CONTAINER (appmenu), quit);
g_signal_connect ((gpointer) quit, "activate",
--- End Message ---
--- Begin Message ---
Author: zhiyong_sun
Date: 2007-03-29 11:22:23 +0200 (Thu, 29 Mar 2007)
New Revision: 1548
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-gsm/src/moko-gsm-conn.c
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-gsm/src/moko-gsm-conn.h
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-gsm/src/openmoko-panel-gsm.c
Log:
some small modifies, and reorgnize the icon names, add gprs icons, needs to
find out gprs signal(connection) update function
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-gsm/src/moko-gsm-conn.c
===================================================================
---
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-gsm/src/moko-gsm-conn.c
2007-03-29 08:11:39 UTC (rev 1547)
+++
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-gsm/src/moko-gsm-conn.c
2007-03-29 09:22:23 UTC (rev 1548)
@@ -17,7 +17,8 @@
static struct lgsm_handle *lgsmh = NULL;
static GPollFD GPfd;
-static int signal_value = GSM_SIGNAL_ERROR;
+static gint gsm_q = -99;
+static gint gprs_q = -99;
static gboolean
gsm_watcher_prepare (GSource * source, gint * timeout)
@@ -67,7 +68,7 @@
sigq_handler(struct lgsm_handle *lh, int evt, struct gsmd_evt_auxdata *aux)
{
printf("EVENT: Signal Quality: %u\n", aux->u.signal.sigq.rssi);
- signal_value = aux->u.signal.sigq.rssi;
+ gsm_q = aux->u.signal.sigq.rssi;
//FIXME: Call panel applet image change function here, instead of use g
timeout function to check singal value
return 0;
}
@@ -124,12 +125,39 @@
}
}
-int
+GsmSignalQuality
moko_panel_gsm_signal_quality()
{
- return signal_value;
+ switch (gsm_q)
+ {
+ case 4 :
+ return GSM_SIGNAL_LEVEL_1 ;
+ case 3 :
+ return GSM_SIGNAL_LEVEL_2 ;
+ case 2 :
+ return GSM_SIGNAL_LEVEL_3 ;
+ case 1 :
+ return GSM_SIGNAL_LEVEL_4 ;
+ case 0 :
+ return GSM_SIGNAL_LEVEL_5 ;
+ default :
+ return GSM_SIGNAL_ERROR;
+ }
}
+/*for a rainning day*/
+GprsSignalQuality
+moko_panel_gprs_signal_quality()
+{
+if(0)
+{ switch (gprs_q)
+ {
+
+ }
+}
+ return GPRS_CLOSE;
+}
+
void
gsm_watcher_install (void)
{
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-gsm/src/moko-gsm-conn.h
===================================================================
---
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-gsm/src/moko-gsm-conn.h
2007-03-29 08:11:39 UTC (rev 1547)
+++
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-gsm/src/moko-gsm-conn.h
2007-03-29 09:22:23 UTC (rev 1548)
@@ -1,20 +1,38 @@
#ifndef _MOKO_PANEL_GSM_CONN_
#define _MOKO_PANEL_GSM_CONN_
+#include <glib-object.h>
+
#define STDIN_BUF_SIZE 1024
/*signal value: "0": best connection "5": connect error*/
-enum{
- GSM_SIGNAL_LEVEL_5 = 0,
+G_BEGIN_DECLS
+
+typedef enum{
+ GSM_SIGNAL_LEVEL_1 = 0,
+ GSM_SIGNAL_LEVEL_2,
+ GSM_SIGNAL_LEVEL_3,
GSM_SIGNAL_LEVEL_4,
- GSM_SIGNAL_LEVEL_3,
- GSM_SIGNAL_LEVEL_2,
- GSM_SIGNAL_LEVEL_1,
- GSM_SIGNAL_ERROR ,
- TOTAL_SIGNALS
-};
+ GSM_SIGNAL_LEVEL_5,
+ GSM_SIGNAL_ERROR,
+ TOTAL_GSM_SIGNALS
+}GsmSignalQuality;
+typedef enum{
+ GPRS_SIGNAL_LEVEL_1 = 0,
+ GPRS_SIGNAL_LEVEL_2,
+ GPRS_SIGNAL_LEVEL_3,
+ GPRS_SIGNAL_LEVEL_4,
+ GPRS_SIGNAL_LEVEL_5,
+ TOTAL_GPRS_SIGNALS,
+ GPRS_CLOSE
+}GprsSignalQuality;
+
void gsm_watcher_install (void);
-int moko_panel_gsm_signal_quality(void);
+GsmSignalQuality moko_panel_gsm_signal_quality(void);
+GprsSignalQuality moko_panel_gprs_signal_quality(void);
+
+G_END_DECLS
+
#endif /*_MOKO_PANEL_GSM_CONN_*/
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-gsm/src/openmoko-panel-gsm.c
===================================================================
---
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-gsm/src/openmoko-panel-gsm.c
2007-03-29 08:11:39 UTC (rev 1547)
+++
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-gsm/src/openmoko-panel-gsm.c
2007-03-29 09:22:23 UTC (rev 1548)
@@ -22,11 +22,29 @@
#include "moko-gsm-conn.h"
typedef struct {
- int gsm_quality;
- GtkImage *image;
- guint timeout_id;
+ GsmSignalQuality gsm_quality;
+ GprsSignalQuality gprs_quality;
+ GtkImage *image;
+ guint timeout_id;
} GsmApplet;
+static gchar *gsm_q_name[TOTAL_GSM_SIGNALS]={
+ "SignalStrength_01.png",
+ "SignalStrength_02.png",
+ "SignalStrength_03.png",
+ "SignalStrength_04.png",
+ "SignalStrength_05.png",
+ "SignalStrength_00.png",
+};
+
+static gchar *gprs_q_name[TOTAL_GPRS_SIGNALS]={
+ "SignalStrength25g_01.png",
+ "SignalStrength25g_02.png",
+ "SignalStrength25g_03.png",
+ "SignalStrength25g_04.png",
+ "SignalStrength25g_05.png",
+};
+
static void
gsm_applet_free (GsmApplet *applet)
{
@@ -38,7 +56,8 @@
static gboolean
timeout_cb (GsmApplet *applet)
{
- int new_gsm_q = moko_panel_gsm_signal_quality ();
+ GsmSignalQuality new_gsm_q = moko_panel_gsm_signal_quality ();
+ //GprsSignalQuality new_gprs_q = moko_panel_gprs_signal_quality ();
if (applet->gsm_quality == new_gsm_q)
/*Keep going, image need not change*/
@@ -46,53 +65,29 @@
else
applet->gsm_quality = new_gsm_q;
- g_debug ("gsm signal = %d", applet->gsm_quality);
+ /*load new signal status image, FIXME:load these images in memery when
initial the applet*/
+ char path[512];
+ snprintf (path, 512, "%s/%s", PKGDATADIR, gsm_q_name[applet->gsm_quality]);
+ gtk_image_set_from_file (applet->image, path);
- switch (applet->gsm_quality)
- {
- case GSM_SIGNAL_ERROR :
- gtk_image_set_from_file (applet->image,
PKGDATADIR"/SignalStrength_00.png");
- break;
-
- case GSM_SIGNAL_LEVEL_1 :
- gtk_image_set_from_file (applet->image,
PKGDATADIR"/SignalStrength_01.png");
- break;
-
- case GSM_SIGNAL_LEVEL_2 :
- gtk_image_set_from_file (applet->image,
PKGDATADIR"/SignalStrength_02.png");
- break;
-
- case GSM_SIGNAL_LEVEL_3 :
- gtk_image_set_from_file (applet->image,
PKGDATADIR"/SignalStrength_03.png");
- break;
-
- case GSM_SIGNAL_LEVEL_4 :
- gtk_image_set_from_file (applet->image,
PKGDATADIR"/SignalStrength_04.png");
- break;
-
- case GSM_SIGNAL_LEVEL_5 :
- gtk_image_set_from_file (applet->image,
PKGDATADIR"/SignalStrength_05.png");
- break;
-
- default :
- gtk_image_set_from_file (applet->image,
PKGDATADIR"/SignalStrength_00.png");
- break;
- }
- /* Keep going */
- return TRUE;
+ /* Keep going */
+ return TRUE;
}
G_MODULE_EXPORT GtkWidget*
mb_panel_applet_create(const char* id, GtkOrientation orientation)
{
MokoPanelApplet* mokoapplet = moko_panel_applet_new();
+ char path[512];
GsmApplet *applet;
applet = g_slice_new (GsmApplet);
applet->gsm_quality = GSM_SIGNAL_ERROR;
+ applet->gsm_quality = GPRS_CLOSE;
- applet->image = GTK_IMAGE(gtk_image_new_from_file
(PKGDATADIR"/SignalStrength_00.png"));
+ snprintf (path, 512, "%s/%s", PKGDATADIR, gsm_q_name[applet->gsm_quality]);
+ applet->image = GTK_IMAGE(gtk_image_new_from_file (path));
gtk_widget_set_name( applet->image, "OpenMoko gsm applet" );
g_object_weak_ref( G_OBJECT(applet->image), (GWeakNotify) gsm_applet_free,
applet );
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
