Changeset 211

Show
Ignore:
Timestamp:
03/26/06 18:04:18 (3 years ago)
Author:
goodea
Message:

uh, slightly better

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/hal/lpc2106-cmucam3/cc3.c

    r210 r211  
    297297    } 
    298298    else { 
    299       // ... 
     299      // we are just reading 1 channel 
     300      // FIXME 
    300301    } 
    301302 

  • trunk/lib/cc3_ilp/cc3_ilp.c

    r210 r211  
    88{ 
    99  uint32_t x, y; 
     10  uint32_t size_x, size_y; 
    1011  uint8_t *row = cc3_malloc_rows(1); 
    1112 
    1213  cc3_set_led (1); 
    1314 
     15  size_x = cc3_g_current_frame.width; 
     16  size_y = cc3_g_current_frame.height; 
     17 
     18  cc3_pixbuf_load (); 
     19 
    1420  putchar (1); 
    15   putchar (cc3_g_current_frame.width); 
    16   if (cc3_g_current_frame.height > 255) 
    17     cc3_g_current_frame.height = 255; 
    18   putchar (cc3_g_current_frame.height); 
    19   for (y = 0; y < cc3_g_current_frame.height; y++) { 
     21  putchar (size_x); 
     22  if (size_y > 255) 
     23    size_y = 255; 
     24  putchar (size_y); 
     25  for (y = 0; y < size_y; y++) { 
    2026    putchar (2); 
    2127     
    2228    cc3_pixbuf_read_rows(row, 1); 
    23     for (x = 0; x < cc3_g_current_frame.width * 3U; x++) { 
     29    for (x = 0; x < size_x * 3U; x++) { 
    2430      putchar (row[x]); 
    2531    } 

  • trunk/projects/cmucam2/cmucam2.c

    r210 r211  
    6767 
    6868  cc3_camera_init (); 
     69  cc3_set_resolution(CC3_LOW_RES); 
    6970 
    7071  printf ("%s\r", VERSION_BANNER);