Changeset 460

Timestamp:

07/30/08 19:16:01 (5 years ago)

Author:

EWAVR

Message:

SX100IS:
+ added adjustable <alt> button and "face" key

• changed "toggle zebra" shortcut to half+down
• removed "hide OSD on shooting menu"

Location:

trunk

Files:

• core/gui.c (modified) (2 diffs)
• core/kbd.c (modified) (1 diff)
• include/camera.h (modified) (1 diff)
• include/keyboard.h (modified) (1 diff)
• platform/sx100is/kbd.c (modified) (3 diffs)
• platform/sx100is/sub/100c/makefile.inc (modified) (1 diff)
• platform/sx100is/sub/100c/movie_rec.c (modified) (1 diff)

trunk/core/gui.c

@@ -67 +67 @@
  #define SHORTCUT_SET_HYPERFOCAL      KEY_DOWN
 
+#elif defined(CAMERA_sx100is)
+//Alt mode
+ #define SHORTCUT_TOGGLE_RAW          KEY_ERASE
+//Half press shoot button    
+ #define SHORTCUT_TOGGLE_HISTO        KEY_UP
+ #define SHORTCUT_TOGGLE_ZEBRA        KEY_DOWN
+ #define SHORTCUT_TOGGLE_OSD          KEY_RIGHT
+//Alt mode & Manual mode  
+ #define SHORTCUT_SET_INFINITY        KEY_UP
+ #define SHORTCUT_SET_HYPERFOCAL      KEY_DOWN
+
 #else
 
@@ -988 +999 @@
     static const char* names[]={ "Print", "ISO"};
     static const int keys[]={ KEY_PRINT, KEY_ISO };
+#elif defined(CAMERA_sx100is)
+    static const char* names[]={ "Print", "Face"};
+    static const int keys[]={ KEY_PRINT, KEY_FACE };
 #else
     #error camera alt-buttons not defined

trunk/core/kbd.c

@@ -432 +432 @@
     { KEY_EXPO_CORR,    "expo_corr"  },
     { KEY_MICROPHONE,   "fe"         },
+    { KEY_FACE,         "face"       },
     { 0xFF,             "remote"     },
-        { 0xFFFF,           "no_key"     },
+    { 0xFFFF,           "no_key"     },
 };
 

trunk/include/camera.h

@@ -552 +552 @@
     #define CAM_CAN_MUTE_MICROPHONE     1
     #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1
+    #define CAM_ADJUSTABLE_ALT_BUTTON   1
+    #define CAM_SHOW_OSD_IN_SHOOT_MENU  1
 
 //----------------------------------------------------------

trunk/include/keyboard.h

@@ -23 +23 @@
 #define KEY_EXPO_CORR   20     //G-series
 #define KEY_MICROPHONE  21
-#define KEY_DUMMY       22     //dummy key for pressing to disable energy saving in alt mode
+#define KEY_FACE        22  //SX100IS
+#define KEY_DUMMY       23     //dummy key for pressing to disable energy saving in alt mode
 
 

trunk/platform/sx100is/kbd.c

@@ -18 +18 @@
 static long last_kbd_key = 0;
 static long alt_mode_key_mask = 0x10000000;
-static int alt_mode_led=0;
 static int usb_power=0;
 static int remote_key, remote_count;
@@ -24 +23 @@
 
 #define KEYS_MASK0 (0x0000000C)
-#define KEYS_MASK1 (0x171F0300)
+#define KEYS_MASK1 (0x1F1F0300)
 #define KEYS_MASK2 (0x00000000)
 
@@ -51 +50 @@
         { 1, KEY_ERASE    , 0x01000000 },
         { 1, KEY_LEFT     , 0x00040000 },
+        { 1, KEY_FACE     , 0x08000000 },
 
         { 0, KEY_SHOOT_FULL, 0x0000000C }, 

trunk/platform/sx100is/sub/100c/makefile.inc

@@ -8 +8 @@
 MEMISOSTART=0x9F498
 MEMISOSIZE=0x40000
-//MEMISOSIZE=0x50000
 ROMBASEADDR=0xffc00000
 

trunk/platform/sx100is/sub/100c/movie_rec.c

@@ -1959 +1959 @@
 
 long CompressionRateTable[]={0x60, 0x5D, 0x5A, 0x57, 0x54, 0x51, 0x4D, 0x48, 0x42, 0x3B, 0x32, 0x29, 0x22, 0x1D, 0x17, 0x14, 0x10, 0xE, 0xB, 9, 7, 6, 5, 4, 3, 2, 1};
-                                                        
+