Changeset 911

Timestamp:

07/05/10 21:12:42 (3 years ago)

Author:

fe50

Message:

• added adjustable <Alt> button for A570, by Rorschach, ​http://chdk.setepontos.com/index.php/topic,3025.msg31537.html#msg31537 <Alt> key can be set to the DISPLAY or PRINT button from the "Miscellaneous stuff" / "<ALT> mode button" menu

Location:

trunk

Files:

• Makefile (modified) (1 diff)
• core/gui.c (modified) (1 diff)
• include/camera.h (modified) (1 diff)
• platform/a570/kbd.c (modified) (4 diffs)

trunk/Makefile

@@ -560 +560 @@
         #$(MAKE) -s --no-print-directory PLATFORM=sx20 PLATFORMSUB=102b NO_INC_BUILD=1 clean
         $(MAKE) -s --no-print-directory PLATFORM=ixus85_sd770 PLATFORMSUB=100a NO_INC_BUILD=1 clean
-        $(MAKE) -s --no-print-directory PLATFORM=ixus95_sd1200 PLATFORMSUB=100c NO_INC_BUILD=1 clean
+        #$(MAKE) -s --no-print-directory PLATFORM=ixus95_sd1200 PLATFORMSUB=100c NO_INC_BUILD=1 clean
 
         .PHONY: fir upload

trunk/core/gui.c

@@ -1447 +1447 @@
     static const char* names[]={ "Shrtcut", "Flash", "Video"};
     static const int keys[]={ KEY_PRINT, KEY_FLASH, KEY_VIDEO };
+#elif defined(CAMERA_a570)
+    static const char* names[]={ "Print", "Display"};
+    static const int keys[] = {KEY_PRINT, KEY_DISPLAY};
 #else
     #error camera alt-buttons not defined

trunk/include/camera.h

@@ -499 +499 @@
 
 #elif defined (CAMERA_a570)
-    #define CAM_PROPSET                 2
-
-    #define CAM_RAW_ROWPIX              3152   // for 7 MP
-    #define CAM_RAW_ROWS                2340   // for 7 MP
-    #define CAM_MULTIPART               1
-    #define CAM_CAN_MUTE_MICROPHONE     1
-    #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1
-    #define CAM_EV_IN_VIDEO             1
-    #define DNG_SUPPORT                 1
-    #define CAM_REAR_CURTAIN            1
-    // pattern
-    #define cam_CFAPattern 0x02010100 // Red  Green  Green  Blue
-    // color
-    #define CAM_COLORMATRIX1                               \
-      528283,  1000000,-144259, 1000000, -85966, 1000000,  \
-     -202789,  1000000, 736563, 1000000,  73008, 1000000,  \
-     -27130,   1000000, 107702, 1000000, 264543, 1000000
-
-    #define cam_CalibrationIlluminant1 1 // Daylight
-    // cropping
-    #define CAM_JPEG_WIDTH  3072
-    #define CAM_JPEG_HEIGHT 2304
-    #define CAM_ACTIVE_AREA_X1 38
-    #define CAM_ACTIVE_AREA_Y1 14
-    #define CAM_ACTIVE_AREA_X2 3146
-    #define CAM_ACTIVE_AREA_Y2 2338
-    // camera name
-    #define PARAM_CAMERA_NAME 4 // parameter number for GetParameterData
-
-    #define DNG_EXT_FROM ".DPS"
-    #define CAM_EXT_TV_RANGE            1
+        #define CAM_PROPSET                 2
+
+        #define CAM_RAW_ROWPIX              3152        // for 7 MP
+        #define CAM_RAW_ROWS                2340        // for 7 MP
+        #define CAM_MULTIPART               1
+        #define CAM_CAN_MUTE_MICROPHONE     1
+        #define CAM_ADJUSTABLE_ALT_BUTTON   1
+        #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1
+        #define CAM_EV_IN_VIDEO             1
+        #define DNG_SUPPORT                 1
+        #define CAM_REAR_CURTAIN            1
+        // pattern
+        #define cam_CFAPattern 0x02010100 // Red  Green  Green  Blue
+        // color
+        #define CAM_COLORMATRIX1                            \
+    528283, 1000000,-144259, 1000000, -85966, 1000000,  \
+    -202789, 1000000, 736563, 1000000, 73008, 1000000,  \
+    -27130,  1000000, 107702, 1000000, 264543, 1000000
+
+        #define cam_CalibrationIlluminant1 1 // Daylight
+        // cropping
+        #define CAM_JPEG_WIDTH  3072
+        #define CAM_JPEG_HEIGHT 2304
+        #define CAM_ACTIVE_AREA_X1 38
+        #define CAM_ACTIVE_AREA_Y1 14
+        #define CAM_ACTIVE_AREA_X2 3146
+        #define CAM_ACTIVE_AREA_Y2 2338
+        // camera name
+        #define PARAM_CAMERA_NAME 4 // parameter number for GetParameterData
+
+        #define DNG_EXT_FROM ".DPS"
+        #define CAM_EXT_TV_RANGE            1
 //----------------------------------------------------------
 

trunk/platform/a570/kbd.c

@@ -17 +17 @@
 static KeyMap keymap[];
 static long last_kbd_key = 0;
+static long alt_mode_key_mask = 0x00000800;
 static int usb_power=0;
 static int remote_key, remote_count;
@@ -234 +235 @@
         physw_status[1] = kbd_new_state[1];
         physw_status[2] = kbd_new_state[2];
-        //physw_status[1] |= alt_mode_key_mask;
+        physw_status[1] |= alt_mode_key_mask;
 
     } else {
@@ -279 +280 @@
 }
 
-/* void kbd_set_alt_mode_key_mask(long key)
+void kbd_set_alt_mode_key_mask(long key)
 {
     int i;
@@ -288 +289 @@
         }
     }
-} */
+}
 
 void kbd_key_press(long key)