Changeset 686


Ignore:
Timestamp:
06/18/11 04:19:05 (2 years ago)
Author:
reyalp
Message:

Aktualisierung auf Rev.1205-1206 offizieller Trunk

+ a490 100f beta, danke mrowl

Location:
trunk
Files:
32 added
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Makefile

    r682 r686  
    275275        $(MAKE) -s --no-print-directory PLATFORM=ixus100_sd780  PLATFORMSUB=100c NO_INC_BUILD=1 firzipsub 
    276276        $(MAKE) -s --no-print-directory PLATFORM=a480  PLATFORMSUB=100b NO_INC_BUILD=1 firzipsub 
     277        $(MAKE) -s --no-print-directory PLATFORM=a490  PLATFORMSUB=100f NO_INC_BUILD=1 firzipsub 
    277278        $(MAKE) -s --no-print-directory PLATFORM=s90  PLATFORMSUB=100c NO_INC_BUILD=1 firzipsub 
    278279        $(MAKE) -s --no-print-directory PLATFORM=s90  PLATFORMSUB=101a NO_INC_BUILD=1 firzipsub 
     
    371372        mv $(topdir)bin/$(VER)-a580-101b-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-a580-101b-$(BUILD_NUMBER)_ALPHA.zip 
    372373        mv $(topdir)bin/$(VER)-ixus300_sd4000-100d-$(BUILD_NUMBER).zip $(topdir)bin/ixus300_sd4000-100d-$(BUILD_NUMBER)_ALPHA.zip 
     374        mv $(topdir)bin/$(VER)-a490-100f-$(BUILD_NUMBER).zip $(topdir)bin/a490-100f-$(BUILD_NUMBER)_BETA.zip 
    373375        @echo "**** Done Copying duplicate Firmwares" 
    374376        @echo "**** Summary of memisosizes" 
     
    478480        $(MAKE) -s --no-print-directory PLATFORM=ixus100_sd780  PLATFORMSUB=100c NO_INC_BUILD=1 firzipsubcomplete 
    479481        $(MAKE) -s --no-print-directory PLATFORM=a480  PLATFORMSUB=100b NO_INC_BUILD=1 firzipsubcomplete 
     482        $(MAKE) -s --no-print-directory PLATFORM=a490  PLATFORMSUB=100f NO_INC_BUILD=1 firzipsubcomplete 
    480483        $(MAKE) -s --no-print-directory PLATFORM=s90  PLATFORMSUB=100c NO_INC_BUILD=1 firzipsubcomplete 
    481484        $(MAKE) -s --no-print-directory PLATFORM=s90  PLATFORMSUB=101a NO_INC_BUILD=1 firzipsubcomplete 
     
    637640        mv $(topdir)bin/a580-101b-$(BUILD_NUMBER).zip $(topdir)bin/a580-101b-$(BUILD_NUMBER)_ALPHA.zip 
    638641        mv $(topdir)bin/ixus300_sd4000-100d-$(BUILD_NUMBER)-full.zip $(topdir)bin/ixus300_sd4000-100d-$(BUILD_NUMBER)-full_ALPHA.zip 
     642        mv $(topdir)bin/a490-100f-$(BUILD_NUMBER).zip $(topdir)bin/a490-100f-$(BUILD_NUMBER)_BETA.zip 
     643        mv $(topdir)bin/a490-100f-$(BUILD_NUMBER)-full.zip $(topdir)bin/a490-100f-$(BUILD_NUMBER)-full_BETA.zip 
    639644        mv $(topdir)bin/ixus300_sd4000-100d-$(BUILD_NUMBER).zip $(topdir)bin/ixus300_sd4000-100d-$(BUILD_NUMBER)_ALPHA.zip 
    640645        @echo "**** Done Copying duplicate Firmwares" 
     
    741746        $(MAKE) -s --no-print-directory PLATFORM=ixus100_sd780  PLATFORMSUB=100c NO_INC_BUILD=1 clean 
    742747        $(MAKE) -s --no-print-directory PLATFORM=a480  PLATFORMSUB=100b NO_INC_BUILD=1 clean 
     748        $(MAKE) -s --no-print-directory PLATFORM=a490  PLATFORMSUB=100f NO_INC_BUILD=1 clean 
    743749        $(MAKE) -s --no-print-directory PLATFORM=s90  PLATFORMSUB=100c NO_INC_BUILD=1 clean 
    744750        $(MAKE) -s --no-print-directory PLATFORM=s90  PLATFORMSUB=101a NO_INC_BUILD=1 clean 
  • trunk/core/kbd.c

    r677 r686  
    4141#endif 
    4242 
    43 #if defined(CAMERA_a450) || defined(CAMERA_ixus50_sd400) || defined(CAMERA_ixusizoom_sd30) || defined(CAMERA_ixus40_sd300) || defined(CAMERA_ixus55_sd450) || defined(CAMERA_ixus60_sd600) || defined(CAMERA_ixus65_sd630) || defined(CAMERA_ixus70_sd1000) || defined(CAMERA_ixus700_sd500) || defined(CAMERA_ixus750_sd550) || defined(CAMERA_ixus850_sd800) || defined(CAMERA_ixus900_sd900) || defined(CAMERA_ixus75_sd750) || defined(CAMERA_a470) || defined(CAMERA_ixus90_sd790) || defined(CAMERA_ixus100_sd780) || defined(CAMERA_ixus120_sd940) || defined(CAMERA_a480) || defined(CAMERA_d10) || defined(CAMERA_ixus85_sd770) || defined(CAMERA_ixus95_sd1200) || defined(CAMERA_a495) || defined(CAMERA_a580) || defined(CAMERA_ixus300_sd4000) 
     43#if defined(CAMERA_a450) || defined(CAMERA_ixus50_sd400) || defined(CAMERA_ixusizoom_sd30) || defined(CAMERA_ixus40_sd300) || defined(CAMERA_ixus55_sd450) || defined(CAMERA_ixus60_sd600) || defined(CAMERA_ixus65_sd630) || defined(CAMERA_ixus70_sd1000) || defined(CAMERA_ixus700_sd500) || defined(CAMERA_ixus750_sd550) || defined(CAMERA_ixus850_sd800) || defined(CAMERA_ixus900_sd900) || defined(CAMERA_ixus75_sd750) || defined(CAMERA_a470) || defined(CAMERA_ixus90_sd790) || defined(CAMERA_ixus100_sd780) || defined(CAMERA_ixus120_sd940) || defined(CAMERA_a480) || defined(CAMERA_d10) || defined(CAMERA_ixus85_sd770) || defined(CAMERA_ixus95_sd1200) || defined(CAMERA_a495) || defined(CAMERA_a490) || defined(CAMERA_a580) || defined(CAMERA_ixus300_sd4000) 
    4444#define ZSTEP_TABLE_SIZE 7 
    4545static int nTxtbl[]={0,1,2,3,4,5,6};    // remote zoom steps (we need a distinct number of steps, even if the camera zooms smoothly) 
  • trunk/makefile.inc

    r682 r686  
    238238#PLATFORM=a470 
    239239#PLATFORMSUB=101b 
     240 
     241#PLATFORM=a490 
     242#PLATFORMSUB=100f 
    240243 
    241244#PLATFORM=ixus980_sd990 
Note: See TracChangeset for help on using the changeset viewer.