Changeset 613


Ignore:
Timestamp:
12/02/08 14:34:23 (5 years ago)
Author:
phyrephox
Message:

+ added new feature (By PlasmaHH) - compare Propcases
Usage: go to debug menu, go to "ALT +/- debug action", set to "CmpProps?" (Compare propcases)
then in alt-mode, press the +/- button to initialize it (all current propcases are then saved)
then after you made changes in the camera (canon menu) you enter alt-mode, press +/- button - you will see all the props that have changed, until you exit alt-mode
if there are more than 12 changed propcases, after 15 seconds it will show the next entries. this is not convenient, but i couldnt come up with a better way for now.
on the other hand: it's not clever changing so many things at once (in-camera) to find out propcases. one at a time is the better solution.

  • gui_fselect.c & rbf_font/rbf_font.c - squashed some compiler warnings (PlasmaHH)
  • makefile - version.inc was updated even when no new data was inserted, i disabled it (dont think there will be any sideeffects)
Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Makefile

    r586 r613  
    5858version: FORCE 
    5959        echo "**** Build: $(BUILD_NUMBER)" 
    60         echo "BUILD_NUMBER := $(BUILD_NUMBER)" > version.inc 
     60#       echo "BUILD_NUMBER := $(BUILD_NUMBER)" > version.inc 
    6161 
    6262FORCE: 
  • trunk/core/gui.c

    r603 r613  
    146146#endif 
    147147static void gui_draw_load_menu_rbf(int arg); 
    148 static void gui_draw_load_symbol_rbf(int arg);                  //AKA 
     148static void gui_draw_load_symbol_rbf(int arg);          //AKA 
    149149#ifdef OPT_TEXTREADER 
    150150        static void gui_draw_load_rbf(int arg); 
     
    158158static void gui_menuproc_edge_load(int arg); 
    159159static void gui_menuproc_edge_free(int arg); 
    160  
     160#ifdef OPT_DEBUGGING 
     161void gui_compare_props(int arg); 
     162#endif 
    161163#ifndef OPTIONS_AUTOSAVE 
    162164static void gui_menuproc_save(int arg); 
     
    18451847#define DEBUG_DISPLAY_TASKS 3 
    18461848static const char * gui_debug_shortcut_enum(int change, int arg) { 
    1847     static const char* modes[]={ "None", "Dmp RAM", "Page"}; 
     1849    static const char* modes[]={ "None", "DmpRAM", "Page", "CmpProps"}; 
    18481850 
    18491851    conf.debug_shortcut_action += change; 
     
    18911893                    debug_propcase_page = 0; 
    18921894            } 
     1895        break; 
     1896        case 3: 
     1897            gui_compare_props(1); 
    18931898        break; 
    18941899    } 
     
    31833188} 
    31843189 
     3190#ifdef OPT_DEBUGGING 
     3191 
     3192void gui_compare_props(int arg) 
     3193{ 
     3194        #define NUM_PROPS 512 
     3195        static int initialized = 0; 
     3196        static int props[NUM_PROPS] = { }; 
     3197        char buf[64]; 
     3198        int i; 
     3199        int p; 
     3200        int c; 
     3201 
     3202 
     3203        if( initialized ) 
     3204        { // we have previous data set! do a comparison 
     3205                c = 0; 
     3206                for( i = 0; i < NUM_PROPS; ++i ) 
     3207                { 
     3208                        p = shooting_get_prop(i); 
     3209                        if( props[i] != p ) 
     3210                        { 
     3211                                ++c; 
     3212                                sprintf(buf,"%4d is %8d was %8d",i,p,props[i]); 
     3213                                draw_string(16,16*c,buf,MAKE_COLOR(COLOR_BLACK,COLOR_YELLOW)); 
     3214                        } 
     3215                        props[i] = p; 
     3216                        if( c == 12 ) 
     3217                        { 
     3218                                ++c; 
     3219                                sprintf(buf,"%s","Waiting 15 Seconds"); 
     3220                                draw_string(16,16*c,buf,MAKE_COLOR(COLOR_BLACK,COLOR_YELLOW)); 
     3221                                msleep(15000); 
     3222                                c = 0; 
     3223                        } 
     3224                } 
     3225                ++c; 
     3226                sprintf(buf,"%s","Press <ALT> to leave"); 
     3227                draw_string(16,16*c,buf,MAKE_COLOR(COLOR_BLACK,COLOR_YELLOW)); 
     3228        } 
     3229        else 
     3230        { 
     3231        // no previous data was set so we save the data initially 
     3232                for( i = 0; i < NUM_PROPS; ++i ) 
     3233                { 
     3234                        props[i] = shooting_get_prop(i); 
     3235                } 
     3236        } 
     3237        initialized = 1; 
     3238} 
     3239 
     3240#endif 
  • trunk/core/gui_fselect.c

    r594 r613  
    656656static void fselect_marked_paste_cb(unsigned int btn) { 
    657657    struct fitem  *ptr; 
    658     int ss, sd, fsrc, fdst, i=0; 
     658    int ss, sd = 0, fsrc, fdst, i=0; 
    659659    register int *buf; 
    660660    unsigned char fend; 
  • trunk/lib/font/rbf_font.c

    r515 r613  
    211211     
    212212    for (i=0; i<256; ++i) { 
    213         rbf_assign_char_8x16(&rbf_font.cTable[i], font[i], rbf_font.height); 
     213        rbf_assign_char_8x16(&rbf_font.cTable[i], (char*)font[i], rbf_font.height); 
    214214    } 
    215215    need_free = 1; 
Note: See TracChangeset for help on using the changeset viewer.