headers
mailer | 1 Jan 2009 06:04
Favicon

jdgordon: r19630 - trunk/apps/gui

Date: 2009-01-01 06:04:34 +0100 (Thu, 01 Jan 2009)
New Revision: 19630

Log Message:
fis FS#9739 - yesterdays statusbar commits broke the WPS disk spindown handling

Modified:
   trunk/apps/gui/gwps.c

Modified: trunk/apps/gui/gwps.c
===================================================================
--- trunk/apps/gui/gwps.c	2008-12-31 21:02:56 UTC (rev 19629)
+++ trunk/apps/gui/gwps.c	2009-01-01 05:04:34 UTC (rev 19630)
 <at>  <at>  -700,7 +700,7  <at>  <at> 
             return GO_TO_PREVIOUS;
         }

-        if ( button )
+        if ( !IS_SYSEVENT(button) )
             storage_spin();
     }
     return GO_TO_ROOT; /* unreachable - just to reduce compiler warnings */

_______________________________________________
rockbox-cvs mailing list
rockbox-cvs <at> cool.haxx.se
http://cool.haxx.se/cgi-bin/mailman/listinfo/rockbox-cvs
Permalink | Reply | 0 comments |
headers
mailer | 1 Jan 2009 06:12
Favicon

jdgordon: r19631 - trunk/apps/gui

Date: 2009-01-01 06:12:27 +0100 (Thu, 01 Jan 2009)
New Revision: 19631

Log Message:
try again... BUTTON_NONE is not a sys event :p

Modified:
   trunk/apps/gui/gwps.c

Modified: trunk/apps/gui/gwps.c
===================================================================
--- trunk/apps/gui/gwps.c	2009-01-01 05:04:34 UTC (rev 19630)
+++ trunk/apps/gui/gwps.c	2009-01-01 05:12:27 UTC (rev 19631)
 <at>  <at>  -700,7 +700,7  <at>  <at> 
             return GO_TO_PREVIOUS;
         }

-        if ( !IS_SYSEVENT(button) )
+        if (button && !IS_SYSEVENT(button) )
             storage_spin();
     }
     return GO_TO_ROOT; /* unreachable - just to reduce compiler warnings */

_______________________________________________
rockbox-cvs mailing list
rockbox-cvs <at> cool.haxx.se
http://cool.haxx.se/cgi-bin/mailman/listinfo/rockbox-cvs
Permalink | Reply | 0 comments |
headers
mailer | 1 Jan 2009 14:12
Favicon

jdgordon: r19632 - trunk/apps

Date: 2009-01-01 14:12:37 +0100 (Thu, 01 Jan 2009)
New Revision: 19632

Log Message:
bah, the filetree does the same spindown handling as the WPS so fix it there also

Modified:
   trunk/apps/tree.c

Modified: trunk/apps/tree.c
===================================================================
--- trunk/apps/tree.c	2009-01-01 05:12:27 UTC (rev 19631)
+++ trunk/apps/tree.c	2009-01-01 13:12:37 UTC (rev 19632)
 <at>  <at>  -821,7 +821,7  <at>  <at> 
         }
         if (start_wps)
             return GO_TO_WPS;
-        if (button)
+        if (button && !IS_SYSEVENT(button))
         {
             storage_spin();
         }

_______________________________________________
rockbox-cvs mailing list
rockbox-cvs <at> cool.haxx.se
http://cool.haxx.se/cgi-bin/mailman/listinfo/rockbox-cvs
Permalink | Reply | 0 comments |
headers
mailer | 1 Jan 2009 14:17
Favicon

nls: r19633 - trunk/apps/plugins

Date: 2009-01-01 14:17:22 +0100 (Thu, 01 Jan 2009)
New Revision: 19633

Log Message:
Fix building invadrog with DEBUG defined, patch by Yoshihisa Uchida, FS#9737

Modified:
   trunk/apps/plugins/invadrox.c

Modified: trunk/apps/plugins/invadrox.c
===================================================================
--- trunk/apps/plugins/invadrox.c	2009-01-01 13:12:37 UTC (rev 19632)
+++ trunk/apps/plugins/invadrox.c	2009-01-01 13:17:22 UTC (rev 19633)
 <at>  <at>  -44,8 +44,7  <at>  <at> 

 /* #define DEBUG */
 #ifdef DEBUG
