Changeset 1888

Timestamp:

05/31/12 05:17:09 (13 months ago)

Author:

reyalp

Message:

Merged revision(s) 1886-1887 from trunk:
sx200 improvements from adamb in ​http://chdk.setepontos.com/index.php?topic=650.msg85859#msg85859

• vid_bitmap_refresh() from ixus870_sd880, gives less flicker than original one.
• custom palette (philmoz), so CAM_BITMAP_PALETTE changed from 3 to 13.

Location:

branches/release-1_0

Files:

• . (modified) (1 prop)
• core/gui_draw.h (modified) (4 diffs)
• platform/sx200is/lib.c (modified) (2 diffs)
• platform/sx200is/platform_camera.h (modified) (1 diff)
• platform/sx200is/sub/100c/stubs_entry_2.S (modified) (1 diff)
• platform/sx200is/sub/100c/stubs_min.S (modified) (1 diff)

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

@@ -151 +151 @@
 #elif CAM_BITMAP_PALETTE==3
 
-// Used by :- IXUS120_SD940, SX200IS
+// Used by :- IXUS120_SD940
 
     #define COLOR_WHITE                 0x01
@@ -181 +181 @@
     #define COLOR_HISTO_BG_PLAY         COLOR_BLUE_LT
     #define COLOR_HISTO_RG_PLAY         COLOR_YELLOW
-    
-#if defined (CAMERA_sx200is)
-    #undef SCREEN_COLOR
-    #define SCREEN_COLOR                0x15    // try for a dark color in both record and play mode
-#endif
 
 // Icon colors
@@ -191 +186 @@
 // Separate definitions for record and playback mode
 // to cater for cameras with variable palettes
-#if defined (CAMERA_sx200is)
-    #define COLOR_ICON_REC_RED          0x2C
-    #define COLOR_ICON_REC_RED_DK       0x2C
-    #define COLOR_ICON_REC_RED_LT       0x20
-    #define COLOR_ICON_REC_GREEN        0x68
-    #define COLOR_ICON_REC_GREEN_DK     0x68
-    #define COLOR_ICON_REC_GREEN_LT     0x60
-    #define COLOR_ICON_REC_YELLOW       0x8F
-    #define COLOR_ICON_REC_YELLOW_DK    0x93
-    #define COLOR_ICON_REC_YELLOW_LT    0x87
-    #define COLOR_ICON_REC_GREY         COLOR_GREY
-    #define COLOR_ICON_REC_GREY_DK      0x15
-    #define COLOR_ICON_REC_GREY_LT      0x10
-    #define COLOR_ICON_PLY_RED          COLOR_ICON_REC_RED
-    #define COLOR_ICON_PLY_RED_DK       COLOR_ICON_REC_RED_DK
-    #define COLOR_ICON_PLY_RED_LT       COLOR_ICON_REC_RED_LT
-    #define COLOR_ICON_PLY_GREEN        0xA0
-    #define COLOR_ICON_PLY_GREEN_DK     0xA0
-    #define COLOR_ICON_PLY_GREEN_LT     0xA0
-    #define COLOR_ICON_PLY_YELLOW       0x6A
-    #define COLOR_ICON_PLY_YELLOW_DK    0x6C
-    #define COLOR_ICON_PLY_YELLOW_LT    0x66
-    #define COLOR_ICON_PLY_GREY         COLOR_ICON_REC_GREY
-    #define COLOR_ICON_PLY_GREY_DK      COLOR_ICON_REC_GREY_DK
-    #define COLOR_ICON_PLY_GREY_LT      COLOR_ICON_REC_GREY_LT
-#endif
 #if defined (CAMERA_ixus120_sd940)
     #define COLOR_ICON_REC_RED          0xE7
@@ -668 +637 @@
 #elif CAM_BITMAP_PALETTE==13
 
-// Used by :- G12, SX30, SX40HS, IXUS310_ELPH500HS
+// Used by :- G12, SX30, SX40HS, IXUS310_ELPH500HS, SX200IS
 
     #define COLOR_WHITE                 0x01

branches/release-1_0/platform/sx200is/lib.c

@@ -2 +2 @@
 #include "lolevel.h"
 
