Changeset 1793


Ignore:
Timestamp:
04/09/12 10:39:05 (14 months ago)
Author:
philmoz
Message:

Updates to A800 and IXUS120 from waterwingz.
​http://chdk.setepontos.com/index.php?topic=650.msg83799#msg83799
​http://chdk.setepontos.com/index.php?topic=650.msg83952#msg83952

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

Legend:

Unmodified
Added
Removed

  • branches/release-1_0/camera_list.csv

    r1734 r1793  
    4444a710,100a,,, 
    4545a720,100c,,, 
    46 a800,100c,ALPHA,, 
     46a800,100b,BETA,, 
     47a800,100c,BETA,, 
    4748d10,100a,BETA,100b, 
    4849g10,102a,,, 

  • branches/release-1_0/platform/a800/shooting.c

    r1726 r1793  
    110110 
    111111#if defined(CAM_DATE_FOLDER_NAMING) 
    112 void get_target_dir_name(char *out) { 
     112// A800 uses date to name directory 
     113void get_target_dir_name(char *out)  
     114{ 
    113115    extern void _GetImageFolder(char*,int,int,int); 
    114     out[0] = 'A'; 
    115     _GetImageFolder(out+1,get_file_next_counter(),CAM_DATE_FOLDER_NAMING,time(NULL)); 
    116     out[15] = '\0'; 
     116        _GetImageFolder(out,get_file_next_counter(),0x400,time(NULL)); 
    117117} 
    118118#else 

  • branches/release-1_0/platform/ixus120_sd940/platform_camera.h

    r1697 r1793  
    3838    #define CAM_UNCACHED_BIT                0x40000000 
    3939    #define CAM_HAS_ND_FILTER               1 
    40  
     40    #undef CAM_HAS_ERASE_BUTTON    // Camera does not have a dedicated erase button 
     41    
    4142    #define CAM_DNG_LENS_INFO               { 50,10, 200,10, 28,10, 59,10 } // See comments in camera.h 
    4243    // pattern 
Note: See TracChangeset for help on using the changeset viewer.