Changeset 145

Timestamp:

02/25/06 18:58:43 (3 years ago)

Author:

agr

Message:

CMUcam2 coming into form...

Files:

• trunk/hal/lpc2106-cmucam3/serial.c (modified) (1 diff)
• trunk/lib/cc3_ilp/cc3_ilp.c (modified) (5 diffs)
• trunk/lib/cc3_ilp/cc3_ilp.h (modified) (1 diff)
• trunk/projects/cmucam2/Makefile (modified) (1 diff)
• trunk/projects/cmucam2/main.c (modified) (2 diffs)

trunk/hal/lpc2106-cmucam3/serial.c

@@ -154 +154 @@
-
-
-
-void uart0_write (char *str)
-{

trunk/lib/cc3_ilp/cc3_ilp.c

@@ -2 +2 @@
-#include "cc3_ilp.h"
-#include <stdbool.h>
+#include <stdio.h>
-
+void cc3_send_image_direct(void)
+{
+    uint32_t x, y;
+    uint32_t size_x, size_y;
-
+   cc3_set_led(1);
+   size_x=cc3_g_current_frame.width; 
+   size_y=cc3_g_current_frame.height; 
+    cc3_pixbuf_load ();
+    putchar (1);
+    putchar (size_x);
+    if (size_y > 255)
+        size_y = 255;
+    putchar (size_y);
+    for (y = 0; y < size_y; y++) {
+        putchar (2);
+        for (x = 0; x < size_x; x++) {
+            cc3_pixbuf_read ();
+            putchar (cc3_g_current_pixel.channel[CC3_RED]);
+            putchar (cc3_g_current_pixel.channel[CC3_GREEN]);
+            putchar (cc3_g_current_pixel.channel[CC3_BLUE]);
+        }
+    }
+    putchar (3);
+}
-
-uint8_t cc3_load_img_rows( cc3_image_t *img, uint16_t rows )
@@ -58 +83 @@
- int y, x;
-
-->channel[0]>pkt->upper_bound->
-->channel[1]>pkt->upper_bound->
-->channel[2]>pkt->upper_bound->
+.channel[0]>pkt->upper_bound.
+.channel[1]>pkt->upper_bound.
+.channel[2]>pkt->upper_bound.
-pkt->num_pixels=0;
-pkt->x0=UINT16_MAX;
@@ -68 +93 @@
-mm_x=0;
-mm_y=0;
+
+cc3_pixbuf_load();
-for(y=0; y<cc3_g_current_frame.height; y++ )
-for(x=0; x<cc3_g_current_frame.width; x++ )
@@ -74 +101 @@
-        cc3_pixbuf_read();
-        if(cc3_g_current_frame.coi==CC3_ALL ) { 
-->
-->
-->
-->
-->
-->
+.
+.
+.
+.
+.
+.
-        } else
-        {
-->
-->
+.
+.
-        }
-
@@ -98 +125 @@
-}
-
-pkt->centroid_x= mm_x / cc3_g_current_frame.width;
-pkt->centroid_y= mm_y / cc3_g_current_frame.height;
-
-// FIXME:  Density hack to keep it an integer
-if(pkt->num_pixels>0 )
+{
+        // FIXME:  Density hack to keep it an integer
-        pkt->int_density=(pkt->num_pixels*1000) / ((pkt->x1 - pkt->x0)*(pkt->y1 - pkt->y0));
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-return 1;
-}

trunk/lib/cc3_ilp/cc3_ilp.h

@@ -17 +17 @@
-    uint32_t int_density;
-    uint8_t noise_filter;
-*
-*
+
+
-} cc3_track_pkt_t;
-
+void cc3_send_image_direct(void);
-void cc3_get_pixel(cc3_image_t *img, uint16_t x, uint16_t y, cc3_pixel_t *out_pix);
-void cc3_set_pixel(cc3_image_t *img, uint16_t x, uint16_t y, cc3_pixel_t *in_pix);

trunk/projects/cmucam2/Makefile

@@ -2 +2 @@
-INCLUDES=
-PROJECT=cmucam2
+LIBS=cc3_ilp
-
-include ../../include/common.mk

trunk/projects/cmucam2/main.c

@@ -1 @@
-"LPC2100.h"
-"cc3.h"
-"interrupt.h"
+<cc3.h>
+<cc3_ilp.h>
+<servo.h>
-#include <math.h>
-#include <stdbool.h>
-#include <stdio.h>
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    cc3_system_setup ();
-
-
-    //disable_ext_interrupt ();
-    //uart0_write("CMUcam3 v2 Starting up...\r");
-    //system_setup ();
-    cc3_uart0_init (115200,UART_8N1,UART_STDOUT);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
+    
+    }
+    else error=1;
+    
+    if(error==1) print_NCK(); 
+
+    }
-
-
@@ -51 +144 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
-
-
-
+
+
+
+
+
+
+