Changeset 391 for trunk


Ignore:
Timestamp:
09/13/10 08:41:55 (4 years ago)
Author:
msl
Message:

SX120 Alpha-Version

Location:
trunk
Files:
32 added
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Makefile

    r389 r391  
    240240        $(MAKE) -s --no-print-directory PLATFORM=a470  PLATFORMSUB=102c NO_INC_BUILD=1 firzipsub 
    241241        $(MAKE) -s --no-print-directory PLATFORM=sx110is  PLATFORMSUB=100b NO_INC_BUILD=1 firzipsub 
     242        $(MAKE) -s --no-print-directory PLATFORM=sx120is  PLATFORMSUB=100b NO_INC_BUILD=1 firzipsub 
    242243        $(MAKE) -s --no-print-directory PLATFORM=sx200is  PLATFORMSUB=100c NO_INC_BUILD=1 firzipsub 
    243244        $(MAKE) -s --no-print-directory PLATFORM=ixus90_sd790  PLATFORMSUB=100c NO_INC_BUILD=1 firzipsub 
     
    294295        mv $(topdir)bin/$(VER)-d10-100a-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-d10-100a-$(BUILD_NUMBER)_BETA.zip 
    295296        mv $(topdir)bin/$(VER)-a430-100b-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-a430-100b-$(BUILD_NUMBER)_BETA.zip 
     297        mv $(topdir)bin/$(VER)-sx120is-100b-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-sx120is-100b-$(BUILD_NUMBER)_ALPHA.zip 
    296298        @echo "**** Done Copying duplicate Firmwares" 
    297299        @echo "**** Summary of memisosizes" 
     
    387389        $(MAKE) -s --no-print-directory PLATFORM=a470  PLATFORMSUB=102c NO_INC_BUILD=1 firzipsubcomplete 
    388390        $(MAKE) -s --no-print-directory PLATFORM=sx110is  PLATFORMSUB=100b NO_INC_BUILD=1 firzipsubcomplete 
     391        $(MAKE) -s --no-print-directory PLATFORM=sx120is  PLATFORMSUB=100b NO_INC_BUILD=1 firzipsubcomplete 
    389392        $(MAKE) -s --no-print-directory PLATFORM=sx200is  PLATFORMSUB=100c NO_INC_BUILD=1 firzipsubcomplete 
    390393        $(MAKE) -s --no-print-directory PLATFORM=ixus90_sd790  PLATFORMSUB=100c NO_INC_BUILD=1 firzipsubcomplete 
     
    476479        mv $(topdir)bin/a430-100b-$(BUILD_NUMBER)-full.zip $(topdir)bin/a430-100b-$(BUILD_NUMBER)-full_BETA.zip 
    477480        mv $(topdir)bin/a430-100b-$(BUILD_NUMBER).zip $(topdir)bin/a430-100b-$(BUILD_NUMBER)_BETA.zip 
     481        mv $(topdir)bin/sx120is-100b-$(BUILD_NUMBER)-full.zip $(topdir)bin/sx120is-100b-$(BUILD_NUMBER)-full_ALPHA.zip 
     482        mv $(topdir)bin/sx120is-100b-$(BUILD_NUMBER).zip $(topdir)bin/sx120is-100b-$(BUILD_NUMBER)_ALPHA.zip 
    478483        @echo "**** Done Copying duplicate Firmwares" 
    479484        @echo "**** Summary of memisosizes" 
     
    567572        $(MAKE) -s --no-print-directory PLATFORM=a470  PLATFORMSUB=102c NO_INC_BUILD=1 clean 
    568573        $(MAKE) -s --no-print-directory PLATFORM=sx110is  PLATFORMSUB=100b NO_INC_BUILD=1 clean 
     574        $(MAKE) -s --no-print-directory PLATFORM=sx120is  PLATFORMSUB=100b NO_INC_BUILD=1 clean 
    569575        $(MAKE) -s --no-print-directory PLATFORM=sx200is  PLATFORMSUB=100c NO_INC_BUILD=1 clean 
    570576        $(MAKE) -s --no-print-directory PLATFORM=ixus90_sd790  PLATFORMSUB=100c NO_INC_BUILD=1 clean 
  • trunk/core/gui.c

    r380 r391  
    7272 // KEY_LEFT/KEY_RIGHT is used for gui_subj_dist_override_value_enum (because of no separate ZOOM_IN/OUT) 
    7373  
    74 #elif defined(CAMERA_g7) || defined(CAMERA_sx10) || defined(CAMERA_sx1) ||defined(CAMERA_sx110is) || defined(CAMERA_sx20) 
     74#elif defined(CAMERA_g7) || defined(CAMERA_sx10) || defined(CAMERA_sx1) ||defined(CAMERA_sx110is) ||defined(CAMERA_sx120is) || defined(CAMERA_sx20) 
    7575//Alt mode 
    7676 #define SHORTCUT_TOGGLE_RAW          KEY_ERASE 
  • trunk/core/kbd.c

    r371 r391  
    106106#endif 
    107107// ------ add by Masuji SUTO (end)   -------------- 
    108 #if defined(CAMERA_sx100is) || defined(CAMERA_sx110is) 
     108#if defined(CAMERA_sx100is) || defined(CAMERA_sx110is) || defined(CAMERA_sx120is) 
    109109#define ZSTEP_TABLE_SIZE 8 
    110110static int nTxtbl[]={0,3,6,9,13,16,20,23}; 
  • trunk/include/camera.h

    r389 r391  
    26212621//---------------------------------------------------------- 
    26222622 
     2623#elif defined (CAMERA_sx120is) 
     2624 
     2625    #define CAM_PROPSET                     3 
     2626    #define CAM_DRYOS                       1 
     2627    #define CAM_RAW_ROWPIX                  3728 // see platform/sub/*/lib.c 
     2628    #define CAM_RAW_ROWS                    2778 
     2629    #undef  CAM_SYNCH  
     2630    #define CAM_CAN_MUTE_MICROPHONE         1  
     2631    #define CAM_SHOW_OSD_IN_SHOOT_MENU      0 
     2632    #define CAM_REAR_CURTAIN                1 
     2633    #define CAM_CAN_UNLOCK_OPTICAL_ZOOM_IN_VIDEO 1 
     2634    #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1  
     2635    #undef  CAM_VIDEO_CONTROL 
     2636    #define CAM_MULTIPART                   1 
     2637    #define CAM_HAS_JOGDIAL                 1 
     2638    #undef  CAM_USE_ZOOM_FOR_MF 
     2639    #undef  CAM_UNCACHED_BIT                    // shut up compiler 
     2640    #define CAM_UNCACHED_BIT                0x40000000 
     2641    #undef  CAM_SENSOR_BITS_PER_PIXEL 
     2642    #define CAM_SENSOR_BITS_PER_PIXEL       12 
     2643    #undef  CAM_WHITE_LEVEL 
     2644    #define CAM_WHITE_LEVEL                 ((1<<CAM_SENSOR_BITS_PER_PIXEL)-1) 
     2645    #undef  CAM_BLACK_LEVEL 
     2646    #define CAM_BLACK_LEVEL                 128 // black level set to 128 per reports on the forum 
     2647    #define DNG_SUPPORT                     1 
     2648    #define PARAM_CAMERA_NAME               4   // parameter number for GetParameterData 
     2649    #define cam_CFAPattern                  0x01000201 // Green  Blue  Red  Green 
     2650 
     2651    #define CAM_COLORMATRIX1                               \ 
     2652      728616, 1000000, -224281, 1000000, -104767, 1000000, \ 
     2653        4176, 1000000,  440179, 1000000,   45782, 1000000, \ 
     2654       26983, 1000000,   68443, 1000000,  186465, 1000000 
     2655 
     2656    #define CAM_ACTIVE_AREA_X1              12 
     2657    #define CAM_ACTIVE_AREA_Y1              10 
     2658    #define CAM_ACTIVE_AREA_X2              3664 
     2659    #define CAM_ACTIVE_AREA_Y2              2768 
     2660    #define cam_CalibrationIlluminant1      1   // Daylight 
     2661    #define CAM_JPEG_WIDTH                  3648  
     2662    #define CAM_JPEG_HEIGHT                 2736 
     2663    #undef  CAM_BITMAP_PALETTE 
     2664    #define CAM_BITMAP_PALETTE              4 
     2665 
     2666    #undef  CAM_USES_ASPECT_CORRECTION 
     2667    #define CAM_USES_ASPECT_CORRECTION      1 
     2668    #undef  CAM_USES_ASPECT_YCORRECTION 
     2669    #define CAM_USES_ASPECT_YCORRECTION     0 
     2670    #undef  ASPECT_XCORRECTION 
     2671    #define ASPECT_XCORRECTION(x)           (x) 
     2672    #undef  ASPECT_YCORRECTION 
     2673    #define ASPECT_YCORRECTION(y)           (y) 
     2674    #undef  ASPECT_GRID_XCORRECTION 
     2675    #define ASPECT_GRID_XCORRECTION(x)      (((x)<<1)) 
     2676    #undef  ASPECT_GRID_YCORRECTION 
     2677    #define ASPECT_GRID_YCORRECTION(y)      (y) 
     2678    #undef  ASPECT_VIEWPORT_XCORRECTION 
     2679    #define ASPECT_VIEWPORT_XCORRECTION(x)  (((x)<<1)) 
     2680    #undef  ASPECT_VIEWPORT_YCORRECTION 
     2681    #define ASPECT_VIEWPORT_YCORRECTION(y)  (y) 
     2682    #undef  GAMES_SCREEN_WIDTH 
     2683    #define GAMES_SCREEN_WIDTH 360 
     2684    #undef  GAMES_SCREEN_HEIGHT 
     2685    #define GAMES_SCREEN_HEIGHT 240 
     2686    #undef  ASPECT_GAMES_XCORRECTION 
     2687    #define ASPECT_GAMES_XCORRECTION(x)     (((x)<<1)) 
     2688    #undef  ASPECT_GAMES_YCORRECTION 
     2689    #define ASPECT_GAMES_YCORRECTION(y)     (y) 
     2690    #define CAM_ZEBRA_ASPECT_ADJUST         1 
     2691 
     2692    #define CAM_EXT_TV_RANGE                1 
     2693    #define CAM_QUALITY_OVERRIDE            1 
     2694//---------------------------------------------------------- 
     2695 
    26232696#elif defined (CAMERA_sx200is) 
    26242697 
  • trunk/makefile.inc

    r371 r391  
    2929 
    3030#PLATFORM=sx110is 
     31#PLATFORMSUB=100b 
     32 
     33#PLATFORM=sx120is 
    3134#PLATFORMSUB=100b 
    3235 
  • trunk/platform/generic/shooting.c

    r331 r391  
    801801// reyalp - this is related to http://chdk.setepontos.com/index.php/topic,3994.405.html 
    802802// TODO 
    803 #if defined (CAMERA_sx200is) || defined (CAMERA_g11) || defined (CAMERA_ixus100_sd780) || defined (CAMERA_a480) || defined (CAMERA_s90) || defined (CAMERA_sx20) 
     803#if defined (CAMERA_sx200is) || defined (CAMERA_g11) || defined (CAMERA_ixus100_sd780) || defined (CAMERA_a480) || defined (CAMERA_s90) || defined (CAMERA_sx20) || defined (CAMERA_sx120is) 
    804804   short n; 
    805805   // unlike other cameras, sx200 does set PROPCASE_DRIVE_MODE when in custom timer mode 
Note: See TracChangeset for help on using the changeset viewer.