Changeset 1968

Timestamp:

07/10/12 04:58:30 (11 months ago)

Author:

reyalp

Message:

adjustable alt button (disp or play) for ixus120_sd940 from waterwingz in ​http://chdk.setepontos.com/index.php?topic=650.msg87620#msg87620

Location:

trunk

Files:

• core/gui.c (modified) (1 diff)
• platform/ixus120_sd940/kbd.c (modified) (3 diffs)
• platform/ixus120_sd940/platform_camera.h (modified) (1 diff)

trunk/core/gui.c

@@ -1480 +1480 @@
         static const char* names[]={ "Video", "Display", "Playback", "Video"};
         static const int keys[] = {KEY_PRINT, KEY_DISPLAY, KEY_PLAYBACK, KEY_VIDEO};
+    #elif defined(CAMERA_ixus120_sd940)
+        static const char* names[]={ "Display", "Playback" };
+        static const int keys[] = {KEY_DISPLAY, KEY_PLAYBACK };
     #else
         #error camera alt-buttons not defined

trunk/platform/ixus120_sd940/kbd.c

@@ -23 +23 @@
 #define KEYS_MASK0 (0x00000008|0X00000004)
 #define KEYS_MASK1 (0x00000000)
-#define KEYS_MASK2 (0x00000300|0x00000100|0x00000080|0x00000040|0x00000010|0x00000020|0x00000004|0x00000008|0x00000001)
+#define KEYS_MASK2 (0x00000800|0x00000300|0x00000100|0x00000080|0x00000040|0x00000010|0x00000020|0x00000004|0x00000008|0x00000001)
 
 #define NEW_SS (0x2000)
@@ -50 +50 @@
         /* tiny bug: key order matters. see kbd_get_pressed_key() */
 
+        { 2, KEY_PLAYBACK       , 0x00000800 },
         { 2, KEY_SHOOT_FULL     , 0x00000300 },
-    { 2, KEY_SHOOT_FULL_ONLY, 0x00000200 },
+        { 2, KEY_SHOOT_FULL_ONLY, 0x00000200 },
         { 2, KEY_SHOOT_HALF     , 0x00000100 },
-        { 2, KEY_UP                     , 0x00000080 },
+        { 2, KEY_UP             , 0x00000080 },
         { 2, KEY_DOWN           , 0x00000040 },
         { 2, KEY_LEFT           , 0x00000010 },
@@ -64 +65 @@
         { 0, KEY_SET            , 0x00000004 },
         /*
-        { 2, KEY_PWR_PLAYBACK   , 0x00000800 },
         { 2, KEY_PWR_SHOOT              , 0x00000400 },
         { 2, KEY_BATTERY_DOOR   , 0x00008000 },

trunk/platform/ixus120_sd940/platform_camera.h

@@ -39 +39 @@
     #define CAM_HAS_ND_FILTER               1
     #undef CAM_HAS_ERASE_BUTTON    // Camera does not have a dedicated erase button
+
+    #define CAM_ADJUSTABLE_ALT_BUTTON       1
    
     #define CAM_DNG_LENS_INFO               { 50,10, 200,10, 28,10, 59,10 } // See comments in camera.h