Changeset 159

Timestamp:

03/04/06 15:15:57 (3 years ago)

Author:

anthony_rowe

Message:

Get Mean fix.

Files:

• trunk/lib/cc3_ilp/cc3_color_info.c (modified) (3 diffs)
• trunk/lib/cc3_ilp/cc3_color_info.h (modified) (1 diff)
• trunk/projects/cmucam2/cmucam2.c (modified) (4 diffs)

trunk/lib/cc3_ilp/cc3_color_info.c

@@ -21 +21 @@
-pkt->scratch_x=0;
-pkt->scratch_y=0;
+pkt->scratch_pix=0;
-
-return 1;
@@ -35 +36 @@
-        cc3_pixel_t cp;
-        cc3_get_pixel( img, x, 0, &cp );        
+        pkt->scratch_pix++;
-        if(cc3_g_current_frame.coi==CC3_ALL ) { 
-                uint8_t i;
@@ -67 +69 @@
-for(i=0; i<3; i++ )
-{
+        pkt->mean.channel[i]=pkt->scratch_mean[i]/pkt->scratch_pix;
-        pkt->deviation.channel[i]=((pkt->max.channel[i]-pkt->mean.channel[i])+
-                (pkt->mean.channel[i]-pkt->min.channel[i]))/2;

trunk/lib/cc3_ilp/cc3_color_info.h

@@ -14 +14 @@
-    uint16_t scratch_x,scratch_y;
-    uint32_t scratch_mean[3];
+    uint32_t scratch_pix;
-} cc3_color_info_pkt_t;
-

trunk/projects/cmucam2/cmucam2.c

@@ -26 +26 @@
-        POLL_MODE,
-        LINE_MODE,
+        SEND_JPEG,
-        VIRTUAL_WINDOW,
-        DOWN_SAMPLE,
@@ -104 +105 @@
-                else line_mode=0;
-            }
+            break;
+        case SEND_JPEG:
+            if(n!=0 && n!=1) { error=1; break; } else print_ACK();
+            //init_jpeg(); 
+
+
-            break;
-        case SEND_FRAME:
@@ -305 +312 @@
-cmucam2_cmds[DOWN_SAMPLE]="DS"; 
-cmucam2_cmds[LINE_MODE]="LM"; 
+cmucam2_cmds[SEND_JPEG]="SJ"; 
-}
-
@@ -380 +388 @@
-
-}
-
-