Changeset 1267


Ignore:
Timestamp:
08/04/11 19:42:48 (3 years ago)
Author:
pixeldoc2000
Message:

"Show misc. values" improved (better Labels, order of value changed, show hex values with 0x00 and some comments)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/core/gui.c

    r1254 r1267  
    24232423#endif 
    24242424 
     2425    // DEBUG: "Show misc. values" 
     2426    // change ROW to fit values on screen in draw_txt_string(COLUMN, ROW, ...) 
     2427    // uncomment gui_draw_debug_vals_osd() below if you want debug values always on top 
    24252428    if (conf.debug_misc_vals_show) { 
    2426         //        long v=get_file_counter(); 
    2427         //      sprintf(osd_buf, "1:%03d-%04d  ", (v>>18)&0x3FF, (v>>4)&0x3FFF); 
    2428         //      sprintf(osd_buf, "1:%d, %08X  ", xxxx, eeee); 
     2429        // show value of Memory Address selected with Memory Browser 
     2430        sprintf(osd_buf, "MEM: %#8x", (void*) (*(int*)conf.mem_view_addr_init));    // show value in Hexadecimal integer 
     2431        //sprintf(osd_buf, "MEM: %8u", (void*) (*(int*)conf.mem_view_addr_init));    // show value in Decimal integer 
     2432        draw_txt_string(28,  9, osd_buf, conf.osd_color); 
     2433 
     2434        // show Autofocus status (if AF is working) 
     2435        extern volatile long focus_busy; 
     2436        sprintf(osd_buf, "FB:  %8u", focus_busy); 
     2437        draw_txt_string(28, 10, osd_buf, conf.osd_color); 
     2438 
     2439        // show Zoom status (if Lens is moving) 
     2440        extern volatile long zoom_busy; 
     2441        sprintf(osd_buf, "ZB:  %8u", zoom_busy); 
     2442        draw_txt_string(28, 11, osd_buf, conf.osd_color); 
     2443 
     2444        // show USB-Power status to debug remote / sync 
     2445        sprintf(osd_buf, "USB: %8u", get_usb_power(1)); 
     2446        draw_txt_string(28, 12, osd_buf, conf.osd_color); 
     2447 
    24292448        /* 
     2449        // some cameras missing zoom_status 
     2450        sprintf(osd_buf, "ZS:  %#8x", zoom_status); 
     2451        draw_txt_string(28, 13, osd_buf, conf.osd_color); 
     2452        */ 
     2453 
     2454        /* 
     2455        sprintf(osd_buf, "VP:  %#8x", vid_get_viewport_fb_d()); 
     2456        draw_txt_string(28, 14, osd_buf, conf.osd_color); 
     2457        */ 
     2458 
     2459        /* 
     2460        // debug keymap, KEYS_MASKx, SD_READONLY_FLAG, USB_MASK 
    24302461        extern long physw_status[3]; 
    2431         sprintf(osd_buf, "1:%8x  ", physw_status[0]); 
     2462        sprintf(osd_buf, "PS1: %#8x", physw_status[0]); 
    24322463        draw_txt_string(28, 10, osd_buf, conf.osd_color); 
    24332464 
    2434         sprintf(osd_buf, "2:%8x  ", physw_status[1]); 
     2465        sprintf(osd_buf, "PS2: %#8x", physw_status[1]); 
    24352466        draw_txt_string(28, 11, osd_buf, conf.osd_color); 
    24362467 
    2437         sprintf(osd_buf, "3:%8x  ", physw_status[2]); 
     2468        sprintf(osd_buf, "PS3: %#8x", physw_status[2]); 
    24382469        draw_txt_string(28, 12, osd_buf, conf.osd_color); 
    2439  
    2440         //      sprintf(osd_buf, "4:%8x  ", vid_get_viewport_fb_d()); 
    24412470        */ 
    2442         sprintf(osd_buf, "u:%8x  ", get_usb_power(1)); 
    2443         draw_txt_string(28,  9, osd_buf, conf.osd_color); 
    2444  
    2445         sprintf(osd_buf, "1:%8x  ", (void*) (*(int*)conf.mem_view_addr_init)); 
    2446         draw_txt_string(28, 10, osd_buf, conf.osd_color); 
    2447  
    2448     extern volatile long focus_busy; 
    2449         sprintf(osd_buf, "f:%8x  ", focus_busy); 
    2450         draw_txt_string(28, 11, osd_buf, conf.osd_color); 
    2451  
    2452     extern volatile long zoom_busy; 
    2453         sprintf(osd_buf, "z:%8x  ", zoom_busy); 
    2454         draw_txt_string(28, 12, osd_buf, conf.osd_color); 
    2455  
    2456         // some cameras missing zoom_status 
    2457         #if 0 
    2458         sprintf(osd_buf, "t:%8x  ", zoom_status); 
    2459         draw_txt_string(28, 13, osd_buf, conf.osd_color); 
    2460         #endif 
    2461  
     2471 
     2472        /* 
     2473        long v=get_file_counter(); 
     2474        sprintf(osd_buf, "1:%03d-%04d", (v>>18)&0x3FF, (v>>4)&0x3FFF); 
     2475        sprintf(osd_buf, "1:%d, %08X", xxxx, eeee); 
     2476        */ 
    24622477    } 
    24632478    { 
     
    25242539    m = mode_get(); 
    25252540 
    2526 // uncomment if you want debug values always on top 
    2527 //      gui_draw_debug_vals_osd(); 
     2541// DEBUG: uncomment if you want debug values always on top 
     2542//gui_draw_debug_vals_osd(); 
    25282543 
    25292544#if CAM_SWIVEL_SCREEN 
Note: See TracChangeset for help on using the changeset viewer.