Changeset 1258 for trunk/platform/sx130is/platform_camera.h

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

File:

• trunk/platform/sx130is/platform_camera.h (modified) (3 diffs)

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
-        //********