• R/O
  • SSH
  • HTTPS

qrobosdk: コミット


コミットメタ情報

リビジョン1926 (tree)
日時2010-09-27 08:06:51
作者satofumi

ログメッセージ

Urg_driver.h を追加

変更サマリ

差分

--- branches/tsukuba_2010/libs/run_master/Run_driver.h (revision 1925)
+++ branches/tsukuba_2010/libs/run_master/Run_driver.h (revision 1926)
@@ -128,7 +128,8 @@
128128
129129
130130 private:
131- // !!!
131+ Run_driver(const Run_driver& rhs);
132+ Run_driver& operator = (const Run_driver& rhs);
132133
133134 struct pImpl;
134135 std::auto_ptr<pImpl> pimpl;
--- branches/tsukuba_2010/libs/run_master/Makefile (revision 1925)
+++ branches/tsukuba_2010/libs/run_master/Makefile (revision 1926)
@@ -1,4 +1,4 @@
1-# taiyaki_master/
1+# run_master/
22
33 CXXFLAGS = -g -O0 -Wall -Werror -W $(INCLUDES) `urg_c-config --cflags`
44 CFLAGS = $(CXXFLAGS)
--- branches/tsukuba_2010/libs/lidar/Makefile (nonexistent)
+++ branches/tsukuba_2010/libs/lidar/Makefile (revision 1926)
@@ -0,0 +1,24 @@
1+# lidar/
2+
3+CXXFLAGS = -g -O0 -Wall -Werror -W $(INCLUDES) `urg_c-config --cflags`
4+CFLAGS = $(CXXFLAGS)
5+INCLUDES =
6+
7+LIDAR_MASTER_LIB = liblidar_master.a
8+TARGET = $(LIDAR_MASTER_LIB)
9+
10+all : $(TARGET)
11+
12+clean :
13+ $(RM) $(TARGET) *.o
14+# cd samples/ && $(MAKE) clean
15+
16+depend :
17+ makedepend -Y -- $(INCLUDES_FOR_BUILD) -- $(wildcard *.h *.c *.cpp)
18+
19+.PHONY : all clean depend
20+######################################################################
21+$(LIDAR_MASTER_LIB) : \
22+ $(LIDAR_MASTER_LIB)(Urg_driver.o) \
23+
24+# DO NOT DELETE
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
--- branches/tsukuba_2010/libs/lidar/Urg_driver.h (nonexistent)
+++ branches/tsukuba_2010/libs/lidar/Urg_driver.h (revision 1926)
@@ -0,0 +1,41 @@
1+#ifndef QRK_URG_DRIVER_H
2+#define QRK_URG_DRIVER_H
3+
4+/*!
5+ \file
6+ \brief URG ドライバ
7+
8+ \author Satofumi KAMIMURA
9+
10+ $Id$
11+*/
12+
13+
14+namespace qrk
15+{
16+ class Urg_driver
17+ {
18+ public:
19+ bool open(const char* device_name, long baudrate);
20+ void close(void);
21+
22+ // !!! データ取得の開始
23+
24+ // !!! 受信データの受け取り
25+
26+ // !!! データ取得の中断
27+
28+ // !!! タイムスタンプの同期
29+
30+ // !!!
31+
32+ private:
33+ Urg_driver(const Urg_driver& rhs);
34+ Urg_driver& operator = (const Urg_driver& rhs);
35+
36+ struct pImpl;
37+ std::auto_ptr<pImpl> pimpl;
38+ };
39+};
40+
41+#endif /* !QRK_URG_DRIVER_H */
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
--- branches/tsukuba_2010/programs/run_wired_controller/run_wired_controller.cpp (revision 1925)
+++ branches/tsukuba_2010/programs/run_wired_controller/run_wired_controller.cpp (revision 1926)
@@ -32,7 +32,7 @@
3232 namespace
3333 {
3434 enum Velocity {
35- Normal_velocity = 300, // [mm/sec]
35+ Normal_velocity = 500, // [mm/sec]
3636 Slow_velocity = 100, // [mm/sec]
3737 Rotate_velocity = 250, // [mm/sec]
3838 };
@@ -53,13 +53,13 @@
5353 {
5454 // 移動ロボットと接続
5555 if (!robot_moving.open("/dev/ttyUSB0")) {
56- cout << robot_moving.what() << endl;
56+ cout << "Run_driver::open(): " << robot_moving.what() << endl;
5757 return false;
5858 }
5959
6060 // Joystick と接続
6161 if (!joystick.open()) {
62- cout << joystick.what() << endl;
62+ cout << "Usb_joystick::open(): " << joystick.what() << endl;
6363 return false;
6464 }
6565
--- branches/tsukuba_2010/programs/urg_auto_recorder/urg_auto_recorder.cpp (revision 1925)
+++ branches/tsukuba_2010/programs/urg_auto_recorder/urg_auto_recorder.cpp (revision 1926)
@@ -100,6 +100,7 @@
100100 fprintf(stderr, "b\n");
101101 break;
102102 }
103+ fprintf(stderr, ".");
103104 }
104105 cout << "urg_get_distance: " << urg_error(&urg) << endl;
105106
旧リポジトリブラウザで表示