Changeset 1414


Ignore:
Timestamp:
11/12/11 23:55:35 (19 months ago)
Author:
philmoz
Message:

Add ALPHA version for SX40HS, firmware 1.00f and 1.00g (thx ERR99).

Location:
trunk
Files:
45 added
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/camera_list.csv

    r1382 r1414  
    153153sx30,100n,,, 
    154154sx30,100p,,, 
     155sx40hs,100f,ALPHA,, 
     156sx40hs,100g,ALPHA,, 
    155157tx1,100g,,, 
    156158tx1,101b,,, 

  • trunk/core/gui.c

    r1411 r1414  
    101101 // KEY_LEFT/KEY_RIGHT is used for gui_subj_dist_override_value_enum (because of no separate ZOOM_IN/OUT) 
    102102 
    103 #elif defined(CAMERA_g7) || defined(CAMERA_sx10) || defined(CAMERA_sx1) || defined(CAMERA_sx20) || defined(CAMERA_sx30) 
     103#elif defined(CAMERA_g7) || defined(CAMERA_sx10) || defined(CAMERA_sx1) || defined(CAMERA_sx20) || defined(CAMERA_sx30) || defined(CAMERA_sx40hs) 
    104104//Alt mode 
    105105 #define SHORTCUT_TOGGLE_RAW          KEY_ERASE 
    … …  
    12571257    static const char* names[]={ "Print", "Face"}; 
    12581258    static const int keys[]={ KEY_PRINT, KEY_FACE }; 
    1259 #elif defined(CAMERA_sx10) || defined(CAMERA_sx1) || defined(CAMERA_sx20) || defined(CAMERA_sx30) 
     1259#elif defined(CAMERA_sx10) || defined(CAMERA_sx1) || defined(CAMERA_sx20) || defined(CAMERA_sx30) || defined(CAMERA_sx40hs) 
    12601260    static const char* names[]={ "Shrtcut", "Flash", "Video"}; 
    12611261    static const int keys[]={ KEY_PRINT, KEY_FLASH, KEY_VIDEO }; 

  • trunk/core/gui_draw.h

    r1402 r1414  
    626626#elif CAM_BITMAP_PALETTE==12 
    627627 
    628 // Used by :- G12, SX30, IXUS310_ELPH500HS 
     628// Used by :- G12, SX30, SX40HS, IXUS310_ELPH500HS 
    629629 
    630630// Default Canon colors 

  • trunk/core/kbd.c

    r1382 r1414  
    5959#endif 
    6060 
    61 #if defined(CAMERA_sx30) 
     61#if defined(CAMERA_sx30) || defined(CAMERA_sx40hs) 
    6262#define ZSTEP_TABLE_SIZE 11 
    6363static int nTxtbl[]={0,20,40,60,80,100,120,140,160,180,200}; 

  • trunk/core/raw.c

    r1412 r1414  
    117117    int i; 
    118118    if (gamma[255]) return; 
    119 #if defined(CAMERA_sx30) || defined(CAMERA_g12) || defined(CAMERA_ixus310_elph500hs) 
     119#if defined(CAMERA_sx30) || defined(CAMERA_sx40hs) || defined(CAMERA_g12) || defined(CAMERA_ixus310_elph500hs) 
    120120    for (i=0; i<12; i++) gamma[i]=255*pow(i/255.0, 0.5); 
    121121    for (i=12; i<64; i++) gamma[i]=255*pow(i/255.0, 0.4); 

  • trunk/platform/generic/shooting.c

    r1324 r1414  
    300300  if (iso_market_base==0) { 
    301301      if (ISO_MIN_VALUE==50) iso_market_base=50; 
     302#if defined(CAMERA_sx40hs) 
     303      else iso_market_base=200; 
     304#else 
    302305      else iso_market_base=100; 
     306#endif 
    303307     } 
    304308  return iso_market_base; 
Note: See TracChangeset for help on using the changeset viewer.