+//from ixus870_sd880
 void vid_bitmap_refresh()
 {
- extern int enabled_refresh_physical_screen;
- enabled_refresh_physical_screen=1;
- _RefreshPhysicalScreen(1);
+ extern int enabled_refresh_physical_screen; // screen lock counter
+ int old_val = enabled_refresh_physical_screen;
+ if ( old_val == 0 )
+ {
+   _ScreenLock(); // make sure code is called at least once
+ } else {
+   enabled_refresh_physical_screen=1; // forces actual redraw
+ }
+ _RefreshPhysicalScreen(1); // unlock/refresh
+
+ // restore original situation
+ if ( old_val > 0 )
+ {
+   _ScreenLock();
+   enabled_refresh_physical_screen = old_val;
+ }
 }
 
@@ -49 +63 @@
  _PostLogicalEventForNotPowerType(0x875, 1);  // RotateJogDialLeft
 }
+
+void *vid_get_bitmap_active_palette()
+{
+    extern int active_palette_buffer;
+    extern char* palette_buffer[];
+    return (palette_buffer[active_palette_buffer]+0xC);
+}
+// Function to load CHDK custom colors into active Canon palette
+void load_chdk_palette()
+{
+    extern int active_palette_buffer;
+    // Only load for the standard record and playback palettes
+    if ((active_palette_buffer == 0) || (active_palette_buffer == 2))
+    {
+        int *pal = (int*)vid_get_bitmap_active_palette();
+        if (pal[CHDK_COLOR_BASE+0] != 0x33ADF62)
+        {
+            pal[CHDK_COLOR_BASE+0]  = 0x33ADF62;  // Red
+            pal[CHDK_COLOR_BASE+1]  = 0x326EA40;  // Dark Red
+            pal[CHDK_COLOR_BASE+2]  = 0x34CD57F;  // Light Red
+            pal[CHDK_COLOR_BASE+3]  = 0x373BFAE;  // Green
+            pal[CHDK_COLOR_BASE+4]  = 0x34BD6CA;  // Dark Green
+            pal[CHDK_COLOR_BASE+5]  = 0x395AB95;  // Light Green
+            pal[CHDK_COLOR_BASE+6]  = 0x34766F0;  // Blue
+            pal[CHDK_COLOR_BASE+7]  = 0x31250F3;  // Dark Blue
+            pal[CHDK_COLOR_BASE+8]  = 0x37F408F;  // Cyan
+            pal[CHDK_COLOR_BASE+9]  = 0x3512D5B;  // Magenta
+            pal[CHDK_COLOR_BASE+10] = 0x3A9A917;  // Yellow
+            pal[CHDK_COLOR_BASE+11] = 0x3819137;  // Dark Yellow
+            pal[CHDK_COLOR_BASE+12] = 0x3DED115;  // Light Yellow
+
+            extern char palette_control;
+            palette_control = 1;
+            vid_bitmap_refresh();
+        }
+    }
+}

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

@@ -64 +64 @@
     #define CAM_EXT_TV_RANGE            1
     #undef  CAM_BITMAP_PALETTE
-    #define CAM_BITMAP_PALETTE              3
+    #define CAM_BITMAP_PALETTE              13
+    #define CAM_LOAD_CUSTOM_COLORS          1   // Enable loading CHDK colors into the camera palette memory/hardware
+    #define CHDK_COLOR_BASE                 0xD0// Start color index for CHDK colors loaded into camera palette.
     #undef  CAM_HAS_ERASE_BUTTON
     #define CAM_SHOW_OSD_IN_SHOOT_MENU      1

branches/release-1_0/platform/sx200is/sub/100c/stubs_entry_2.S

@@ -16 +16 @@
 NHSTUB(PostLEDMessage,              0xFF847470)
 NHSTUB(platformsub_kbd_fetch_data,  0xFF848340)
+
+// Palette
+NHSTUB(ScreenLock,                0xFF9D4F28)

branches/release-1_0/platform/sx200is/sub/100c/stubs_min.S

@@ -4 +4 @@
 DEF(enabled_refresh_physical_screen,    0x8e04 + 0x30)  //found at FF9D4918 and FF9D4F38
 DEF(led_table,                          0x24AC + 0x04)  // found at FF847374
+DEF(palette_buffer,                 0x15B5A0) // ref by 0x8D9C, sub_FF9CFC10
+DEF(active_palette_buffer,            0x8D8C) // sub_FF9CFE34
+DEF(palette_control,                  0x8D88) // sub_FF9CFE34