Changeset 919


Ignore:
Timestamp:
08/07/10 19:35:07 (3 years ago)
Author:
fe50
Message:
Location:
trunk
Files:
14 added
4 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/Makefile

    r911 r919  
    106106        zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full.zip $(topdir)CHDK/LUALIB/GEN/*   > $(DEVNULL) 
    107107        zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full.zip $(topdir)CHDK/SCRIPTS/*  > $(DEVNULL) 
    108         zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full.zip $(topdir)CHDK/SCRIPTS/examples/*         > $(DEVNULL) 
     108        zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full.zip $(topdir)CHDK/SCRIPTS/EXAM/*     > $(DEVNULL) 
    109109        zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full.zip $(topdir)CHDK/SCRIPTS/TEST/*     > $(DEVNULL) 
    110110        zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full.zip $(topdir)CHDK/syscurves.CVF      > $(DEVNULL) 
    … …  
    235235        $(MAKE) -s --no-print-directory PLATFORM=s90  PLATFORMSUB=101c NO_INC_BUILD=1 firzipsub 
    236236        #$(MAKE) -s --no-print-directory PLATFORM=sx20 PLATFORMSUB=102b NO_INC_BUILD=1 firzipsub 
     237        #$(MAKE) -s --no-print-directory PLATFORM=sx20 PLATFORMSUB=102d NO_INC_BUILD=1 firzipsub 
    237238        $(MAKE) -s --no-print-directory PLATFORM=ixus85_sd770 PLATFORMSUB=100a NO_INC_BUILD=1 firzipsub 
    238239        #$(MAKE) -s --no-print-directory PLATFORM=ixus95_sd1200  PLATFORMSUB=100c NO_INC_BUILD=1 firzipsub 
    … …  
    273274        mv $(topdir)bin/$(VER)-ixus100_sd780-100c-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-ixus100_sd780-100c-$(BUILD_NUMBER)_BETA.zip 
    274275        #mv $(topdir)bin/$(VER)-sx20-102b-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-sx20-102b-$(BUILD_NUMBER)_BETA.zip 
     276        #mv $(topdir)bin/$(VER)-sx20-102d-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-sx20-102d-$(BUILD_NUMBER)_BETA.zip 
    275277        mv $(topdir)bin/$(VER)-ixus85_sd770-100a-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-ixus85_sd770-100a-$(BUILD_NUMBER)_BETA.zip 
    276278        #mv $(topdir)bin/$(VER)-ixus95_sd1200-100c-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-ixus95_sd1200-100c-$(BUILD_NUMBER)_BETA.zip 
    … …  
    380382        $(MAKE) -s --no-print-directory PLATFORM=s90  PLATFORMSUB=101c NO_INC_BUILD=1 firzipsubcomplete 
    381383        #$(MAKE) -s --no-print-directory PLATFORM=sx20 PLATFORMSUB=102b NO_INC_BUILD=1 firzipsubcomplete 
     384        #$(MAKE) -s --no-print-directory PLATFORM=sx20 PLATFORMSUB=102d NO_INC_BUILD=1 firzipsubcomplete 
    382385        $(MAKE) -s --no-print-directory PLATFORM=ixus85_sd770 PLATFORMSUB=100a NO_INC_BUILD=1 firzipsubcomplete 
    383386        #$(MAKE) -s --no-print-directory PLATFORM=ixus95_sd1200  PLATFORMSUB=100c NO_INC_BUILD=1 firzipsubcomplete       
    … …  
    452455        #mv $(topdir)bin/sx20-102b-$(BUILD_NUMBER)-full.zip $(topdir)bin/sx20-102b-$(BUILD_NUMBER)-full_BETA.zip 
    453456        #mv $(topdir)bin/sx20-102b-$(BUILD_NUMBER).zip $(topdir)bin/sx20-102b-$(BUILD_NUMBER)_BETA.zip 
     457        #mv $(topdir)bin/sx20-102d-$(BUILD_NUMBER)-full.zip $(topdir)bin/sx20-102d-$(BUILD_NUMBER)-full_BETA.zip 
     458        #mv $(topdir)bin/sx20-102d-$(BUILD_NUMBER).zip $(topdir)bin/sx20-102d-$(BUILD_NUMBER)_BETA.zip 
    454459        mv $(topdir)bin/ixus85_sd770-100a-$(BUILD_NUMBER)-full.zip $(topdir)bin/ixus85_sd770-100a-$(BUILD_NUMBER)-full_BETA.zip 
    455460        mv $(topdir)bin/ixus85_sd770-100a-$(BUILD_NUMBER).zip $(topdir)bin/ixus85_sd770-100a-$(BUILD_NUMBER)_BETA.zip 
    … …  
    559564        $(MAKE) -s --no-print-directory PLATFORM=s90  PLATFORMSUB=101c NO_INC_BUILD=1 clean 
    560565        #$(MAKE) -s --no-print-directory PLATFORM=sx20 PLATFORMSUB=102b NO_INC_BUILD=1 clean 
     566        #$(MAKE) -s --no-print-directory PLATFORM=sx20 PLATFORMSUB=102d NO_INC_BUILD=1 clean 
    561567        $(MAKE) -s --no-print-directory PLATFORM=ixus85_sd770 PLATFORMSUB=100a NO_INC_BUILD=1 clean 
    562568        #$(MAKE) -s --no-print-directory PLATFORM=ixus95_sd1200 PLATFORMSUB=100c NO_INC_BUILD=1 clean 

  • trunk/core/gui.c

    r917 r919  
    14471447    static const char* names[]={ "Shrtcut", "Flash", "Video"}; 
    14481448    static const int keys[]={ KEY_PRINT, KEY_FLASH, KEY_VIDEO }; 
    1449 #elif defined(CAMERA_a570) || defined(CAMERA_a590) 
     1449#elif defined(CAMERA_a570) || defined(CAMERA_a590) || defined(CAMERA_a720) 
    14501450    static const char* names[]={ "Print", "Display"}; 
    14511451    static const int keys[] = {KEY_PRINT, KEY_DISPLAY}; 

  • trunk/include/camera.h

    r917 r919  
    832832    #define CAM_RAW_ROWPIX              3336   // for new 8 MP 
    833833    #define CAM_RAW_ROWS                2480   // for new 8 MP 
     834    #define CAM_ADJUSTABLE_ALT_BUTTON   1 
    834835    #define CAM_CAN_MUTE_MICROPHONE     1 
    835836    #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1 

  • trunk/platform/a720/kbd.c

    r515 r919  
    1919static int usb_power=0; 
    2020static int remote_key, remote_count; 
     21static long alt_mode_key_mask = 0x00000800; 
    2122static int shoot_counter=0; 
    2223#define DELAY_TIMEOUT 10000 
    … …  
    240241        physw_status[1] = kbd_new_state[1]; 
    241242        physw_status[2] = kbd_new_state[2]; 
     243        physw_status[1] |= alt_mode_key_mask; 
    242244    } else { 
    243245        // override keys 
    … …  
    464466    dst[2] = *mmio2 & 0xffff; 
    465467} 
     468 
     469 
     470void kbd_set_alt_mode_key_mask(long key) 
     471{ 
     472        int i; 
     473        for (i=0; keymap[i].hackkey; ++i) { 
     474                if (keymap[i].hackkey == key) { 
     475                        alt_mode_key_mask = keymap[i].canonkey; 
     476                        return; 
     477                } 
     478        } 
     479} 
Note: See TracChangeset for help on using the changeset viewer.