• R/O
  • SSH
  • HTTPS

qrobosdk: コミット


コミットメタ情報

リビジョン1928 (tree)
日時2010-09-27 08:32:16
作者satofumi

ログメッセージ

Urg_drive.cpp を追加。未実装

変更サマリ

差分

--- branches/tsukuba_2010/libs/run/Makefile (revision 1927)
+++ branches/tsukuba_2010/libs/run/Makefile (revision 1928)
@@ -1,11 +1,11 @@
1-# run_master/
1+# run/
22
33 CXXFLAGS = -g -O0 -Wall -Werror -W $(INCLUDES) `urg_c-config --cflags`
44 CFLAGS = $(CXXFLAGS)
55 INCLUDES = -I../geometry
66
7-RUN_MASTER_LIB = librun_master.a
8-TARGET = $(RUN_MASTER_LIB)
7+RUN_LIB = librun.a
8+TARGET = $(RUN_LIB)
99
1010 all : $(TARGET)
1111
@@ -18,9 +18,9 @@
1818
1919 .PHONY : all clean depend
2020 ######################################################################
21-$(RUN_MASTER_LIB) : \
22- $(RUN_MASTER_LIB)(c_run_driver.o) \
23- $(RUN_MASTER_LIB)(Run_driver.o) \
21+$(RUN_LIB) : \
22+ $(RUN_LIB)(c_run_driver.o) \
23+ $(RUN_LIB)(Run_driver.o) \
2424
2525 # DO NOT DELETE
2626
--- branches/tsukuba_2010/libs/lidar/Urg_driver.cpp (nonexistent)
+++ branches/tsukuba_2010/libs/lidar/Urg_driver.cpp (revision 1928)
@@ -0,0 +1,44 @@
1+/*!
2+ \file
3+ \brief URG ドライバ
4+
5+ \author Satofumi KAMIMURA
6+
7+ $Id$
8+*/
9+
10+#include "Urg_driver.h"
11+
12+using namespace qrk;
13+
14+
15+struct Urg_driver::pImpl
16+{
17+ // !!!
18+};
19+
20+
21+bool Urg_driver::open(const char* device_name, long baudrate)
22+{
23+ (void)device_name;
24+ (void)baudrate;
25+
26+ // !!!
27+
28+ return false;
29+}
30+
31+
32+void Urg_driver::close(void)
33+{
34+ // !!!
35+}
36+
37+
38+bool Urg_driver::set_sensor_timestamp(long timestamp)
39+{
40+ (void)timestamp;
41+ // !!!
42+
43+ return false;
44+}
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
--- branches/tsukuba_2010/libs/lidar/Makefile (revision 1927)
+++ branches/tsukuba_2010/libs/lidar/Makefile (revision 1928)
@@ -4,8 +4,8 @@
44 CFLAGS = $(CXXFLAGS)
55 INCLUDES =
66
7-LIDAR_MASTER_LIB = liblidar_master.a
8-TARGET = $(LIDAR_MASTER_LIB)
7+LIDAR_LIB = liblidar.a
8+TARGET = $(LIDAR_LIB)
99
1010 all : $(TARGET)
1111
@@ -18,7 +18,9 @@
1818
1919 .PHONY : all clean depend
2020 ######################################################################
21-$(LIDAR_MASTER_LIB) : \
22- $(LIDAR_MASTER_LIB)(Urg_driver.o) \
21+$(LIDAR_LIB) : \
22+ $(LIDAR_LIB)(Urg_driver.o) \
2323
2424 # DO NOT DELETE
25+
26+Urg_driver.o: Urg_driver.h
--- branches/tsukuba_2010/libs/lidar/Urg_driver.h (revision 1927)
+++ branches/tsukuba_2010/libs/lidar/Urg_driver.h (revision 1928)
@@ -10,7 +10,9 @@
1010 $Id$
1111 */
1212
13+#include <memory>
1314
15+
1416 namespace qrk
1517 {
1618 class Urg_driver
@@ -26,8 +28,12 @@
2628 // !!! データ取得の中断
2729
2830 // !!! タイムスタンプの同期
31+ bool set_sensor_timestamp(long timestamp);
2932
30- // !!!
33+ // !!! 角度変換
34+ // !!! 最小距離、最大距離の取得
35+ // !!! 設定可能範囲の取得
36+ // !!! 1周あたりのスキャン時間の取得
3137
3238 private:
3339 Urg_driver(const Urg_driver& rhs);
--- branches/tsukuba_2010/programs/run_wired_controller/Makefile (revision 1927)
+++ branches/tsukuba_2010/programs/run_wired_controller/Makefile (revision 1928)
@@ -3,7 +3,7 @@
33 LIBS_DIR = ../../libs
44
55 CXXFLAGS = -g -O0 -Wall -Werror -W $(INCLUDES) `sdl-config --cflags` `urg_c-config --cflags`
6-INCLUDES = -I$(LIBS_DIR)/controller -I$(LIBS_DIR)/run_master -I$(LIBS_DIR)/geometry
6+INCLUDES = -I$(LIBS_DIR)/controller -I$(LIBS_DIR)/run -I$(LIBS_DIR)/geometry
77 LDFLAGS =
88 LDLIBS = `sdl-config --libs` `urg_c-config --libs`
99
@@ -19,7 +19,7 @@
1919
2020 .PHONY : all clean depend
2121 ######################################################################
22-REQUIRE_LIBS = $(LIBS_DIR)/run_master/librun_master.a $(LIBS_DIR)/controller/libcontroller.a $(LIBS_DIR)/gui/libgui.a $(LIBS_DIR)/geometry/libgeometry.a $(LIBS_DIR)/system/libsystem.a
22+REQUIRE_LIBS = $(LIBS_DIR)/run/librun.a $(LIBS_DIR)/controller/libcontroller.a $(LIBS_DIR)/gui/libgui.a $(LIBS_DIR)/geometry/libgeometry.a $(LIBS_DIR)/system/libsystem.a
2323
2424 $(REQUIRE_LIBS) :
2525 cd $(@D)/ && $(MAKE) $(@F)
旧リポジトリブラウザで表示