Changeset 1970 for branches/release-1_0


Ignore:
Timestamp:
07/10/12 05:49:42 (11 months ago)
Author:
reyalp
Message:

alpha a3200 100d port from nafraf in ​http://chdk.setepontos.com/index.php?topic=7180.msg87628#msg87628

Location:
branches/release-1_0
Files:
33 added
3 edited

Legend:

Unmodified
Added
Removed

  • branches/release-1_0/camera_list.csv

    r1937 r1970  
    88a3000,100c,BETA,, 
    99a3000,100d,BETA,, 
     10a3200,100d,ALPHA,, 
    1011a3300,100a,BETA,, 
    1112a3300,100c,BETA,, 

  • branches/release-1_0/core/gui.c

    r1922 r1970  
    8686    // KEY_LEFT/KEY_RIGHT is used for gui_subj_dist_override_value_enum (because of no separate ZOOM_IN/OUT) 
    8787 
    88 #elif defined(CAMERA_a3300)     // a3300 has no erase button, so make DISP button the toggle_raw and Alt +/- shortcuts. 
     88#elif defined(CAMERA_a3300) || defined(CAMERA_a3200)// a3300 has no erase button, so make DISP button the toggle_raw and Alt +/- shortcuts. 
    8989    //Alt mode 
    9090    // NOTE both of these conflict with adjustable alt 
    … …  
    15201520        static const char* names[]={ "Print", "ISO"}; 
    15211521        static const int keys[]={ KEY_PRINT, KEY_ISO }; 
    1522     #elif defined(CAMERA_a3300) 
     1522    #elif defined(CAMERA_a3300) || defined(CAMERA_a3200) 
    15231523        static const char* names[]={ "Print", "Face", "Disp"}; 
    15241524        static const int keys[]={ KEY_PRINT, KEY_FACE, KEY_DISPLAY }; 

  • branches/release-1_0/core/kbd.c

    r1734 r1970  
    110110    defined(CAMERA_a1100) || \ 
    111111    defined(CAMERA_a3000) || \ 
     112    defined(CAMERA_a3200) || \ 
    112113    defined(CAMERA_a3300) 
    113114#define ZSTEP_TABLE_SIZE 8 
Note: See TracChangeset for help on using the changeset viewer.