Changeset 1541

Timestamp:

01/11/12 11:27:53 (16 months ago)

Author:

msl

Message:

+ activate colored icons for the a720
+ deactivate CAM_QUALITY_OVERRIDE for the sx220. This feature doesn't work really, it produce not useable pictures. Probably there is a EXMEM problem.
+ uniform activating PTP support for sx220/230, why is the ptp support not enabled for all cameras in camera.h?
+ some cleanups in platform_camera.h (a720, sx220/230)

Location:

branches/release-1_0/platform

Files:

• a720/platform_camera.h (modified) (2 diffs)
• sx220hs/platform_camera.h (modified) (1 diff)
• sx230hs/platform_camera.h (modified) (1 diff)

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

@@ -21 +21 @@
 // don't override them again in here.
 
-    #define CAM_PROPSET                 2
-    #define CAM_DRYOS                   1
+    #define CAM_PROPSET                     2
+    #define CAM_DRYOS                       1
 
-    #define CAM_RAW_ROWPIX              3336   // for new 8 MP
-    #define CAM_RAW_ROWS                2480   // for new 8 MP
+    #define CAM_RAW_ROWPIX                  3336   // for new 8 MP
+    #define CAM_RAW_ROWS                    2480   // for new 8 MP
 
-    #define CAM_MULTIPART               1
-    #define CAM_ADJUSTABLE_ALT_BUTTON   1
-    #define CAM_CAN_MUTE_MICROPHONE     1
+    #define CAM_MULTIPART                   1
+    #define CAM_ADJUSTABLE_ALT_BUTTON       1
+    #define CAM_CAN_MUTE_MICROPHONE         1
     #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1
-    #define CAM_EV_IN_VIDEO             1
+    #define CAM_EV_IN_VIDEO                 1
     #undef  CAM_VIDEO_CONTROL
-// disabled for now, see http://chdk.setepontos.com/index.php?topic=6182.0
-//    #define CAM_EXT_TV_RANGE            1
+
+//    #define CAM_EXT_TV_RANGE                1   // disabled for now, see http://chdk.setepontos.com/index.php?topic=6182.0
 
     #define CAM_DNG_LENS_INFO               { 58,10, 348,10, 28,10, 48,10 } // See comments in camera.h
     // pattern
-    #define cam_CFAPattern 0x01000201 // Green  Blue  Red  Green
+    #define cam_CFAPattern                  0x01000201  // Green  Blue  Red  Green
     // color
     #define CAM_COLORMATRIX1                               \
@@ -45 +45 @@
       17965,  1000000, 78396,   1000000, 231868, 1000000
     
-    #define cam_CalibrationIlluminant1 1 // Daylight
+    #define cam_CalibrationIlluminant1      1   // Daylight
     // cropping
-    #define CAM_JPEG_WIDTH  3264
-    #define CAM_JPEG_HEIGHT 2448
-    #define CAM_ACTIVE_AREA_X1 10
-    #define CAM_ACTIVE_AREA_Y1 8
-    #define CAM_ACTIVE_AREA_X2 3302
-    #define CAM_ACTIVE_AREA_Y2 2474
+    #define CAM_JPEG_WIDTH                  3264
+    #define CAM_JPEG_HEIGHT                 2448
+    #define CAM_ACTIVE_AREA_X1              10
+    #define CAM_ACTIVE_AREA_Y1              8
+    #define CAM_ACTIVE_AREA_X2              3302
+    #define CAM_ACTIVE_AREA_Y2              2474
     // camera name
-    #define PARAM_CAMERA_NAME 4 // parameter number for GetParameterData
+    #define PARAM_CAMERA_NAME               4   // parameter number for GetParameterData
 
-    #define DNG_EXT_FROM ".CR2"
-    #define  CAM_CHDK_PTP               1 // include CHDK PTP support
+    #define DNG_EXT_FROM                    ".CR2"
+
+    #define  CAM_CHDK_PTP                   1   // include CHDK PTP support
+
+    #define CAM_USE_COLORED_ICONS           1   // Enable using the CHDK-DE colored icons.
 //----------------------------------------------------------
 

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

@@ -85 +85 @@
     #define CAM_ZEBRA_NOBUF                 1
 
-    #define CAM_QUALITY_OVERRIDE            1
-    
+    //#define CAM_QUALITY_OVERRIDE            1   // this feature doesn't work really, it produce not useable pictures. There is a EXMEM problem.
+
     #define CAM_STARTUP_CRASH_FILE_OPEN_FIX 1
 
-    #define CAM_USE_COLORED_ICONS           1       // Enable using the CHDK-DE colored icons.
+    #define  CAM_CHDK_PTP                   1   // include CHDK PTP support
+
+    #define CAM_USE_COLORED_ICONS           1   // Enable using the CHDK-DE colored icons.
 //----------------------------------------------------------

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

@@ -99 +99 @@
     #define CAM_STARTUP_CRASH_FILE_OPEN_FIX 1
 
-    #define CAM_USE_COLORED_ICONS           1       // Enable using the CHDK-DE colored icons.
+    #define  CAM_CHDK_PTP                   1   // include CHDK PTP support
+
+    #define CAM_USE_COLORED_ICONS           1   // Enable using the CHDK-DE colored icons.