• R/O
  • SSH
  • HTTPS

qrobosdk: コミット


コミットメタ情報

リビジョン1776 (tree)
日時2010-04-13 17:04:32
作者satofumi

ログメッセージ

removed comment block

変更サマリ

差分

--- trunk/libs/range_sensor/c/urg_ctrl.c (revision 1775)
+++ trunk/libs/range_sensor/c/urg_ctrl.c (revision 1776)
@@ -404,7 +404,7 @@
404404
405405 static int convertRawData(long data[], int data_max,
406406 const char* buffer, int buffer_size, int filled,
407- int is_me_type, int data_bytes, int skip_lines,
407+ int data_bytes, int skip_lines,
408408 int store_last, urg_t* urg)
409409 {
410410 int n;
@@ -414,8 +414,6 @@
414414 long length;
415415 long *data_p = data + filled;
416416
417- (void)is_me_type;
418-
419417 if (data_max > store_last) {
420418 data_max = store_last;
421419 }
@@ -442,13 +440,6 @@
442440 *data_p++ = length;
443441 }
444442 filled += n;
445-#if 0
446- if (is_me_type) {
447- for (j = 0; j < skip_lines; ++j) {
448- /* !!! */
449- }
450- }
451-#endif
452443 }
453444
454445 /* Process one line of data */
@@ -462,14 +453,6 @@
462453 *data_p++ = length;
463454 ++filled;
464455 }
465-
466-#if 0
467- if (is_me_type) {
468- for (j = 0; j < skip_lines; ++j) {
469- /* !!! */
470- }
471- }
472-#endif
473456 }
474457
475458 /* Save the remaining data */
@@ -528,7 +511,6 @@
528511 int is_echoback = False;
529512 int n;
530513
531- int is_me_type = 0;
532514 char current_type[] = "xx";
533515 int current_first = -1;
534516 int current_last = -1;
@@ -570,7 +552,7 @@
570552 if (lines > Timestamp) {
571553 /* convert data */
572554 filled = convertRawData(data, data_max, buffer, n - 1, filled,
573- is_me_type, current_data_bytes, skip_lines,
555+ current_data_bytes, skip_lines,
574556 store_last, urg);
575557
576558 } else if (lines == EchoBack) {
@@ -586,9 +568,6 @@
586568 /* Response command */
587569 current_type[0] = buffer[0];
588570 current_type[1] = buffer[1];
589- if (! strncmp("ME", current_type, 2)) {
590- is_me_type = 1;
591- }
592571
593572 /* Initialisation of receiving settings */
594573 current_first = atoi_substr(&buffer[2], 4);
--- trunk/libs/range_sensor/c/samples/intensity_sample.c (revision 1775)
+++ trunk/libs/range_sensor/c/samples/intensity_sample.c (revision 1776)
@@ -30,7 +30,7 @@
3030 static void printData(urg_t *urg, urg_parameter_t *parameter,
3131 long data[], int data_size, long intensity[])
3232 {
33-#if 1
33+#if 0
3434 int timestamp = urg_recentTimestamp(urg);
3535
3636 /* Display the front data with timestamp */
@@ -44,7 +44,8 @@
4444 int i;
4545
4646 for (i = 0; i < data_size; ++i) {
47- printf("%d: %ld [mm] (%ld)\n", i, data[i], intensity[i]);
47+ //printf("%d: %ld [mm] (%ld)\n", i, data[i], intensity[i]);
48+ printf("%d, %ld, %ld\n", i, data[i], intensity[i]);
4849 }
4950 #endif
5051 }
@@ -54,7 +55,7 @@
5455 int main(int argc, char *argv[])
5556 {
5657 enum {
57- CaptureTimes = 10,
58+ CaptureTimes = 1,
5859 };
5960
6061 #ifdef WINDOWS_OS
旧リポジトリブラウザで表示