Changeset 155

Timestamp:

02/26/06 15:33:02 (3 years ago)

Author:

anthony_rowe

Message:

Line mode added to cmucam2 project

Files:

• trunk/lib/cc3_ilp/cc3_color_track.c (modified) (2 diffs)
• trunk/lib/cc3_ilp/cc3_color_track.h (modified) (1 diff)
• trunk/projects/cmucam2/cmucam2.c (modified) (5 diffs)

trunk/lib/cc3_ilp/cc3_color_track.c

@@ -140 +140 @@
-        }
-
-
+
+
+
+
+
+
-        {
+        uint8_t block,offset;
+        block=x/8;
+        offset=x%8;
+        offset=7-offset;
+        pkt->binary_scanline[block] |= (1<<offset);
-        pkt->num_pixels++;
-        if(pkt->x0 > x ) pkt->x0=x;     
@@ -154 +164 @@
-pkt->scratch_y=y;
-
-
+
-}
-

trunk/lib/cc3_ilp/cc3_color_track.h

@@ -16 +16 @@
-    uint32_t int_density;
-    uint8_t noise_filter;
-32
+8
-    cc3_pixel_t upper_bound;
-    cc3_pixel_t lower_bound;

trunk/projects/cmucam2/cmucam2.c

@@ -24 +24 @@
-        CAMERA_REG,
-        POLL_MODE,
+        LINE_MODE,
-        VIRTUAL_WINDOW,
-        DOWN_SAMPLE,
@@ -37 +38 @@
-void print_NCK(void);
-void cmucam2_write_t_packet(cc3_track_pkt_t *pkt);
-
-
-int main (void)
@@ -90 +90 @@
-            if(arg_list[0]==1 ) poll_mode=1;
-            else poll_mode=0;
+            break;
+        case LINE_MODE:
+            if(n!=2) { error=1; break; } else print_ACK();
+            // FIXME: Make bitmasks later
+            if(arg_list[0]==0 ) 
+            {
+                if(arg_list[1]==1)
+                    line_mode=1;
+                else line_mode=0;
+            }
-            break;
-        case SEND_FRAME:
@@ -158 +168 @@
-                cc3_pixbuf_load();
-                if(cc3_track_color_scanline_start(t_pkt)!=0 )
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        for(i=0; i<cc3_g_current_frame.height; i++ )
-                        {
-                        cc3_pixbuf_read_rows(img.pix, img.width, 1);    
-                        cc3_track_color_scanline(&img, t_pkt);
+                        if(line_mode==1)
+                                {
+                                
+                                for(int j=0; j<lm_width; j++ )
+                                        {
+                                //      printf( "%d ",lm[j] );
+                                        if(lm[j]==0xAA ) putchar(0xAB);
+                                        else
+                                                putchar( lm[j] );
+                                        }
+                                }
-                        }
-
-
+
+
+
+
+
+
+
+
-                }
-                if(!cc3_uart_has_data(0) ) break;
@@ -218 +265 @@
-cmucam2_cmds[VIRTUAL_WINDOW]="VW"; 
-cmucam2_cmds[DOWN_SAMPLE]="DS"; 
+cmucam2_cmds[LINE_MODE]="LM"; 
-}
-