Changeset 1258

Timestamp:

07/31/11 02:31:11 (22 months ago)

Author:

philmoz

Message:

Fixes for SX130is.

• Corrected value for get_flash_params_count
• Fixed modemap
• Remove redundant values from platform_camera.h
• Enable screen erase detect logic for menu redraw
• Updated memory size comment in makefile.inc

Location:

trunk/platform/sx130is

Files:

• lib.c (modified) (1 diff)
• platform_camera.h (modified) (3 diffs)
• shooting.c (modified) (4 diffs)
• sub/101c/makefile.inc (modified) (1 diff)
• sub/101d/makefile.inc (modified) (1 diff)
• sub/101f/makefile.inc (modified) (1 diff)

trunk/platform/sx130is/lib.c

@@ -152 +152 @@
 
 int get_flash_params_count(void){
- return 132; 
+ return 0x9a; 
 }
 

trunk/platform/sx130is/platform_camera.h

@@ -61 +61 @@
      #undef  CAM_SENSOR_BITS_PER_PIXEL
      #define CAM_SENSOR_BITS_PER_PIXEL                   12
-     #undef  CAM_WHITE_LEVEL
-     #define CAM_WHITE_LEVEL                             ((1<<CAM_SENSOR_BITS_PER_PIXEL)-1)
-     #undef  CAM_BLACK_LEVEL
-     #define CAM_BLACK_LEVEL                             127
  
      #define CAM_EXT_TV_RANGE                            1
@@ -71 +67 @@
      // copied from the SX200 which has the same video buffer size
      #undef CAM_USES_ASPECT_CORRECTION
-     #undef CAM_USES_ASPECT_YCORRECTION
      #define CAM_USES_ASPECT_CORRECTION                  1  //camera uses the modified graphics primitives to map screens an viewports to buffers more sized 
-     #define CAM_USES_ASPECT_YCORRECTION                 0  //only uses mappings on x coordinate
- 
-     #undef ASPECT_XCORRECTION
-     #define ASPECT_XCORRECTION(x)                       ((x)<<1)
- 
-     #undef ASPECT_GRID_XCORRECTION
-     #define ASPECT_GRID_XCORRECTION(x)                  (x)  //grids are designed on a 360x240 basis and screen is 320x240, we need x*320/360=x*8/9
-     #undef ASPECT_GRID_YCORRECTION
-     #define ASPECT_GRID_YCORRECTION(y)                  (y)  //y correction for grids  made on a 360x240 As the buffer is 720x240 we have no correction here.
- 
-     #undef ASPECT_VIEWPORT_XCORRECTION 
-     #define ASPECT_VIEWPORT_XCORRECTION(x)              ASPECT_GRID_XCORRECTION(x)
-     #undef ASPECT_VIEWPORT_YCORRECTION 
-     #define ASPECT_VIEWPORT_YCORRECTION(y)              (y)
- 
-     //games mappings
-     #undef GAMES_SCREEN_WIDTH
-     #define GAMES_SCREEN_WIDTH                          360
-     #undef GAMES_SCREEN_HEIGHT
-     #define GAMES_SCREEN_HEIGHT                         240
-     #undef ASPECT_GAMES_XCORRECTION
-     // 720/360=2 same aspect than grids and viewport but another approach: there is a lot of corrections to do in game's code, and we decide to paint directly on display buffer wirh another resolution
-     // used by gui.c that configures the draw environment (trhough new draw_gui function) depending on gui_mode: we have then 360x240 for games (but deformed output:circles are not circles) and 320x240 for
-     // other modes in perfect aspect ratio 4/3: slightly better visualization: file menus more readable, ...
-     #define ASPECT_GAMES_XCORRECTION(x)                 (((x)<<1))
-     #undef ASPECT_GAMES_YCORRECTION
-     #define ASPECT_GAMES_YCORRECTION(y)                 ((y))  //none
  
      #define CAM_ZEBRA_ASPECT_ADJUST                     1
@@ -129 +97 @@
                                                 // Used to enabled bracketing in custom timer, required on many recent cameras
                                                 // see http://chdk.setepontos.com/index.php/topic,3994.405.html
