Changeset 1318

Timestamp:

09/07/11 08:15:11 (21 months ago)

Author:

philmoz

Message:

Updates fpr S90 (tested by wrobbie):

• Enable startup crash fix - ​http://chdk.setepontos.com/index.php?topic=6179.msg72844#msg72844
• Change screen scaling from 9/4 to X2 - ​http://chdk.setepontos.com/index.php?topic=6395.msg72866#msg72866
• Removed redundant definitions from platform_camera.h

File:

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

trunk/platform/s90/platform_camera.h

@@ -50 +50 @@
     #define PARAM_CAMERA_NAME 4 // parameter number for GetParameterData
     #undef  CAM_SENSOR_BITS_PER_PIXEL
-    #undef  CAM_WHITE_LEVEL
-    #undef  CAM_BLACK_LEVEL
     #define CAM_SENSOR_BITS_PER_PIXEL   12
-    #define CAM_WHITE_LEVEL             ((1<<CAM_SENSOR_BITS_PER_PIXEL)-1)
-    #define CAM_BLACK_LEVEL             127
 
     #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
-    //games mappings
-        #undef GAMES_SCREEN_WIDTH
-        #undef GAMES_SCREEN_HEIGHT
-        #define GAMES_SCREEN_WIDTH 360
-        #define GAMES_SCREEN_HEIGHT 240
 
     #undef CAM_BITMAP_PALETTE
     #define CAM_BITMAP_PALETTE    4
 
-    #undef ASPECT_XCORRECTION
-        #define ASPECT_XCORRECTION(x)  ( ( ((x)<<3) + (x) )  >>2 )
-        #undef ASPECT_GAMES_XCORRECTION 
-        #define ASPECT_GAMES_XCORRECTION(x)   ( ((x)<<1) )  
-        #undef ASPECT_GAMES_YCORRECTION
-        #define ASPECT_GAMES_YCORRECTION(y)   ( (y) )  //none
-
-    #undef ASPECT_GRID_XCORRECTION
-    #define ASPECT_GRID_XCORRECTION(x)  ( ((x)<<3)/9  )  //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) //viewport is 360x240 and screen 320x240, we need x*320/360=x*8/9, equal than grids, used by edgeoverlay
-    #undef ASPECT_VIEWPORT_YCORRECTION 
-    #define ASPECT_VIEWPORT_YCORRECTION(y) ( (y) ) 
     #undef EDGE_HMARGIN 
     #define EDGE_HMARGIN 28
@@ -108 +81 @@
     /**** From SX200IS, ok for S90 END?*/
 
-   #define CAM_ZEBRA_ASPECT_ADJUST 1
+    #define CAM_ZEBRA_ASPECT_ADJUST 1
 
     #define CAM_DRIVE_MODE_FROM_TIMER_MODE      // use PROPCASE_TIMER_MODE to check for multiple shot custom timer.
@@ -114 +87 @@
                                                 // see http://chdk.setepontos.com/index.php/topic,3994.405.html
 
+        #define CAM_STARTUP_CRASH_FILE_OPEN_FIX 1                               // enable fix for camera crash at startup when opening the conf / font files
+                                                                                                                        // see http://chdk.setepontos.com/index.php?topic=6179.0
+
 //----------------------------------------------------------