Changeset 1392


Ignore:
Timestamp:
11/03/11 07:03:56 (19 months ago)
Author:
philmoz
Message:

Add configurable ALT button for G10, G11 & G12 (from waterwingz).
​http://chdk.setepontos.com/index.php?topic=650.msg75220#msg75220

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/core/gui.c

    r1372 r1392  
    12391239    static const char* names[]={ "Shrtcut", "Flash", "Timer", "ISO", "Video" }; 
    12401240    static const int keys[]={ KEY_PRINT, KEY_FLASH, KEY_TIMER, KEY_ISO, KEY_VIDEO }; 
    1241 #elif defined(CAMERA_g7) 
     1241#elif defined(CAMERA_g7) || defined(CAMERA_g9) 
    12421242    static const char* names[]={ "Print", "FE"}; 
    12431243    static const int keys[]={ KEY_PRINT, KEY_MICROPHONE }; 
    1244 #elif defined(CAMERA_g9) 
    1245     static const char* names[]={ "Print", "FE"}; 
    1246     static const int keys[]={ KEY_PRINT,  KEY_MICROPHONE }; 
     1244#elif defined(CAMERA_g10) || defined(CAMERA_g12)   
     1245    static const char* names[]={ "Print", "Disp",  "AE Lock", "Jump" }; 
     1246    static const int keys[]={ KEY_PRINT, KEY_DISPLAY, KEY_AE_LOCK, KEY_METERING}; 
     1247#elif defined(CAMERA_g11) 
     1248    static const char* names[]={ "Print", "Disp",  "AE Lock", "Jump" }; 
     1249    static const int keys[]={ KEY_PRINT, KEY_DISPLAY, KEY_MICROPHONE, KEY_METERING};     
    12471250#elif defined(CAMERA_a650) 
    12481251    static const char* names[]={ "Print", "ISO"}; 

  • trunk/platform/g10/platform_camera.h

    r1364 r1392  
    3131    #undef  CAM_EMUL_KEYPRESS_DURATION 
    3232    #define CAM_EMUL_KEYPRESS_DURATION          10 
     33         
     34        #define CAM_ADJUSTABLE_ALT_BUTTON 1      
    3335 
    3436        #define CAM_RAW_ROWPIX                  4480            // G10 auto found @0xffacde38 

  • trunk/platform/g11/platform_camera.h

    r1363 r1392  
    3131    #define CAM_EMUL_KEYPRESS_DURATION  10 
    3232 
     33        #define CAM_ADJUSTABLE_ALT_BUTTON 1 
     34         
    3335    #undef CAM_MENU_BORDERWIDTH 
    3436    #define CAM_MENU_BORDERWIDTH        10 

  • trunk/platform/g12/kbd.c

    r1389 r1392  
    297297/****************/ 
    298298 
     299void kbd_set_alt_mode_key_mask(long key) 
     300{ 
     301} 
     302 
    299303void kbd_key_press(long key) 
    300304{ 

  • trunk/platform/g12/platform_camera.h

    r1352 r1392  
    3232    #undef  CAM_EMUL_KEYPRESS_DURATION 
    3333    #define CAM_EMUL_KEYPRESS_DURATION  10 
     34         
     35        #define CAM_ADJUSTABLE_ALT_BUTTON 1 
     36         
    3437    #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1 
    3538    #define CAM_MULTIPART               1 
Note: See TracChangeset for help on using the changeset viewer.