+
+        #define CAM_DETECT_SCREEN_ERASE     1       // Turn on guard pixels to detect screen erase and redraw CHDK buttons and menus
      
  //----------------------------------------------------------
- 
-        //********
-        /////SX200
-        //********

trunk/platform/sx130is/shooting.c

@@ -84 +84 @@
 
 
+/*
+http://www.usa.canon.com/cusa/consumer/products/cameras/digital_cameras/powershot_sx130_is#Specifications
+Shooting Modes:
+    M, Av, Tv, P, Auto, Easy, Portrait, Landscape, Kids & Pets, SCN, Movie
+
+SCN Scene Modes:
+    Smart Shutter, Low Light, Super Vivid, Poster Effect, Color Accent, Color Swap, 
+        Fish-eye Effect, Miniature Effect, Beach, Foliage, Snow, Fireworks
+
+Movie Modes:
+    Standard, Miniature Effect, Color Accent, Color Swap
+
+Smart Shutter Modes:
+    Smile, Wink Self-timer, Face Self-Timer
+*/
 // Corrected for SX130
 static const CapturemodeMap modemap[] = {
@@ -93 +108 @@
         { MODE_KIDS_PETS,          32786  },
         { MODE_LANDSCAPE,          32782  },
-        { MODE_PORTRAIT,           32873  },
+        { MODE_PORTRAIT,           32783  },
         { MODE_EASY,               33314  },
         
@@ -99 +114 @@
         { MODE_VIDEO_COLOR_SWAP,   2613   },
         { MODE_VIDEO_STD,          2614   },
-        //{ MODE_VIDEO_MINIATURE,    2620   }, // not defined in modelist.h
+        { MODE_VIDEO_MINIATURE,    2620   },
 
-        { MODE_SCN_SMART_SHUTTER,  16938  },
+    { MODE_SCN_FACE_SELF_TIMER,16936  },
+        { MODE_SCN_SMART_SHUTTER,  16937  },
+    { MODE_SCN_WINK_SELF_TIMER,16938  },
         { MODE_SCN_LOWLIGHT,       16417  },
         { MODE_SCN_SUPER_VIVID,    16934  },
@@ -112 +129 @@
         { MODE_SCN_FOLIAGE,        16405  },
         { MODE_SCN_SNOW,           16406  },
-        { MODE_SCN_FIREWORK,       16406  }
+        { MODE_SCN_FIREWORK,       16408  }
 };
 

trunk/platform/sx130is/sub/101c/makefile.inc

@@ -23 +23 @@
 # Set up size variables for EXMEM
 EXMEM_HEAP_SKIP=0x2F7600        #(0x44000000-0x43D08A00) from sub_FF8885CC = size of video buffers in EXMEM area
-EXMEM_BUFFER_SIZE=0x200000      # Amount of EXMEM memory to allocate for CHDK = 42B
+EXMEM_BUFFER_SIZE=0x200000      # Amount of EXMEM memory to allocate for CHDK = 2MB
 
 # points to the start of the memory pool used by the firmware

trunk/platform/sx130is/sub/101d/makefile.inc

@@ -23 +23 @@
 # Set up size variables for EXMEM
 EXMEM_HEAP_SKIP=0x2F7600        #(0x44000000-0x43D08A00) from sub_FF8885CC = size of video buffers in EXMEM area
-EXMEM_BUFFER_SIZE=0x200000      # Amount of EXMEM memory to allocate for CHDK = 42B
+EXMEM_BUFFER_SIZE=0x200000      # Amount of EXMEM memory to allocate for CHDK = 2MB
 
 # points to the start of the memory pool used by the firmware

trunk/platform/sx130is/sub/101f/makefile.inc

@@ -23 +23 @@
 # Set up size variables for EXMEM
 EXMEM_HEAP_SKIP=0x2F7600        #(0x44000000-0x43D08A00) from sub_FF8885CC = size of video buffers in EXMEM area
-EXMEM_BUFFER_SIZE=0x200000      # Amount of EXMEM memory to allocate for CHDK = 42B
+EXMEM_BUFFER_SIZE=0x200000      # Amount of EXMEM memory to allocate for CHDK = 2MB
 
 # points to the start of the memory pool used by the firmware