Assembla home | Assembla project page
 

Changeset 488

Show
Ignore:
Timestamp:
08/19/08 07:37:58 (2 years ago)
Author:
phyrephox
Message:

+ added sx100 100b - http://chdk.setepontos.com/index.php/topic,237.msg19899.html#msg19899
* changed osd item "remaining video time" - now the quality/bitrate you set via the fast video function is shown directly beneath the remaining time/bitrate
* applied reyalps Patch, now you can develop raws directly from within the filebrowser (not only from the RAW menu anymore)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/juciphox/Makefile

    r484 r488  
    170170        $(MAKE) -s --no-print-directory PLATFORM=tx1  PLATFORMSUB=100g NO_INC_BUILD=1 firzipsub 
    171171        $(MAKE) -s --no-print-directory PLATFORM=tx1  PLATFORMSUB=101b NO_INC_BUILD=1 firzipsub 
    172         #$(MAKE) -s --no-print-directory PLATFORM=sx100is  PLATFORMSUB=100b NO_INC_BUILD=1 firzipsub 
     172        $(MAKE) -s --no-print-directory PLATFORM=sx100is  PLATFORMSUB=100b NO_INC_BUILD=1 firzipsub 
    173173        $(MAKE) -s --no-print-directory PLATFORM=sx100is  PLATFORMSUB=100c NO_INC_BUILD=1 firzipsub 
    174174        $(MAKE) -s --no-print-directory PLATFORM=ixus750_sd550  PLATFORMSUB=100f NO_INC_BUILD=1 firzipsub 
    …… 
    228228        $(MAKE) -s --no-print-directory PLATFORM=tx1  PLATFORMSUB=100g NO_INC_BUILD=1 firzipsubcomplete 
    229229        $(MAKE) -s --no-print-directory PLATFORM=tx1  PLATFORMSUB=101b NO_INC_BUILD=1 firzipsubcomplete 
    230         #$(MAKE) -s --no-print-directory PLATFORM=sx100is  PLATFORMSUB=100b NO_INC_BUILD=1 firzipsubcomplete 
     230        $(MAKE) -s --no-print-directory PLATFORM=sx100is  PLATFORMSUB=100b NO_INC_BUILD=1 firzipsubcomplete 
    231231        $(MAKE) -s --no-print-directory PLATFORM=sx100is  PLATFORMSUB=100c NO_INC_BUILD=1 firzipsubcomplete 
    232232        $(MAKE) -s --no-print-directory PLATFORM=ixus750_sd550  PLATFORMSUB=100f NO_INC_BUILD=1 firzipsubcomplete 
    …… 
    288288        $(MAKE) -s --no-print-directory PLATFORM=tx1  PLATFORMSUB=100g NO_INC_BUILD=1 clean 
    289289        $(MAKE) -s --no-print-directory PLATFORM=tx1  PLATFORMSUB=101b NO_INC_BUILD=1 clean 
    290         # $(MAKE) -s --no-print-directory PLATFORM=sx100is  PLATFORMSUB=100b NO_INC_BUILD=1 clean 
     290        $(MAKE) -s --no-print-directory PLATFORM=sx100is  PLATFORMSUB=100b NO_INC_BUILD=1 clean 
    291291        $(MAKE) -s --no-print-directory PLATFORM=sx100is  PLATFORMSUB=100c NO_INC_BUILD=1 clean 
    292292        $(MAKE) -s --no-print-directory PLATFORM=ixus750_sd550  PLATFORMSUB=100f NO_INC_BUILD=1 clean 

  • branches/juciphox/core/gui_fselect.c

    r479 r488  
    912912            process_raw_files(); 
    913913            break; 
     914                case MPOPUP_RAW_DEVELOP: 
     915            sprintf(buf, "%s/%s", current_dir, selected->name); 
     916            gui_mbox_init((int)"", LANG_RAW_DEVELOP_MESSAGE, MBOX_BTN_OK|MBOX_TEXT_CENTER, NULL); 
     917            raw_prepare_develop(buf); 
     918                break; 
    914919        case MPOPUP_SUBTRACT: 
    915920        { 
    …… 
    974979                     (selected->name[3] == 'C'))//If item is a DCIM sub folder 
    975980                    i |= MPOPUP_PURGE;//Display PURGE RAW function in popup menu 
     981                if(selected->size == hook_raw_size()) 
     982                    i |= MPOPUP_RAW_DEVELOP; 
    976983                gui_mpopup_init(i, fselect_mpopup_cb); 
    977984            } 

  • branches/juciphox/core/gui_mpopup.c

    r479 r488  
    2525        { MPOPUP_RAW_ADD,       LANG_POPUP_RAW_SUM}, 
    2626        { MPOPUP_RAW_AVERAGE,   LANG_POPUP_RAW_AVERAGE }, 
     27        { MPOPUP_RAW_DEVELOP,   (int)"Raw Develop"  }, 
    2728        { MPOPUP_PURGE,         LANG_POPUP_PURGE  }, 
    2829        { MPOPUP_SUBTRACT,      LANG_POPUP_SUB_FROM_MARKED  }, 
    …… 
    3031 
    3132#define ACTIONSNUM              (sizeof(actions)/sizeof(actions[0])) 
    32 #define MAX_ACTIONS             9 
     33#define MAX_ACTIONS             10 
    3334static int                      mpopup_actions[MAX_ACTIONS], mpopup_actions_num, mpopup_actions_active; 
    3435static coord                    mpopup_actions_x, mpopup_actions_y; 

  • branches/juciphox/core/gui_mpopup.h

    r479 r488  
    33 
    44//------------------------------------------------------------------- 
    5 #define MPOPUP_MASK             0x01FF 
     5#define MPOPUP_MASK             0x03FF 
    66#define MPOPUP_CUT              0x0001 
    77#define MPOPUP_COPY             0x0002 
    …… 
    1111#define MPOPUP_RAW_ADD          0x0020 
    1212#define MPOPUP_RAW_AVERAGE      0x0040 
    13 #define MPOPUP_CANCEL           0x0200 
     13#define MPOPUP_CANCEL           0x0400 
    1414#define MPOPUP_PURGE            0x0080 
    1515#define MPOPUP_SUBTRACT         0x0100 
     16#define MPOPUP_RAW_DEVELOP      0x0200 
    1617 
    1718//------------------------------------------------------------------- 

  • branches/juciphox/core/gui_osd.c

    r486 r488  
    3838    {LANG_OSD_LAYOUT_EDITOR_CLOCK,      &conf.clock_pos,        {5*FONT_WIDTH, FONT_HEIGHT}     }, 
    3939    {LANG_OSD_LAYOUT_EDITOR_TEMP,      &conf.temp_pos,        {9*FONT_WIDTH, FONT_HEIGHT}     }, 
    40     {LANG_OSD_LAYOUT_EDITOR_VIDEO,     &conf.mode_video_pos,   {9*FONT_WIDTH, 2*FONT_HEIGHT}   }, 
     40    {LANG_OSD_LAYOUT_EDITOR_VIDEO,     &conf.mode_video_pos,   {9*FONT_WIDTH, 4*FONT_HEIGHT}   }, 
    4141    {LANG_OSD_LAYOUT_EDITOR_EV,     &conf.mode_ev_pos,   {12*FONT_WIDTH, FONT_HEIGHT}   }, 
    4242    {0} 
    …… 
    4545static int curr_item; 
    4646static char osd_buf[64]; 
    47 static char osd_buf2[64]; 
     47static char osd_buf2[10]; 
     48static char osd_buf3[10]; 
     49static char osd_buf4[10]; 
     50 
    4851static int step; 
    4952static unsigned char *img_buf, *scr_buf, *cur_buf; 
    …… 
    737740void gui_osd_draw_state() { 
    738741    int a,  gui_mode=gui_get_mode(), m=(mode_get()&MODE_SHOOTING_MASK);  
    739     int mode_video = MODE_IS_VIDEO(m); 
    740742    long t;  
    741743     
    …… 
    745747   //draw_string(conf.mode_state_pos.x, conf.mode_state_pos.y+6*FONT_HEIGHT, osd_buf, conf.osd_color); 
    746748   ////////////////////////////   
    747     if (mode_video || movie_status > 1) { 
    748         // if manual adjust, show the field item to be adjusted 
    749         // if any value overriden, show the override value 
    750         if ((conf.video_mode == 0 && conf.fast_movie_quality_control==1) || conf.video_bitrate != VIDEO_DEFAULT_BITRATE) { 
    751             gui_print_osd_state_string_chr("Bitrate: ",video_bitrate_strings[conf.video_bitrate]); 
    752         } 
    753         if ((conf.video_mode == 1 && conf.fast_movie_quality_control==1) || conf.video_quality != VIDEO_DEFAULT_QUALITY) { 
    754             gui_print_osd_state_string_int("Quality: ",conf.video_quality); 
    755         } 
    756         // everything else is for stills 
    757                 if(mode_video) 
    758                         return; 
    759     } 
     749 
    760750       
    761751    if ((((conf.tv_enum_type) || (conf.tv_override_value)) && (conf.tv_override_koef)  && !(conf.override_disable==1)) || gui_mode==GUI_MODE_OSD){ 
    …… 
    967957static unsigned int skipcalls = 1; 
    968958unsigned int hour=0, min=0, sec=0; 
    969   
     959int mode_video = MODE_IS_VIDEO(m);  
     960 
     961 
     962if (mode_video || movie_status > 1) { 
     963    // if manual adjust, show the field item to be adjusted 
     964   // if any value overriden, show the override value 
     965   if ((conf.video_mode == 0 && conf.fast_movie_quality_control==1) || conf.video_bitrate != VIDEO_DEFAULT_BITRATE) { 
     966       // gui_print_osd_state_string_chr("Bitrate: ",video_bitrate_strings[conf.video_bitrate]); 
     967       sprintf(osd_buf3, "Bit:%5s",video_bitrate_strings[conf.video_bitrate]); 
     968       draw_string( conf.mode_video_pos.x, conf.mode_video_pos.y+2*FONT_HEIGHT, osd_buf3, conf.osd_color); 
     969   } 
     970   if ((conf.video_mode == 1 && conf.fast_movie_quality_control==1) || conf.video_quality != VIDEO_DEFAULT_QUALITY) { 
     971       // gui_print_osd_state_string_int("Quality: ",conf.video_quality); 
     972                         sprintf(osd_buf4, "Qual:%2i",conf.video_quality); 
     973       draw_string( conf.mode_video_pos.x, conf.mode_video_pos.y+3*FONT_HEIGHT, osd_buf4, conf.osd_color); 
     974   } 
     975   // everything else is for stills 
     976         if(mode_video) 
     977         return; 
     978    } 
     979 
    970980if (movie_reset == 1) 
    971981        { 

  • branches/juciphox/doc/version.txt

    r487 r488  
    66log 
    77 
     80.3.8 / PP 
     9 
     10+ added sx100 100b - http://chdk.setepontos.com/index.php/topic,237.msg19899.html#msg19899 
     11* changed osd item "remaining video time" - now the quality/bitrate you set via the fast video function is shown directly beneath the remaining time/bitrate 
     12* applied reyalps Patch, now you can develop raws directly from within the filebrowser (not only from the RAW menu anymore) 
    813 
    914487 / 0.3.7 

  • branches/juciphox/loader/sx100is

    • Property svn:ignore set to
      main.bin
      main.dump
      main.elf
      main.elf.syms

  • branches/juciphox/loader/sx100is/resetcode

    • Property svn:ignore set to
      main.elf
      main.elf.syms
      main.bin
      main.dump

  • branches/juciphox/makefile.inc

    r479 r488  
    1212#PLATFORM=sx100is 
    1313#PLATFORMSUB=100c 
     14 
     15#PLATFORM=sx100is 
     16#PLATFORMSUB=100b 
    1417 
    1518#PLATFORM=ixus50_sd400 

  • branches/juciphox/platform/sx100is/sub/100b

    • Property svn:mergeinfo set

  • branches/juciphox/platform/sx100is/sub/100b/lib.c

    r485 r488  
    9292  _GiveSemaphore(*(int*)(0x2590+0x10)); 
    9393} 
     94void _EnterToCompensationEVF() {} // Dummy function. To be removed after stub is found. See stubs_entry_2.S. 
     95void _ExitFromCompensationEVF() {} // Dummy function. To be removed after stub is found. See stubs_entry_2.S. 

  • branches/juciphox/platform/sx100is/sub/100b/stubs_entry_2.S

    r485 r488  
    174174NSTUB(taskResume,                       0xFFC00958) 
    175175NSTUB(taskSuspend,                      0xFFC00958) 
     176NHSTUB(GetBatteryTemperature, 0xFFC3A31C) 
     177NHSTUB(GetCCDTemperature, 0xFFC3A2AC) 
     178NHSTUB(GetOpticalTemperature, 0xFFC3A38C) 
     179NHSTUB(PT_PlaySound, 0xFFC52FA0) 
     180//NHSTUB(EnterToCompensationEVF, 0xFFFFFFFF) // Stub not found. When found, remove dummy function from lib.c. 
     181//NHSTUB(ExitFromCompensationEVF, 0xFFFFFFFF) // Stub not found. When found, remove dummy function from lib.c. 

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

    r461 r488  
    103103NSTUB(vsprintf, 0xffc0e7b4) 
    104104NSTUB(write, 0xffc0a4a0) 
    105 NHSTUB(GetBatteryTemperature, 0xFFC3A350) 
    106 NHSTUB(GetCCDTemperature, 0xFFC3A474) 
    107 NHSTUB(GetOpticalTemperature, 0xFFDC4FC4) 
    108 NHSTUB(PT_PlaySound, 0xFFC52FD4) 
     105 

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

    r473 r488  
    177177//NHSTUB(EnterToCompensationEVF, 0xFFFFFFFF) // Stub not found. When found, remove dummy function from lib.c. 
    178178//NHSTUB(ExitFromCompensationEVF, 0xFFFFFFFF) // Stub not found. When found, remove dummy function from lib.c. 
     179NHSTUB(GetBatteryTemperature, 0xFFC3A350) 
     180NHSTUB(GetCCDTemperature, 0xFFC3A474) 
     181NHSTUB(GetOpticalTemperature, 0xFFDC4FC4) 
     182NHSTUB(PT_PlaySound, 0xFFC52FD4) 

  • branches/juciphox/version.inc

    r487 r488  
    1 BUILD_NUMBER := 0.3.7 
     1BUILD_NUMBER := 0.3.8