Changeset 1791

Timestamp:

04/04/12 23:12:57 (14 months ago)

Author:

philmoz

Message:

Merged revision(s) 1790 from trunk:

Location:

branches/release-1_0

Files:

• . (modified) (1 prop)
• core/gui_draw.c (modified) (1 diff)
• include/camera.h (modified) (1 diff)
• platform/sx220hs/kbd.c (modified) (1 diff)
• platform/sx220hs/platform_camera.h (modified) (1 diff)
• platform/sx220hs/sub/100a/stubs_min.S (modified) (1 diff)
• platform/sx220hs/sub/101a/stubs_min.S (modified) (1 diff)
• platform/sx220hs/sub/101b/stubs_min.S (modified) (1 diff)

branches/release-1_0/core/gui_draw.c

@@ -15 +15 @@
 //-------------------------------------------------------------------
 static void draw_pixel_std(unsigned int offset, color cl) {
-    frame_buffer[0][offset] = frame_buffer[1][offset] = cl & 0xff;
+#ifdef DRAW_ON_ACTIVE_BITMAP_BUFFER_ONLY        
+        extern int active_bitmap_buffer;
+        frame_buffer[active_bitmap_buffer][offset] = cl & 0xff;
+#else
+        frame_buffer[0][offset] = frame_buffer[1][offset] = cl & 0xff;
+#endif
 }
 

branches/release-1_0/include/camera.h

@@ -199 +199 @@
     #define CAMERA_MAX_DIST         65535       // Define max distance that can be set in _MoveFocusLensToDistance (allow override for superzooms - SX30/SX40)
 
+        #undef  DRAW_ON_ACTIVE_BITMAP_BUFFER_ONLY       // Draw pixels on active bitmap buffer only. Requires active_bitmap_buffer location in stubs_min.S or stubs_entry.S.
+        
 //----------------------------------------------------------
 // Overridden values for each camera

branches/release-1_0/platform/sx220hs/kbd.c

@@ -64 +64 @@
     { 0, KEY_MENU            , 0x00040000 },
     { 0, KEY_VIDEO           , 0x00080000 },
-    { 0, KEY_RIGHT_SOFT      , 0x00002000 },
-    { 0, KEY_UP_SOFT         , 0x00000400 },
-    { 0, KEY_DOWN_SOFT       , 0x00008000 },
+ //   { 0, KEY_RIGHT_SOFT      , 0x00002000 },  //soft keys commented out but still counted in the keymasks, seems to disable them like we want.
+ //   { 0, KEY_UP_SOFT         , 0x00000400 },  //if enabled can cause unintentional button presses in alt menu when rotating the jogdial really fast.
+ //   { 0, KEY_DOWN_SOFT       , 0x00008000 },
 
     { 1, KEY_PRINT           , 0x00200000 }, // playback = alt button
     { 1, KEY_PLAYBACK        , 0x00200000 },
 
-    { 2, KEY_LEFT_SOFT       , 0x00000080 },
+ //   { 2, KEY_LEFT_SOFT       , 0x00000080 },
     { 2, KEY_LEFT            , 0x00000100 },
     { 2, KEY_SHOOT_FULL      , 0x00002002 },

branches/release-1_0/platform/sx220hs/platform_camera.h

@@ -104 +104 @@
     #undef  CAMERA_MAX_DIST
     #define CAMERA_MAX_DIST                 2000000 // Override max subject distance 1739131 //testscript=1098902
+        #define DRAW_ON_ACTIVE_BITMAP_BUFFER_ONLY       1
 //----------------------------------------------------------

branches/release-1_0/platform/sx220hs/sub/100a/stubs_min.S

@@ -2 +2 @@
 
 DEF(recreview_hold,                     0x93D4 + 0xF0)  // FF1B6640
-DEF(enabled_refresh_physical_screen,    0x53C4 + 0x14)  //changed to fix error when displaying menu, was 0x20 FF0A99C0 
 DEF(led_table,                          0x258C + 0x04)  // FF0557C4

branches/release-1_0/platform/sx220hs/sub/101a/stubs_min.S

@@ -3 +3 @@
 DEF(zoom_status,                        0xF5A4)         // ff31c404
 DEF(recreview_hold,                     0x93D4 + 0xF0)  // FF1B6640
-DEF(enabled_refresh_physical_screen,    0x53C4 + 0x14)  //changed to fix error when displaying menu, was 0x20 FF0A99C0 
 DEF(led_table,                          0x258C + 0x04)  // FF0557C4

branches/release-1_0/platform/sx220hs/sub/101b/stubs_min.S

@@ -4 +4 @@
 DEF(zoom_status,                        0xF5A4)         // ff31c404
 DEF(recreview_hold,                     0x93D4 + 0xF0)  // FF1B6640
-DEF(enabled_refresh_physical_screen,    0x53C4 + 0x14)  //changed to fix error when displaying menu, was 0x20 FF0A99C0 
 DEF(led_table,                          0x258C + 0x04)  // FF0557C4