-#include <stdio.h>
-#define DBG(format, arg...) { printf("%s: " format, __FUNCTION__, ## arg); }
+#define DBG(format, arg...) { DEBUGF("%s: " format, __FUNCTION__, ## arg); }
 #else
 #define DBG(format, arg...) {}
 #endif
 <at>  <at>  -1789,7 +1788,7  <at>  <at> 
                             PLAYFIELD_Y + 1 - SCORENUM_Y - FONT_HEIGHT);

         /* Wait until next frame */
-        DBG("%d (%d)\n", end - *rb->current_tick, (CYCLETIME * HZ) / 1000);
+        DBG("%ld (%d)\n", end - *rb->current_tick, (CYCLETIME * HZ) / 1000);
         if (end > *rb->current_tick) {
(Continue reading)

Permalink | Reply | 0 comments |
headers
mailer | 1 Jan 2009 20:54
Favicon

mcuelenaere: r19634 - trunk/firmware

Date: 2009-01-01 20:54:30 +0100 (Thu, 01 Jan 2009)
New Revision: 19634

Log Message:
Fix (USB) serial logf()

Modified:
   trunk/firmware/logf.c

Modified: trunk/firmware/logf.c
===================================================================
--- trunk/firmware/logf.c	2009-01-01 13:17:22 UTC (rev 19633)
+++ trunk/firmware/logf.c	2009-01-01 19:54:30 UTC (rev 19634)
 <at>  <at>  -132,12 +132,12  <at>  <at> 

     len = strlen(buf);
 #ifdef HAVE_SERIAL
-    serial_tx(ptr);
+    serial_tx(buf);
     serial_tx("\r\n");
 #endif
 #ifdef USB_SERIAL
-    usb_serial_send(ptr,len);
-    usb_serial_send("\r\n",2);
+    usb_serial_send(buf, len);
+    usb_serial_send("\r\n", 2);
 #endif

     tlen = 0;
(Continue reading)

Permalink | Reply | 0 comments |
headers
mailer | 2 Jan 2009 02:29
Favicon

jdgordon: r19635 - in trunk/apps: . gui

Date: 2009-01-02 02:29:13 +0100 (Fri, 02 Jan 2009)
New Revision: 19635

Log Message:
More SYS_FOURHERTZ handling fixes.. (FS#9740 FS#9741)

Modified:
   trunk/apps/action.c
   trunk/apps/gui/gwps.c
   trunk/apps/gui/list.c
   trunk/apps/gui/viewport.c
   trunk/apps/gui/viewport.h
   trunk/apps/screens.c

Modified: trunk/apps/action.c
===================================================================
--- trunk/apps/action.c	2009-01-01 19:54:30 UTC (rev 19634)
+++ trunk/apps/action.c	2009-01-02 01:29:13 UTC (rev 19635)
 <at>  <at>  -105,6 +105,9  <at>  <at> 
                   TIMEOUT_BLOCK   to wait for a button press
    Any number >0   to wait that many ticks for a press

+   This function will likely return SYS_FOURHERTZ which should be passed to the
+   default_event_handler(). If this doesnt happen parts of the GUI may not be
+   redrawn correctly
  */
 static int get_action_worker(int context, int timeout,
                              const struct button_mapping* (*get_context_map)(int) )

Modified: trunk/apps/gui/gwps.c
(Continue reading)

Permalink | Reply | 0 comments |
headers
mailer | 2 Jan 2009 02:43
Favicon

jdgordon: r19636 - in trunk/apps: . gui

Date: 2009-01-02 02:43:00 +0100 (Fri, 02 Jan 2009)
New Revision: 19636

Log Message:
woops... fix the header and bump the plugin API

Modified:
   trunk/apps/gui/gwps.c
   trunk/apps/plugin.c
   trunk/apps/plugin.h

Modified: trunk/apps/gui/gwps.c
===================================================================
--- trunk/apps/gui/gwps.c	2009-01-02 01:29:13 UTC (rev 19635)
+++ trunk/apps/gui/gwps.c	2009-01-02 01:43:00 UTC (rev 19636)
 <at>  <at>  -62,6 +62,7  <at>  <at> 
 #include "quickscreen.h"
 #include "pitchscreen.h"
 #include "appevents.h"
+#include "viewport.h"

 /* currently only on wps_state is needed */
 struct wps_state wps_state;

Modified: trunk/apps/plugin.c
===================================================================
--- trunk/apps/plugin.c	2009-01-02 01:29:13 UTC (rev 19635)
+++ trunk/apps/plugin.c	2009-01-02 01:43:00 UTC (rev 19636)
 <at>  <at>  -210,6 +210,7  <at>  <at> 
     lcd_remote_bitmap,
(Continue reading)

Permalink | Reply | 0 comments |
headers
mailer | 2 Jan 2009 04:16
Favicon

saratoga: r19637 - trunk/firmware/export

Date: 2009-01-02 04:16:12 +0100 (Fri, 02 Jan 2009)
New Revision: 19637

Log Message:
Add very rough battery life estimateion for iPod minis.  Also, update Sansav1 estimation while I'm at it.

Modified:
   trunk/firmware/export/config-c200.h
   trunk/firmware/export/config-e200.h
   trunk/firmware/export/config-ipodmini.h
   trunk/firmware/export/config-ipodmini2g.h

Modified: trunk/firmware/export/config-c200.h
===================================================================
--- trunk/firmware/export/config-c200.h	2009-01-02 01:43:00 UTC (rev 19636)
+++ trunk/firmware/export/config-c200.h	2009-01-02 03:16:12 UTC (rev 19637)
 <at>  <at>  -130,9 +130,9  <at>  <at> 
 #define HAVE_USB_POWER

 /* define current usage levels */
-#define CURRENT_NORMAL     45  /* Should be nearly identical to E200 */
+#define CURRENT_NORMAL     30  /* Should be nearly identical to E200 */
 #define CURRENT_BACKLIGHT  40  /* Screen is about 20, blue LEDs are another 20, so 40 if both */
-#define CURRENT_RECORD     40  /* flash player, so this is just unboosted current*/
+#define CURRENT_RECORD     30  /* flash player, so this is just unboosted current*/

 /** Non-simulator section **/
 #ifndef SIMULATOR

Modified: trunk/firmware/export/config-e200.h
(Continue reading)

Permalink | Reply | 0 comments |
headers
mailer | 2 Jan 2009 04:30
Favicon

jdgordon: r19638 - trunk/apps/plugins

Date: 2009-01-02 04:30:05 +0100 (Fri, 02 Jan 2009)
New Revision: 19638

Log Message:
FS#9742 - hopefully the last of these

Modified:
   trunk/apps/plugins/credits.c

Modified: trunk/apps/plugins/credits.c
===================================================================
--- trunk/apps/plugins/credits.c	2009-01-02 03:16:12 UTC (rev 19637)
+++ trunk/apps/plugins/credits.c	2009-01-02 03:30:05 UTC (rev 19638)
 <at>  <at>  -373,6 +373,7  <at>  <at> 

 enum plugin_status plugin_start(const struct plugin_api* api, const void* parameter)
 {
+    long finish;
     (void)parameter;
     rb = api;

 <at>  <at>  -385,9 +386,12  <at>  <at> 
 #endif

     /* Show the logo for about 3 secs allowing the user to stop */
-    if(!rb->action_userabort(3*HZ))
-        roll_credits();
-
+    finish = *rb->current_tick + 3*HZ;
+    while (*rb->current_tick < finish)
(Continue reading)

Permalink | Reply | 0 comments |
headers
mailer | 2 Jan 2009 05:35
Favicon

lowlight: r19639 - trunk/uisimulator/sdl

Date: 2009-01-02 05:35:13 +0100 (Fri, 02 Jan 2009)
New Revision: 19639

Log Message:
Add the sim build for the Philips HDD1630.

Added:
   trunk/uisimulator/sdl/UI-hdd1630.bmp
Modified:
   trunk/uisimulator/sdl/button.c
   trunk/uisimulator/sdl/uisdl.h

Added: trunk/uisimulator/sdl/UI-hdd1630.bmp
===================================================================
(Binary files differ)

Property changes on: trunk/uisimulator/sdl/UI-hdd1630.bmp
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/uisimulator/sdl/button.c
===================================================================
--- trunk/uisimulator/sdl/button.c	2009-01-02 03:30:05 UTC (rev 19638)
+++ trunk/uisimulator/sdl/button.c	2009-01-02 04:35:13 UTC (rev 19639)
 <at>  <at>  -1049,6 +1049,47  <at>  <at> 
     case SDLK_KP9:
         new_btn = BUTTON_VOLUP;
         break;
+
(Continue reading)

Permalink | Reply | 0 comments |

Gmane