Assembla home | Assembla project page
 

Changeset 495

Show
Ignore:
Timestamp:
08/31/08 21:53:23 (2 years ago)
Author:
phyrephox
Message:

* fixed glitch in a720 files - see http://chdk.setepontos.com/index.php/topic,688.msg20696.html#msg20696
+ added copy command in makefile to copy CHDK for same hardwares with similar firmwares (see lenghty thread about it here: http://chdk.setepontos.com/index.php/topic,2202.msg20540.html#msg20540
* fixes from Fudgey - http://chdk.setepontos.com/index.php/topic,2051.msg20683.html#msg20683
* small changes in gui.c - symbols, see http://www.wirklemms.de/chdk/forum/viewtopic.php?p=3792#3792

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/juciphox/Makefile

    r488 r495  
    6767        cp $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB).FIR $(topdir)bin/PS.FIR 
    6868        zip -9j $(topdir)bin/$(VER)-$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER).zip $(topdir)bin/PS.FIR > $(DEVNULL) 
     69        rm -f $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB).FIR 
    6970        rm -f $(topdir)bin/PS.FIR 
    7071  endif 
    …… 
    123124batch-zip: version 
    124125        $(MAKE) -s --no-print-directory PLATFORM=a610 PLATFORMSUB=100e NO_INC_BUILD=1 firzipsub 
     126        cp $(topdir)bin/$(VER)-a610-100e-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-a610-100d-$(BUILD_NUMBER).zip 
    125127        $(MAKE) -s --no-print-directory PLATFORM=a610 PLATFORMSUB=100f NO_INC_BUILD=1 firzipsub 
    126128        $(MAKE) -s --no-print-directory PLATFORM=a620 PLATFORMSUB=100f NO_INC_BUILD=1 firzipsub 
    …… 
    132134        $(MAKE) -s --no-print-directory PLATFORM=s2is PLATFORMSUB=100f NO_INC_BUILD=1 firzipsub 
    133135        $(MAKE) -s --no-print-directory PLATFORM=s2is PLATFORMSUB=100g NO_INC_BUILD=1 firzipsub 
     136        cp $(topdir)bin/$(VER)-s2is-100g-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-s2is-100i-$(BUILD_NUMBER).zip 
    134137        $(MAKE) -s --no-print-directory PLATFORM=s3is PLATFORMSUB=100a NO_INC_BUILD=1 firzipsub 
    135138        $(MAKE) -s --no-print-directory PLATFORM=g7   PLATFORMSUB=100e NO_INC_BUILD=1 firzipsub 
    …… 
    146149        $(MAKE) -s --no-print-directory PLATFORM=ixus700_sd500   PLATFORMSUB=101b NO_INC_BUILD=1 firzipsub 
    147150        $(MAKE) -s --no-print-directory PLATFORM=ixus800_sd700   PLATFORMSUB=101b NO_INC_BUILD=1 firzipsub 
     151        cp $(topdir)bin/$(VER)-ixus800_sd700-101b-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-ixus800_sd700-101a-$(BUILD_NUMBER).zip 
    148152        $(MAKE) -s --no-print-directory PLATFORM=ixus800_sd700   PLATFORMSUB=100b NO_INC_BUILD=1 firzipsub 
    149153        $(MAKE) -s --no-print-directory PLATFORM=ixus850_sd800   PLATFORMSUB=100e NO_INC_BUILD=1 firzipsub 
     154        cp $(topdir)bin/$(VER)-ixus850_sd800-100e-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-ixus850_sd800-100d-$(BUILD_NUMBER).zip 
    150155        $(MAKE) -s --no-print-directory PLATFORM=ixus860_sd870   PLATFORMSUB=100c NO_INC_BUILD=1 firzipsub 
    151156        $(MAKE) -s --no-print-directory PLATFORM=ixus950_sd850   PLATFORMSUB=100c NO_INC_BUILD=1 firzipsub       
    …… 
    159164        $(MAKE) -s --no-print-directory PLATFORM=ixus70_sd1000   PLATFORMSUB=100c NO_INC_BUILD=1 firzipsub 
    160165        $(MAKE) -s --no-print-directory PLATFORM=ixus70_sd1000   PLATFORMSUB=101b NO_INC_BUILD=1 firzipsub 
     166        cp $(topdir)bin/$(VER)-ixus70_sd1000-101b-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-ixus70_sd1000-101a-$(BUILD_NUMBER).zip 
    161167        $(MAKE) -s --no-print-directory PLATFORM=ixus70_sd1000   PLATFORMSUB=102a NO_INC_BUILD=1 firzipsub 
    162168        #$(MAKE) -s --no-print-directory PLATFORM=ixusW_sd430     PLATFORMSUB=110a NO_INC_BUILD=1 firzipsub 
    …… 
    181187batch-zip-complete: version 
    182188        $(MAKE) -s --no-print-directory PLATFORM=a610 PLATFORMSUB=100e NO_INC_BUILD=1 firzipsubcomplete 
     189        cp $(topdir)bin/a610-100e-$(BUILD_NUMBER)-full.zip $(topdir)bin/a610-100d-$(BUILD_NUMBER)-full.zip 
     190        cp $(topdir)bin/a610-100e-$(BUILD_NUMBER).zip $(topdir)bin/a610-100d-$(BUILD_NUMBER).zip 
    183191        $(MAKE) -s --no-print-directory PLATFORM=a610 PLATFORMSUB=100f NO_INC_BUILD=1 firzipsubcomplete 
    184192        $(MAKE) -s --no-print-directory PLATFORM=a620 PLATFORMSUB=100f NO_INC_BUILD=1 firzipsubcomplete 
    …… 
    190198        $(MAKE) -s --no-print-directory PLATFORM=s2is PLATFORMSUB=100f NO_INC_BUILD=1 firzipsubcomplete 
    191199        $(MAKE) -s --no-print-directory PLATFORM=s2is PLATFORMSUB=100g NO_INC_BUILD=1 firzipsubcomplete 
     200        cp $(topdir)bin/s2is-100g-$(BUILD_NUMBER)-full.zip $(topdir)bin/s2is-100i-$(BUILD_NUMBER)-full.zip 
     201        cp $(topdir)bin/s2is-100g-$(BUILD_NUMBER).zip $(topdir)bin/s2is-100i-$(BUILD_NUMBER).zip 
    192202        $(MAKE) -s --no-print-directory PLATFORM=s3is PLATFORMSUB=100a NO_INC_BUILD=1 firzipsubcomplete 
    193203        $(MAKE) -s --no-print-directory PLATFORM=g7   PLATFORMSUB=100e NO_INC_BUILD=1 firzipsubcomplete 
    …… 
    204214        $(MAKE) -s --no-print-directory PLATFORM=ixus700_sd500   PLATFORMSUB=101b NO_INC_BUILD=1 firzipsubcomplete 
    205215        $(MAKE) -s --no-print-directory PLATFORM=ixus800_sd700   PLATFORMSUB=101b NO_INC_BUILD=1 firzipsubcomplete 
     216        cp $(topdir)bin/ixus800_sd700-101b-$(BUILD_NUMBER)-full.zip $(topdir)bin/ixus800_sd700-101a-$(BUILD_NUMBER)-full.zip 
     217        cp $(topdir)bin/ixus800_sd700-101b-$(BUILD_NUMBER).zip $(topdir)bin/ixus800_sd700-101a-$(BUILD_NUMBER).zip 
    206218        $(MAKE) -s --no-print-directory PLATFORM=ixus800_sd700   PLATFORMSUB=100b NO_INC_BUILD=1 firzipsubcomplete 
    207219        $(MAKE) -s --no-print-directory PLATFORM=ixus850_sd800   PLATFORMSUB=100e NO_INC_BUILD=1 firzipsubcomplete 
     220        cp $(topdir)bin/ixus850_sd800-100e-$(BUILD_NUMBER)-full.zip $(topdir)bin/ixus850_sd800-100d-$(BUILD_NUMBER)-full.zip 
     221        cp $(topdir)bin/ixus850_sd800-100e-$(BUILD_NUMBER).zip $(topdir)bin/ixus850_sd800-100d-$(BUILD_NUMBER).zip 
    208222        $(MAKE) -s --no-print-directory PLATFORM=ixus860_sd870   PLATFORMSUB=100c NO_INC_BUILD=1 firzipsubcomplete 
    209223        $(MAKE) -s --no-print-directory PLATFORM=ixus950_sd850   PLATFORMSUB=100c NO_INC_BUILD=1 firzipsubcomplete       
    …… 
    217231        $(MAKE) -s --no-print-directory PLATFORM=ixus70_sd1000   PLATFORMSUB=100c NO_INC_BUILD=1 firzipsubcomplete 
    218232        $(MAKE) -s --no-print-directory PLATFORM=ixus70_sd1000   PLATFORMSUB=101b NO_INC_BUILD=1 firzipsubcomplete 
     233        cp $(topdir)bin/ixus70_sd1000-101b-$(BUILD_NUMBER)-full.zip $(topdir)bin/ixus70_sd1000-101a-$(BUILD_NUMBER)-full.zip 
     234        cp $(topdir)bin/ixus70_sd1000-101b-$(BUILD_NUMBER).zip $(topdir)bin/ixus70_sd1000-101a-$(BUILD_NUMBER).zip 
    219235        $(MAKE) -s --no-print-directory PLATFORM=ixus70_sd1000   PLATFORMSUB=102a NO_INC_BUILD=1 firzipsubcomplete 
    220236        #$(MAKE) -s --no-print-directory PLATFORM=ixusW_sd430     PLATFORMSUB=110a NO_INC_BUILD=1 firzipsubcomplete 

  • branches/juciphox/core/gui.c

    r487 r495  
    504504     {0} 
    505505}; 
    506 static CMenu operation_submenu = {0x20,LANG_MENU_OPERATION_PARAM_TITLE, NULL, operation_submenu_items }; 
     506static CMenu operation_submenu = {0x21,LANG_MENU_OPERATION_PARAM_TITLE, NULL, operation_submenu_items }; 
    507507 
    508508static CMenuItem edge_overlay_submenu_items[] = { 
    …… 
    522522    {0x0,(int)grid_title,                   MENUITEM_TEXT }, 
    523523    {0x0,(int)"",                           MENUITEM_SEPARATOR }, 
    524     {0x4c,LANG_MENU_GRID_FORCE_COLOR,        MENUITEM_BOOL,          &conf.grid_force_color }, 
     524    {0x5c,LANG_MENU_GRID_FORCE_COLOR,        MENUITEM_BOOL,          &conf.grid_force_color }, 
    525525    {0x65,LANG_MENU_GRID_COLOR_LINE,         MENUITEM_COLOR_FG,      (int*)&conf.grid_color }, 
    526526    {0x65,LANG_MENU_GRID_COLOR_FILL,         MENUITEM_COLOR_BG,      (int*)&conf.grid_color }, 

  • branches/juciphox/doc/version.txt

    r494 r495  
    66log 
    77 
    8  
     80.4.2 / PP 
     9 
     10* fixed glitch in a720 files - see http://chdk.setepontos.com/index.php/topic,688.msg20696.html#msg20696 
     11+ added copy command in makefile to copy CHDK for same hardwares with similar firmwares (see lenghty thread about it here: http://chdk.setepontos.com/index.php/topic,2202.msg20540.html#msg20540 
     12* fixes from Fudgey - http://chdk.setepontos.com/index.php/topic,2051.msg20683.html#msg20683 
     13* small changes in gui.c - symbols, see http://www.wirklemms.de/chdk/forum/viewtopic.php?p=3792#3792 
    914 
    10150.4.1 / PP 

  • branches/juciphox/platform/a610/notes.txt

    r483 r495  
    66- A610 does have a real IRIS Diaphragm, it does not have an ND Filter!  
    77Mind this. 
     8- CHDK for firmware 1.00d is the SAME for 1.00e 
    89 
    910 
    10  

  • branches/juciphox/platform/a720/sub/100c/stubs_entry.S

    r461 r495  
    9191NSTUB(vsprintf, 0xffc0e7b4) 
    9292NSTUB(write, 0xffc0a4a8) 
    93 NHSTUB(GetBatteryTemperature, 0xFFC39178) 
    94 NHSTUB(GetCCDTemperature, 0xFFC39108) 
    95 NHSTUB(GetOpticalTemperature, 0xFFC391E8) 
    96 NHSTUB(PT_PlaySound, 0xFFC50F40) 

  • branches/juciphox/platform/a720/sub/100c/stubs_entry_2.S

    r493 r495  
    185185NSTUB(taskSuspend,                       0xFFC00958) 
    186186 
     187NHSTUB(GetBatteryTemperature, 0xFFC39178) 
     188NHSTUB(GetCCDTemperature, 0xFFC39108) 
     189NHSTUB(GetOpticalTemperature, 0xFFC391E8) 
     190NHSTUB(PT_PlaySound, 0xFFC50F40) 
     191 
     192 
    187193NHSTUB(EnterToCompensationEVF, 0xffc170a4)  
    188194NHSTUB(ExitFromCompensationEVF, 0xffc170f4)  

  • branches/juciphox/platform/ixus70_sd1000/notes.txt

    r483 r495  
    66- ixus70_sd1000 does NOT have a real IRIS Diaphragm, it only has an ND Filter!  
    77Mind this. 
     8- CHDK for firmware 1.01a is the SAME for 1.01b 
    89 
    910 

  • branches/juciphox/platform/ixus70_sd1000/sub/100c/stubs_entry_2.S

    r493 r495  
    3232NHSTUB(GetOpticalTemperature, 0xFFA34448) 
    3333NHSTUB(PT_PlaySound, 0xFFB0B1F8) 
    34  
    35  
    36  
    3734NHSTUB(EnterToCompensationEVF, 0xffafaa6c) 
    3835NHSTUB(ExitFromCompensationEVF, 0xffafaaf0) 

  • branches/juciphox/platform/ixus70_sd1000/sub/101b/lib.c

    r473 r495  
    7474long vid_get_bitmap_buffer_height() { return 240; } 
    7575 
    76 void _EnterToCompensationEVF() {} // Dummy function. To be removed after stub is found. See stubs_entry_2.S. 
    77 void _ExitFromCompensationEVF() {} // Dummy function. To be removed after stub is found. See stubs_entry_2.S. 

  • branches/juciphox/platform/ixus70_sd1000/sub/101b/stubs_entry_2.S

    r473 r495  
    3434 
    3535 
    36 //NHSTUB(EnterToCompensationEVF, 0xFFFFFFFF) // Stub not found. When found, remove dummy function from lib.c. 
    37 //NHSTUB(ExitFromCompensationEVF, 0xFFFFFFFF) // Stub not found. When found, remove dummy function from lib.c. 
     36NHSTUB(EnterToCompensationEVF, 0xffafaae0)  
     37NHSTUB(ExitFromCompensationEVF, 0xffafab64)  

  • branches/juciphox/platform/ixus800_sd700/notes.txt

    r483 r495  
    66- ixus800_sd700 does NOT have a real IRIS Diaphragm, it only has an ND Filter!  
    77Mind this. 
     8- CHDK for firmware 1.01a is the SAME for 1.01b 
    89 
    9  

  • branches/juciphox/platform/ixus850_sd800/notes.txt

    r483 r495  
    66- ixus850_sd800 does NOT have a real IRIS Diaphragm, it only has an ND Filter!  
    77Mind this. 
     8- CHDK for firmware 1.00d is the SAME for 1.00e 
    89 
    910 
    1011 
    11  

  • branches/juciphox/platform/s2is/notes.txt

    r483 r495  
    66- s2is does have a REAL IRIS Diaphragm, it does NOT have an an ND Filter!  
    77Mind this. 
    8  
     8- CHDK for firmware 1.00i is the SAME for 1.00g 

  • branches/juciphox/platform/s2is/sub/100e/lib.c

    r473 r495  
    6464long vid_get_bitmap_buffer_height() { return 240; } 
    6565 
    66 void _EnterToCompensationEVF() {} // Dummy function. To be removed after stub is found. See stubs_entry_2.S. 
    67 void _ExitFromCompensationEVF() {} // Dummy function. To be removed after stub is found. See stubs_entry_2.S. 

  • branches/juciphox/platform/s2is/sub/100e/stubs_entry_2.S

    r480 r495  
    3939NHSTUB(GetOpticalTemperature, 0xFF82E340) 
    4040NHSTUB(PT_PlaySound, 0xFF97BD40) 
    41  
    42  
    43 //NHSTUB(EnterToCompensationEVF, 0xFFFFFFFF) // Stub not found. When found, remove dummy function from lib.c. 
    44 //NHSTUB(ExitFromCompensationEVF, 0xFFFFFFFF) // Stub not found. When found, remove dummy function from lib.c. 
     41NHSTUB(EnterToCompensationEVF, 0xff968150)  
     42NHSTUB(ExitFromCompensationEVF, 0xff9681a4)  

  • branches/juciphox/platform/s2is/sub/100f/lib.c

    r473 r495  
    6464long vid_get_bitmap_buffer_height() { return 240; } 
    6565 
    66 void _EnterToCompensationEVF() {} // Dummy function. To be removed after stub is found. See stubs_entry_2.S. 
    67 void _ExitFromCompensationEVF() {} // Dummy function. To be removed after stub is found. See stubs_entry_2.S. 

  • branches/juciphox/platform/s2is/sub/100f/stubs_entry_2.S

    r480 r495  
    3939NHSTUB(GetOpticalTemperature, 0xFF82E340) 
    4040NHSTUB(PT_PlaySound, 0xFF97BD18) 
    41  
    42 //NHSTUB(EnterToCompensationEVF, 0xFFFFFFFF) // Stub not found. When found, remove dummy function from lib.c. 
    43 //NHSTUB(ExitFromCompensationEVF, 0xFFFFFFFF) // Stub not found. When found, remove dummy function from lib.c. 
     41NHSTUB(EnterToCompensationEVF, 0xff968128)  
     42NHSTUB(ExitFromCompensationEVF, 0xff96817c)  

  • branches/juciphox/platform/s2is/sub/100g/lib.c

    r473 r495  
    6464long vid_get_bitmap_buffer_height() { return 240; } 
    6565 
    66 void _EnterToCompensationEVF() {} // Dummy function. To be removed after stub is found. See stubs_entry_2.S. 
    67 void _ExitFromCompensationEVF() {} // Dummy function. To be removed after stub is found. See stubs_entry_2.S. 

  • branches/juciphox/platform/s2is/sub/100g/stubs_entry_2.S

    r473 r495  
    3939NHSTUB(GetOpticalTemperature, 0xFF82E340) 
    4040NHSTUB(PT_PlaySound, 0xFF97BAA4) 
    41  
    42 //NHSTUB(EnterToCompensationEVF, 0xFFFFFFFF) // Stub not found. When found, remove dummy function from lib.c. 
    43 //NHSTUB(ExitFromCompensationEVF, 0xFFFFFFFF) // Stub not found. When found, remove dummy function from lib.c. 
     41NHSTUB(EnterToCompensationEVF, 0xff967eb4) 
     42NHSTUB(ExitFromCompensationEVF, 0xff967f08) 

  • branches/juciphox/version.inc

    r494 r495  
    1 BUILD_NUMBER := 0.4.1 
     1BUILD_NUMBER := 0.4.2