Changeset 417

Timestamp:

02/17/07 17:21:57 (2 years ago)

Author:

anthony_rowe

Message:

noise filter

Files:

• trunk/lib/cc3-ilp/cc3_color_track.c (modified) (8 diffs)
• trunk/lib/cc3-ilp/cc3_color_track.h (modified) (1 diff)
• trunk/projects/cmucam2/cmucam2.c (modified) (4 diffs)

trunk/lib/cc3-ilp/cc3_color_track.c

@@ -67 +67 @@
-
-      if (cc3_g_pixbuf_frame.coi == CC3_CHANNEL_ALL) {
-      
+       
-            && pixel[0] <= pkt->upper_bound.channel[0]
-            && pixel[1] >= pkt->lower_bound.channel[1]
@@ -74 +74 @@
-            && pixel[2] <= pkt->upper_bound.channel[2])
-          pixel_good = 1;
-    
-  
+
+ 
-      }
-      else {
@@ -87 +87 @@
-      }
-
+      if(pkt->track_invert==1) pixel_good=!pixel_good;
-      if (pixel_good) {
-        pkt->num_pixels++;
@@ -156 +157 @@
-{
-  uint32_t x, y;
+  uint8_t seq_count;
-
-  for (x = 0; x < MAX_BINARY_WIDTH; x++)
@@ -161 +163 @@
-
-  for (y = pkt->scratch_y; y < (pkt->scratch_y + img->height); y++)
+  {
+    seq_count=0;
-    for (x = 0; x < img->width; x++) {
-      bool pixel_good = 0;
@@ -183 +187 @@
-      }
-
+      if(pkt->track_invert==1) pixel_good=!pixel_good;
-      /*      pkt->binary_scanline[0]=0x01020304; 
-         pkt->binary_scanline[1]=0x05060708; 
@@ -188 +193 @@
-         pkt->binary_scanline[3]=0x0D0E0F10; 
-         pkt->binary_scanline[4]=0x11121314; 
-
+
+
+
+
+
+
+
-        uint8_t block, offset;
-        block = x / 8;
@@ -207 +218 @@
-      }
-    }
-
+
-  pkt->scratch_y = y;
-

trunk/lib/cc3-ilp/cc3_color_track.h

@@ -34 +34 @@
-    uint32_t int_density;
-    uint8_t noise_filter;
+    bool track_invert;
-    uint8_t binary_scanline[MAX_BINARY_WIDTH];
-    cc3_pixel_t upper_bound;

trunk/projects/cmucam2/cmucam2.c

@@ -51 +51 @@
-  GET_WINDOW,
-  LED_0,
+  NOISE_FILTER,
-  TRACK_INVERT,
-  CMUCAM2_CMD_END               // Must be last entry so array sizes are correct
@@ -87 +88 @@
-  line_mode = false;
-  t_pkt.track_invert = false;
+  t_pkt.noise_filter = 0;
-  t_pkt.lower_bound.channel[0] = 16;
-  t_pkt.upper_bound.channel[0] = 240;
@@ -204 +206 @@
-                t_pkt.track_invert=1;
-        break;
-
+
+
+
+
+
+
+
+
+
+
-
-      case LINE_MODE:
@@ -661 +672 @@
-  cmucam2_cmds[TRACK_WINDOW] = "TW";
-  cmucam2_cmds[GET_WINDOW] = "GW";
+  cmucam2_cmds[NOISE_FILTER] = "NF";
-  cmucam2_cmds[GET_TRACK] = "GT";
-  cmucam2_cmds[LED_0] = "L0";