Changeset 1048


Ignore:
Timestamp:
01/16/11 01:34:28 (2 years ago)
Author:
reyalP
Message:

enable CHDK PTP by default for tested cameras: a540, a590, a610, a720, d10, ixus870_sd880, ixus970_sd890, ixus95_sd1200, s5is, sx200is, sx20, sx30, g12

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/buildconf.inc

    r1041 r1048  
    99OPT_DEBUGGING=1 
    1010OPT_EDGEOVERLAY=1 
     11# experimental PTP/USB interface. Enabled/disabled for individual cameras in camera.h 
     12OPT_PTP=1 
    1113 
    1214# Scripting components 
    … …  
    2426# See exmem_malloc_init in generic/wrappers.c 
    2527#OPT_EXMEM_MALLOC=1 
    26 # experimental PTP/USB interface 
    27 #OPT_PTP=1 
    2828#OPT_MD_DEBUG=1 
    2929# require correct FI2 keys in platform/fi2.inc , see http://chdk.wikia.com/wiki/For_Developers/fi2offsets and http://chdk.setepontos.com/index.php/topic,2995.0.html 

  • trunk/include/camera.h

    r1046 r1048  
    680680 
    681681    #define DNG_EXT_FROM ".DPS" 
     682    #define  CAM_CHDK_PTP               1 // include CHDK PTP support 
    682683//---------------------------------------------------------- 
    683684 
    … …  
    18801881    #define CAM_WHITE_LEVEL             ((1<<CAM_SENSOR_BITS_PER_PIXEL)-1) 
    18811882    #define CAM_BLACK_LEVEL             127 
     1883    #define  CAM_CHDK_PTP               1 // include CHDK PTP support 
    18821884//---------------------------------------------------------- 
    18831885 
    … …  
    22962298        // camera has very little free memory 
    22972299    #define CAM_ZEBRA_NOBUF 1 
     2300    #define  CAM_CHDK_PTP               1 // include CHDK PTP support 
    22982301 
    22992302//---------------------------------------------------------- 
    … …  
    24072410    #define CAM_BRACKETING              1  
    24082411    #define DNG_EXT_FROM ".DPS" 
     2412    #define  CAM_CHDK_PTP               1 // include CHDK PTP support 
    24092413//---------------------------------------------------------- 
    24102414 
    … …  
    27382742   #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1 
    27392743   #define CAM_ZEBRA_ASPECT_ADJUST 1 
     2744    #define  CAM_CHDK_PTP               1 // include CHDK PTP support 
    27402745//---------------------------------------------------------- 
    27412746 
    … …  
    31203125   #undef EDGE_HMARGIN 
    31213126   #define EDGE_HMARGIN 2 
    3122    #undef CAM_CHDK_PTP 
    31233127   #define CAM_CHDK_PTP 1 
    31243128         
Note: See TracChangeset for help on using the changeset viewer.