Changeset 1652 for branches/release-1_0/platform/ixus980_sd990/platform_camera.h

Timestamp:

02/09/12 10:43:09 (16 months ago)

Author:

philmoz

Message:

Re-align CHDK and CHDK-DE code base (part 2) - ​http://chdk.setepontos.com/index.php?topic=7601.0

• align more platform files that differed in white space or line order
• Add SetFileAttributes? function

File:

• branches/release-1_0/platform/ixus980_sd990/platform_camera.h (modified) (2 diffs)

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

@@ -1 @@
-// Camera - IXUS980_SD990 - platform_camera.h
+// Camera - ixus980_sd990 - platform_camera.h
 
-// This file contains the various settings values specific to the IXUS980_SD990 camera.
+// This file contains the various settings values specific to the ixus980_sd990 camera.
 // This file is referenced via the 'include/camera.h' file and should not be loaded directly.
 
@@ -21 +21 @@
 // don't override them again in here.
 
-    #define CAM_PROPSET                 2 // all values checked so far match propset 2
-    #define CAM_DRYOS                   1
+    #define CAM_PROPSET                     2       // all values checked so far match propset 2
+    #define CAM_DRYOS                       1
 
-    #define CAM_RAW_ROWPIX              4480 // 14.7 MP 12bpp
-    #define CAM_RAW_ROWS                3348   
+    #define CAM_RAW_ROWPIX                  4480    // 14.7 MP 12bpp
+    #define CAM_RAW_ROWS                    3348
 
     #undef  CAM_USE_ZOOM_FOR_MF
     #undef  CAM_HAS_ERASE_BUTTON
-    #define CAM_MULTIPART               1
+    #define CAM_MULTIPART                   1
     #undef  CAM_HAS_IRIS_DIAPHRAGM
-    #define CAM_HAS_ND_FILTER           1
+    #define CAM_HAS_ND_FILTER               1
     #define  CAM_HAS_MANUAL_FOCUS               1
     #define  CAM_HAS_USER_TV_MODES              1 //include M/P ? needed to make Tv bracketing work
-    #define CAM_SHOW_OSD_IN_SHOOT_MENU  1
+    #define CAM_SHOW_OSD_IN_SHOOT_MENU      1
     #define CAM_CHDK_HAS_EXT_VIDEO_MENU 1
     #undef  CAM_VIDEO_CONTROL
-    #undef CAM_UNCACHED_BIT  // shut up compiler
-    #define CAM_UNCACHED_BIT    0x40000000
-    #undef CAM_BITMAP_PALETTE
-    #define CAM_BITMAP_PALETTE    2
+    #undef  CAM_UNCACHED_BIT                        // shut up compiler
+    #define CAM_UNCACHED_BIT                0x40000000
+    #undef  CAM_BITMAP_PALETTE
+    #define CAM_BITMAP_PALETTE              2
 
-    #define CAM_HAS_JOGDIAL             1
-//    #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1
-    #define CAM_VIDEO_QUALITY_ONLY          1  
-        #undef CAM_SENSOR_BITS_PER_PIXEL
-    #define CAM_SENSOR_BITS_PER_PIXEL   12
+    #define CAM_HAS_JOGDIAL                 1
+//  #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1
+    #define CAM_VIDEO_QUALITY_ONLY          1
+    #undef  CAM_SENSOR_BITS_PER_PIXEL
+    #define CAM_SENSOR_BITS_PER_PIXEL       12
 
     #define CAM_DNG_LENS_INFO               { 77,10, 285,10, 28,10, 58,10 } // See comments in camera.h
     // pattern
-    #define cam_CFAPattern 0x01000201 // Green  Blue  Red  Green
+    #define cam_CFAPattern                  0x01000201 // Green  Blue  Red  Green
     // color preliminary
-    #define CAM_COLORMATRIX1                               \
-      837237, 1000000, -290137, 1000000, -128156, 1000000, \
-      -127762, 1000000, 643909, 1000000,  52973,  1000000, \
-      4446,  1000000, 88354,   1000000,  224246, 1000000
-    
-    #define cam_CalibrationIlluminant1 1 // Daylight
-    // cropping 
-    #define CAM_JPEG_WIDTH  4416
-    #define CAM_JPEG_HEIGHT 3312
-    #define CAM_ACTIVE_AREA_X1 12
-    #define CAM_ACTIVE_AREA_Y1 12
-    #define CAM_ACTIVE_AREA_X2 4444
-    #define CAM_ACTIVE_AREA_Y2 3324
+    #define CAM_COLORMATRIX1                              \
+     837237, 1000000, -290137, 1000000, -128156, 1000000, \
+    -127762, 1000000,  643909, 1000000,   52973, 1000000, \
+       4446, 1000000,   88354, 1000000,  224246, 1000000
+
+    #define cam_CalibrationIlluminant1      1       // Daylight
+    // cropping
+    #define CAM_JPEG_WIDTH                  4416
+    #define CAM_JPEG_HEIGHT                 3312
+    #define CAM_ACTIVE_AREA_X1              12
+    #define CAM_ACTIVE_AREA_Y1              12
+    #define CAM_ACTIVE_AREA_X2              4444
+    #define CAM_ACTIVE_AREA_Y2              3324
     // camera name
-    #define PARAM_CAMERA_NAME 4 // parameter number for GetParameterData sd990: OK
+    #define PARAM_CAMERA_NAME               4       // parameter number for GetParameterData sd990: OK
 
-    // copied from DavidBs D10 stuff
-    #undef CAM_USES_ASPECT_CORRECTION
-    #define CAM_USES_ASPECT_CORRECTION          1  //camera uses the modified graphics primitives to map screens an viewports to buffers more sized 
+   // copied from DavidBs D10 stuff
+    #undef  CAM_USES_ASPECT_CORRECTION
+    #define CAM_USES_ASPECT_CORRECTION      1       //camera uses the modified graphics primitives to map screens an viewports to buffers more sized
 
-    #define CAM_ZEBRA_ASPECT_ADJUST 1
+//  #define DNG_EXT_FROM                    ".CR2"
 
-//    #define DNG_EXT_FROM ".CR2"
+    #define CAM_ZEBRA_ASPECT_ADJUST         1
 //----------------------------------------------------------