Changeset 440
- Timestamp:
- 02/18/07 18:52:30 (2 years ago)
- Files:
-
- trunk/projects/cmucam2/cmucam2.c (modified) (8 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/projects/cmucam2/cmucam2.c
r438 r440 70 70 BUF_MODE, 71 71 READ_FRAME, 72 PACKET_FILTER, 72 73 CONF_HISTOGRAM, 73 74 CMUCAM2_CMD_END // Must be last entry so array sizes are correct … … 95 96 /* Buffer Commands */ 96 97 cmucam2_cmds[BUF_MODE] = "BM"; 97 // BM buffer mode98 98 cmucam2_cmds[READ_FRAME] = "RF"; 99 // RF read frame100 99 101 100 /* Camera Module Commands */ … … 109 108 // PS packet skip 110 109 // RM raw mode 111 // PF packet filter110 cmucam2_cmds[PACKET_FILTER] = "PF"; 112 111 // OM output packet mask 113 112 … … 194 193 static void cmucam2_send_image_direct (bool auto_led); 195 194 196 195 bool packet_filter_flag; 197 196 198 197 int main (void) … … 251 250 line_mode = false; 252 251 buf_mode = false; 252 packet_filter_flag = false; 253 253 h_pkt.bins = 28; 254 254 t_pkt.track_invert = false; … … 375 375 break; 376 376 377 case PACKET_FILTER: 378 if (n != 1 || arg_list[0]>1) { 379 error = true; 380 break; 381 } 382 383 print_ACK (); 384 if (arg_list[0] == 1) 385 packet_filter_flag= true; 386 else 387 packet_filter_flag= false; 388 break; 389 377 390 case POLL_MODE: 378 if (n != 1 ) {391 if (n != 1 || arg_list[0]>1) { 379 392 error = true; 380 393 break; … … 1036 1049 void cmucam2_write_t_packet (cc3_track_pkt_t * pkt, cmucam2_servo_t *servo_settings) 1037 1050 { 1051 static bool empty_cnt=0; 1052 1038 1053 if (pkt->centroid_x > 255) 1039 1054 pkt->centroid_x = 255; … … 1054 1069 1055 1070 if (pkt->num_pixels == 0) 1056 printf ("T 0 0 0 0 0 0 0 0"); 1071 { 1072 if(packet_filter_flag==0) 1073 printf ("T 0 0 0 0 0 0 0 0"); 1074 if(packet_filter_flag==1) 1075 { 1076 if(empty_cnt==0) printf ("T 0 0 0 0 0 0 0 0"); 1077 } 1078 } 1057 1079 else 1080 { 1081 empty_cnt=0; 1058 1082 printf ("T %d %d %d %d %d %d %d %d", pkt->centroid_x, pkt->centroid_y, 1059 1083 pkt->x0, pkt->y0, pkt->x1, pkt->y1, pkt->num_pixels, 1060 1084 pkt->int_density); 1085 } 1061 1086 if(servo_settings->x_report) printf( " %d",servo_settings->x ); 1062 1087 if(servo_settings->y_report) printf( " %d",servo_settings->y ); 1063 printf( "\r" ); 1064 1088 if(packet_filter_flag==0) printf( "\r" ); 1089 if(packet_filter_flag==1) 1090 { 1091 if(empty_cnt==0) printf ("\r"); 1092 if (pkt->num_pixels == 0) empty_cnt=1; 1093 } 1065 1094 } 1066 1095
