Changeset 592


Ignore:
Timestamp:
11/25/08 19:05:40 (4 years ago)
Author:
phyrephox
Message:

+ added turkish language
+ added define CAM_BRACKETING for cameras that have bracketing in original firmware (g7,g9,s2is,s3is,s5is - need propcase for the dryos ones!) for gui.c

Location:
trunk
Files:
1 added
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/CHDK/LANG/german.lng

    r582 r592  
    585585414 "    Bei Neustart löschen" 
    586586 
    587 415 "Raw Suffix" 
     587415 "RAW-Endung für Reihe" 
     588 
    588589416 "  in Fahrenheit" 
    589590 
    … …  
    595596421 "Lade und setze Zoom" 
    596597422 "Sperre Konturenüberlagerung" 
     598 
     599423 "2. Vorhang Blitzsychro" 
     600 
     601// DNG 
     602424 "DNG-Format" 
     603425 "RAW-Puffer nutzen" 
     604426 "Datei badpixel.bin fehlt!" 

  • trunk/CHDK/LANG/spanish.lng

    r586 r592  
    487487364 "Fondo del Símbolo" 
    488488 
    489 365 "Curva Propias" 
     489365 "Curvas Propias" 
    490490/ / "366" Custom curvas -> " 
    491491366 "Curvas Propias" 
    … …  
    562562421 "Cargar+Fijar Zoom" 
    563563422 "Bloq. Linea de Borde" 
     564423 "Sinc. flash 2da Cortina" 
     565424 "Formato DNG" 
     566425 "Buffer Cache de RAW" 
     567426 "No encuentra CHDK/badpixel.bin" 

  • trunk/CHDK/LANG/ukrainian.lng

    r590 r592  
    1 // Translation by Pavlo Kasperskyi (pkasperskyi[at]gmail{dot}com): 29 october, 2008 
     1// Translation by Pavlo Kasperskyi (pkasperskyi[at]gmail{dot}com): November 21, 2008 
    22// Êîäîâà ñòîð³íêà Win1251 
    33// CHDK ìîâíèé ôàéë 
    … …  
    162162 
    163163106 "*** Ïðîøèâêà ***" 
    164 107 "Âåðñ³ÿ CHDK: %s, #%s\n       Äàòà: %s\n        ×àñ: %s\n     Êàìåðà: %s\n   Ïðîøèâêà: %s\nCompiler: %s" 
     164107 "Âåðñ³ÿ CHDK: %s, #%s\n       Äàòà: %s\n        ×àñ: %s\n     Êàìåðà: %s\n   Ïðîøèâêà: %s\n Êîìï³ëÿòîð: %s" 
    165165 
    166166108 "*** Ïàì'ÿòü ***" 
    … …  
    562562421 "Çàâàíò. òà âñòàíîâë. ìàñøòàá" 
    563563422 "Çàô³êñóâàòè ãðàíèöþ îâåðëåÿ" 
    564  

  • trunk/core/gui.c

    r590 r592  
    740740    {0x5c,LANG_MENU_RAW_SAVE_IN_TIMER,                MENUITEM_BOOL,      &conf.save_raw_in_timer }, 
    741741 
    742                 #if CAM_PROPSET == 1 
     742                #if CAM_BRACKETING 
    743743        {0x5c,LANG_MENU_RAW_SAVE_IN_EV_BRACKETING,                MENUITEM_BOOL,      &conf.save_raw_in_ev_bracketing }, 
    744744                #endif 

  • trunk/core/gui_lang.c

    r590 r592  
    542542"421 \"Load+Set Zoom\"\n" 
    543543"422 \"Lock Edge Overlay\"\n" 
    544 "423 \"RAW develop\"\n" 
    545 "424 \"Rear curtain flash sync\"\n" 
    546 "425 \"DNG format\"\n" 
    547 "426 \"RAW buffer cached\"\n" 
    548 "427 \"Cannot load CHDK/badpixel.bin\"\n" 
     544"423 \"Rear curtain flash sync\"\n" 
     545"424 \"DNG format\"\n" 
     546"425 \"RAW buffer cached\"\n" 
     547"426 \"Cannot load CHDK/badpixel.bin\"\n" 
    549548; 
    550549 

  • trunk/core/gui_osd.c

    r580 r592  
    684684    int x, m=(mode_get()&MODE_SHOOTING_MASK); 
    685685    static int b; 
    686      
    687  
    688686    if ((!((movie_status > 1) && conf.save_raw_in_video   )) && (!((m==MODE_SPORTS) && conf.save_raw_in_sports)) && (!((shooting_get_prop(PROPCASE_DRIVE_MODE)==1) && conf.save_raw_in_burst && !(m==MODE_SPORTS)))  && (!((shooting_get_prop(PROPCASE_DRIVE_MODE)>=2) && conf.save_raw_in_timer)) && (!((shooting_get_prop(PROPCASE_BRACKET_MODE)==1) && conf.save_raw_in_ev_bracketing)) ) 
    689687    {  
    … …  
    693691            if (raw_count>conf.remaining_raw_treshold) 
    694692                { 
    695                 sprintf(osd_buf, "RAW:%3d", raw_count); 
     693                if (conf.dng_raw) sprintf(osd_buf, "DNG:%3d", raw_count); else sprintf(osd_buf, "RAW:%3d", raw_count); 
    696694                draw_string(conf.mode_raw_pos.x, conf.mode_raw_pos.y, osd_buf, conf.osd_color); 
    697695                } 
    … …  
    699697                { 
    700698 
    701                 sprintf(osd_buf, "RAW:%3d", raw_count); 
     699                if (conf.dng_raw) sprintf(osd_buf, "DNG:%3d", raw_count); else sprintf(osd_buf, "RAW:%3d", raw_count); 
    702700                 
    703701                if (b > 6) 
    … …  
    713711                } 
    714712        } 
    715     else draw_string(conf.mode_raw_pos.x, conf.mode_raw_pos.y, "RAW", conf.osd_color); 
     713    else if (conf.dng_raw) draw_string(conf.mode_raw_pos.x, conf.mode_raw_pos.y, "DNG", conf.osd_color); else draw_string(conf.mode_raw_pos.x, conf.mode_raw_pos.y, "RAW", conf.osd_color); 
    716714        }    
    717715        else if (conf.raw_exceptions_warn) 
    718716                { 
    719                         gui_print_osd_state_string_chr("RAW Disabled",""); 
     717                        if (conf.dng_raw) gui_print_osd_state_string_chr("DNG Disabled",""); else gui_print_osd_state_string_chr("RAW Disabled",""); 
    720718                } 
    721719                 

  • trunk/doc/version.txt

    r584 r592  
    33version / revision / author 
    44 
    5 0.8.1 / #784 / PhyrePhoX 
     50.8.2 / #592 / PhyrePhoX 
     6 
     7* fixed a590 zoom table (see http://chdk.setepontos.com/index.php/topic,2659.msg24733.html#msg24733) 
     8* language updates 
     9* fixed very small bug in gui_lang.c which caused a bug in the dng menu 
     10+ added turkish language 
     11+ added define CAM_BRACKETING for cameras that have bracketing in original firmware (g7,g9,s2is,s3is,s5is - need propcase for the dryos ones!) for gui.c 
     12* RAW osd elements now change to DNG when dng saving is enabled 
     13  
     140.8.2 / #590-591 / ewavr 
     15 
     16+ added initial DNG support (yay!) 
     17+ added rear curtain flash sync for a570 & sx100is  
     18* small language fix: "raw develop" the same in main and popup menu  
     19 
     200.8.1 / #587-587 / reyalp 
     21 
     22some ignore props  
     23Set CFLAGS differently for gcc3 and gcc4. See http://chdk.setepontos.com/index.php/topic,2500.30.html  
     24check in correct stubs_entry.S  (sd1100) 
     25 
     260.8.1 / #585-586 / PhyrePhoX 
     27 
     28+ added g9 chdk for 1.00d (see http://chdk.setepontos.com/index.php/topic,2342.msg24602.html#msg24602) 
     29* updated spanish.lng  
     30* small edit in notes.txt of a590  
     31 
     320.8.1 / #584 / PhyrePhoX 
    633 
    734+ initial import of a590 port - thanks to ma_jk (see http://chdk.setepontos.com/index.php/topic,2361.msg24541.html#msg24541 and the whole thread) 
    835 
    936 
    10 0.8.0 / #781-783 / php 
     370.8.0 / #581-583 / php 
    1138 
    1239* small fixes, updates 
    1340 
    14 0.8.0 / #780 / PhyrePhoX 
     410.8.0 / #580 / PhyrePhoX 
    1542 
    1643tadaa! major pimping of an already cool feature! 

  • trunk/include/camera.h

    r590 r592  
    4747    #define CAM_VIDEO_CONTROL      1   // pause / unpause video recordings 
    4848 
    49 // better: OPT_ stuff in makefile.inc 
    5049    #define ZOOM_OVERRIDE               0   // Shall zoom-override be used? default 0 becoz not implemented right now 
    5150    #undef  DNG_SUPPORT                  
    5251    #undef  CAM_REAR_CURTAIN                // Camera do not have front/rear curtain flash sync in menu 
     52    #undef  CAM_BRACKETING                // Cameras that have bracketing (focus & ev) in original firmware already, most likely s- & g-series (propcase for digic III not found yet!) 
    5353 
    5454//---------------------------------------------------------- 
    … …  
    9090    // camera name 
    9191    #define PARAM_CAMERA_NAME 4 // parameter number for GetParameterData 
    92      
     92    #define CAM_BRACKETING              1     
    9393 //---------------------------------------------------------- 
    9494#elif defined (CAMERA_g9) 
    … …  
    112112    #define CAM_EV_IN_VIDEO             1 
    113113//      #define CAM_CONSOLE_LOG_ENABLED     1 
    114      
     114//  #define CAM_BRACKETING              1  //propcase still missing for dryos     
    115115//========================================================== 
    116116// A-series 
    … …  
    12581258    // camera name 
    12591259    #define PARAM_CAMERA_NAME 2 // parameter number for GetParameterData 
    1260  
     1260    #define CAM_BRACKETING              1 
    12611261//---------------------------------------------------------- 
    12621262#elif defined (CAMERA_s3is) 
    … …  
    12921292    // camera name 
    12931293    #define PARAM_CAMERA_NAME 3 // parameter number for GetParameterData 
     1294    #define CAM_BRACKETING              1 
    12941295 
    12951296//---------------------------------------------------------- 
    … …  
    13261327    // camera name 
    13271328    #define PARAM_CAMERA_NAME 4 // parameter number for GetParameterData 
    1328  
     1329//  #define CAM_BRACKETING              1 //propcase for dryos not found yet 
    13291330 
    13301331//========================================================== 

  • trunk/makefile.inc

    r588 r592  
    44PLATFORMSUB=100a 
    55 
    6 #PLATFORM=a610 
    7 #PLATFORMSUB=100e 
    8  
    96#PLATFORM=a620 
    107#PLATFORMSUB=100f 
     8 
     9#PLATFORM=a610 
     10#PLATFORMSUB=100e 
    1111 
    1212#PLATFORM=ixus40_sd300 

  • trunk/platform/a590/main.c

    r584 r592  
    6363 
    6464 
    65 static const int fl_tbl[] = {5800, 6420, 7060, 7700, 8340, 9950, 11550, 13160, 14750, 17150, 19570, 22760, 26750, 30750, 34800}; 
     65static const int fl_tbl[] = {5800, 6600, 7900, 9900, 12700, 16000, 19600, 23200}; 
    6666#define NUM_FL (sizeof(fl_tbl)/sizeof(fl_tbl[0])) 
    6767#define CF_EFL 60345 
Note: See TracChangeset for help on using the changeset viewer.