Changeset 603


Ignore:
Timestamp:
11/29/08 22:01:48 (4 years ago)
Author:
phyrephox
Message:

+ new function (one of my favourites to date, and i just wrote it :D), only for s-series & TX-1
you now can use the flash during videos... see ​http://www.zshare.net/video/52034396605a6fd7/ for example
it is in the override menu at the bottom. you can enable/disable the flash and set the power of the flash (0 - low,1 - middle, 2 - power! this should work in all modes! sorry, no automatic flash power!)
DryOS (s5is) is experimental, as the propcase values arent verified by "authority"
big thanks to ewavr, Savior of the CHDK-Universe!

Location:
trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/CHDK/LANG/english.lng

    r601 r603  
    576576435 "Disable Raw @ EdgerOverlay" 
    577577436 "Disable Raw @ Auto Mode" 
     578437 "Enable flash in video?" 
     579438 "   Flash Power" 

  • trunk/CHDK/LANG/german.lng

    r602 r603  
    615615435 "RAW im EdgeOverlayModus aus" 
    616616436 "RAW im Auto Modus aus" 
     617437 "Aktiviere Blitz in Video?" 
     618438 "   Stärke des Blitzes" 

  • trunk/core/conf.c

    r602 r603  
    393393    CONF_INFO(230, conf.save_raw_in_edgeoverlay,     CONF_DEF_VALUE, i:0, NULL), 
    394394    CONF_INFO(231, conf.save_raw_in_auto,     CONF_DEF_VALUE, i:0, NULL), 
     395    CONF_INFO(232, conf.flash_video_override,     CONF_DEF_VALUE, i:0, NULL), 
     396    CONF_INFO(233, conf.flash_video_override_power,     CONF_DEF_VALUE, i:0, NULL), 
    395397    }; 
    396398#define CONF_NUM (sizeof(conf_info)/sizeof(conf_info[0])) 

  • trunk/core/gui.c

    r601 r603  
    588588#if CAM_REAR_CURTAIN 
    589589      {0x5c, LANG_MENU_REAR_CURTAIN, MENUITEM_BOOL, &conf.flash_sync_curtain }, 
     590#endif 
     591#if CAM_HAS_VIDEO_BUTTON 
     592                    {0x5c, LANG_MENU_FLASH_VIDEO_OVERRIDE, MENUITEM_BOOL,   &conf.flash_video_override}, 
     593                        {0x5f, LANG_MENU_FLASH_VIDEO_OVERRIDE_POWER,      MENUITEM_INT|MENUITEM_F_UNSIGNED|MENUITEM_F_MINMAX, &conf.flash_video_override_power, MENU_MINMAX(0, 2)}, 
    590594#endif 
    591595          {0x51,LANG_MENU_BACK,                     MENUITEM_UP }, 

  • trunk/core/gui_lang.c

    r601 r603  
    557557"435 \"Disable Raw @ Edgeoverlay\"\n" 
    558558"436 \"Disable RAW @ Auto\"\n" 
     559"437 \"Enable flash in video?\"\n" 
     560"438 \"   Power of flash\"\n" 
    559561; 
    560562 

  • trunk/core/gui_lang.h

    r601 r603  
    547547#define LANG_MENU_RAW_SAVE_IN_EDGEOVERLAY  435 
    548548#define LANG_MENU_RAW_SAVE_IN_AUTO         436 
     549#define LANG_MENU_FLASH_VIDEO_OVERRIDE     437 
     550#define LANG_MENU_FLASH_VIDEO_OVERRIDE_POWER     438 
    549551//------------------------------------------------------------------- 
    550552 
    551 #define GUI_LANG_ITEMS                  436 
     553#define GUI_LANG_ITEMS                  438 
    552554 
    553555//------------------------------------------------------------------- 

  • trunk/doc/version.txt

    r596 r603  
    22 
    33version / revision / author 
     4 
     5 
     60.8.6 / #597-603 / PhyrePhoX 
     7 
     8+ new function (one of my favourites to date, and i just wrote it :D), only for s-series & TX-1  
     9you now can use the flash during videos... see http://www.zshare.net/video/52034396605a6fd7/ for example 
     10it is in the override menu at the bottom. you can enable/disable the flash and set the power of the flash (0 - low,1 - middle, 2 - power! this should work in all modes! sorry, no automatic flash power!)  
     11DryOS (s5is) is experimental, as the propcase values arent verified by "authority" 
     12big thanks to ewavr, Savior of the CHDK-Universe! 
     13 
     14* fixed get_platform_id in ubasic and also in the "safety feature" 
     15now returns the right decimal platform id. perhaps someone can figure out why atoi(PLATFORMID) can't be assigned to conf.platformid on cfg creation ( error: initializer element is not constant)? 
     16 
     17due to this fix, some cfg items get resetted on cfgs by people who used latest revisions (no biggie i hope): 
     18 
     19    conf.raw_cache = 0; 
     20    conf.zoom_override_value = 0; 
     21    conf.fast_ev = 0; 
     22    conf.fast_movie_control = 0; 
     23    conf.fast_movie_quality_control = 0; 
     24    conf.zoom_scale = 100; 
     25    conf.platformid = atoi(PLATFORMID); 
     26 
     27this one gave me a headache, and in the end it turned out i was the idiot :D 
     28note: perhaps someone should update the wiki with the decimal platform ids http://chdk.wikia.com/wiki/P-ID_(Table)  
     29 
     30+ added two new "raw exception" options: you can now disable the writing of raw/dng automatically when you enable edgeoverlay or set the modedial of the camera to auto (options are OFF at default) 
     31* small fix in connect4 
     32 
     33note: somehow all these checks in raw.c and gui_osd.c make me dizzy (self-inflicted, i know), probably should be done in another way (in the future, of course)  
     34 
     35+ added a nice little game - Connect Four (see http://en.wikipedia.org/wiki/Connect_Four ) 
     36game was written by CHDKLover & Kettmeister in the german forum, see http://chdk.kernreaktor.org/mantis/view.php?id=106 for more links 
     37 
     38note: if we hear of reports that the binary is being to big for some cameras since the introduction of Connect 4, we are likely to disable it in the buildconf.inc (so people can compile it using the chdk shell or maybe another build server)  
     39 
     40several fixes in edgeoverlay.c: 
     41- changed file prefix from edge_ to EDG_ which fixes both filelength & saving issues on dryos 
     42- the timestamp of the edge files now is always correct (thx ewavr on hints for both of these) 
     43- the edge overalay now can be moved in alt-mode only. reason: some cameras have functions for up/down/left/right in original firmware, also the overlay was moved when in a menu (before) 
     44- some smaller fixes (i/o & layout) thx to plasmahh  
     45 
     46* update of a few lang files 
     47* moved "show raw saving time" from raw submenu to debug submenu (it isnt really a feature) 
     48trying to split my modifications into smaller svn commits now  
     49 
     500.8.5 / #596 / ewavr 
     51* fixed colors in DNG thumbnail for some cameras  
    452 
    5530.8.4 / #596 / ewavr 

  • trunk/include/conf.h

    r601 r603  
    269269    long mem_view_addr_init; 
    270270    int flash_sync_curtain; 
     271    int flash_video_override; 
     272    int flash_video_override_power; 
    271273} Conf; 
    272274 

  • trunk/include/propset1.h

    r590 r603  
    88#define PROPCASE_FOCUS_MODE                             12 
    99#define PROPCASE_FLASH_MODE                                     16 
     10#define PROPCASE_FLASH_OVERRIDE                         79 
    1011// need corresponding values for propset2!!! 
    11 // #define PROPCASE_FLASH_ADJUST_MODE           15 
     12#define PROPCASE_FLASH_ADJUST_MODE              15 
    1213// #define PROPCASE_FLASH_CORRECTION               28       
    13 // #define PROPCASE_FLASH_MANUAL_OUTPUT    29 
     14#define PROPCASE_FLASH_MANUAL_OUTPUT    29 
    1415//  #define PROPCASE_FOCUS_OK           67 
    1516#define PROPCASE_USER_TV                                40 

  • trunk/include/propset2.h

    r590 r603  
    88#define PROPCASE_FOCUS_MODE                                     133 
    99#define PROPCASE_FLASH_MODE                     143 
     10#define PROPCASE_FLASH_OVERRIDE                         122 //unverified! 
     11#define PROPCASE_FLASH_MANUAL_OUTPUT    141 
     12#define PROPCASE_FLASH_ADJUST_MODE              121 
    1013#define PROPCASE_USER_TV                                264 
    1114#define PROPCASE_TV                                             262 

  • trunk/platform/generic/shooting.c

    r590 r603  
    11931193#endif 
    11941194 
     1195#if CAM_HAS_VIDEO_BUTTON // enables Flash during video recording on cameras that support it (sorry, only manual flash!) 
     1196        void shooting_set_flash_video_override(int flash, int power){ 
     1197                int mode = 1; 
     1198                if (movie_status > 1) { 
     1199                                _SetPropertyCase(PROPCASE_FLASH_ADJUST_MODE, &mode, sizeof(mode)); 
     1200                                _SetPropertyCase(PROPCASE_FLASH_OVERRIDE, &flash, sizeof(flash)); 
     1201                                _SetPropertyCase(PROPCASE_FLASH_MANUAL_OUTPUT, &power, sizeof(power)); 
     1202                } 
     1203  } 
     1204#endif 
    11951205 
    11961206void __attribute__((naked,noinline)) shooting_expo_param_override(void){ 
    … …  
    12481258  shooting_set_flash_sync_curtain(conf.flash_sync_curtain); 
    12491259#endif 
     1260 
     1261#if CAM_HAS_VIDEO_BUTTON 
     1262  shooting_set_flash_video_override(conf.flash_video_override,conf.flash_video_override_power); 
     1263#endif 
     1264 
    12501265 asm volatile("LDMFD   SP!, {R0-R12,PC}\n"); 
    12511266} 

  • trunk/version.inc

    r596 r603  
    1 BUILD_NUMBER := 0.8.5 
     1BUILD_NUMBER := 0.8.6 
Note: See TracChangeset for help on using the changeset viewer.