• R/O
  • SSH
  • HTTPS

qrobosdk: コミット


コミットメタ情報

リビジョン1939 (tree)
日時2010-11-22 11:05:24
作者satofumi

ログメッセージ

added urg_c_simple package

変更サマリ

差分

--- trunk/libs/system/c/detect_os.h (revision 1938)
+++ trunk/libs/system/c/detect_os.h (revision 1939)
@@ -27,6 +27,7 @@
2727 #else
2828 // 検出できないときを、Mac 扱いにしてしまう
2929 #define MAC_OS
30+//#define EMBEDDED_OS
3031 #endif
3132
3233 #endif /* !QRK_C_DETECT_OS_H */
--- trunk/libs/range_sensor/c/samples/gd_scan.c (revision 1938)
+++ trunk/libs/range_sensor/c/samples/gd_scan.c (revision 1939)
@@ -34,6 +34,8 @@
3434 #else
3535 const char device[] = "/dev/ttyACM0"; /* For Linux */
3636 #endif
37+ (void)argc;
38+ (void)argv;
3739
3840 int data_max;
3941 long *data;
--- trunk/libs/range_sensor/samples/evaluateMdTimestamp.cpp (revision 1938)
+++ trunk/libs/range_sensor/samples/evaluateMdTimestamp.cpp (revision 1939)
@@ -87,7 +87,7 @@
8787 skip(&con, Timeout);
8888
8989 enum {
90- EvaluateTimes = 60 * 40 * 10,
90+ EvaluateTimes = 60 * 100 * 10,
9191 };
9292
9393 con.send("MD0000000101000\r", 16);
@@ -104,7 +104,7 @@
104104 int urg_timestamp = getUrgTimestamp(con);
105105 int pc_timestamp = ticks();
106106
107- if ((pc_timestamp - pre_pc_timestamp) >= (1000 - 10)) {
107+ if ((pc_timestamp - pre_pc_timestamp) >= 0) {
108108 pre_pc_timestamp = pc_timestamp;
109109 printf("%d\t%d\n",
110110 pc_timestamp - first_pc_timestamp,
--- trunk/libs/range_sensor/samples/Makefile (revision 1938)
+++ trunk/libs/range_sensor/samples/Makefile (revision 1939)
@@ -96,6 +96,10 @@
9696 evaluateGdTimestamp.o: ../../connection/Connection.h
9797 evaluateGdTimestamp.o: ../../connection/ConnectionUtils.h
9898 evaluateGdTimestamp.o: ../../system/ticks.h ../../system/delay.h
99+evaluateMdTimestamp.o: ../../connection/SerialDevice.h
100+evaluateMdTimestamp.o: ../../connection/Connection.h
101+evaluateMdTimestamp.o: ../../connection/ConnectionUtils.h
102+evaluateMdTimestamp.o: ../../system/ticks.h ../../system/delay.h
99103 evaluateTmTimestamp.o: ../../connection/SerialDevice.h
100104 evaluateTmTimestamp.o: ../../connection/Connection.h
101105 evaluateTmTimestamp.o: ../../connection/ConnectionUtils.h
--- trunk/libs/packages/c_urg_sample/Makefile (revision 1938)
+++ trunk/libs/packages/c_urg_sample/Makefile (revision 1939)
@@ -2,7 +2,7 @@
22
33 CFLAGS = -g -O0 -Wall -Werror `c_urg-config --cflags`
44 LDFLAGS = `c_urg-config --libs`
5-LDLIBS =
5+LDLIBS = -lm
66
77 TARGET = gd_scan md_scan
88
--- trunk/libs/packages/urg_c_simple/gd_scan.c (nonexistent)
+++ trunk/libs/packages/urg_c_simple/gd_scan.c (revision 1939)
@@ -0,0 +1 @@
1+link ../urg/samples/c/gd_scan.c
\ No newline at end of file
Added: svn:special
## -0,0 +1 ##
+*
\ No newline at end of property
--- trunk/libs/packages/urg_c_simple/serial_utils.c (nonexistent)
+++ trunk/libs/packages/urg_c_simple/serial_utils.c (revision 1939)
@@ -0,0 +1 @@
1+link ../urg/src/c/connection/serial_utils.c
\ No newline at end of file
Added: svn:special
## -0,0 +1 ##
+*
\ No newline at end of property
--- trunk/libs/packages/urg_c_simple/urg_ticks.h (nonexistent)
+++ trunk/libs/packages/urg_c_simple/urg_ticks.h (revision 1939)
@@ -0,0 +1 @@
1+link ../urg/src/c/system/urg_ticks.h
\ No newline at end of file
Added: svn:special
## -0,0 +1 ##
+*
\ No newline at end of property
--- trunk/libs/packages/urg_c_simple/scip_handler.h (nonexistent)
+++ trunk/libs/packages/urg_c_simple/scip_handler.h (revision 1939)
@@ -0,0 +1 @@
1+link ../urg/src/c/urg/scip_handler.h
\ No newline at end of file
Added: svn:special
## -0,0 +1 ##
+*
\ No newline at end of property
--- trunk/libs/packages/urg_c_simple/urg_errno.c (nonexistent)
+++ trunk/libs/packages/urg_c_simple/urg_errno.c (revision 1939)
@@ -0,0 +1 @@
1+link ../urg/src/c/urg/urg_errno.c
\ No newline at end of file
Added: svn:special
## -0,0 +1 ##
+*
\ No newline at end of property
--- trunk/libs/packages/urg_c_simple/serial_ctrl.c (nonexistent)
+++ trunk/libs/packages/urg_c_simple/serial_ctrl.c (revision 1939)
@@ -0,0 +1 @@
1+link ../urg/src/c/connection/serial_ctrl.c
\ No newline at end of file
Added: svn:special
## -0,0 +1 ##
+*
\ No newline at end of property
--- trunk/libs/packages/urg_c_simple/serial_utils.h (nonexistent)
+++ trunk/libs/packages/urg_c_simple/serial_utils.h (revision 1939)
@@ -0,0 +1 @@
1+link ../urg/src/c/connection/serial_utils.h
\ No newline at end of file
Added: svn:special
## -0,0 +1 ##
+*
\ No newline at end of property
--- trunk/libs/packages/urg_c_simple/serial_ctrl_lin.c (nonexistent)
+++ trunk/libs/packages/urg_c_simple/serial_ctrl_lin.c (revision 1939)
@@ -0,0 +1 @@
1+link ../urg/src/c/connection/serial_ctrl_lin.c
\ No newline at end of file
Added: svn:special
## -0,0 +1 ##
+*
\ No newline at end of property
--- trunk/libs/packages/urg_c_simple/serial_t.h (nonexistent)
+++ trunk/libs/packages/urg_c_simple/serial_t.h (revision 1939)
@@ -0,0 +1 @@
1+link ../urg/src/c/connection/serial_t.h
\ No newline at end of file
Added: svn:special
## -0,0 +1 ##
+*
\ No newline at end of property
--- trunk/libs/packages/urg_c_simple/urg_errno.h (nonexistent)
+++ trunk/libs/packages/urg_c_simple/urg_errno.h (revision 1939)
@@ -0,0 +1 @@
1+link ../urg/src/c/urg/urg_errno.h
\ No newline at end of file
Added: svn:special
## -0,0 +1 ##
+*
\ No newline at end of property
--- trunk/libs/packages/urg_c_simple/serial_ctrl.h (nonexistent)
+++ trunk/libs/packages/urg_c_simple/serial_ctrl.h (revision 1939)
@@ -0,0 +1 @@
1+link ../urg/src/c/connection/serial_ctrl.h
\ No newline at end of file
Added: svn:special
## -0,0 +1 ##
+*
\ No newline at end of property
--- trunk/libs/packages/urg_c_simple/serial_t_lin.h (nonexistent)
+++ trunk/libs/packages/urg_c_simple/serial_t_lin.h (revision 1939)
@@ -0,0 +1 @@
1+link ../urg/src/c/connection/serial_t_lin.h
\ No newline at end of file
Added: svn:special
## -0,0 +1 ##
+*
\ No newline at end of property
--- trunk/libs/packages/urg_c_simple/urg_delay.c (nonexistent)
+++ trunk/libs/packages/urg_c_simple/urg_delay.c (revision 1939)
@@ -0,0 +1 @@
1+link ../urg/src/c/system/urg_delay.c
\ No newline at end of file
Added: svn:special
## -0,0 +1 ##
+*
\ No newline at end of property
--- trunk/libs/packages/urg_c_simple/math_utils.h (nonexistent)
+++ trunk/libs/packages/urg_c_simple/math_utils.h (revision 1939)
@@ -0,0 +1 @@
1+link ../urg/src/c/system/math_utils.h
\ No newline at end of file
Added: svn:special
## -0,0 +1 ##
+*
\ No newline at end of property
--- trunk/libs/packages/urg_c_simple/detect_os.h (nonexistent)
+++ trunk/libs/packages/urg_c_simple/detect_os.h (revision 1939)
@@ -0,0 +1 @@
1+link ../urg/src/c/system/detect_os.h
\ No newline at end of file
Added: svn:special
## -0,0 +1 ##
+*
\ No newline at end of property
--- trunk/libs/packages/urg_c_simple/urg_delay.h (nonexistent)
+++ trunk/libs/packages/urg_c_simple/urg_delay.h (revision 1939)
@@ -0,0 +1 @@
1+link ../urg/src/c/system/urg_delay.h
\ No newline at end of file
Added: svn:special
## -0,0 +1 ##
+*
\ No newline at end of property
--- trunk/libs/packages/urg_c_simple/urg_ctrl.c (nonexistent)
+++ trunk/libs/packages/urg_c_simple/urg_ctrl.c (revision 1939)
@@ -0,0 +1 @@
1+link ../urg/src/c/urg/urg_ctrl.c
\ No newline at end of file
Added: svn:special
## -0,0 +1 ##
+*
\ No newline at end of property
--- trunk/libs/packages/urg_c_simple/urg_t.h (nonexistent)
+++ trunk/libs/packages/urg_c_simple/urg_t.h (revision 1939)
@@ -0,0 +1 @@
1+link ../urg/src/c/urg/urg_t.h
\ No newline at end of file
Added: svn:special
## -0,0 +1 ##
+*
\ No newline at end of property
--- trunk/libs/packages/urg_c_simple/urg_parameter_t.h (nonexistent)
+++ trunk/libs/packages/urg_c_simple/urg_parameter_t.h (revision 1939)
@@ -0,0 +1 @@
1+link ../urg/src/c/urg/urg_parameter_t.h
\ No newline at end of file
Added: svn:special
## -0,0 +1 ##
+*
\ No newline at end of property
--- trunk/libs/packages/urg_c_simple/urg_ctrl.h (nonexistent)
+++ trunk/libs/packages/urg_c_simple/urg_ctrl.h (revision 1939)
@@ -0,0 +1 @@
1+link ../urg/src/c/urg/urg_ctrl.h
\ No newline at end of file
Added: svn:special
## -0,0 +1 ##
+*
\ No newline at end of property
--- trunk/libs/packages/urg_c_simple/ring_buffer.c (nonexistent)
+++ trunk/libs/packages/urg_c_simple/ring_buffer.c (revision 1939)
@@ -0,0 +1 @@
1+link ../urg/src/c/connection/ring_buffer.c
\ No newline at end of file
Added: svn:special
## -0,0 +1 ##
+*
\ No newline at end of property
--- trunk/libs/packages/urg_c_simple/serial_errno.h (nonexistent)
+++ trunk/libs/packages/urg_c_simple/serial_errno.h (revision 1939)
@@ -0,0 +1 @@
1+link ../urg/src/c/connection/serial_errno.h
\ No newline at end of file
Added: svn:special
## -0,0 +1 ##
+*
\ No newline at end of property
--- trunk/libs/packages/urg_c_simple/urg_ticks.c (nonexistent)
+++ trunk/libs/packages/urg_c_simple/urg_ticks.c (revision 1939)
@@ -0,0 +1 @@
1+link ../urg/src/c/system/urg_ticks.c
\ No newline at end of file
Added: svn:special
## -0,0 +1 ##
+*
\ No newline at end of property
--- trunk/libs/packages/urg_c_simple/scip_handler.c (nonexistent)
+++ trunk/libs/packages/urg_c_simple/scip_handler.c (revision 1939)
@@ -0,0 +1 @@
1+link ../urg/src/c/urg/scip_handler.c
\ No newline at end of file
Added: svn:special
## -0,0 +1 ##
+*
\ No newline at end of property
--- trunk/libs/packages/urg_c_simple/Makefile (nonexistent)
+++ trunk/libs/packages/urg_c_simple/Makefile (revision 1939)
@@ -0,0 +1,74 @@
1+# urg_c_simple
2+
3+CC = gcc
4+CFLAGS = -g -O0 -Wall -Werror -W
5+LDFLAGS =
6+LDLIBS = -lm
7+
8+VERSION = 0.8.12
9+RELEASE_DIR = urg_c_simple-$(VERSION)
10+
11+URG_C_LIB = liburg.a
12+TARGET = \
13+ $(URG_C_LIB) \
14+ gd_scan \
15+
16+all : $(TARGET)
17+
18+clean :
19+ $(RM) $(TARGET) *.o
20+ $(RM) -rf $(RELEASE_DIR)
21+
22+depend :
23+ makedepend -Y -- $(INCLUDES) -- $(wildcard *.h *.c)
24+
25+release :
26+ mkdir -p $(RELEASE_DIR)
27+ cp -p *.h *.c $(RELEASE_DIR)
28+ cp Makefile.release $(RELEASE_DIR)/Makefile
29+
30+zip : release
31+ zip -r $(RELEASE_DIR).zip $(RELEASE_DIR)/*
32+
33+.PHONY : all clean release
34+######################################################################
35+$(URG_C_LIB) : \
36+ $(URG_C_LIB)(ring_buffer.o) \
37+ $(URG_C_LIB)(serial_utils.o) \
38+ $(URG_C_LIB)(urg_delay.o) \
39+ $(URG_C_LIB)(urg_ticks.o) \
40+ $(URG_C_LIB)(scip_handler.o) \
41+ $(URG_C_LIB)(serial_ctrl.o) \
42+ $(URG_C_LIB)(urg_ctrl.o) \
43+ $(URG_C_LIB)(urg_errno.o) \
44+
45+gd_scan : $(URG_C_LIB)
46+
47+# DO NOT DELETE
48+
49+math_utils.o: detect_os.h
50+scip_handler.o: urg_parameter_t.h serial_t.h detect_os.h serial_t_lin.h
51+scip_handler.o: ring_buffer.h
52+serial_ctrl.o: serial_t.h detect_os.h serial_t_lin.h ring_buffer.h
53+serial_t.o: detect_os.h serial_t_lin.h ring_buffer.h
54+serial_t_lin.o: ring_buffer.h
55+serial_utils.o: serial_t.h detect_os.h serial_t_lin.h ring_buffer.h
56+urg_ctrl.o: urg_t.h urg_parameter_t.h serial_t.h detect_os.h serial_t_lin.h
57+urg_ctrl.o: ring_buffer.h
58+urg_t.o: urg_parameter_t.h serial_t.h detect_os.h serial_t_lin.h
59+urg_t.o: ring_buffer.h
60+gd_scan.o: urg_ctrl.h urg_t.h urg_parameter_t.h serial_t.h detect_os.h
61+gd_scan.o: serial_t_lin.h ring_buffer.h
62+ring_buffer.o: ring_buffer.h
63+serial_ctrl.o: serial_ctrl.h serial_t.h detect_os.h serial_t_lin.h
64+serial_ctrl.o: ring_buffer.h serial_ctrl_lin.c serial_errno.h
65+serial_ctrl_lin.o: serial_errno.h ring_buffer.h
66+serial_utils.o: serial_utils.h serial_t.h detect_os.h serial_t_lin.h
67+serial_utils.o: ring_buffer.h serial_ctrl.h
68+urg_ctrl.o: math_utils.h detect_os.h urg_ctrl.h urg_t.h urg_parameter_t.h
69+urg_ctrl.o: serial_t.h serial_t_lin.h ring_buffer.h scip_handler.h
70+urg_ctrl.o: urg_errno.h serial_ctrl.h serial_utils.h serial_errno.h
71+urg_ctrl.o: urg_ticks.h urg_delay.h
72+urg_delay.o: detect_os.h
73+urg_errno.o: urg_errno.h
74+urg_ticks.o: urg_ticks.h detect_os.h
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
--- trunk/libs/packages/urg_c_simple/ring_buffer.h (nonexistent)
+++ trunk/libs/packages/urg_c_simple/ring_buffer.h (revision 1939)
@@ -0,0 +1 @@
1+link ../urg/src/c/connection/ring_buffer.h
\ No newline at end of file
Added: svn:special
## -0,0 +1 ##
+*
\ No newline at end of property
--- trunk/programs/UrgViewer/main.cpp (revision 1938)
+++ trunk/programs/UrgViewer/main.cpp (revision 1939)
@@ -10,7 +10,6 @@
1010 #include "UrgViewerWindow.h"
1111 #include <QApplication>
1212 #include <QTranslator>
13-#include <QLocale>
1413
1514
1615 //! main
--- trunk/programs/ScipPlayer/ScipPlayerWindow.cpp (revision 1938)
+++ trunk/programs/ScipPlayer/ScipPlayerWindow.cpp (revision 1939)
@@ -381,7 +381,8 @@
381381 long timestamp(const ScipData& data)
382382 {
383383 if (data.size() <= 2) {
384- return 100;
384+ //return 100;
385+ return 25;
385386 }
386387 return ScipHandler::decode(data[2].c_str(), 4);
387388 }
旧リポジトリブラウザで表示