|
From: <mor...@us...> - 2008-04-23 21:28:24
|
Revision: 166
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=166&view=rev
Author: morgan_quigley
Date: 2008-04-23 14:28:22 -0700 (Wed, 23 Apr 2008)
Log Message:
-----------
gui library 'sdlgl' for building sdl-based opengl guis with as little pain as possible
Added Paths:
-----------
pkg/branches/rosbus/gui/
pkg/branches/rosbus/gui/sdlgl/
pkg/branches/rosbus/gui/sdlgl/Makefile
pkg/branches/rosbus/gui/sdlgl/include/
pkg/branches/rosbus/gui/sdlgl/include/sdlgl/
pkg/branches/rosbus/gui/sdlgl/include/sdlgl/sdlgl.h
pkg/branches/rosbus/gui/sdlgl/lib/
pkg/branches/rosbus/gui/sdlgl/manifest.xml
pkg/branches/rosbus/gui/sdlgl/src/
pkg/branches/rosbus/gui/sdlgl/src/Makefile
pkg/branches/rosbus/gui/sdlgl/src/sdlgl.cpp
Added: pkg/branches/rosbus/gui/sdlgl/Makefile
===================================================================
--- pkg/branches/rosbus/gui/sdlgl/Makefile (rev 0)
+++ pkg/branches/rosbus/gui/sdlgl/Makefile 2008-04-23 21:28:22 UTC (rev 166)
@@ -0,0 +1,2 @@
+SUBDIRS = src
+include $(shell rospack find mk)/recurse_subdirs.mk
Added: pkg/branches/rosbus/gui/sdlgl/include/sdlgl/sdlgl.h
===================================================================
--- pkg/branches/rosbus/gui/sdlgl/include/sdlgl/sdlgl.h (rev 0)
+++ pkg/branches/rosbus/gui/sdlgl/include/sdlgl/sdlgl.h 2008-04-23 21:28:22 UTC (rev 166)
@@ -0,0 +1,33 @@
+#ifndef SDLGL_SDLGL_H
+#define SDLGL_SDLGL_H
+
+#include <SDL/SDL.h>
+
+namespace ros
+{
+
+class SDLGL
+{
+public:
+ SDLGL();
+ virtual ~SDLGL();
+ virtual void mouse_motion(int x, int y, int dx, int dy, int buttons) { }
+ virtual void mouse_button(int x, int y, int button, bool is_down) { }
+ virtual void keypress(char c, uint16_t u, SDLMod mod) { }
+ virtual void set_view_params(int width, int height) { }
+ bool init_gui(int width, int height, const char *window_title = NULL);
+ void main_loop();
+ void request_render();
+protected:
+ static const int RENDER_USER_EVENT = 0xdeadbeef; // ha ha
+ virtual void render() = 0;
+private:
+/*
+ static void *g_main_loop(void *parent);
+*/
+};
+
+}
+
+#endif
+
Added: pkg/branches/rosbus/gui/sdlgl/manifest.xml
===================================================================
--- pkg/branches/rosbus/gui/sdlgl/manifest.xml (rev 0)
+++ pkg/branches/rosbus/gui/sdlgl/manifest.xml 2008-04-23 21:28:22 UTC (rev 166)
@@ -0,0 +1,6 @@
+<package>
+ <depend package="sdl"/>
+ <export>
+ <cpp cflags="-I${prefix}/include" lflags="-L${prefix}/lib -lsdlgl -lGL -lGLU"/>
+ </export>
+</package>
Added: pkg/branches/rosbus/gui/sdlgl/src/Makefile
===================================================================
--- pkg/branches/rosbus/gui/sdlgl/src/Makefile (rev 0)
+++ pkg/branches/rosbus/gui/sdlgl/src/Makefile 2008-04-23 21:28:22 UTC (rev 166)
@@ -0,0 +1,5 @@
+SRC = sdlgl.cpp
+OUT = ../lib/libsdlgl.a
+PKG = sdlgl
+include $(shell rospack find mk)/lib.mk
+
Added: pkg/branches/rosbus/gui/sdlgl/src/sdlgl.cpp
===================================================================
--- pkg/branches/rosbus/gui/sdlgl/src/sdlgl.cpp (rev 0)
+++ pkg/branches/rosbus/gui/sdlgl/src/sdlgl.cpp 2008-04-23 21:28:22 UTC (rev 166)
@@ -0,0 +1,92 @@
+#include <unistd.h>
+#include "sdlgl/sdlgl.h"
+
+using namespace ros;
+
+SDLGL::SDLGL()
+{
+}
+
+SDLGL::~SDLGL()
+{
+}
+
+void SDLGL::request_render()
+{
+ SDL_Event e;
+ e.type = SDL_USEREVENT;
+ e.user.code = RENDER_USER_EVENT;
+ e.user.data1 = NULL;
+ e.user.data2 = NULL;
+ SDL_PushEvent(&e);
+}
+
+bool SDLGL::init_gui(int width, int height, const char *title)
+{
+ SDL_EnableUNICODE(SDL_ENABLE);
+ if (SDL_Init(SDL_INIT_VIDEO) < 0)
+ {
+ printf("video init failed: %s\n", SDL_GetError());
+ return false;
+ }
+ SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24);
+ SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
+ if (title)
+ SDL_WM_SetCaption(title, title);
+ if (!SDL_SetVideoMode(width, height, 32, SDL_OPENGL | SDL_HWSURFACE))
+ {
+ printf("setvideomode failed: %s\n", SDL_GetError());
+ return false;
+ }
+ set_view_params(width, height);
+ request_render();
+}
+/*
+void *srosSDLGL::g_main_loop(void *parent)
+{
+ ((srosSDLGL *)parent)->main_loop();
+}
+*/
+void SDLGL::main_loop()
+{
+ bool done = false;
+ while (!done)
+ {
+ usleep(1000);
+ SDL_Event event;
+ while (SDL_PollEvent(&event))
+ {
+ switch(event.type)
+ {
+ case SDL_USEREVENT:
+ if (event.user.code == RENDER_USER_EVENT)
+ render();
+ break;
+ case SDL_MOUSEMOTION:
+ mouse_motion(event.motion.x, event.motion.y,
+ event.motion.xrel, event.motion.yrel,
+ event.motion.state);
+ break;
+ case SDL_MOUSEBUTTONDOWN:
+ case SDL_MOUSEBUTTONUP:
+ mouse_button(event.button.x, event.button.y,
+ event.button.button,
+ (event.type == SDL_MOUSEBUTTONDOWN ? true : false));
+ break;
+ case SDL_KEYDOWN:
+ if (event.key.keysym.sym == SDLK_ESCAPE)
+ done = true;
+ else
+ keypress(event.key.keysym.sym,
+ event.key.keysym.unicode,
+ event.key.keysym.mod);
+ break;
+ case SDL_QUIT:
+ done = true;
+ break;
+ }
+ }
+ }
+ SDL_Quit();
+}
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mor...@us...> - 2008-04-23 21:30:35
|
Revision: 167
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=167&view=rev
Author: morgan_quigley
Date: 2008-04-23 14:30:43 -0700 (Wed, 23 Apr 2008)
Log Message:
-----------
nav view GUI coming over from ros core, because it doesn't belong on the ROS core svn
Added Paths:
-----------
pkg/branches/rosbus/nav/
pkg/branches/rosbus/nav/Makefile
pkg/branches/rosbus/nav/nav_view/
pkg/branches/rosbus/nav/nav_view/Makefile
pkg/branches/rosbus/nav/nav_view/launch_in_namespace
pkg/branches/rosbus/nav/nav_view/manifest.xml
pkg/branches/rosbus/nav/nav_view/nav_view.cpp
pkg/branches/rosbus/nav/nav_view/ns_demo
Added: pkg/branches/rosbus/nav/Makefile
===================================================================
--- pkg/branches/rosbus/nav/Makefile (rev 0)
+++ pkg/branches/rosbus/nav/Makefile 2008-04-23 21:30:43 UTC (rev 167)
@@ -0,0 +1,3 @@
+SUBDIRS = nav_view
+include $(shell rospack find mk)/recurse_subdirs.mk
+
Added: pkg/branches/rosbus/nav/nav_view/Makefile
===================================================================
--- pkg/branches/rosbus/nav/nav_view/Makefile (rev 0)
+++ pkg/branches/rosbus/nav/nav_view/Makefile 2008-04-23 21:30:43 UTC (rev 167)
@@ -0,0 +1,4 @@
+SRC = nav_view.cpp
+OUT = nav_view
+PKG = nav_view
+include $(shell rospack find mk)/node.mk
Added: pkg/branches/rosbus/nav/nav_view/launch_in_namespace
===================================================================
--- pkg/branches/rosbus/nav/nav_view/launch_in_namespace (rev 0)
+++ pkg/branches/rosbus/nav/nav_view/launch_in_namespace 2008-04-23 21:30:43 UTC (rev 167)
@@ -0,0 +1,9 @@
+#!/bin/bash
+export ROS_NAMESPACE=$ROS_NAMESPACE/nav
+ODOM=`rosmap odom $*`
+echo $ODOM
+if [ "$ODOM" = "" ]; then
+ echo "woah! i need an odometry map"
+ exit
+fi
+xterm -e `rospack find nav_view`/nav_view odom:=$ODOM &
Property changes on: pkg/branches/rosbus/nav/nav_view/launch_in_namespace
___________________________________________________________________
Name: svn:executable
+ *
Added: pkg/branches/rosbus/nav/nav_view/manifest.xml
===================================================================
--- pkg/branches/rosbus/nav/nav_view/manifest.xml (rev 0)
+++ pkg/branches/rosbus/nav/nav_view/manifest.xml 2008-04-23 21:30:43 UTC (rev 167)
@@ -0,0 +1,5 @@
+<package>
+ <depend package="roscpp"/>
+ <depend package="std_msgs"/>
+ <depend package="sdlgl"/>
+</package>
Added: pkg/branches/rosbus/nav/nav_view/nav_view.cpp
===================================================================
--- pkg/branches/rosbus/nav/nav_view/nav_view.cpp (rev 0)
+++ pkg/branches/rosbus/nav/nav_view/nav_view.cpp 2008-04-23 21:30:43 UTC (rev 167)
@@ -0,0 +1,81 @@
+#include <unistd.h>
+#include <math.h>
+#include <GL/gl.h>
+#include "ros/node.h"
+#include "std_msgs/MsgPose2DFloat32.h"
+#include "sdlgl/sdlgl.h"
+
+class NavView : public ros::node, public ros::SDLGL
+{
+public:
+ MsgPose2DFloat32 odom;
+ float view_scale, view_x, view_y;
+
+ NavView() : ros::node("nav_view"),
+ view_scale(50), view_x(0), view_y(0)
+ {
+ subscribe("odom", odom, &NavView::odom_cb);
+ init_gui(640, 480, "nav view");
+ }
+ void odom_cb()
+ {
+ request_render();
+ }
+ void render()
+ {
+ glClearColor(0.2,0.2,0.2,0);
+ glClear(GL_COLOR_BUFFER_BIT);
+ glLoadIdentity();
+ glScalef(view_scale, view_scale, view_scale);
+ glTranslatef(view_x, view_y, 0);
+
+ glPushMatrix();
+ odom.lock();
+ glTranslatef(odom.x, odom.y, 0);
+ glRotatef(odom.th * 180 / M_PI, 0, 0, 1);
+ odom.unlock();
+ glColor3f(0.2, 1.0, 0.4);
+ glBegin(GL_LINE_LOOP);
+ const float robot_rad = 0.3;
+ for (float f = 0; f < (float)(2*M_PI); f += 0.5f)
+ glVertex2f(robot_rad * cos(f), robot_rad * sin(f));
+ glEnd();
+ glBegin(GL_LINES);
+ glVertex2f(0,0);
+ glVertex2f(robot_rad,0);
+ glEnd();
+ glPopMatrix();
+
+ SDL_GL_SwapBuffers();
+ }
+ void set_view_params(int width, int height)
+ {
+ glMatrixMode(GL_PROJECTION);
+ glLoadIdentity();
+ glOrtho(-width/2, width/2, -height/2, height/2, -1, 1);
+ glMatrixMode(GL_MODELVIEW);
+ }
+ virtual void mouse_motion(int x, int y, int dx, int dy, int buttons)
+ {
+ if (buttons & SDL_BUTTON(1)) // left button: translate view
+ {
+ view_x += dx / view_scale;
+ view_y -= dy / view_scale;
+ request_render();
+ }
+ else if (buttons & SDL_BUTTON(3)) // right button: scale view
+ {
+ view_scale *= 1.0 - dy * 0.01;
+ request_render();
+ }
+ }
+};
+
+int main(int argc, char **argv)
+{
+ ros::init(argc, argv);
+ NavView view;
+ view.main_loop();
+ return 0;
+}
+
Added: pkg/branches/rosbus/nav/nav_view/ns_demo
===================================================================
--- pkg/branches/rosbus/nav/nav_view/ns_demo (rev 0)
+++ pkg/branches/rosbus/nav/nav_view/ns_demo 2008-04-23 21:30:43 UTC (rev 167)
@@ -0,0 +1,4 @@
+#!/bin/bash
+xterm -e `rospack find nav_view`/nav_view odom:=/robot/odom &
+export ROS_NAMESPACE=$ROS_NAMESPACE/robot
+xterm -e `rospack find flatland`/flatland &
Property changes on: pkg/branches/rosbus/nav/nav_view/ns_demo
___________________________________________________________________
Name: svn:executable
+ *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mor...@us...> - 2008-04-23 21:33:26
|
Revision: 169
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=169&view=rev
Author: morgan_quigley
Date: 2008-04-23 14:33:34 -0700 (Wed, 23 Apr 2008)
Log Message:
-----------
input devices (just joysticks for now) coming over from ros core svn. I anticipate this to include things like pedals, spaceball, mice, keyboard, etc., anything you might want to ship onto the botnet to control stuff
Added Paths:
-----------
pkg/branches/rosbus/input/
pkg/branches/rosbus/input/Makefile
pkg/branches/rosbus/input/joy/
pkg/branches/rosbus/input/joy/Makefile
pkg/branches/rosbus/input/joy/joy.cpp
pkg/branches/rosbus/input/joy/manifest.xml
pkg/branches/rosbus/input/joy/msg/
pkg/branches/rosbus/input/joy/msg/Joy.msg
pkg/branches/rosbus/input/joy_view/
pkg/branches/rosbus/input/joy_view/Makefile
pkg/branches/rosbus/input/joy_view/joy_view.cpp
pkg/branches/rosbus/input/joy_view/manifest.xml
Added: pkg/branches/rosbus/input/Makefile
===================================================================
--- pkg/branches/rosbus/input/Makefile (rev 0)
+++ pkg/branches/rosbus/input/Makefile 2008-04-23 21:33:34 UTC (rev 169)
@@ -0,0 +1,3 @@
+SUBDIRS = joy joy_view
+include $(shell rospack find mk)/recurse_subdirs.mk
+
Added: pkg/branches/rosbus/input/joy/Makefile
===================================================================
--- pkg/branches/rosbus/input/joy/Makefile (rev 0)
+++ pkg/branches/rosbus/input/joy/Makefile 2008-04-23 21:33:34 UTC (rev 169)
@@ -0,0 +1,4 @@
+SRC = joy.cpp
+OUT = joy
+PKG = joy
+include $(shell rospack find mk)/node.mk
Added: pkg/branches/rosbus/input/joy/joy.cpp
===================================================================
--- pkg/branches/rosbus/input/joy/joy.cpp (rev 0)
+++ pkg/branches/rosbus/input/joy/joy.cpp 2008-04-23 21:33:34 UTC (rev 169)
@@ -0,0 +1,88 @@
+#include <unistd.h>
+#include <math.h>
+#include <linux/joystick.h>
+#include <fcntl.h>
+#include "ros/node.h"
+#include "joy/MsgJoy.h"
+#include "std_msgs/MsgEmpty.h"
+
+void *s_joy_func(void *);
+using namespace ros;
+
+class Joy : public node
+{
+public:
+ MsgJoy joy_msg;
+ MsgEmpty deadman_msg;
+
+ int joy_fd;
+ string joy_dev;
+ int joy_buttons;
+
+ Joy() : node("joy")
+ {
+ param("joy_dev", joy_dev, "/dev/input/js0");
+ joy_fd = open(joy_dev.c_str(), O_RDONLY);
+ if (joy_fd <= 0)
+ log(FATAL, "couldn't open joystick %s.", joy_dev.c_str());
+ pthread_t joy_thread;
+ pthread_create(&joy_thread, NULL, s_joy_func, this);
+
+ advertise("joy", joy_msg);
+ advertise("deadman", deadman_msg);
+ }
+ void monitor_deadman()
+ {
+ while (ok())
+ {
+ usleep(100000);
+ if (joy_buttons & 0x20)
+ publish("deadman", deadman_msg);
+ }
+ }
+ void joy_func()
+ {
+ js_event event;
+ while (ok())
+ {
+ read(joy_fd, &event, sizeof(js_event));
+ if (event.type & JS_EVENT_INIT)
+ continue;
+ switch(event.type)
+ {
+ case JS_EVENT_BUTTON:
+ if (event.value)
+ joy_buttons |= (1 << event.number);
+ else
+ joy_buttons &= ~(1 << event.number);
+ publish("joy", joy_msg);
+ break;
+ case JS_EVENT_AXIS:
+ switch(event.number)
+ {
+ case 0: joy_msg.x1 = event.value / 32767.0; break;
+ case 1: joy_msg.y1 = -event.value / 32767.0; break;
+ case 2: joy_msg.x2 = event.value / 32767.0; break;
+ case 3: joy_msg.y2 = -event.value / 32767.0; break;
+ default: break;
+ }
+ publish("joy", joy_msg);
+ break;
+ }
+ }
+ }
+};
+
+void *s_joy_func(void *parent)
+{
+ ((Joy *)parent)->joy_func();
+}
+
+int main(int argc, char **argv)
+{
+ ros::init(argc, argv);
+ Joy joy;
+ joy.monitor_deadman();
+ return 0;
+}
+
Added: pkg/branches/rosbus/input/joy/manifest.xml
===================================================================
--- pkg/branches/rosbus/input/joy/manifest.xml (rev 0)
+++ pkg/branches/rosbus/input/joy/manifest.xml 2008-04-23 21:33:34 UTC (rev 169)
@@ -0,0 +1,7 @@
+<package>
+ <depend package="roscpp"/>
+ <depend package="std_msgs"/>
+ <export>
+ <cpp cflags="-I${prefix}/msg/cpp" />
+ </export>
+</package>
Added: pkg/branches/rosbus/input/joy/msg/Joy.msg
===================================================================
--- pkg/branches/rosbus/input/joy/msg/Joy.msg (rev 0)
+++ pkg/branches/rosbus/input/joy/msg/Joy.msg 2008-04-23 21:33:34 UTC (rev 169)
@@ -0,0 +1,5 @@
+float32 x1
+float32 y1
+float32 x2
+float32 y2
+int32 buttons
Added: pkg/branches/rosbus/input/joy_view/Makefile
===================================================================
--- pkg/branches/rosbus/input/joy_view/Makefile (rev 0)
+++ pkg/branches/rosbus/input/joy_view/Makefile 2008-04-23 21:33:34 UTC (rev 169)
@@ -0,0 +1,4 @@
+SRC = joy_view.cpp
+OUT = joy_view
+PKG = joy_view
+include $(shell rospack find mk)/node.mk
Added: pkg/branches/rosbus/input/joy_view/joy_view.cpp
===================================================================
--- pkg/branches/rosbus/input/joy_view/joy_view.cpp (rev 0)
+++ pkg/branches/rosbus/input/joy_view/joy_view.cpp 2008-04-23 21:33:34 UTC (rev 169)
@@ -0,0 +1,60 @@
+#include <unistd.h>
+#include <math.h>
+#include <GL/gl.h>
+#include "ros/node.h"
+#include "joy/MsgJoy.h"
+#include "sdlgl/sdlgl.h"
+
+using namespace ros;
+
+class JoyView : public node, public SDLGL
+{
+public:
+ MsgJoy joy;
+
+ JoyView() : node("joy_view")
+ {
+ subscribe("joy", joy, &JoyView::joy_cb);
+ init_gui(640, 480, "nav view");
+ }
+ void joy_cb()
+ {
+ request_render();
+ }
+ void render()
+ {
+ glClearColor(0.2,0.2,0.2,0);
+ glClear(GL_COLOR_BUFFER_BIT);
+ glLoadIdentity();
+ joy.lock();
+ glLineWidth(5);
+ glBegin(GL_LINES);
+ glColor3f(1, 0, 0);
+ glVertex2f(-1,0);
+ glVertex2f(-1 + joy.x1, joy.y1);
+
+ glColor3f(0, 1, 0);
+ glVertex2f(1, 0);
+ glVertex2f(1 + joy.x2, joy.y2);
+ glEnd();
+ joy.unlock();
+ SDL_GL_SwapBuffers();
+ }
+ void set_view_params(int width, int height)
+ {
+ glMatrixMode(GL_PROJECTION);
+ glLoadIdentity();
+ glOrtho(-2, 2, -2, 2, -1, 1);
+ glMatrixMode(GL_MODELVIEW);
+ request_render();
+ }
+};
+
+int main(int argc, char **argv)
+{
+ ros::init(argc, argv);
+ JoyView view;
+ view.main_loop();
+ return 0;
+}
+
Added: pkg/branches/rosbus/input/joy_view/manifest.xml
===================================================================
--- pkg/branches/rosbus/input/joy_view/manifest.xml (rev 0)
+++ pkg/branches/rosbus/input/joy_view/manifest.xml 2008-04-23 21:33:34 UTC (rev 169)
@@ -0,0 +1,6 @@
+<package>
+ <depend package="roscpp"/>
+ <depend package="std_msgs"/>
+ <depend package="joy"/>
+ <depend package="sdlgl"/>
+</package>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mor...@us...> - 2008-04-26 01:03:34
|
Revision: 183
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=183&view=rev
Author: morgan_quigley
Date: 2008-04-25 18:03:39 -0700 (Fri, 25 Apr 2008)
Log Message:
-----------
deleting thread_utils package because it has been subsumed by the rosthread package, which provides more stuff (e.g. semaphore)
Modified Paths:
--------------
pkg/branches/rosbus/axis_cam/include/axis_cam/axis_cam.h
pkg/branches/rosbus/axis_cam/manifest.xml
pkg/branches/rosbus/axis_cam/src/libaxis_cam/Makefile
pkg/branches/rosbus/sharks/manifest.xml
pkg/branches/rosbus/sharks/src/libsharks/Makefile
Removed Paths:
-------------
pkg/branches/rosbus/thread_utils/
Modified: pkg/branches/rosbus/axis_cam/include/axis_cam/axis_cam.h
===================================================================
--- pkg/branches/rosbus/axis_cam/include/axis_cam/axis_cam.h 2008-04-26 00:37:15 UTC (rev 182)
+++ pkg/branches/rosbus/axis_cam/include/axis_cam/axis_cam.h 2008-04-26 01:03:39 UTC (rev 183)
@@ -33,7 +33,7 @@
#include <curl/curl.h>
#include <string>
#include <sstream>
-#include "thread_utils/mutex.h"
+#include "rosthread/mutex.h"
using namespace std;
class AxisCam
@@ -65,7 +65,7 @@
CURL *jpeg_curl, *getptz_curl, *setptz_curl;
char *image_url, *ptz_url;
stringstream ptz_ss; // need to mutex this someday...
- ThreadUtils::Mutex ptz_ss_mutex;
+ ros::thread::mutex ptz_ss_mutex;
inline double clamp(double d, double low, double high)
{
return (d < low ? low : (d > high ? high : d));
Modified: pkg/branches/rosbus/axis_cam/manifest.xml
===================================================================
--- pkg/branches/rosbus/axis_cam/manifest.xml 2008-04-26 00:37:15 UTC (rev 182)
+++ pkg/branches/rosbus/axis_cam/manifest.xml 2008-04-26 01:03:39 UTC (rev 183)
@@ -13,8 +13,11 @@
<url>http://stair.stanford.edu</url>
<depend package="common_flows"/>
<depend package="image_viewer"/>
-<depend package="thread_utils"/>
+<depend package="rosthread"/>
<depend package="string_utils"/>
<depend package="unstable_flows"/>
+<export>
+ <cpp cflags="-I${prefix}/include" lflags="-L${prefix}/lib -laxis_cam"/>
+</export>
</package>
Modified: pkg/branches/rosbus/axis_cam/src/libaxis_cam/Makefile
===================================================================
--- pkg/branches/rosbus/axis_cam/src/libaxis_cam/Makefile 2008-04-26 00:37:15 UTC (rev 182)
+++ pkg/branches/rosbus/axis_cam/src/libaxis_cam/Makefile 2008-04-26 01:03:39 UTC (rev 183)
@@ -1,4 +1,5 @@
SRC = axis_cam.cpp
OUT = ../../lib/libaxis_cam.a
PKG = axis_cam
-include $(shell $(ROS_ROOT)/rospack find roscpp)/make_include/lib.mk
+CFLAGS = -I../../include
+include $(shell rospack find mk)/lib.mk
Modified: pkg/branches/rosbus/sharks/manifest.xml
===================================================================
--- pkg/branches/rosbus/sharks/manifest.xml 2008-04-26 00:37:15 UTC (rev 182)
+++ pkg/branches/rosbus/sharks/manifest.xml 2008-04-26 01:03:39 UTC (rev 183)
@@ -22,6 +22,10 @@
<depend package="vacuum"/>
<depend package="sdl"/>
<depend package="sdl_image"/>
+<depend package="serial_port"/>
<sys_depend lib="ncurses"/>
+<export>
+ <cpp cflags="-I${prefix}/include" lflags="-L${prefix}/lib -lsharks"/>
+</export>
</package>
Modified: pkg/branches/rosbus/sharks/src/libsharks/Makefile
===================================================================
--- pkg/branches/rosbus/sharks/src/libsharks/Makefile 2008-04-26 00:37:15 UTC (rev 182)
+++ pkg/branches/rosbus/sharks/src/libsharks/Makefile 2008-04-26 01:03:39 UTC (rev 183)
@@ -1,4 +1,4 @@
SRC = sharks.cpp kbhit.cpp
OUT = ../../lib/libsharks.a
PKG = sharks
-include $(shell $(ROS_ROOT)/rospack find roscpp)/make_include/lib.mk
+include $(shell rospack find mk)/lib.mk
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mor...@us...> - 2008-04-26 01:35:37
|
Revision: 189
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=189&view=rev
Author: morgan_quigley
Date: 2008-04-25 18:35:42 -0700 (Fri, 25 Apr 2008)
Log Message:
-----------
moving axis_cam into drivers
Added Paths:
-----------
pkg/branches/rosbus/drivers/
pkg/branches/rosbus/drivers/axis_cam/
pkg/branches/rosbus/drivers/axis_cam/Makefile
pkg/branches/rosbus/drivers/axis_cam/doc/
pkg/branches/rosbus/drivers/axis_cam/include/
pkg/branches/rosbus/drivers/axis_cam/lib/
pkg/branches/rosbus/drivers/axis_cam/manifest.xml
pkg/branches/rosbus/drivers/axis_cam/nodes/
pkg/branches/rosbus/drivers/axis_cam/src/
pkg/branches/rosbus/drivers/axis_cam/test/
Removed Paths:
-------------
pkg/branches/rosbus/axis_cam/
pkg/branches/rosbus/drivers/axis_cam/build.yaml
pkg/branches/rosbus/drivers/axis_cam/doc/
pkg/branches/rosbus/drivers/axis_cam/include/
pkg/branches/rosbus/drivers/axis_cam/lib/
pkg/branches/rosbus/drivers/axis_cam/manifest.xml
pkg/branches/rosbus/drivers/axis_cam/nodes/
pkg/branches/rosbus/drivers/axis_cam/rosbuild
pkg/branches/rosbus/drivers/axis_cam/src/
pkg/branches/rosbus/drivers/axis_cam/test/
Copied: pkg/branches/rosbus/drivers/axis_cam (from rev 176, pkg/branches/rosbus/axis_cam)
Copied: pkg/branches/rosbus/drivers/axis_cam/Makefile (from rev 188, pkg/branches/rosbus/axis_cam/Makefile)
===================================================================
--- pkg/branches/rosbus/drivers/axis_cam/Makefile (rev 0)
+++ pkg/branches/rosbus/drivers/axis_cam/Makefile 2008-04-26 01:35:42 UTC (rev 189)
@@ -0,0 +1,3 @@
+SUBDIRS = src test
+include $(shell rospack find mk)/recurse_subdirs.mk
+
Deleted: pkg/branches/rosbus/drivers/axis_cam/build.yaml
===================================================================
--- pkg/branches/rosbus/axis_cam/build.yaml 2008-04-24 02:01:29 UTC (rev 176)
+++ pkg/branches/rosbus/drivers/axis_cam/build.yaml 2008-04-26 01:35:42 UTC (rev 189)
@@ -1,8 +0,0 @@
-cpp:
- make:
- - src/libaxis_cam
- - src/axis_cam
- - src/axis_ptz
- - src/axis_cam_polled
- - test/test_get
- - test/test_ptz
Copied: pkg/branches/rosbus/drivers/axis_cam/doc (from rev 188, pkg/branches/rosbus/axis_cam/doc)
Copied: pkg/branches/rosbus/drivers/axis_cam/include (from rev 188, pkg/branches/rosbus/axis_cam/include)
Copied: pkg/branches/rosbus/drivers/axis_cam/lib (from rev 188, pkg/branches/rosbus/axis_cam/lib)
Deleted: pkg/branches/rosbus/drivers/axis_cam/manifest.xml
===================================================================
--- pkg/branches/rosbus/axis_cam/manifest.xml 2008-04-24 02:01:29 UTC (rev 176)
+++ pkg/branches/rosbus/drivers/axis_cam/manifest.xml 2008-04-26 01:35:42 UTC (rev 189)
@@ -1,20 +0,0 @@
-<package>
-<description brief="Controlling and acquiring data from Axis IP-based cameras">
-
-There are many ways to get images out of Axis IP-based cameras. The simplest is
-to just call 'wget' over and over. This is what the 'axis_cam_wget' and
-'axis_cam_wget_polled' programs do.
-
-In the future, I may add more sophisticated (more efficient) transport methods.
-
-</description>
-<author>Morgan Quigley (email: mqu...@cs...)</author>
-<license>BSD</license>
-<url>http://stair.stanford.edu</url>
-<depend package="common_flows"/>
-<depend package="image_viewer"/>
-<depend package="thread_utils"/>
-<depend package="string_utils"/>
-<depend package="unstable_flows"/>
-</package>
-
Copied: pkg/branches/rosbus/drivers/axis_cam/manifest.xml (from rev 188, pkg/branches/rosbus/axis_cam/manifest.xml)
===================================================================
--- pkg/branches/rosbus/drivers/axis_cam/manifest.xml (rev 0)
+++ pkg/branches/rosbus/drivers/axis_cam/manifest.xml 2008-04-26 01:35:42 UTC (rev 189)
@@ -0,0 +1,22 @@
+<package>
+<description brief="Controlling and acquiring data from Axis IP-based cameras">
+
+There are many ways to get images out of Axis IP-based cameras. The simplest is
+to just call 'wget' over and over. This is what the 'axis_cam_wget' and
+'axis_cam_wget_polled' programs do.
+
+In the future, I may add more sophisticated (more efficient) transport methods.
+
+</description>
+<author>Morgan Quigley (email: mqu...@cs...)</author>
+<license>BSD</license>
+<url>http://stair.stanford.edu</url>
+<depend package="std_msgs"/>
+<!--<depend package="image_viewer"/>-->
+<depend package="rosthread"/>
+<depend package="string_utils"/>
+<export>
+ <cpp cflags="-I${prefix}/include" lflags="-L${prefix}/lib -laxis_cam"/>
+</export>
+</package>
+
Copied: pkg/branches/rosbus/drivers/axis_cam/nodes (from rev 188, pkg/branches/rosbus/axis_cam/nodes)
Deleted: pkg/branches/rosbus/drivers/axis_cam/rosbuild
===================================================================
--- pkg/branches/rosbus/axis_cam/rosbuild 2008-04-24 02:01:29 UTC (rev 176)
+++ pkg/branches/rosbus/drivers/axis_cam/rosbuild 2008-04-26 01:35:42 UTC (rev 189)
@@ -1,2 +0,0 @@
-#!/usr/bin/env ruby
-exec("#{`#{ENV['ROS_ROOT']}/rospack find rostools`}/scripts/yamlbuild", 'build.yaml', *ARGV)
Copied: pkg/branches/rosbus/drivers/axis_cam/src (from rev 188, pkg/branches/rosbus/axis_cam/src)
Copied: pkg/branches/rosbus/drivers/axis_cam/test (from rev 188, pkg/branches/rosbus/axis_cam/test)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mor...@us...> - 2008-04-26 01:37:14
|
Revision: 191
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=191&view=rev
Author: morgan_quigley
Date: 2008-04-25 18:37:20 -0700 (Fri, 25 Apr 2008)
Log Message:
-----------
moving ipdcmot into drivers/robot
Added Paths:
-----------
pkg/branches/rosbus/drivers/robot/
pkg/branches/rosbus/drivers/robot/ipdcmot/
Removed Paths:
-------------
pkg/branches/rosbus/ipdcmot/
Copied: pkg/branches/rosbus/drivers/robot/ipdcmot (from rev 188, pkg/branches/rosbus/ipdcmot)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mor...@us...> - 2008-04-26 01:38:43
|
Revision: 192
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=192&view=rev
Author: morgan_quigley
Date: 2008-04-25 18:38:50 -0700 (Fri, 25 Apr 2008)
Log Message:
-----------
utils directory to contain utility libraries, e.g. gui libraries, string snarfing libraries, etc.
Added Paths:
-----------
pkg/branches/rosbus/util/
pkg/branches/rosbus/util/gui/
pkg/branches/rosbus/util/string_utils/
Removed Paths:
-------------
pkg/branches/rosbus/gui/
pkg/branches/rosbus/string_utils/
Copied: pkg/branches/rosbus/util/gui (from rev 188, pkg/branches/rosbus/gui)
Copied: pkg/branches/rosbus/util/string_utils (from rev 188, pkg/branches/rosbus/string_utils)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mor...@us...> - 2008-04-26 01:39:27
|
Revision: 193
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=193&view=rev
Author: morgan_quigley
Date: 2008-04-25 18:39:34 -0700 (Fri, 25 Apr 2008)
Log Message:
-----------
cleanup of top-level
Added Paths:
-----------
pkg/branches/rosbus/3rdparty/sdl_image/
pkg/branches/rosbus/drivers/input/
Removed Paths:
-------------
pkg/branches/rosbus/input/
pkg/branches/rosbus/sdl_image/
Copied: pkg/branches/rosbus/3rdparty/sdl_image (from rev 188, pkg/branches/rosbus/sdl_image)
Copied: pkg/branches/rosbus/drivers/input (from rev 188, pkg/branches/rosbus/input)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mor...@us...> - 2008-04-26 01:40:07
|
Revision: 194
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=194&view=rev
Author: morgan_quigley
Date: 2008-04-25 18:40:14 -0700 (Fri, 25 Apr 2008)
Log Message:
-----------
hokuyo driver now lives in drivers/laser
Added Paths:
-----------
pkg/branches/rosbus/drivers/laser/
pkg/branches/rosbus/drivers/laser/hokuyo_top_urg/
Removed Paths:
-------------
pkg/branches/rosbus/hokuyo_top_urg/
Copied: pkg/branches/rosbus/drivers/laser/hokuyo_top_urg (from rev 188, pkg/branches/rosbus/hokuyo_top_urg)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mor...@us...> - 2008-04-26 01:49:19
|
Revision: 196
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=196&view=rev
Author: morgan_quigley
Date: 2008-04-25 18:49:25 -0700 (Fri, 25 Apr 2008)
Log Message:
-----------
more cleanup of top-level directory
Added Paths:
-----------
pkg/branches/rosbus/3rdparty/ffmpeg/
pkg/branches/rosbus/3rdparty/opencv/
pkg/branches/rosbus/drivers/generic/
pkg/branches/rosbus/drivers/generic/serial_port/
Removed Paths:
-------------
pkg/branches/rosbus/ffmpeg/
pkg/branches/rosbus/opencv/
pkg/branches/rosbus/serial_port/
Copied: pkg/branches/rosbus/3rdparty/ffmpeg (from rev 188, pkg/branches/rosbus/ffmpeg)
Copied: pkg/branches/rosbus/3rdparty/opencv (from rev 188, pkg/branches/rosbus/opencv)
Copied: pkg/branches/rosbus/drivers/generic/serial_port (from rev 188, pkg/branches/rosbus/serial_port)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mor...@us...> - 2008-04-26 01:51:27
|
Revision: 197
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=197&view=rev
Author: morgan_quigley
Date: 2008-04-25 18:51:32 -0700 (Fri, 25 Apr 2008)
Log Message:
-----------
yet more cleanup of top-level directory
Added Paths:
-----------
pkg/branches/rosbus/drivers/cam/cv_cam/
pkg/branches/rosbus/drivers/laser/laser_viewer/
pkg/branches/rosbus/vision/
pkg/branches/rosbus/vision/cloud_viewer/
pkg/branches/rosbus/vision/image_viewer/
Removed Paths:
-------------
pkg/branches/rosbus/cloud_viewer/
pkg/branches/rosbus/cv_cam/
pkg/branches/rosbus/image_viewer/
pkg/branches/rosbus/laser_viewer/
Copied: pkg/branches/rosbus/drivers/cam/cv_cam (from rev 188, pkg/branches/rosbus/cv_cam)
Copied: pkg/branches/rosbus/drivers/laser/laser_viewer (from rev 188, pkg/branches/rosbus/laser_viewer)
Copied: pkg/branches/rosbus/vision/cloud_viewer (from rev 188, pkg/branches/rosbus/cloud_viewer)
Copied: pkg/branches/rosbus/vision/image_viewer (from rev 188, pkg/branches/rosbus/image_viewer)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mor...@us...> - 2008-04-26 01:51:40
|
Revision: 198
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=198&view=rev
Author: morgan_quigley
Date: 2008-04-25 18:51:47 -0700 (Fri, 25 Apr 2008)
Log Message:
-----------
clean clean clean
Added Paths:
-----------
pkg/branches/rosbus/util/vacuum/
Removed Paths:
-------------
pkg/branches/rosbus/vacuum/
Copied: pkg/branches/rosbus/util/vacuum (from rev 188, pkg/branches/rosbus/vacuum)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mor...@us...> - 2008-04-26 01:52:11
|
Revision: 199
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=199&view=rev
Author: morgan_quigley
Date: 2008-04-25 18:52:18 -0700 (Fri, 25 Apr 2008)
Log Message:
-----------
sharks goes to 'vision' now
Added Paths:
-----------
pkg/branches/rosbus/vision/sharks/
Removed Paths:
-------------
pkg/branches/rosbus/sharks/
Copied: pkg/branches/rosbus/vision/sharks (from rev 188, pkg/branches/rosbus/sharks)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mor...@us...> - 2008-04-26 01:57:25
|
Revision: 201
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=201&view=rev
Author: morgan_quigley
Date: 2008-04-25 18:57:28 -0700 (Fri, 25 Apr 2008)
Log Message:
-----------
moving stuff off the lawn and into the forest
Modified Paths:
--------------
pkg/branches/rosbus/drivers/robot/ipdcmot/manifest.xml
Added Paths:
-----------
pkg/branches/rosbus/util/image_utils/
pkg/branches/rosbus/util/image_utils/Makefile
pkg/branches/rosbus/util/image_utils/examples/
pkg/branches/rosbus/util/image_utils/include/
pkg/branches/rosbus/util/image_utils/manifest.xml
pkg/branches/rosbus/util/image_utils/nodes/
pkg/branches/rosbus/util/image_utils/src/
pkg/branches/rosbus/util/image_utils/test/
Removed Paths:
-------------
pkg/branches/rosbus/image_utils/
pkg/branches/rosbus/util/image_utils/build.yaml
pkg/branches/rosbus/util/image_utils/examples/
pkg/branches/rosbus/util/image_utils/include/
pkg/branches/rosbus/util/image_utils/manifest.xml
pkg/branches/rosbus/util/image_utils/nodes/
pkg/branches/rosbus/util/image_utils/rosbuild
pkg/branches/rosbus/util/image_utils/src/
pkg/branches/rosbus/util/image_utils/test/
Modified: pkg/branches/rosbus/drivers/robot/ipdcmot/manifest.xml
===================================================================
--- pkg/branches/rosbus/drivers/robot/ipdcmot/manifest.xml 2008-04-26 01:56:48 UTC (rev 200)
+++ pkg/branches/rosbus/drivers/robot/ipdcmot/manifest.xml 2008-04-26 01:57:28 UTC (rev 201)
@@ -7,5 +7,8 @@
<url>http://stair.stanford.edu</url>
<depend package="common_flows"/>
<depend package="roscpp"/>
+<export>
+ <cpp cflags="-I${prefix}/include" lflags="-L${prefix}/lib -lipdcmot"/>
+</export>
</package>
Copied: pkg/branches/rosbus/util/image_utils (from rev 188, pkg/branches/rosbus/image_utils)
Copied: pkg/branches/rosbus/util/image_utils/Makefile (from rev 200, pkg/branches/rosbus/image_utils/Makefile)
===================================================================
--- pkg/branches/rosbus/util/image_utils/Makefile (rev 0)
+++ pkg/branches/rosbus/util/image_utils/Makefile 2008-04-26 01:57:28 UTC (rev 201)
@@ -0,0 +1,3 @@
+SUBDIRS = src
+include $(shell rospack find mk)/recurse_subdirs.mk
+
Deleted: pkg/branches/rosbus/util/image_utils/build.yaml
===================================================================
--- pkg/branches/rosbus/image_utils/build.yaml 2008-04-26 01:33:10 UTC (rev 188)
+++ pkg/branches/rosbus/util/image_utils/build.yaml 2008-04-26 01:57:28 UTC (rev 201)
@@ -1,5 +0,0 @@
-cpp:
- make:
- - test/get_raster
- - test/read_write
- - examples/image_sender
Copied: pkg/branches/rosbus/util/image_utils/examples (from rev 200, pkg/branches/rosbus/image_utils/examples)
Copied: pkg/branches/rosbus/util/image_utils/include (from rev 200, pkg/branches/rosbus/image_utils/include)
Deleted: pkg/branches/rosbus/util/image_utils/manifest.xml
===================================================================
--- pkg/branches/rosbus/image_utils/manifest.xml 2008-04-26 01:33:10 UTC (rev 188)
+++ pkg/branches/rosbus/util/image_utils/manifest.xml 2008-04-26 01:57:28 UTC (rev 201)
@@ -1,16 +0,0 @@
-<package>
- <description brief="Image utilities">
-
- This package provides a few sample nodes to show how to use the Image flow,
- as well as a few test programs and utility programs (e.g. which send out
- a static image at arbitrary intervals).
-
- </description>
- <author>Morgan Quigley (email: mqu...@cs...)</author>
- <license>BSD</license>
- <url>http://stair.stanford.edu</url>
- <depend package="roscpp"/>
- <depend package="common_flows"/>
- <depend package="ijg_libjpeg"/>
-</package>
-
Copied: pkg/branches/rosbus/util/image_utils/manifest.xml (from rev 200, pkg/branches/rosbus/image_utils/manifest.xml)
===================================================================
--- pkg/branches/rosbus/util/image_utils/manifest.xml (rev 0)
+++ pkg/branches/rosbus/util/image_utils/manifest.xml 2008-04-26 01:57:28 UTC (rev 201)
@@ -0,0 +1,15 @@
+<package>
+ <description brief="Image utilities">
+
+ This package provides a few sample nodes to show how to use the Image flow,
+ as well as a few test programs and utility programs (e.g. which send out
+ a static image at arbitrary intervals).
+
+ </description>
+ <author>Morgan Quigley (email: mqu...@cs...)</author>
+ <license>BSD</license>
+ <url>http://stair.stanford.edu</url>
+ <depend package="ijg_libjpeg"/>
+ <depend package="std_msgs"/>
+</package>
+
Copied: pkg/branches/rosbus/util/image_utils/nodes (from rev 200, pkg/branches/rosbus/image_utils/nodes)
Deleted: pkg/branches/rosbus/util/image_utils/rosbuild
===================================================================
--- pkg/branches/rosbus/image_utils/rosbuild 2008-04-26 01:33:10 UTC (rev 188)
+++ pkg/branches/rosbus/util/image_utils/rosbuild 2008-04-26 01:57:28 UTC (rev 201)
@@ -1,2 +0,0 @@
-#!/usr/bin/env ruby
-exec("#{`#{ENV['ROS_ROOT']}/rospack find rostools`}/scripts/yamlbuild", 'build.yaml', *ARGV)
Copied: pkg/branches/rosbus/util/image_utils/src (from rev 200, pkg/branches/rosbus/image_utils/src)
Copied: pkg/branches/rosbus/util/image_utils/test (from rev 200, pkg/branches/rosbus/image_utils/test)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mor...@us...> - 2008-04-27 06:29:21
|
Revision: 206
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=206&view=rev
Author: morgan_quigley
Date: 2008-04-26 23:29:27 -0700 (Sat, 26 Apr 2008)
Log Message:
-----------
postprocess in sharks tweaking
Modified Paths:
--------------
pkg/branches/rosbus/3rdparty/sdl_image/manifest.xml
pkg/branches/rosbus/drivers/generic/serial_port/manifest.xml
pkg/branches/rosbus/drivers/robot/ipdcmot/manifest.xml
pkg/branches/rosbus/drivers/robot/ipdcmot/src/libipdcmot/ipdcmot.cpp
pkg/branches/rosbus/util/image_utils/manifest.xml
pkg/branches/rosbus/vision/sharks/include/sharks/sharks.h
pkg/branches/rosbus/vision/sharks/manifest.xml
pkg/branches/rosbus/vision/sharks/src/libsharks/sharks.cpp
pkg/branches/rosbus/vision/sharks/src/loneshark/config.txt
pkg/branches/rosbus/vision/sharks/src/postprocess/extract_laser/Makefile
pkg/branches/rosbus/vision/sharks/src/postprocess/extract_laser/extract_laser.cpp
Added Paths:
-----------
pkg/branches/rosbus/vision/sharks/src/postprocess/extract_laser/test
Modified: pkg/branches/rosbus/3rdparty/sdl_image/manifest.xml
===================================================================
--- pkg/branches/rosbus/3rdparty/sdl_image/manifest.xml 2008-04-27 05:52:57 UTC (rev 205)
+++ pkg/branches/rosbus/3rdparty/sdl_image/manifest.xml 2008-04-27 06:29:27 UTC (rev 206)
@@ -17,5 +17,8 @@
<url>http://www.libsdl.org/projects/SDL_image</url>
<depend package="sdl"/>
<depend package="ijg_libjpeg"/>
+<export>
+ <cpp cflags="-I${prefix}/SDL_image/include" lflags="-Xlinker -rpath ${prefix}/SDL_image/lib -L${prefix}/SDL_image/lib -lSDL_image"/>
+</export>
</package>
Modified: pkg/branches/rosbus/drivers/generic/serial_port/manifest.xml
===================================================================
--- pkg/branches/rosbus/drivers/generic/serial_port/manifest.xml 2008-04-27 05:52:57 UTC (rev 205)
+++ pkg/branches/rosbus/drivers/generic/serial_port/manifest.xml 2008-04-27 06:29:27 UTC (rev 206)
@@ -5,5 +5,8 @@
<author>Morgan Quigley (email: mqu...@cs...)</author>
<license>BSD</license>
<url>http://stair.stanford.edu</url>
+<export>
+ <cpp cflags="-I${prefix}/include" lflags="-L${prefix}/lib -lserial_port"/>
+</export>
</package>
Modified: pkg/branches/rosbus/drivers/robot/ipdcmot/manifest.xml
===================================================================
--- pkg/branches/rosbus/drivers/robot/ipdcmot/manifest.xml 2008-04-27 05:52:57 UTC (rev 205)
+++ pkg/branches/rosbus/drivers/robot/ipdcmot/manifest.xml 2008-04-27 06:29:27 UTC (rev 206)
@@ -5,7 +5,6 @@
<author>Morgan Quigley (email: mqu...@cs...)</author>
<license>BSD</license>
<url>http://stair.stanford.edu</url>
-<depend package="common_flows"/>
<depend package="roscpp"/>
<export>
<cpp cflags="-I${prefix}/include" lflags="-L${prefix}/lib -lipdcmot"/>
Modified: pkg/branches/rosbus/drivers/robot/ipdcmot/src/libipdcmot/ipdcmot.cpp
===================================================================
--- pkg/branches/rosbus/drivers/robot/ipdcmot/src/libipdcmot/ipdcmot.cpp 2008-04-27 05:52:57 UTC (rev 205)
+++ pkg/branches/rosbus/drivers/robot/ipdcmot/src/libipdcmot/ipdcmot.cpp 2008-04-27 06:29:27 UTC (rev 206)
@@ -47,7 +47,8 @@
IPDCMOT::IPDCMOT(string host, double mount_bias_deg, bool home_myself) :
host(host), max_ang_vel(500), ok(true), mount_bias_deg(mount_bias_deg),
homing_in_progress(false), awaiting_response(false),
- reg_mode(UNKNOWN), last_pos_deg(0), last_pos_enc(0), sock(0)
+ reg_mode(UNKNOWN), last_pos_deg(0), last_pos_enc(0), sock(0),
+ servo_mode(IDLE)
{
if (clock_gettime(CLOCK_REALTIME, &init_time) == -1)
{
Modified: pkg/branches/rosbus/util/image_utils/manifest.xml
===================================================================
--- pkg/branches/rosbus/util/image_utils/manifest.xml 2008-04-27 05:52:57 UTC (rev 205)
+++ pkg/branches/rosbus/util/image_utils/manifest.xml 2008-04-27 06:29:27 UTC (rev 206)
@@ -11,5 +11,8 @@
<url>http://stair.stanford.edu</url>
<depend package="ijg_libjpeg"/>
<depend package="std_msgs"/>
+ <export>
+ <cpp cflags="-I${prefix}/include"/>
+ </export>
</package>
Modified: pkg/branches/rosbus/vision/sharks/include/sharks/sharks.h
===================================================================
--- pkg/branches/rosbus/vision/sharks/include/sharks/sharks.h 2008-04-27 05:52:57 UTC (rev 205)
+++ pkg/branches/rosbus/vision/sharks/include/sharks/sharks.h 2008-04-27 06:29:27 UTC (rev 206)
@@ -33,6 +33,7 @@
#include "axis_cam/axis_cam.h"
#include "ipdcmot/ipdcmot.h"
#include "image_utils/jpeg_wrapper.h"
+#include "serial_port/lightweightserial.h"
#include "SDL/SDL.h"
using namespace std;
@@ -63,6 +64,7 @@
string axis_ip, ipdcmot_ip;
AxisCam *cam;
IPDCMOT *mot;
+ LightweightSerial *laser_control;
bool get_and_save_image(string filename);
SDL_Surface *screen, *blit_prep;
double left_laser_bound, right_laser_bound;
Modified: pkg/branches/rosbus/vision/sharks/manifest.xml
===================================================================
--- pkg/branches/rosbus/vision/sharks/manifest.xml 2008-04-27 05:52:57 UTC (rev 205)
+++ pkg/branches/rosbus/vision/sharks/manifest.xml 2008-04-27 06:29:27 UTC (rev 206)
@@ -18,6 +18,7 @@
<depend package="roscpp"/>
<depend package="axis_cam"/>
<depend package="sdl"/>
+<depend package="sdl_image"/>
<depend package="serial_port"/>
<sys_depend lib="ncurses"/>
<export>
Modified: pkg/branches/rosbus/vision/sharks/src/libsharks/sharks.cpp
===================================================================
--- pkg/branches/rosbus/vision/sharks/src/libsharks/sharks.cpp 2008-04-27 05:52:57 UTC (rev 205)
+++ pkg/branches/rosbus/vision/sharks/src/libsharks/sharks.cpp 2008-04-27 06:29:27 UTC (rev 206)
@@ -58,6 +58,11 @@
mot = new IPDCMOT(ipdcmot_ip, 0, false);
printf("done with ipdcmot construct\n");
jpeg_wrapper = new JpegWrapper();
+ laser_control = new LightweightSerial("/dev/ttyUSB0", 115200);
+ if (!laser_control)
+ printf("couldn't open laser control port\n");
+ else
+ printf("opened laser control port OK\n");
if (gui)
{
SDL_Init(SDL_INIT_VIDEO);
@@ -69,6 +74,11 @@
{
printf("sharks destructor\n");
mot->stop();
+ if (laser_control)
+ {
+ laser_control->write('Q'); // turn laser on
+ delete laser_control;
+ }
if (blit_prep)
SDL_FreeSurface(blit_prep);
if (gui)
@@ -360,6 +370,8 @@
}
int image_count = 1;
init_keyboard();
+ if (laser_control)
+ laser_control->write('1'); // turn laser on
mot->set_pos_deg_blocking(left_scan_extent);
mot->set_patrol(left_scan_extent, right_scan_extent, 1, 1);
printf("press any key to stop scanning\n");
@@ -387,6 +399,8 @@
break;
}
}
+ if (laser_control)
+ laser_control->write('Q'); // turn laser on
mot->set_pos_deg_blocking(left_laser_bound); // stop the patrol
char c = _getch();
printf("you pressed: [%c]\n", c);
Modified: pkg/branches/rosbus/vision/sharks/src/loneshark/config.txt
===================================================================
--- pkg/branches/rosbus/vision/sharks/src/loneshark/config.txt 2008-04-27 05:52:57 UTC (rev 205)
+++ pkg/branches/rosbus/vision/sharks/src/loneshark/config.txt 2008-04-27 06:29:27 UTC (rev 206)
@@ -1,4 +1,4 @@
-left_scan_extent 100
-right_scan_extent 125
-iris 770
+left_scan_extent 30
+right_scan_extent 75
+iris 300
focus 6930
Modified: pkg/branches/rosbus/vision/sharks/src/postprocess/extract_laser/Makefile
===================================================================
--- pkg/branches/rosbus/vision/sharks/src/postprocess/extract_laser/Makefile 2008-04-27 05:52:57 UTC (rev 205)
+++ pkg/branches/rosbus/vision/sharks/src/postprocess/extract_laser/Makefile 2008-04-27 06:29:27 UTC (rev 206)
@@ -1,4 +1,4 @@
SRC = extract_laser.cpp
OUT = extract_laser
PKG = sharks
-include $(shell $(ROS_ROOT)/rospack find roscpp)/make_include/node.mk
+include $(shell rospack find mk)/node.mk
Modified: pkg/branches/rosbus/vision/sharks/src/postprocess/extract_laser/extract_laser.cpp
===================================================================
--- pkg/branches/rosbus/vision/sharks/src/postprocess/extract_laser/extract_laser.cpp 2008-04-27 05:52:57 UTC (rev 205)
+++ pkg/branches/rosbus/vision/sharks/src/postprocess/extract_laser/extract_laser.cpp 2008-04-27 06:29:27 UTC (rev 206)
@@ -24,11 +24,12 @@
if (argc < 3)
{
printf("give at least two filenames.\n");
+ exit(1);
//bg = string("test_bg.jpg");
//fg = string("test_fg.jpg");
- bg = string("../../../stair__sharks_testdata/stapler_pen_apple/shark_00001_-024.99886_.jpg");
- fgs.push_back(string("../../../stair__sharks_testdata/stapler_pen_apple/shark_00500_-000.05039_.jpg"));
- fgs.push_back(string("../../../stair__sharks_testdata/stapler_pen_apple/shark_00501_-000.00508_.jpg"));
+ //bg = string("../../../stair__sharks_testdata/stapler_pen_apple/shark_00001_-024.99886_.jpg");
+ //fgs.push_back(string("../../../stair__sharks_testdata/stapler_pen_apple/shark_00500_-000.05039_.jpg"));
+ //fgs.push_back(string("../../../stair__sharks_testdata/stapler_pen_apple/shark_00501_-000.00508_.jpg"));
}
else
{
@@ -97,27 +98,37 @@
uint8_t *fg_p = (uint8_t *)fg_image->pixels + y*fg_image->pitch + x*3;
uint8_t bg_r = *(bg_p + bg_image->format->Rshift/8);
uint8_t fg_r = *(fg_p + fg_image->format->Rshift/8);
- *(fg_p + fg_image->format->Gshift/8) = 0;
- *(fg_p + bg_image->format->Bshift/8) = 0;
- int diff = fg_r - bg_r;
- if (diff > 30)
+ uint8_t bg_g = *(bg_p + bg_image->format->Gshift/8);
+ uint8_t fg_g = *(fg_p + fg_image->format->Gshift/8);
+ uint8_t bg_b = *(bg_p + bg_image->format->Bshift/8);
+ uint8_t fg_b = *(fg_p + fg_image->format->Bshift/8);
+ int added = abs(fg_r - bg_r) + abs(fg_g - bg_g) + abs(fg_b - bg_b);
+ if (added > 300)
{
- *(fg_p + fg_image->format->Rshift/8) = diff;
- centroid += (diff) * x;
- sum += diff;
+ *(fg_p + fg_image->format->Rshift/8) = added/3;
+ *(fg_p + fg_image->format->Gshift/8) = added/3;
+ *(fg_p + fg_image->format->Bshift/8) = added/3;
+ centroid += added * x;
+ sum += added;
}
else
+ {
*(fg_p + fg_image->format->Rshift/8) = 0;
+ *(fg_p + fg_image->format->Gshift/8) = 0;
+ *(fg_p + fg_image->format->Bshift/8) = 0;
+ }
}
centroid /= sum;
- if (sum > 200)
+ if (sum > 600)
{
//printf("centroid = %f sum = %f\n", centroid, sum);
int x = (int)floor(centroid);
if (x < 0) x = 0;
if (x >= fg_image->w) x = fg_image->w - 1;
uint8_t *fg_p = (uint8_t *)fg_image->pixels + y*fg_image->pitch + x*3;
+ *(fg_p + fg_image->format->Rshift/8) = 255;
*(fg_p + fg_image->format->Gshift/8) = 255;
+ *(fg_p + fg_image->format->Bshift/8) = 255;
fprintf(log, "%f %d %f %f\n", lang, y, centroid, sum);
}
}
Added: pkg/branches/rosbus/vision/sharks/src/postprocess/extract_laser/test
===================================================================
--- pkg/branches/rosbus/vision/sharks/src/postprocess/extract_laser/test (rev 0)
+++ pkg/branches/rosbus/vision/sharks/src/postprocess/extract_laser/test 2008-04-27 06:29:27 UTC (rev 206)
@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+(puts "please enter a directory name"; exit) if ARGV.length != 1
+fn = Dir.glob(ARGV[0] + '/*.jpg').sort
+puts "#{fn.length} files"
+exit if fn.length == 0
+`./extract_laser #{fn[-1]} #{fn[0,fn.length-1].join(' ')}`
Property changes on: pkg/branches/rosbus/vision/sharks/src/postprocess/extract_laser/test
___________________________________________________________________
Name: svn:executable
+ *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mor...@us...> - 2008-04-28 23:13:39
|
Revision: 216
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=216&view=rev
Author: morgan_quigley
Date: 2008-04-28 16:13:16 -0700 (Mon, 28 Apr 2008)
Log Message:
-----------
joyshark lets you push a button and start the loneshark scanner
Modified Paths:
--------------
pkg/branches/rosbus/nav/nav_view/nav_view.cpp
pkg/branches/rosbus/vision/sharks/manifest.xml
pkg/branches/rosbus/vision/sharks/src/libsharks/sharks.cpp
Added Paths:
-----------
pkg/branches/rosbus/vision/sharks/src/joyshark/
pkg/branches/rosbus/vision/sharks/src/joyshark/Makefile
pkg/branches/rosbus/vision/sharks/src/joyshark/config.txt
pkg/branches/rosbus/vision/sharks/src/joyshark/joyshark.cpp
Modified: pkg/branches/rosbus/nav/nav_view/nav_view.cpp
===================================================================
--- pkg/branches/rosbus/nav/nav_view/nav_view.cpp 2008-04-28 22:51:13 UTC (rev 215)
+++ pkg/branches/rosbus/nav/nav_view/nav_view.cpp 2008-04-28 23:13:16 UTC (rev 216)
@@ -2,13 +2,13 @@
#include <math.h>
#include <GL/gl.h>
#include "ros/node.h"
-#include "std_msgs/MsgPose2DFloat32.h"
+#include "std_msgs/MsgRobotBase2DOdom.h"
#include "sdlgl/sdlgl.h"
class NavView : public ros::node, public ros::SDLGL
{
public:
- MsgPose2DFloat32 odom;
+ MsgRobotBase2DOdom odom;
float view_scale, view_x, view_y;
NavView() : ros::node("nav_view"),
@@ -31,8 +31,8 @@
glPushMatrix();
odom.lock();
- glTranslatef(odom.x, odom.y, 0);
- glRotatef(odom.th * 180 / M_PI, 0, 0, 1);
+ glTranslatef(odom.px, odom.py, 0);
+ glRotatef(odom.pyaw * 180 / M_PI, 0, 0, 1);
odom.unlock();
glColor3f(0.2, 1.0, 0.4);
glBegin(GL_LINE_LOOP);
Modified: pkg/branches/rosbus/vision/sharks/manifest.xml
===================================================================
--- pkg/branches/rosbus/vision/sharks/manifest.xml 2008-04-28 22:51:13 UTC (rev 215)
+++ pkg/branches/rosbus/vision/sharks/manifest.xml 2008-04-28 23:13:16 UTC (rev 216)
@@ -20,6 +20,7 @@
<depend package="sdl"/>
<depend package="sdl_image"/>
<depend package="serial_port"/>
+<depend package="joy"/>
<sys_depend lib="ncurses"/>
<export>
<cpp cflags="-I${prefix}/include" lflags="-L${prefix}/lib -lsharks"/>
Added: pkg/branches/rosbus/vision/sharks/src/joyshark/Makefile
===================================================================
--- pkg/branches/rosbus/vision/sharks/src/joyshark/Makefile (rev 0)
+++ pkg/branches/rosbus/vision/sharks/src/joyshark/Makefile 2008-04-28 23:13:16 UTC (rev 216)
@@ -0,0 +1,5 @@
+SRC = joyshark.cpp
+OUT = joyshark
+LFLAGS = -lcurl
+PKG = sharks
+include $(shell rospack find mk)/node.mk
Added: pkg/branches/rosbus/vision/sharks/src/joyshark/config.txt
===================================================================
--- pkg/branches/rosbus/vision/sharks/src/joyshark/config.txt (rev 0)
+++ pkg/branches/rosbus/vision/sharks/src/joyshark/config.txt 2008-04-28 23:13:16 UTC (rev 216)
@@ -0,0 +1,3 @@
+left_scan_extent 30
+right_scan_extent 75
+iris 600
Added: pkg/branches/rosbus/vision/sharks/src/joyshark/joyshark.cpp
===================================================================
--- pkg/branches/rosbus/vision/sharks/src/joyshark/joyshark.cpp (rev 0)
+++ pkg/branches/rosbus/vision/sharks/src/joyshark/joyshark.cpp 2008-04-28 23:13:16 UTC (rev 216)
@@ -0,0 +1,93 @@
+///////////////////////////////////////////////////////////////////////////////
+// The sharks package provides a triangulation-based laser scanner.
+//
+// Copyright (C) 2008, Morgan Quigley
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+// * Redistributions of source code must retain the above copyright notice,
+// this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+// * Neither the name of Stanford University nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+
+#include <cstdio>
+#include "sharks/sharks.h"
+#include "joy/MsgJoy.h"
+#include "ros/node.h"
+
+using namespace ros;
+
+class JoyShark : public node
+{
+public:
+ MsgJoy joy;
+ int prev_buttons;
+ Sharks *sharks;
+
+ JoyShark() : node("joyshark"), prev_buttons(0)
+ {
+ sharks = new Sharks("192.168.1.90", "192.168.1.38", true);
+ subscribe("joy", joy, &JoyShark::joy_cb);
+ }
+ void joy_cb()
+ {
+ if ((joy.buttons & 0x1) && !(prev_buttons & 0x1))
+ {
+ sharks->load_config_file("config.txt");
+ sharks->loneshark();
+ }
+ prev_buttons = joy.buttons;
+ }
+};
+
+int main(int argc, char **argv)
+{
+ ros::init(argc, argv);
+ JoyShark shark;
+ shark.spin();
+ return 0;
+}
+/*
+ printf("construct Sharks object...\n");
+ Sharks *sharks = new Sharks("192.168.1.90", "192.168.1.38", true);
+
+ //printf("press enter to scan or type 'a' then enter to abort\n");
+ //char c = fgetc(stdin);
+
+ if (argc == 1)
+ sharks->load_config_file("config.txt");
+ else if (argc == 2 && argv[1] == string("--calibrate"))
+ {
+ sharks->manual_calibration();
+ delete sharks; return 0;
+ }
+
+// sharks->calibrate();
+// else if (argc == 2 && argv[1] == "--manual")
+ else
+ sharks->load_config_file(argv[1]);
+ sharks->loneshark();
+
+ //sharks->gui_spin();
+
+ delete sharks;
+ return 0;
+}
+*/
+
Modified: pkg/branches/rosbus/vision/sharks/src/libsharks/sharks.cpp
===================================================================
--- pkg/branches/rosbus/vision/sharks/src/libsharks/sharks.cpp 2008-04-28 22:51:13 UTC (rev 215)
+++ pkg/branches/rosbus/vision/sharks/src/libsharks/sharks.cpp 2008-04-28 23:13:16 UTC (rev 216)
@@ -28,6 +28,9 @@
#include <sstream>
#include <cstdio>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <ctime>
#include "sharks/sharks.h"
#include "axis_cam/axis_cam.h"
#include "ipdcmot/ipdcmot.h"
@@ -370,6 +373,14 @@
}
int image_count = 1;
init_keyboard();
+ char logdir[500];
+ time_t t = time(NULL);
+ struct tm *tms = localtime(&t);
+ snprintf(logdir, sizeof(logdir), "%d-%02d-%02d-%02d-%02d-%02d",
+ tms->tm_year+1900, tms->tm_mon+1, tms->tm_mday,
+ tms->tm_hour , tms->tm_min , tms->tm_sec);
+ printf("log directory: %s", logdir);
+ mkdir(logdir, 0755);
if (laser_control)
laser_control->write('1'); // turn laser on
mot->set_pos_deg_blocking(left_scan_extent);
@@ -390,8 +401,10 @@
}
printf(".");
fflush(stdout);
- char fnamebuf[500];
- sprintf(fnamebuf, "img_%06d_%012.6f.jpg", image_count, pos);
+
+ char fnamebuf[800];
+ snprintf(fnamebuf, sizeof(fnamebuf), "%s/img_%06d_%012.6f.jpg",
+ logdir, image_count, pos);
image_count++;
if (!get_and_save_image(fnamebuf))
{
@@ -400,7 +413,7 @@
}
}
if (laser_control)
- laser_control->write('Q'); // turn laser on
+ laser_control->write('Q'); // turn laser off
mot->set_pos_deg_blocking(left_laser_bound); // stop the patrol
char c = _getch();
printf("you pressed: [%c]\n", c);
@@ -444,6 +457,7 @@
printf("woah! couldn't open [%s]\n", filename.c_str());
return false;
}
+ cam->set_focus(0); // enable autofocus by default
while (!feof(f))
{
char buf[1000]; // OVERRUNS R FUN
@@ -463,6 +477,8 @@
fclose(f);
printf("letting camera settle to new iris/focus for 3 seconds...\n");
usleep(3000000);
+ cam->set_focus(0, true); // lock focus
+ usleep(200000);
printf("done. carry on.\n");
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jl...@us...> - 2008-04-28 23:25:08
|
Revision: 217
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=217&view=rev
Author: jleibs
Date: 2008-04-28 16:25:10 -0700 (Mon, 28 Apr 2008)
Log Message:
-----------
Merging in changes that have occured since branch... time to upgrade to rosbus.
Modified Paths:
--------------
pkg/branches/rosbus/etherdrive/build.yaml
pkg/branches/rosbus/etherdrive/include/etherdrive/etherdrive.h
pkg/branches/rosbus/etherdrive/src/etherdrive_control/etherdrive_control.cpp
pkg/branches/rosbus/etherdrive/src/libetherdrive/etherdrive.cpp
pkg/branches/rosbus/etherdrive/test/test_etherdrive/test_etherdrive.cpp
pkg/branches/rosbus/libTF/include/libTF/Quaternion3D.h
pkg/branches/rosbus/libTF/include/libTF/libTF.h
pkg/branches/rosbus/libTF/src/simple/Quaternion3D.cpp
pkg/branches/rosbus/libTF/src/simple/libTF.cpp
pkg/branches/rosbus/libTF/src/test/main.cpp
pkg/branches/rosbus/tilting_laser/manifest.xml
pkg/branches/rosbus/tilting_laser/nodes/launch_tl
pkg/branches/rosbus/tilting_laser/src/tilting_laser/tilting_laser.cpp
Added Paths:
-----------
pkg/branches/rosbus/controllers/
pkg/branches/rosbus/etherdrive/test/test_etherdrive2/
pkg/branches/rosbus/etherdrive/test/test_etherdrive2/Makefile
pkg/branches/rosbus/etherdrive/test/test_etherdrive2/test_etherdrive2.cpp
pkg/branches/rosbus/kdtree/
pkg/branches/rosbus/kdtree/Makefile
pkg/branches/rosbus/kdtree/include/
pkg/branches/rosbus/kdtree/include/kdtree/
pkg/branches/rosbus/kdtree/kdtree2.tar.gz
pkg/branches/rosbus/kdtree/lib/
pkg/branches/rosbus/kdtree/manifest.xml
pkg/branches/rosbus/kdtree/rosbuild
pkg/branches/rosbus/kdtree/test/
pkg/branches/rosbus/kdtree/test/Makefile
pkg/branches/rosbus/kdtree/test/test.cpp
pkg/branches/rosbus/libTF/doc/
pkg/branches/rosbus/libTF/doc/Makefile
pkg/branches/rosbus/libTF/doc/README.txt
pkg/branches/rosbus/libTF/doc/libTF_Manual.bib
pkg/branches/rosbus/libTF/doc/libTF_Manual.tex
Removed Paths:
-------------
pkg/branches/rosbus/etherdrive/include/etherdrive.h
pkg/branches/rosbus/etherdrive/test/test_etherdrive2/Makefile
pkg/branches/rosbus/etherdrive/test/test_etherdrive2/test_etherdrive2.cpp
pkg/branches/rosbus/kdtree/Makefile
pkg/branches/rosbus/kdtree/include/
pkg/branches/rosbus/kdtree/include/kdtree/
pkg/branches/rosbus/kdtree/kdtree2.tar.gz
pkg/branches/rosbus/kdtree/lib/
pkg/branches/rosbus/kdtree/manifest.xml
pkg/branches/rosbus/kdtree/rosbuild
pkg/branches/rosbus/kdtree/test/
pkg/branches/rosbus/kdtree/test/Makefile
pkg/branches/rosbus/kdtree/test/test.cpp
pkg/branches/rosbus/libTF/doc/Makefile
pkg/branches/rosbus/libTF/doc/README.txt
pkg/branches/rosbus/libTF/doc/libTF_Manual.bib
pkg/branches/rosbus/libTF/doc/libTF_Manual.tex
Copied: pkg/branches/rosbus/controllers (from rev 216, pkg/trunk/controllers)
Modified: pkg/branches/rosbus/etherdrive/build.yaml
===================================================================
--- pkg/branches/rosbus/etherdrive/build.yaml 2008-04-28 23:13:16 UTC (rev 216)
+++ pkg/branches/rosbus/etherdrive/build.yaml 2008-04-28 23:25:10 UTC (rev 217)
@@ -3,4 +3,5 @@
- src/libetherdrive
- src/etherdrive_control
- test/test_etherdrive
+ - test/test_etherdrive2
Modified: pkg/branches/rosbus/etherdrive/include/etherdrive/etherdrive.h
===================================================================
--- pkg/branches/rosbus/etherdrive/include/etherdrive/etherdrive.h 2008-04-28 23:13:16 UTC (rev 216)
+++ pkg/branches/rosbus/etherdrive/include/etherdrive/etherdrive.h 2008-04-28 23:25:10 UTC (rev 217)
@@ -43,6 +43,8 @@
using namespace std;
+class EDMotor;
+
class EtherDrive
{
public:
@@ -63,15 +65,32 @@
// Disable motors
bool motors_off();
+ bool set_control_mode(int8_t m);
+
+ bool set_gain(uint32_t m, char G, int32_t val);
+
+ EDMotor get_motor(uint32_t m);
+
+ void set_drv(uint32_t m, int32_t drv);
+ int32_t get_enc(uint32_t m);
+ int32_t get_cur(uint32_t m);
+ int32_t get_pwm(uint32_t m);
+
// Send an array of motor commands up to 6 in length.
bool drive(size_t num, int32_t* drv);
// Send most recent motor commands, and retrieve update (this must be run at sufficient rate).
bool tick(size_t num = 0, int32_t* enc = 0, int32_t* curr = 0, int32_t* pwm = 0);
+
+
+
private:
bool ready;
int32_t last_drv[6];
+ int32_t last_enc[6];
+ int32_t last_cur[6];
+ int32_t last_pwm[6];
int mot_sock;
int cmd_sock;
@@ -80,5 +99,43 @@
struct sockaddr_in cmd_addr_out;
};
+class EDMotor
+{
+ friend class EtherDrive;
+public:
+ void set_drv(int32_t drv) {
+ driver->set_drv(motor, drv);
+ }
+
+ int32_t get_enc() {
+ return driver->get_enc(motor);
+ }
+
+ int32_t get_cur() {
+ return driver->get_cur(motor);
+ }
+
+ int32_t get_pwm() {
+ return driver->get_pwm(motor);
+ }
+
+ bool set_gains(int32_t P, int32_t I, int32_t D, int32_t W, int32_t M, int32_t Z) {
+ return driver->set_gain(motor, 'P', P) &
+ driver->set_gain(motor, 'I', I) &
+ driver->set_gain(motor, 'D', D) &
+ driver->set_gain(motor, 'W', W) &
+ driver->set_gain(motor, 'M', M) &
+ driver->set_gain(motor, 'Z', Z);
+ }
+protected:
+ EDMotor(EtherDrive* driver, uint32_t motor) : driver(driver), motor(motor) {}
+
+private:
+ EtherDrive* driver;
+
+ uint32_t motor;
+};
+
+
#endif
Deleted: pkg/branches/rosbus/etherdrive/include/etherdrive.h
===================================================================
--- pkg/branches/rosbus/etherdrive/include/etherdrive.h 2008-04-28 23:13:16 UTC (rev 216)
+++ pkg/branches/rosbus/etherdrive/include/etherdrive.h 2008-04-28 23:25:10 UTC (rev 217)
@@ -1,84 +0,0 @@
-/*********************************************************************
-* Software License Agreement (BSD License)
-*
-* Copyright (c) 2008, Willow Garage, Inc.
-* All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions
-* are met:
-*
-* * Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-* * Redistributions in binary form must reproduce the above
-* copyright notice, this list of conditions and the following
-* disclaimer in the documentation and/or other materials provided
-* with the distribution.
-* * Neither the name of the Willow Garage nor the names of its
-* contributors may be used to endorse or promote products derived
-* from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-* POSSIBILITY OF SUCH DAMAGE.
-*********************************************************************/
-
-#ifndef ETHERDRIVE_H
-#define ETHERDRIVE_H
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-
-#include <string>
-
-using namespace std;
-
-class EtherDrive
-{
-public:
- EtherDrive();
- ~EtherDrive();
-
- // Initialize
- bool init(string ip);
-
- void shutdown();
-
- // Manually send EtherDrive command.
- int send_cmd(char* cmd, size_t cmd_len, char* buf, size_t buf_len);
-
- // Enable motors
- bool motors_on();
-
- // Disable motors
- bool motors_off();
-
- // Send an array of motor commands up to 6 in length.
- bool drive(size_t num, int32_t* drv);
-
- // Send most recent motor commands, and retrieve update (this must be run at sufficient rate).
- bool tick(size_t num = 0, int32_t* enc = 0, int32_t* curr = 0, int32_t* pwm = 0);
-private:
- bool ready;
-
- int32_t last_drv[6];
-
- int mot_sock;
- int cmd_sock;
-
- struct sockaddr_in mot_addr_out;
- struct sockaddr_in cmd_addr_out;
-};
-
-#endif
-
Modified: pkg/branches/rosbus/etherdrive/src/etherdrive_control/etherdrive_control.cpp
===================================================================
--- pkg/branches/rosbus/etherdrive/src/etherdrive_control/etherdrive_control.cpp 2008-04-28 23:13:16 UTC (rev 216)
+++ pkg/branches/rosbus/etherdrive/src/etherdrive_control/etherdrive_control.cpp 2008-04-28 23:25:10 UTC (rev 217)
@@ -112,7 +112,7 @@
control_mutex.lock();
- printf("Commanding: %g -- %d\n", last_mot_val[1], tmp_mot_cmd[1]);
+ // printf("Commanding: %g -- %d\n", last_mot_val[1], tmp_mot_cmd[1]);
ed->drive(6,tmp_mot_cmd);
Modified: pkg/branches/rosbus/etherdrive/src/libetherdrive/etherdrive.cpp
===================================================================
--- pkg/branches/rosbus/etherdrive/src/libetherdrive/etherdrive.cpp 2008-04-28 23:13:16 UTC (rev 216)
+++ pkg/branches/rosbus/etherdrive/src/libetherdrive/etherdrive.cpp 2008-04-28 23:25:10 UTC (rev 217)
@@ -48,6 +48,11 @@
}
+EtherDrive::~EtherDrive()
+{
+ shutdown();
+}
+
bool EtherDrive::init(string ip) {
if (ready) {
@@ -94,12 +99,6 @@
}
-EtherDrive::~EtherDrive()
-{
- shutdown();
-}
-
-
void EtherDrive::shutdown() {
if (ready = true) {
@@ -108,10 +107,31 @@
}
ready = false;
-
}
+int EtherDrive::send_cmd(char* cmd, size_t cmd_len, char* buf, size_t buf_len) {
+
+ if (!ready)
+ return -1;
+
+ int n_sent;
+ int n_recv;
+
+ struct sockaddr_in from;
+ socklen_t fromlen = sizeof(struct sockaddr_in);
+
+ n_sent = sendto(cmd_sock, cmd, cmd_len, 0, (struct sockaddr *)&cmd_addr_out, sizeof(mot_addr_out));
+
+ if (n_sent != cmd_len) {
+ return -1;
+ }
+
+ n_recv = recvfrom(cmd_sock, buf, buf_len, 0, (struct sockaddr *)&from, &fromlen);
+
+ return n_recv;
+}
+
bool EtherDrive::motors_on() {
if (ready) {
@@ -119,11 +139,11 @@
cmd[0] = 'm';
cmd[1] = 1;
cmd[2] = 0;
-
+
int32_t res[3];
-
+
int res_len = send_cmd((char*)cmd, 3*sizeof(int32_t), (char*)res, 100*sizeof(int32_t));
-
+
if (res_len == 3) {
if (res[1] == 1) {
return true;
@@ -132,7 +152,6 @@
}
return false;
-
}
bool EtherDrive::motors_off() {
@@ -158,48 +177,96 @@
}
+bool EtherDrive::set_control_mode(int8_t m) {
-int EtherDrive::send_cmd(char* cmd, size_t cmd_len, char* buf, size_t buf_len) {
+ if (ready) {
- int n_sent;
- int n_recv;
+ if (m == 0 || m == 1 || m == 2) {
- struct sockaddr_in from;
- socklen_t fromlen = sizeof(struct sockaddr_in);
+ int32_t cmd[3];
+ cmd[0] = 'i';
+ cmd[1] = m;
+ cmd[2] = 0;
- n_sent = sendto(cmd_sock, cmd, cmd_len, 0, (struct sockaddr *)&cmd_addr_out, sizeof(mot_addr_out));
+ int32_t res[3];
- if (n_sent != cmd_len) {
- return -1;
+ int res_len = send_cmd((char*)cmd, 3*sizeof(int32_t), (char*)res, 100*sizeof(int32_t));
+
+ if (res_len == 3) {
+ if (res[1] == m) {
+ return true;
+ }
+ }
+ }
}
- n_recv = recvfrom(cmd_sock, buf, buf_len, 0, (struct sockaddr *)&from, &fromlen);
+ return false;
+}
- return n_recv;
+bool EtherDrive::set_gain(uint32_t m, char G, int32_t val) {
+ if (ready) {
+
+ if (m < 6) {
+
+ char cmds[] = "PIDWMZ";
+ if ( memchr(cmds, G, strlen(cmds)) != NULL) {
+
+ int32_t cmd[3];
+ cmd[0] = G;
+ cmd[1] = m;
+ cmd[2] = val;
+
+ int32_t res[3];
+
+ int res_len = send_cmd((char*)cmd, 3*sizeof(int32_t), (char*)res, 100*sizeof(int32_t));
+
+ if (res_len == 3) {
+ if (res[1] == m && res[2] == val) {
+ return true;
+ }
+ }
+ }
+ }
+ }
}
-bool EtherDrive::drive(size_t num, int32_t* drv)
-{
- if (num > 6) {
- return false;
+EDMotor EtherDrive::get_motor(uint32_t m) {
+ return EDMotor(this, m);
+}
+
+void EtherDrive::set_drv(uint32_t m, int32_t drv) {
+ if (m < 6) {
+ last_drv[m] = drv;
}
+}
- for (int i = 0; i < num; i++) {
- last_drv[i] = drv[i];
+int32_t EtherDrive::get_enc(uint32_t m) {
+ if (m < 6) {
+ return last_enc[m];
}
+}
- for (int i = num; i < 6; i++) {
- last_drv[i] = 0;
+int32_t EtherDrive::get_cur(uint32_t m) {
+ if (m < 6) {
+ return last_cur[m];
}
+}
- return true;
+int32_t EtherDrive::get_pwm(uint32_t m) {
+ if (m < 6) {
+ return last_pwm[m];
+ }
}
-bool EtherDrive::tick(size_t num, int32_t* enc, int32_t* curr, int32_t* pwm)
+
+bool EtherDrive::tick(size_t num, int32_t* enc, int32_t* cur, int32_t* pwm)
{
+ if (!ready)
+ return false;
+
if (num > 6) {
return false;
}
@@ -224,23 +291,47 @@
return false;
}
+
+ for (int i = 0; i < 6; i++) {
+ last_enc[i] = buf[i];
+ }
+ for (int i = 0; i < 6; i++) {
+ last_cur[i] = buf[6+i];
+ }
+ for (int i = 0; i < 6; i++) {
+ last_pwm[i] = buf[12+i];
+ }
+
+
if (enc > 0) {
for (int i = 0; i < num; i++) {
- enc[i] = buf[i];
+ enc[i] = last_enc[i];
}
}
-
- if (curr > 0) {
+ if (cur > 0) {
for (int i = 0; i < num; i++) {
- curr[i] = buf[6+i];
+ cur[i] = last_cur[i];
}
}
-
if (pwm > 0) {
for (int i = 0; i < num; i++) {
- pwm[i] = buf[12+i];
+ pwm[i] = last_pwm[i];
}
}
return n_recv;
}
+
+bool EtherDrive::drive(size_t num, int32_t* drv)
+{
+ if (num > 6) {
+ return false;
+ }
+
+ for (int i = 0; i < num; i++) {
+ last_drv[i] = drv[i];
+ }
+
+ return true;
+}
+
Modified: pkg/branches/rosbus/etherdrive/test/test_etherdrive/test_etherdrive.cpp
===================================================================
--- pkg/branches/rosbus/etherdrive/test/test_etherdrive/test_etherdrive.cpp 2008-04-28 23:13:16 UTC (rev 216)
+++ pkg/branches/rosbus/etherdrive/test/test_etherdrive/test_etherdrive.cpp 2008-04-28 23:25:10 UTC (rev 217)
@@ -57,7 +57,7 @@
if (!e.drive(1,&drv))
printf("Drive problem!.");
if (!e.tick(2,enc,cur))
-// // // printf("Tick problem!.");
+ printf("Tick problem!.");
printf("Encoder0: %d Current: %d\n", enc[0], cur[0]);
printf("Encoder1: %d Current: %d\n", enc[1], cur[1]);
Copied: pkg/branches/rosbus/etherdrive/test/test_etherdrive2 (from rev 216, pkg/trunk/etherdrive/test/test_etherdrive2)
Deleted: pkg/branches/rosbus/etherdrive/test/test_etherdrive2/Makefile
===================================================================
--- pkg/trunk/etherdrive/test/test_etherdrive2/Makefile 2008-04-28 23:13:16 UTC (rev 216)
+++ pkg/branches/rosbus/etherdrive/test/test_etherdrive2/Makefile 2008-04-28 23:25:10 UTC (rev 217)
@@ -1,4 +0,0 @@
-SRC = test_etherdrive2.cpp
-OUT = test_etherdrive2
-PKG = etherdrive
-include $(shell $(ROS_ROOT)/rospack find roscpp)/make_include/node.mk
Copied: pkg/branches/rosbus/etherdrive/test/test_etherdrive2/Makefile (from rev 216, pkg/trunk/etherdrive/test/test_etherdrive2/Makefile)
===================================================================
--- pkg/branches/rosbus/etherdrive/test/test_etherdrive2/Makefile (rev 0)
+++ pkg/branches/rosbus/etherdrive/test/test_etherdrive2/Makefile 2008-04-28 23:25:10 UTC (rev 217)
@@ -0,0 +1,4 @@
+SRC = test_etherdrive2.cpp
+OUT = test_etherdrive2
+PKG = etherdrive
+include $(shell $(ROS_ROOT)/rospack find roscpp)/make_include/node.mk
Deleted: pkg/branches/rosbus/etherdrive/test/test_etherdrive2/test_etherdrive2.cpp
===================================================================
--- pkg/trunk/etherdrive/test/test_etherdrive2/test_etherdrive2.cpp 2008-04-28 23:13:16 UTC (rev 216)
+++ pkg/branches/rosbus/etherdrive/test/test_etherdrive2/test_etherdrive2.cpp 2008-04-28 23:25:10 UTC (rev 217)
@@ -1,92 +0,0 @@
-/*********************************************************************
-* Software License Agreement (BSD License)
-*
-* Copyright (c) 2008, Willow Garage, Inc.
-* All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions
-* are met:
-*
-* * Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-* * Redistributions in binary form must reproduce the above
-* copyright notice, this list of conditions and the following
-* disclaimer in the documentation and/or other materials provided
-* with the distribution.
-* * Neither the name of the Willow Garage nor the names of its
-* contributors may be used to endorse or promote products derived
-* from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-* POSSIBILITY OF SUCH DAMAGE.
-*********************************************************************/
-
-#include "etherdrive/etherdrive.h"
-#include <iostream>
-
-using namespace std;
-
-int main() {
-
- EtherDrive e;
-
- if (!e.init("192.168.0.100")) {
- cout << "Could not initialize etherdrive." << endl;
- return -1;
- }
-
- EDMotor m0 = e.get_motor(0);
- EDMotor m1 = e.get_motor(1);
-
- e.motors_on();
-
- int count = 0;
-
- int drv = 100000;
-
- e.set_control_mode(2);
-
- if (!m1.set_gains(150, 20, -10, 50, 200, 13)) {
- printf("Setting gains failed!\n");
- return 0;
- }
-
- while (1) {
-
- m0.set_drv(drv);
-
- if (!e.tick())
- printf("Tick problem!.");
-
- printf("Encoder0: %d Current: %d PWM: %d\n", m0.get_enc(), m0.get_cur(), m0.get_pwm());
- printf("Encoder1: %d Current: %d PWM: %d\n", m1.get_enc(), m1.get_cur(), m1.get_pwm());
-
-
- // Crappy control
- if (abs(m0.get_cur()) > 200) {
- if (count++ > 50)
- e.motors_off();
- } else {
- count = 0;
- }
-
- if (m0.get_enc() == 100000) {
- drv = -100000;
- } else if (m0.get_enc() == -100000) {
- drv = 100000;
- }
- }
-
- e.shutdown();
-}
Copied: pkg/branches/rosbus/etherdrive/test/test_etherdrive2/test_etherdrive2.cpp (from rev 216, pkg/trunk/etherdrive/test/test_etherdrive2/test_etherdrive2.cpp)
===================================================================
--- pkg/branches/rosbus/etherdrive/test/test_etherdrive2/test_etherdrive2.cpp (rev 0)
+++ pkg/branches/rosbus/etherdrive/test/test_etherdrive2/test_etherdrive2.cpp 2008-04-28 23:25:10 UTC (rev 217)
@@ -0,0 +1,92 @@
+/*********************************************************************
+* Software License Agreement (BSD License)
+*
+* Copyright (c) 2008, Willow Garage, Inc.
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions
+* are met:
+*
+* * Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+* * Redistributions in binary form must reproduce the above
+* copyright notice, this list of conditions and the following
+* disclaimer in the documentation and/or other materials provided
+* with the distribution.
+* * Neither the name of the Willow Garage nor the names of its
+* contributors may be used to endorse or promote products derived
+* from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+* POSSIBILITY OF SUCH DAMAGE.
+*********************************************************************/
+
+#include "etherdrive/etherdrive.h"
+#include <iostream>
+
+using namespace std;
+
+int main() {
+
+ EtherDrive e;
+
+ if (!e.init("192.168.0.100")) {
+ cout << "Could not initialize etherdrive." << endl;
+ return -1;
+ }
+
+ EDMotor m0 = e.get_motor(0);
+ EDMotor m1 = e.get_motor(1);
+
+ e.motors_on();
+
+ int count = 0;
+
+ int drv = 100000;
+
+ e.set_control_mode(2);
+
+ if (!m1.set_gains(150, 20, -10, 50, 200, 13)) {
+ printf("Setting gains failed!\n");
+ return 0;
+ }
+
+ while (1) {
+
+ m0.set_drv(drv);
+
+ if (!e.tick())
+ printf("Tick problem!.");
+
+ printf("Encoder0: %d Current: %d PWM: %d\n", m0.get_enc(), m0.get_cur(), m0.get_pwm());
+ printf("Encoder1: %d Current: %d PWM: %d\n", m1.get_enc(), m1.get_cur(), m1.get_pwm());
+
+
+ // Crappy control
+ if (abs(m0.get_cur()) > 200) {
+ if (count++ > 50)
+ e.motors_off();
+ } else {
+ count = 0;
+ }
+
+ if (m0.get_enc() == 100000) {
+ drv = -100000;
+ } else if (m0.get_enc() == -100000) {
+ drv = 100000;
+ }
+ }
+
+ e.shutdown();
+}
Copied: pkg/branches/rosbus/kdtree (from rev 216, pkg/trunk/kdtree)
Deleted: pkg/branches/rosbus/kdtree/Makefile
===================================================================
--- pkg/trunk/kdtree/Makefile 2008-04-28 23:13:16 UTC (rev 216)
+++ pkg/branches/rosbus/kdtree/Makefile 2008-04-28 23:25:10 UTC (rev 217)
@@ -1,4 +0,0 @@
-SRC = kdtree2.31/src-c++/kdtree2.cpp
-OUT = lib/libkdtree.a
-PKG = kdtree
-include $(shell $(ROS_ROOT)/rospack find roscpp)/make_include/lib.mk
Copied: pkg/branches/rosbus/kdtree/Makefile (from rev 216, pkg/trunk/kdtree/Makefile)
===================================================================
--- pkg/branches/rosbus/kdtree/Makefile (rev 0)
+++ pkg/branches/rosbus/kdtree/Makefile 2008-04-28 23:25:10 UTC (rev 217)
@@ -0,0 +1,4 @@
+SRC = kdtree2.31/src-c++/kdtree2.cpp
+OUT = lib/libkdtree.a
+PKG = kdtree
+include $(shell $(ROS_ROOT)/rospack find roscpp)/make_include/lib.mk
Copied: pkg/branches/rosbus/kdtree/include (from rev 216, pkg/trunk/kdtree/include)
Copied: pkg/branches/rosbus/kdtree/include/kdtree (from rev 216, pkg/trunk/kdtree/include/kdtree)
Deleted: pkg/branches/rosbus/kdtree/kdtree2.tar.gz
===================================================================
(Binary files differ)
Copied: pkg/branches/rosbus/kdtree/kdtree2.tar.gz (from rev 216, pkg/trunk/kdtree/kdtree2.tar.gz)
===================================================================
(Binary files differ)
Copied: pkg/branches/rosbus/kdtree/lib (from rev 216, pkg/trunk/kdtree/lib)
Deleted: pkg/branches/rosbus/kdtree/manifest.xml
===================================================================
--- pkg/trunk/kdtree/manifest.xml 2008-04-28 23:13:16 UTC (rev 216)
+++ pkg/branches/rosbus/kdtree/manifest.xml 2008-04-28 23:25:10 UTC (rev 217)
@@ -1,9 +0,0 @@
-<package>
-<description brief="KDTree library">
-A Wrapper for the KDTREE2 library.
-</description>
-<author>Matthew B. Kennel</author>
-<license>Academic Free License 1.1</license>
-<url>http://arxiv.org/abs/physics/0408067</url>
-</package>
-
Copied: pkg/branches/rosbus/kdtree/manifest.xml (from rev 216, pkg/trunk/kdtree/manifest.xml)
===================================================================
--- pkg/branches/rosbus/kdtree/manifest.xml (rev 0)
+++ pkg/branches/rosbus/kdtree/manifest.xml 2008-04-28 23:25:10 UTC (rev 217)
@@ -0,0 +1,9 @@
+<package>
+<description brief="KDTree library">
+A Wrapper for the KDTREE2 library.
+</description>
+<author>Matthew B. Kennel</author>
+<license>Academic Free License 1.1</license>
+<url>http://arxiv.org/abs/physics/0408067</url>
+</package>
+
Deleted: pkg/branches/rosbus/kdtree/rosbuild
===================================================================
--- pkg/trunk/kdtree/rosbuild 2008-04-28 23:13:16 UTC (rev 216)
+++ pkg/branches/rosbus/kdtree/rosbuild 2008-04-28 23:25:10 UTC (rev 217)
@@ -1,36 +0,0 @@
-#!/usr/bin/env ruby
-require 'fileutils.rb'
-
-pkg_path = File.expand_path($0).split('/')
-pkg_path = pkg_path[0,pkg_path.length-1].join('/')
-puts "package path: [#{pkg_path}]"
-if pkg_path.length < 1
- puts "woah! package path looks scary. something isn't right. bailing..."
- exit
-end
-
-Dir.chdir(pkg_path)
-# TODO make sure we got there
-
-if ARGV.length == 0 || ARGV[0] == 'update'
- puts "extracting KDTree ============================"
- system("tar xzvf kdtree2.tar.gz")
- system("cp kdtree2.31/src-c++/kdtree2.hpp include/kdtree/")
- puts "making kdtree2 ================================="
- system("make")
- puts "building test ================================="
- Dir.chdir "#{pkg_path}/test"
- system("make")
- puts "done! hooray! =================================="
-elsif ARGV[0] == 'clean'
- Dir.chdir "#{pkg_path}"
- system("make clean")
- system("rm -rf kdtree2.31")
- system("rm include/kdtree/kdtree2.hpp")
- Dir.chdir "#{pkg_path}/test"
- system("make clean")
- puts "done!"
-else
- puts "unknown parameter: #{ARGV[0]}"
-end
-
Copied: pkg/branches/rosbus/kdtree/rosbuild (from rev 216, pkg/trunk/kdtree/rosbuild)
===================================================================
--- pkg/branches/rosbus/kdtree/rosbuild (rev 0)
+++ pkg/branches/rosbus/kdtree/rosbuild 2008-04-28 23:25:10 UTC (rev 217)
@@ -0,0 +1,36 @@
+#!/usr/bin/env ruby
+require 'fileutils.rb'
+
+pkg_path = File.expand_path($0).split('/')
+pkg_path = pkg_path[0,pkg_path.length-1].join('/')
+puts "package path: [#{pkg_path}]"
+if pkg_path.length < 1
+ puts "woah! package path looks scary. something isn't right. bailing..."
+ exit
+end
+
+Dir.chdir(pkg_path)
+# TODO make sure we got there
+
+if ARGV.length == 0 || ARGV[0] == 'update'
+ puts "extracting KDTree ============================"
+ system("tar xzvf kdtree2.tar.gz")
+ system("cp kdtree2.31/src-c++/kdtree2.hpp include/kdtree/")
+ puts "making kdtree2 ================================="
+ system("make")
+ puts "building test ================================="
+ Dir.chdir "#{pkg_path}/test"
+ system("make")
+ puts "done! hooray! =================================="
+elsif ARGV[0] == 'clean'
+ Dir.chdir "#{pkg_path}"
+ system("make clean")
+ system("rm -rf kdtree2.31")
+ system("rm include/kdtree/kdtree2.hpp")
+ Dir.chdir "#{pkg_path}/test"
+ system("make clean")
+ puts "done!"
+else
+ puts "unknown parameter: #{ARGV[0]}"
+end
+
Copied: pkg/branches/rosbus/kdtree/test (from rev 216, pkg/trunk/kdtree/test)
Deleted: pkg/branches/rosbus/kdtree/test/Makefile
===================================================================
--- pkg/trunk/kdtree/test/Makefile 2008-04-28 23:13:16 UTC (rev 216)
+++ pkg/branches/rosbus/kdtree/test/Makefile 2008-04-28 23:25:10 UTC (rev 217)
@@ -1,4 +0,0 @@
-SRC = test.cpp
-OUT = test
-PKG = kdtree
-include $(shell $(ROS_ROOT)/rospack find roscpp)/make_include/node.mk
Copied: pkg/branches/rosbus/kdtree/test/Makefile (from rev 216, pkg/trunk/kdtree/test/Makefile)
===================================================================
--- pkg/branches/rosbus/kdtree/test/Makefile (rev 0)
+++ pkg/branches/rosbus/kdtree/test/Makefile 2008-04-28 23:25:10 UTC (rev 217)
@@ -0,0 +1,4 @@
+SRC = test.cpp
+OUT = test
+PKG = kdtree
+include $(shell $(ROS_ROOT)/rospack find roscpp)/make_include/node.mk
Deleted: pkg/branches/rosbus/kdtree/test/test.cpp
===================================================================
--- pkg/trunk/kdtree/test/test.cpp 2008-04-28 23:13:16 UTC (rev 216)
+++ pkg/branches/rosbus/kdtree/test/test.cpp 2008-04-28 23:25:10 UTC (rev 217)
@@ -1,78 +0,0 @@
-#include "kdtree/kdtree2.hpp"
-
-#include <boost/multi_array.hpp>
-#include <boost/random.hpp>
-#include <sys/time.h>
-
-using namespace boost;
-
- double timeval_diff (struct timeval x,
- struct timeval y) {
- double dsec = x.tv_sec - y.tv_sec;
- double dusec = x.tv_usec - y.tv_usec;
- return dsec + dusec/1000000.0;
- }
-
-static minstd_rand generator(42u);
-static uniform_real<> uni_dist(0,1);
-variate_generator<minstd_rand&,uniform_real<> > uni(generator,uni_dist);
-
-float random_variate() {
- // between [0,1)
- return(uni());
-}
-
-//
-// define, for convenience a 2d array of floats.
-//
-typedef multi_array<float,2> array2dfloat;
-
-int main() {
- array2dfloat realdata;
-
- kdtree2* tree;
-
- int N = 1000000;
- int dim = 3;
-
- struct timeval t0, t1;
-
- realdata.resize(extents[N][dim]);
-
- for (int i=0; i<N; i++) {
- for (int j=0; j<dim; j++)
- realdata[i][j] = random_variate();
- }
-
- kdtree2_result_vector result, resultbrute;
-
- cout << "Building tree... ";
-
- gettimeofday(&t0, NULL);
-
- tree = new kdtree2(realdata,true);
- tree->sort_results = false;
-
- gettimeofday(&t1, NULL);
- cout << timeval_diff(t1, t0) << endl;
-
- int nn = 1;
-
- // tree->n_nearest_around_point(150000,1,nn,result);
-
- cout << "Finding nearest... ";
-
...
[truncated message content] |
|
From: <ge...@us...> - 2008-04-29 22:21:11
|
Revision: 228
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=228&view=rev
Author: gerkey
Date: 2008-04-29 15:21:19 -0700 (Tue, 29 Apr 2008)
Log Message:
-----------
moved hokuyourg_player into drivers/laser
Added Paths:
-----------
pkg/branches/rosbus/drivers/laser/hokuyourg_player/
pkg/branches/rosbus/drivers/laser/hokuyourg_player/Makefile
pkg/branches/rosbus/drivers/laser/hokuyourg_player/hokuyourg_player.cc
pkg/branches/rosbus/drivers/laser/hokuyourg_player/manifest.xml
Removed Paths:
-------------
pkg/branches/rosbus/drivers/laser/hokuyourg_player/Makefile
pkg/branches/rosbus/drivers/laser/hokuyourg_player/hokuyourg_player.cc
pkg/branches/rosbus/drivers/laser/hokuyourg_player/manifest.xml
pkg/branches/rosbus/hokuyourg_player/
Copied: pkg/branches/rosbus/drivers/laser/hokuyourg_player (from rev 223, pkg/branches/rosbus/hokuyourg_player)
Deleted: pkg/branches/rosbus/drivers/laser/hokuyourg_player/Makefile
===================================================================
--- pkg/branches/rosbus/hokuyourg_player/Makefile 2008-04-29 20:38:29 UTC (rev 223)
+++ pkg/branches/rosbus/drivers/laser/hokuyourg_player/Makefile 2008-04-29 22:21:19 UTC (rev 228)
@@ -1,12 +0,0 @@
-PKG = hokuyourg_player
-CXX = g++
-all: $(PKG)
-
-CFLAGS = -g -Wall -Werror `pkg-config --cflags-only-I playercore` `rospack export/cpp/cflags $(PKG)`
-LFLAGS = `pkg-config --libs-only-L playercore` -lurglaser_standalone `rospack export/cpp/lflags $(PKG)`
-
-hokuyourg_player: hokuyourg_player.cc
- $(CXX) $(CFLAGS) -o $@ $< $(LFLAGS)
-
-clean:
- rm -f *.o $(PKG)
Copied: pkg/branches/rosbus/drivers/laser/hokuyourg_player/Makefile (from rev 227, pkg/branches/rosbus/hokuyourg_player/Makefile)
===================================================================
--- pkg/branches/rosbus/drivers/laser/hokuyourg_player/Makefile (rev 0)
+++ pkg/branches/rosbus/drivers/laser/hokuyourg_player/Makefile 2008-04-29 22:21:19 UTC (rev 228)
@@ -0,0 +1,14 @@
+PKG = hokuyourg_player
+CXX = g++
+all: $(PKG)
+
+#CFLAGS = -g -Wall -Werror `pkg-config --cflags-only-I playercore` `rospack export/cpp/cflags $(PKG)`
+#LFLAGS = `pkg-config --libs-only-L playercore` -lurglaser_standalone `rospack export/cpp/lflags $(PKG)`
+CFLAGS = -g -Wall -Werror `rospack export/cpp/cflags $(PKG)`
+LFLAGS = `rospack export/cpp/lflags $(PKG)` -lurglaser_standalone
+
+hokuyourg_player: hokuyourg_player.cc
+ $(CXX) $(CFLAGS) -o $@ $< $(LFLAGS)
+
+clean:
+ rm -f *.o $(PKG)
Deleted: pkg/branches/rosbus/drivers/laser/hokuyourg_player/hokuyourg_player.cc
===================================================================
--- pkg/branches/rosbus/hokuyourg_player/hokuyourg_player.cc 2008-04-29 20:38:29 UTC (rev 223)
+++ pkg/branches/rosbus/drivers/laser/hokuyourg_player/hokuyourg_player.cc 2008-04-29 22:21:19 UTC (rev 228)
@@ -1,128 +0,0 @@
-#include <assert.h>
-
-#include <libstandalone_drivers/urg_laser.h>
-
-#include <ros/node.h>
-#include <std_msgs/MsgLaserScan.h>
-
-class HokuyoNode: public ros::node
-{
- private:
- urg_laser_readings_t* readings;
- urg_laser_config_t cfg;
- bool running;
- unsigned int scanid;
-
- public:
- urg_laser urg;
- MsgLaserScan scan;
- double min_ang;
- double max_ang;
- string port;
-
- HokuyoNode() : ros::node("urglaser")
- {
- advertise("scan", scan);
-
- // TODO: add min/max angle support
- /*
- if (!get_double_param(".min_ang", &min_ang))
- min_ang = -90;
- printf("Setting min_ang to: %g\n",min_ang);
-
- if (!get_double_param(".max_ang", &max_ang))
- max_ang = 90;
- printf("Setting max_ang to: %g\n",max_ang);
- */
-
- if (!has_param("port") || !get_param("port", port))
- port = "/dev/ttyACM0";
- printf("Setting port to: %s\n",port.c_str());
-
- readings = new urg_laser_readings_t;
- assert(readings);
- running = false;
- scanid = 0;
- }
-
- ~HokuyoNode()
- {
- stop();
- delete readings;
- }
-
- int start()
- {
- stop();
- if((urg.Open(port.c_str(),0,0) < 0) || (urg.GetSensorConfig(&cfg) < 0))
- {
- puts("error connecting to laser");
- return(-1);
- }
- running = true;
- return(0);
- }
-
- int stop()
- {
- if(running)
- {
- urg.Close();
- running = false;
- }
- return(0);
- }
-
- int publish_scan()
- {
- // TODO: add support for pushing readings out
- int numreadings;
- if((numreadings = urg.GetReadings(readings,-1,-1)) < 0)
- {
- puts("error getting scan");
- return(numreadings);
- }
-
- printf("%d readings\n", numreadings);
-
- scan.angle_min = cfg.min_angle;
- scan.angle_max = cfg.max_angle;
- scan.angle_increment = cfg.resolution;
- scan.range_max = cfg.max_range;
- scan.id = scanid++;
- scan.set_ranges_size(numreadings);
- scan.set_intensities_size(numreadings);
-
- for(int i = 0; i < numreadings; ++i)
- {
- scan.ranges[i] = readings->Readings[i] < 20 ? (scan.range_max*1000) : (readings->Readings[i]);
- scan.ranges[i] /= 1000;
- // TODO: add intensity support
- scan.intensities[i] = 0;
- }
- publish("scan", scan);
- return(0);
- }
-};
-
-int
-main(int argc, char** argv)
-{
- ros::init(argc, argv);
-
- HokuyoNode hn;
-
- // Start up the laser
- if(hn.start() != 0)
- exit(-1);
-
- for(;;)
- {
- if(hn.publish_scan() < 0)
- break;
- }
-
- hn.stop();
-
- return(0);
-}
Copied: pkg/branches/rosbus/drivers/laser/hokuyourg_player/hokuyourg_player.cc (from rev 227, pkg/branches/rosbus/hokuyourg_player/hokuyourg_player.cc)
===================================================================
--- pkg/branches/rosbus/drivers/laser/hokuyourg_player/hokuyourg_player.cc (rev 0)
+++ pkg/branches/rosbus/drivers/laser/hokuyourg_player/hokuyourg_player.cc 2008-04-29 22:21:19 UTC (rev 228)
@@ -0,0 +1,128 @@
+#include <assert.h>
+
+#include <libstandalone_drivers/urg_laser.h>
+
+#include <ros/node.h>
+#include <std_msgs/MsgLaserScan.h>
+
+class HokuyoNode: public ros::node
+{
+ private:
+ urg_laser_readings_t* readings;
+ urg_laser_config_t cfg;
+ bool running;
+ unsigned int scanid;
+
+ public:
+ urg_laser urg;
+ MsgLaserScan scan;
+ double min_ang;
+ double max_ang;
+ string port;
+
+ HokuyoNode() : ros::node("urglaser")
+ {
+ advertise("scan", scan);
+
+ // TODO: add min/max angle support
+ /*
+ if (!get_double_param(".min_ang", &min_ang))
+ min_ang = -90;
+ printf("Setting min_ang to: %g\n",min_ang);
+
+ if (!get_double_param(".max_ang", &max_ang))
+ max_ang = 90;
+ printf("Setting max_ang to: %g\n",max_ang);
+ */
+
+ if (!has_param("port") || !get_param("port", port))
+ port = "/dev/ttyACM0";
+ printf("Setting port to: %s\n",port.c_str());
+
+ readings = new urg_laser_readings_t;
+ assert(readings);
+ running = false;
+ scanid = 0;
+ }
+
+ ~HokuyoNode()
+ {
+ stop();
+ delete readings;
+ }
+
+ int start()
+ {
+ stop();
+ if((urg.Open(port.c_str(),0,0) < 0) || (urg.GetSensorConfig(&cfg) < 0))
+ {
+ puts("error connecting to laser");
+ return(-1);
+ }
+ running = true;
+ return(0);
+ }
+
+ int stop()
+ {
+ if(running)
+ {
+ urg.Close();
+ running = false;
+ }
+ return(0);
+ }
+
+ int publish_scan()
+ {
+ // TODO: add support for pushing readings out
+ int numreadings;
+ if((numreadings = urg.GetReadings(readings,-1,-1)) < 0)
+ {
+ puts("error getting scan");
+ return(numreadings);
+ }
+
+ printf("%d readings\n", numreadings);
+
+ scan.angle_min = cfg.min_angle;
+ scan.angle_max = cfg.max_angle;
+ scan.angle_increment = cfg.resolution;
+ scan.range_max = cfg.max_range;
+ scan.id = scanid++;
+ scan.set_ranges_size(numreadings);
+ scan.set_intensities_size(numreadings);
+
+ for(int i = 0; i < numreadings; ++i)
+ {
+ scan.ranges[i] = readings->Readings[i] < 20 ? (scan.range_max*1000) : (readings->Readings[i]);
+ scan.ranges[i] /= 1000;
+ // TODO: add intensity support
+ scan.intensities[i] = 0;
+ }
+ publish("scan", scan);
+ return(0);
+ }
+};
+
+int
+main(int argc, char** argv)
+{
+ ros::init(argc, argv);
+
+ HokuyoNode hn;
+
+ // Start up the laser
+ if(hn.start() != 0)
+ exit(-1);
+
+ for(;;)
+ {
+ if(hn.publish_scan() < 0)
+ break;
+ }
+
+ hn.stop();
+
+ return(0);
+}
Deleted: pkg/branches/rosbus/drivers/laser/hokuyourg_player/manifest.xml
===================================================================
--- pkg/branches/rosbus/hokuyourg_player/manifest.xml 2008-04-29 20:38:29 UTC (rev 223)
+++ pkg/branches/rosbus/drivers/laser/hokuyourg_player/manifest.xml 2008-04-29 22:21:19 UTC (rev 228)
@@ -1,7 +0,0 @@
-<package>
- <description>A ROS node that wraps up the Player urglaser driver, which provides access to a wide range of Hokuyo URG lasers.</description>
- <author>Brian P. Gerkey</author>
- <license>BSD</license>
- <depend package="roscpp" />
- <depend package="std_msgs" />
-</package>
Copied: pkg/branches/rosbus/drivers/laser/hokuyourg_player/manifest.xml (from rev 227, pkg/branches/rosbus/hokuyourg_player/manifest.xml)
===================================================================
--- pkg/branches/rosbus/drivers/laser/hokuyourg_player/manifest.xml (rev 0)
+++ pkg/branches/rosbus/drivers/laser/hokuyourg_player/manifest.xml 2008-04-29 22:21:19 UTC (rev 228)
@@ -0,0 +1,8 @@
+<package>
+ <description>A ROS node that wraps up the Player urglaser driver, which provides access to a wide range of Hokuyo URG lasers.</description>
+ <author>Brian P. Gerkey</author>
+ <license>BSD</license>
+ <depend package="roscpp" />
+ <depend package="player" />
+ <depend package="std_msgs" />
+</package>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2008-04-29 22:58:35
|
Revision: 231
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=231&view=rev
Author: gerkey
Date: 2008-04-29 15:58:41 -0700 (Tue, 29 Apr 2008)
Log Message:
-----------
moving nodes to unported
Added Paths:
-----------
pkg/branches/rosbus/unported/IBPSBatteryInterface/
pkg/branches/rosbus/unported/camera_calibration/
pkg/branches/rosbus/unported/cpp_template/
pkg/branches/rosbus/unported/elphel_cam/
pkg/branches/rosbus/unported/erratic_player/
pkg/branches/rosbus/unported/etherdrive/
Removed Paths:
-------------
pkg/branches/rosbus/IBPSBatteryInterface/
pkg/branches/rosbus/camera_calibration/
pkg/branches/rosbus/cpp_template/
pkg/branches/rosbus/elphel_cam/
pkg/branches/rosbus/erratic_player/
pkg/branches/rosbus/etherdrive/
Copied: pkg/branches/rosbus/unported/IBPSBatteryInterface (from rev 229, pkg/branches/rosbus/IBPSBatteryInterface)
Copied: pkg/branches/rosbus/unported/camera_calibration (from rev 229, pkg/branches/rosbus/camera_calibration)
Copied: pkg/branches/rosbus/unported/cpp_template (from rev 229, pkg/branches/rosbus/cpp_template)
Copied: pkg/branches/rosbus/unported/elphel_cam (from rev 229, pkg/branches/rosbus/elphel_cam)
Copied: pkg/branches/rosbus/unported/erratic_player (from rev 229, pkg/branches/rosbus/erratic_player)
Copied: pkg/branches/rosbus/unported/etherdrive (from rev 229, pkg/branches/rosbus/etherdrive)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2008-04-29 23:03:04
|
Revision: 232
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=232&view=rev
Author: gerkey
Date: 2008-04-29 16:03:09 -0700 (Tue, 29 Apr 2008)
Log Message:
-----------
moving nodes to unported
Added Paths:
-----------
pkg/branches/rosbus/unported/exploreGraph/
pkg/branches/rosbus/unported/exploreGraph/doc/
pkg/branches/rosbus/unported/exploreGraph/flows/
pkg/branches/rosbus/unported/exploreGraph/lib/
pkg/branches/rosbus/unported/exploreGraph/manifest.xml
pkg/branches/rosbus/unported/exploreGraph/nodes/
pkg/branches/rosbus/unported/exploreGraph/rosbuild
pkg/branches/rosbus/unported/exploreGraph/src/
pkg/branches/rosbus/unported/gmapping/
pkg/branches/rosbus/unported/gmapping/Makefile
pkg/branches/rosbus/unported/gmapping/TODO.txt
pkg/branches/rosbus/unported/gmapping/bin/
pkg/branches/rosbus/unported/gmapping/build_tools/
pkg/branches/rosbus/unported/gmapping/carmenwrapper/
pkg/branches/rosbus/unported/gmapping/configfile/
pkg/branches/rosbus/unported/gmapping/configure
pkg/branches/rosbus/unported/gmapping/docs/
pkg/branches/rosbus/unported/gmapping/gfs-carmen/
pkg/branches/rosbus/unported/gmapping/grid/
pkg/branches/rosbus/unported/gmapping/gridfastslam/
pkg/branches/rosbus/unported/gmapping/gui/
pkg/branches/rosbus/unported/gmapping/ini/
pkg/branches/rosbus/unported/gmapping/lib/
pkg/branches/rosbus/unported/gmapping/log/
pkg/branches/rosbus/unported/gmapping/manual.mk
pkg/branches/rosbus/unported/gmapping/manual.mk-template
pkg/branches/rosbus/unported/gmapping/particlefilter/
pkg/branches/rosbus/unported/gmapping/playerwrapper/
pkg/branches/rosbus/unported/gmapping/scanmatcher/
pkg/branches/rosbus/unported/gmapping/sensor/
pkg/branches/rosbus/unported/gmapping/setlibpath
pkg/branches/rosbus/unported/gmapping/utils/
pkg/branches/rosbus/unported/linuxjoystick_player/
pkg/branches/rosbus/unported/range_flows/
pkg/branches/rosbus/unported/simple_sdl_gui/
Removed Paths:
-------------
pkg/branches/rosbus/exploreGraph/
pkg/branches/rosbus/gmapping/
pkg/branches/rosbus/linuxjoystick_player/
pkg/branches/rosbus/range_flows/
pkg/branches/rosbus/simple_sdl_gui/
pkg/branches/rosbus/unported/exploreGraph/doc/
pkg/branches/rosbus/unported/exploreGraph/flows/
pkg/branches/rosbus/unported/exploreGraph/lib/
pkg/branches/rosbus/unported/exploreGraph/manifest.xml
pkg/branches/rosbus/unported/exploreGraph/nodes/
pkg/branches/rosbus/unported/exploreGraph/rosbuild
pkg/branches/rosbus/unported/exploreGraph/src/
pkg/branches/rosbus/unported/gmapping/Makefile
pkg/branches/rosbus/unported/gmapping/TODO.txt
pkg/branches/rosbus/unported/gmapping/bin/
pkg/branches/rosbus/unported/gmapping/build_tools/
pkg/branches/rosbus/unported/gmapping/carmenwrapper/
pkg/branches/rosbus/unported/gmapping/configfile/
pkg/branches/rosbus/unported/gmapping/configure
pkg/branches/rosbus/unported/gmapping/docs/
pkg/branches/rosbus/unported/gmapping/gfs-carmen/
pkg/branches/rosbus/unported/gmapping/grid/
pkg/branches/rosbus/unported/gmapping/gridfastslam/
pkg/branches/rosbus/unported/gmapping/gui/
pkg/branches/rosbus/unported/gmapping/ini/
pkg/branches/rosbus/unported/gmapping/lib/
pkg/branches/rosbus/unported/gmapping/log/
pkg/branches/rosbus/unported/gmapping/manual.mk
pkg/branches/rosbus/unported/gmapping/manual.mk-template
pkg/branches/rosbus/unported/gmapping/particlefilter/
pkg/branches/rosbus/unported/gmapping/playerwrapper/
pkg/branches/rosbus/unported/gmapping/scanmatcher/
pkg/branches/rosbus/unported/gmapping/sensor/
pkg/branches/rosbus/unported/gmapping/setlibpath
pkg/branches/rosbus/unported/gmapping/utils/
Copied: pkg/branches/rosbus/unported/exploreGraph (from rev 229, pkg/branches/rosbus/exploreGraph)
Copied: pkg/branches/rosbus/unported/exploreGraph/doc (from rev 231, pkg/branches/rosbus/exploreGraph/doc)
Copied: pkg/branches/rosbus/unported/exploreGraph/flows (from rev 231, pkg/branches/rosbus/exploreGraph/flows)
Copied: pkg/branches/rosbus/unported/exploreGraph/lib (from rev 231, pkg/branches/rosbus/exploreGraph/lib)
Deleted: pkg/branches/rosbus/unported/exploreGraph/manifest.xml
===================================================================
--- pkg/branches/rosbus/exploreGraph/manifest.xml 2008-04-29 22:32:30 UTC (rev 229)
+++ pkg/branches/rosbus/unported/exploreGraph/manifest.xml 2008-04-29 23:03:09 UTC (rev 232)
@@ -1,8 +0,0 @@
-<package>
- <description brief='This is a package to display the ROS Graph'></description>
- <author>Tully Foote tfoote at willowgarage.com</author>
- <license>BSD</license>
- <depend package="rospy" />
- <depend package="rospy_demo" />
- <depend package="pyImageViewer" />
-</package>
\ No newline at end of file
Copied: pkg/branches/rosbus/unported/exploreGraph/manifest.xml (from rev 231, pkg/branches/rosbus/exploreGraph/manifest.xml)
===================================================================
--- pkg/branches/rosbus/unported/exploreGraph/manifest.xml (rev 0)
+++ pkg/branches/rosbus/unported/exploreGraph/manifest.xml 2008-04-29 23:03:09 UTC (rev 232)
@@ -0,0 +1,8 @@
+<package>
+ <description brief='This is a package to display the ROS Graph'></description>
+ <author>Tully Foote tfoote at willowgarage.com</author>
+ <license>BSD</license>
+ <depend package="rospy" />
+ <depend package="rospy_demo" />
+ <depend package="pyImageViewer" />
+</package>
\ No newline at end of file
Copied: pkg/branches/rosbus/unported/exploreGraph/nodes (from rev 231, pkg/branches/rosbus/exploreGraph/nodes)
Deleted: pkg/branches/rosbus/unported/exploreGraph/rosbuild
===================================================================
--- pkg/branches/rosbus/exploreGraph/rosbuild 2008-04-29 22:32:30 UTC (rev 229)
+++ pkg/branches/rosbus/unported/exploreGraph/rosbuild 2008-04-29 23:03:09 UTC (rev 232)
@@ -1,36 +0,0 @@
-#!/usr/bin/env ruby
-
-if !ENV['ROS_ROOT']
- puts "aaaaaaa! The ROS_ROOT environment variable is not set."
- puts "Navigate to your ROS_ROOT directory and run ./set_ros_root"
- puts "(alternatively, you can do this in your .bashrc file"
- exit
-end
-
-pkg_path = File.expand_path($0).split('/')
-pkg_path = pkg_path[0,pkg_path.length-1].join('/')
-
-if ARGV.length == 0 || ARGV[0] == 'update'
- puts "generating flows..."
- # look up the latest versions of rosrb and rospy
- rosrb = `#{ENV['ROS_ROOT']}/rospack latest rosrb`.chomp
- rospy = `#{ENV['ROS_ROOT']}/rospack latest rospy`.chomp
- puts `#{rospy}/scripts/flowgen_py #{pkg_path}/flows/*.flow`
- puts `#{rosrb}/scripts/flowgen_rb #{pkg_path}/flows/*.flow`
-elsif ARGV[0] == 'clean'
- puts "cleaning auto-generated flows..."
- # string hackery to generate the same filenames the flow generators do
- pkg = File.expand_path($0).split('/')[-2]
- Dir.glob("#{pkg_path}/flows/*.flow").each do |f|
- f = f.split('/')[-1]
- f[-5,:end] = ''
- puts "deleting auto-generated flows for flow #{f}"
- `rm #{pkg_path}/flows/python/#{pkg}/#{f}.py` if File.exist? "#{pkg_path}/flows/python/#{pkg}/#{f}.py"
- `rm #{pkg_path}/flows/python/#{pkg}/#{f}.pyc` if File.exist? "#{pkg_path}/flows/python/#{pkg}/#{f}.pyc"
- `rm #{pkg_path}/flows/ruby/#{pkg}/Flow#{f}.rb` if File.exist? "#{pkg_path}/flows/ruby/#{pkg}/Flow#{f}.rb"
- end
- `rm #{pkg_path}/flows/python/#{pkg}/__init__.py` if File.exist? "#{pkg_path}/flows/python/#{pkg}/__init__.py"
- `rm #{pkg_path}/flows/python/#{pkg}/__init__.pyc` if File.exist? "#{pkg_path}/flows/python/#{pkg}/__init__.pyc"
-else
- puts "unknown parameter: #{ARGV[0]}"
-end
Copied: pkg/branches/rosbus/unported/exploreGraph/rosbuild (from rev 231, pkg/branches/rosbus/exploreGraph/rosbuild)
===================================================================
--- pkg/branches/rosbus/unported/exploreGraph/rosbuild (rev 0)
+++ pkg/branches/rosbus/unported/exploreGraph/rosbuild 2008-04-29 23:03:09 UTC (rev 232)
@@ -0,0 +1,36 @@
+#!/usr/bin/env ruby
+
+if !ENV['ROS_ROOT']
+ puts "aaaaaaa! The ROS_ROOT environment variable is not set."
+ puts "Navigate to your ROS_ROOT directory and run ./set_ros_root"
+ puts "(alternatively, you can do this in your .bashrc file"
+ exit
+end
+
+pkg_path = File.expand_path($0).split('/')
+pkg_path = pkg_path[0,pkg_path.length-1].join('/')
+
+if ARGV.length == 0 || ARGV[0] == 'update'
+ puts "generating flows..."
+ # look up the latest versions of rosrb and rospy
+ rosrb = `#{ENV['ROS_ROOT']}/rospack latest rosrb`.chomp
+ rospy = `#{ENV['ROS_ROOT']}/rospack latest rospy`.chomp
+ puts `#{rospy}/scripts/flowgen_py #{pkg_path}/flows/*.flow`
+ puts `#{rosrb}/scripts/flowgen_rb #{pkg_path}/flows/*.flow`
+elsif ARGV[0] == 'clean'
+ puts "cleaning auto-generated flows..."
+ # string hackery to generate the same filenames the flow generators do
+ pkg = File.expand_path($0).split('/')[-2]
+ Dir.glob("#{pkg_path}/flows/*.flow").each do |f|
+ f = f.split('/')[-1]
+ f[-5,:end] = ''
+ puts "deleting auto-generated flows for flow #{f}"
+ `rm #{pkg_path}/flows/python/#{pkg}/#{f}.py` if File.exist? "#{pkg_path}/flows/python/#{pkg}/#{f}.py"
+ `rm #{pkg_path}/flows/python/#{pkg}/#{f}.pyc` if File.exist? "#{pkg_path}/flows/python/#{pkg}/#{f}.pyc"
+ `rm #{pkg_path}/flows/ruby/#{pkg}/Flow#{f}.rb` if File.exist? "#{pkg_path}/flows/ruby/#{pkg}/Flow#{f}.rb"
+ end
+ `rm #{pkg_path}/flows/python/#{pkg}/__init__.py` if File.exist? "#{pkg_path}/flows/python/#{pkg}/__init__.py"
+ `rm #{pkg_path}/flows/python/#{pkg}/__init__.pyc` if File.exist? "#{pkg_path}/flows/python/#{pkg}/__init__.pyc"
+else
+ puts "unknown parameter: #{ARGV[0]}"
+end
Copied: pkg/branches/rosbus/unported/exploreGraph/src (from rev 231, pkg/branches/rosbus/exploreGraph/src)
Copied: pkg/branches/rosbus/unported/gmapping (from rev 229, pkg/branches/rosbus/gmapping)
Deleted: pkg/branches/rosbus/unported/gmapping/Makefile
===================================================================
--- pkg/branches/rosbus/gmapping/Makefile 2008-04-29 22:32:30 UTC (rev 229)
+++ pkg/branches/rosbus/unported/gmapping/Makefile 2008-04-29 23:03:09 UTC (rev 232)
@@ -1,21 +0,0 @@
--include ./global.mk
-
-ifeq ($(CARMENSUPPORT),1)
-SUBDIRS=utils sensor log configfile scanmatcher carmenwrapper gridfastslam gui gfs-carmen
-else
-ifeq ($(PLAYERSUPPORT),1)
-SUBDIRS=utils sensor log configfile scanmatcher gridfastslam playerwrapper gui
-else
-ifeq ($(MACOSX),1)
-SUBDIRS=utils sensor log configfile scanmatcher gridfastslam
-else
-SUBDIRS=utils sensor log configfile scanmatcher gridfastslam gui
-endif
-endif
-endif
-
-LDFLAGS+=
-CPPFLAGS+= -I../sensor
-
--include ./build_tools/Makefile.subdirs
-
Copied: pkg/branches/rosbus/unported/gmapping/Makefile (from rev 231, pkg/branches/rosbus/gmapping/Makefile)
===================================================================
--- pkg/branches/rosbus/unported/gmapping/Makefile (rev 0)
+++ pkg/branches/rosbus/unported/gmapping/Makefile 2008-04-29 23:03:09 UTC (rev 232)
@@ -0,0 +1,21 @@
+-include ./global.mk
+
+ifeq ($(CARMENSUPPORT),1)
+SUBDIRS=utils sensor log configfile scanmatcher carmenwrapper gridfastslam gui gfs-carmen
+else
+ifeq ($(PLAYERSUPPORT),1)
+SUBDIRS=utils sensor log configfile scanmatcher gridfastslam playerwrapper gui
+else
+ifeq ($(MACOSX),1)
+SUBDIRS=utils sensor log configfile scanmatcher gridfastslam
+else
+SUBDIRS=utils sensor log configfile scanmatcher gridfastslam gui
+endif
+endif
+endif
+
+LDFLAGS+=
+CPPFLAGS+= -I../sensor
+
+-include ./build_tools/Makefile.subdirs
+
Deleted: pkg/branches/rosbus/unported/gmapping/TODO.txt
===================================================================
--- pkg/branches/rosbus/gmapping/TODO.txt 2008-04-29 22:32:30 UTC (rev 229)
+++ pkg/branches/rosbus/unported/gmapping/TODO.txt 2008-04-29 23:03:09 UTC (rev 232)
@@ -1,21 +0,0 @@
-TODO-List for gmapping (and partly explore)
---------------------------------------------
-
-open:
------
-
-1. implement a working(!) ancestry tree
-
-2. compute trajectory uncertainty based on the
- ancestry tree formula
-
-3. possibility to choose the way the pose uncertainty
- for a particle set is computed (grid vs set of
- gaussians)
-
-4. Fix the NAN Problem with the pose uncertainty with gaussians
-
-done:
------
-
-(move the done stuff down here)
\ No newline at end of file
Copied: pkg/branches/rosbus/unported/gmapping/TODO.txt (from rev 231, pkg/branches/rosbus/gmapping/TODO.txt)
===================================================================
--- pkg/branches/rosbus/unported/gmapping/TODO.txt (rev 0)
+++ pkg/branches/rosbus/unported/gmapping/TODO.txt 2008-04-29 23:03:09 UTC (rev 232)
@@ -0,0 +1,21 @@
+TODO-List for gmapping (and partly explore)
+--------------------------------------------
+
+open:
+-----
+
+1. implement a working(!) ancestry tree
+
+2. compute trajectory uncertainty based on the
+ ancestry tree formula
+
+3. possibility to choose the way the pose uncertainty
+ for a particle set is computed (grid vs set of
+ gaussians)
+
+4. Fix the NAN Problem with the pose uncertainty with gaussians
+
+done:
+-----
+
+(move the done stuff down here)
\ No newline at end of file
Copied: pkg/branches/rosbus/unported/gmapping/bin (from rev 231, pkg/branches/rosbus/gmapping/bin)
Copied: pkg/branches/rosbus/unported/gmapping/build_tools (from rev 231, pkg/branches/rosbus/gmapping/build_tools)
Copied: pkg/branches/rosbus/unported/gmapping/carmenwrapper (from rev 231, pkg/branches/rosbus/gmapping/carmenwrapper)
Copied: pkg/branches/rosbus/unported/gmapping/configfile (from rev 231, pkg/branches/rosbus/gmapping/configfile)
Deleted: pkg/branches/rosbus/unported/gmapping/configure
===================================================================
--- pkg/branches/rosbus/gmapping/configure 2008-04-29 22:32:30 UTC (rev 229)
+++ pkg/branches/rosbus/unported/gmapping/configure 2008-04-29 23:03:09 UTC (rev 232)
@@ -1,256 +0,0 @@
-#!/bin/bash
-#if [ "$UID" = 0 ]; then echo "Please don't run configure as root"; exit 1; fi
-
-LINUX=0
-MACOSX=0
-
-if [ `uname` = "Linux" ]; then
- LINUX=1
- OSTYPE=LINUX
- CPPFLAGS="-DLINUX"
-fi
-if [ `uname` = "Darwin" ]; then
- MACOSX=1
- CPPFLAGS="-DMACOSX"
- OSTYPE=MACOSX
-fi
-
-if [ ! $CXX ]; then
- echo "No 'CXX' environment variable found, using g++.";
- CXX="g++"
-fi
-
-if [ ! $CC ]; then
- echo "No 'CC' environment variable found, using gcc.";
- CC="gcc"
-fi
-
-if [ ! -x `which $CXX` ]; then
- echo "Can't execute C++ compiler '$CXX'.";
- exit 1;
-else
- echo "Using C++ compiler: $CXX"
-fi
-
-if [ ! -x `which $CC` ]; then
- echo "Can't execute C++ compiler '$CC'.";
- exit 1;
-else
- echo "Using C compiler: $CC"
-fi
-
-GCC_VERSION=`$CXX --version`
-
-echo -n "Checking for Qt 3.x ... "
-for GUESS_QTDIR in `ls /usr/lib/ | grep -E "qt3|qt-3"`; do
- if [ -d /usr/lib/$GUESS_QTDIR/include -a -d /usr/lib/$GUESS_QTDIR/lib -a -f /usr/lib/$GUESS_QTDIR/bin/moc ]; then
- QT_INCLUDE="-I /usr/lib/$GUESS_QTDIR/include"
- QT_LIB="-L /usr/lib/$GUESS_QTDIR/lib -lqt-mt" ;
- MOC="/usr/lib/$GUESS_QTDIR/bin/moc" ;
- fi ;
-done ;
-if [ ! "$QT_INCLUDE" ]; then
- echo -e "\n\n*** Qt 3.x not found. I'll make some educated guesses. If this doesn't work, please set QT_INCLUDE, QT_LIB, MOC by hand in the file global.mk.\n\a"
- #exit 1
- QT_INCLUDE="-I/usr/include/qt3";
- QT_LIB="-lqt-mt" ;
- MOC="moc" ;
-else
- echo "Ok" ;
-fi
-
-ARIASUPPORT="0"
-echo -n "Checking for Aria libs "
-for GUESS_ARIADIR in `ls /usr/local/ | grep -E "Aria"`; do
- if [ -d /usr/local/$GUESS_ARIADIR/include -a -d /usr/local/$GUESS_ARIADIR/lib ]; then
- ARIA_INCLUDE="-I/usr/local/$GUESS_ARIADIR/include"
- ARIA_LIB="-L/usr/local/$GUESS_ARIADIR/lib -lAria"
- ARIASUPPORT="1"
- fi ;
-done ;
-
-if [ ! "$ARIA_INCLUDE" ]; then
- echo -e "\n\n*** ARIA not found, please set ARIA_INCLUDE and ARIA_LIB by hand\n\a"
-else
- echo "Ok" ;
-fi
-
-#echo -n "Checking for Gsl libs "
-#if [ "$OSTYPE" = "LINUX" ]; then
-# GSL_LIB="-lgsl -lgslcblas"
-# GSL_INCLUDE="-I/usr/include/"
-#fi
-#if [ "$OSTYPE" = "MACOSX" ]; then
-# GSL_LIB="-L/sw/lib -lgsl -lgslcblas"
-# GSL_INCLUDE="-I/sw/include"
-#fi
-#
-#if [ ! "$GSL_INCLUDE" ]; then
-# echo -e "\n\n*** GSL not found, please set GSL_INCLUDE and GSL_LIB by hand\n\a"
-#else
-# echo "Ok" ;
-#fi
-
-
-# echo -n "Checking for KDE 3.x includes ... "
-# for GUESS_KDE_INCLUDE in /usr/include/kde /usr/include/kde3 /opt/kde3/include /opt/kde/include; do
-# if [ -d $GUESS_KDE_INCLUDE ]; then
-# KDE_INCLUDE="-I$GUESS_KDE_INCLUDE"
-# fi ;
-# done ;
-#
-# if [ ! "$KDE_INCLUDE" ]; then
-# echo -e "\n\n*** KDE 3.x includes not found please set KDE_INCLUDE by hand\n\a"
-# exit 1
-# else
-# echo "Ok" ;
-# fi
-#
-# echo -n "Checking for KDE 3.x libs ... "
-# for GUESS_KDE_LIB in /usr/lib/kde3 /opt/kde3/lib; do
-# if [ -d $GUESS_KDE_LIB ]; then
-# KDE_LIB="-L$GUESS_KDE_LIB -lkdeui"
-# fi ;
-# done ;
-#
-# if [ ! "$KDE_LIB" ]; then
-# echo -e "\n\n*** KDE 3.x libs not found please set KDE_LIBS by hand\n\a"
-# exit 1
-# else
-# echo "Ok" ;
-# fi
-
-
-# echo -n "Checking for uic ... "
-# for GUESS_UIC in `ls /usr/bin/ | grep -E "uic|uic3"`; do
-# if [ -f /usr/bin/$GUESS_UIC ]; then
-# UIC=$GUESS_UIC;
-# fi ;
-# done ;
-#
-# if [ ! "$UIC" ]; then
-# echo -e "\n\n*** uic not found please set UIC by hand\n\a"
-# exit 1
-# else
-# echo "Ok" ;
-# fi
-
-MAPPING_ROOT=`pwd`
-
-
-BINDIR=$MAPPING_ROOT/bin
-echo -n "Checking bin directory $BINDIR ... "
-if [ ! -d $BINDIR ]; then
- mkdir $BINDIR
- echo "created."
-else
- echo "Ok."
-fi
-
-LIBDIR=$MAPPING_ROOT/lib
-echo -n "Checking lib directory $LIBDIR ... "
-if [ ! -d $LIBDIR ]; then
- mkdir $LIBDIR
- echo "created."
-else
- echo "Ok."
-fi
-
-CARMENFLAG=""
-CARMENSUPPORT="0"
-CARMEN_LIBS="libnavigator_interface.a libipc.a librobot_interface.a liblaser_interface.a libsimulator_interface.a liblocalize_interface.a libreadlog.a libwritelog.a libglobal.a libipc.a"
-if [ ! "$CARMEN_HOME" ]; then
- echo -e "Carmen NOT FOUND."
- echo -e "If you have a carmen version installed please set the"
- echo -e "CARMEN_HOME variable to the carmen path."
-else
- if [ -d $CARMEN_HOME ]; then
- echo -e "carmen found in $CARMEN_HOME, enabling support"
- CARMENFLAG="-DCARMEN_SUPPORT"
- echo -e "generating shared objects"
- for CARMEN_OBJECT in $CARMEN_LIBS ; do
- if [ -f $CARMEN_HOME/lib/$CARMEN_OBJECT ]; then
- cp $CARMEN_HOME/lib/$CARMEN_OBJECT $LIBDIR
- ./build_tools/generate_shared_object $LIBDIR/$CARMEN_OBJECT
- rm $LIBDIR/$CARMEN_OBJECT
- else
- echo -e "Compile carmen first "$CARMEN_HOME/lib/$CARMEN_OBJECT" not found"
- exit -1
- fi
- done;
- CARMENSUPPORT="1"
- else
- echo -e "CARMEN_HOME=$CARMEN_HOME does not exist, disabling support\n"
- fi
-fi
-
-PLAYERFLAG=""
-PLAYERSUPPORT="0"
-echo -n "Checking for player (pkg-config --libs playercore)..."
-playerlibs=`pkg-config --libs playercore`
-if [ -z "$playerlibs" ]; then
- echo -e "Player not found."
-else
- echo -e "Player found."
- PLAYERFLAG="-DPLAYER_SUPPORT"
- PLAYERSUPPORT="1"
-fi
-
-
-CONFIG=global.mk
-rm -f $CONFIG
-
-cat << EOF > $CONFIG
-### You should not need to change anything below.
-LINUX=$LINUX
-MACOSX=$MACOSX
-
-# Compilers
-CC=$CC
-CXX=$CXX
-
-# Paths
-MAPPING_ROOT=$MAPPING_ROOT
-LIBDIR=$LIBDIR
-BINDIR=$BINDIR
-
-# Build tools
-PRETTY=$MAPPING_ROOT/build_tools/pretty_compiler
-MESSAGE=$MAPPING_ROOT/build_tools/message
-TESTLIB=$MAPPING_ROOT/build_tools/testlib
-
-# QT support
-MOC=$MOC
-QT_LIB=$QT_LIB
-QT_INCLUDE=$QT_INCLUDE
-
-# ARIA support
-ARIA_LIB=$ARIA_LIB
-ARIA_INCLUDE=$ARIA_INCLUDE
-
-
-# # KDE support
-# KDE_LIB=$KDE_LIB
-# KDE_INCLUDE=$KDE_INCLUDE
-# UIC=$UIC
-
-# Generic makefiles
-MAKEFILE_GENERIC=$MAPPING_ROOT/build_tools/Makefile.generic-shared-object
-MAKEFILE_APP=$MAPPING_ROOT/build_tools/Makefile.app
-MAKEFILE_SUBDIRS=$MAPPING_ROOT/build_tools/Makefile.subdirs
-
-
-# Flags
-CPPFLAGS+=$CPPFLAGS -I$MAPPING_ROOT $CARMENFLAG $PLAYERFLAG
-CXXFLAGS+=$CXXFLAGS
-LDFLAGS+=$LDFLAGS -Xlinker -rpath $MAPPING_ROOT/lib
-CARMENSUPPORT=$CARMENSUPPORT
-PLAYERSUPPORT=$PLAYERSUPPORT
-ARIASUPPORT=$ARIASUPPORT
-
-$OTHER
-
-include $MAPPING_ROOT/manual.mk
-
-EOF
-
Copied: pkg/branches/rosbus/unported/gmapping/configure (from rev 231, pkg/branches/rosbus/gmapping/configure)
===================================================================
--- pkg/branches/rosbus/unported/gmapping/configure (rev 0)
+++ pkg/branches/rosbus/unported/gmapping/configure 2008-04-29 23:03:09 UTC (rev 232)
@@ -0,0 +1,256 @@
+#!/bin/bash
+#if [ "$UID" = 0 ]; then echo "Please don't run configure as root"; exit 1; fi
+
+LINUX=0
+MACOSX=0
+
+if [ `uname` = "Linux" ]; then
+ LINUX=1
+ OSTYPE=LINUX
+ CPPFLAGS="-DLINUX"
+fi
+if [ `uname` = "Darwin" ]; then
+ MACOSX=1
+ CPPFLAGS="-DMACOSX"
+ OSTYPE=MACOSX
+fi
+
+if [ ! $CXX ]; then
+ echo "No 'CXX' environment variable found, using g++.";
+ CXX="g++"
+fi
+
+if [ ! $CC ]; then
+ echo "No 'CC' environment variable found, using gcc.";
+ CC="gcc"
+fi
+
+if [ ! -x `which $CXX` ]; then
+ echo "Can't execute C++ compiler '$CXX'.";
+ exit 1;
+else
+ echo "Using C++ compiler: $CXX"
+fi
+
+if [ ! -x `which $CC` ]; then
+ echo "Can't execute C++ compiler '$CC'.";
+ exit 1;
+else
+ echo "Using C compiler: $CC"
+fi
+
+GCC_VERSION=`$CXX --version`
+
+echo -n "Checking for Qt 3.x ... "
+for GUESS_QTDIR in `ls /usr/lib/ | grep -E "qt3|qt-3"`; do
+ if [ -d /usr/lib/$GUESS_QTDIR/include -a -d /usr/lib/$GUESS_QTDIR/lib -a -f /usr/lib/$GUESS_QTDIR/bin/moc ]; then
+ QT_INCLUDE="-I /usr/lib/$GUESS_QTDIR/include"
+ QT_LIB="-L /usr/lib/$GUESS_QTDIR/lib -lqt-mt" ;
+ MOC="/usr/lib/$GUESS_QTDIR/bin/moc" ;
+ fi ;
+done ;
+if [ ! "$QT_INCLUDE" ]; then
+ echo -e "\n\n*** Qt 3.x not found. I'll make some educated guesses. If this doesn't work, please set QT_INCLUDE, QT_LIB, MOC by hand in the file global.mk.\n\a"
+ #exit 1
+ QT_INCLUDE="-I/usr/include/qt3";
+ QT_LIB="-lqt-mt" ;
+ MOC="moc" ;
+else
+ echo "Ok" ;
+fi
+
+ARIASUPPORT="0"
+echo -n "Checking for Aria libs "
+for GUESS_ARIADIR in `ls /usr/local/ | grep -E "Aria"`; do
+ if [ -d /usr/local/$GUESS_ARIADIR/include -a -d /usr/local/$GUESS_ARIADIR/lib ]; then
+ ARIA_INCLUDE="-I/usr/local/$GUESS_ARIADIR/include"
+ ARIA_LIB="-L/usr/local/$GUESS_ARIADIR/lib -lAria"
+ ARIASUPPORT="1"
+ fi ;
+done ;
+
+if [ ! "$ARIA_INCLUDE" ]; then
+ echo -e "\n\n*** ARIA not found, please set ARIA_INCLUDE and ARIA_LIB by hand\n\a"
+else
+ echo "Ok" ;
+fi
+
+#echo -n "Checking for Gsl libs "
+#if [ "$OSTYPE" = "LINUX" ]; then
+# GSL_LIB="-lgsl -lgslcblas"
+# GSL_INCLUDE="-I/usr/include/"
+#fi
+#if [ "$OSTYPE" = "MACOSX" ]; then
+# GSL_LIB="-L/sw/lib -lgsl -lgslcblas"
+# GSL_INCLUDE="-I/sw/include"
+#fi
+#
+#if [ ! "$GSL_INCLUDE" ]; then
+# echo -e "\n\n*** GSL not found, please set GSL_INCLUDE and GSL_LIB by hand\n\a"
+#else
+# echo "Ok" ;
+#fi
+
+
+# echo -n "Checking for KDE 3.x includes ... "
+# for GUESS_KDE_INCLUDE in /usr/include/kde /usr/include/kde3 /opt/kde3/include /opt/kde/include; do
+# if [ -d $GUESS_KDE_INCLUDE ]; then
+# KDE_INCLUDE="-I$GUESS_KDE_INCLUDE"
+# fi ;
+# done ;
+#
+# if [ ! "$KDE_INCLUDE" ]; then
+# echo -e "\n\n*** KDE 3.x includes not found please set KDE_INCLUDE by hand\n\a"
+# exit 1
+# else
+# echo "Ok" ;
+# fi
+#
+# echo -n "Checking for KDE 3.x libs ... "
+# for GUESS_KDE_LIB in /usr/lib/kde3 /opt/kde3/lib; do
+# if [ -d $GUESS_KDE_LIB ]; then
+# KDE_LIB="-L$GUESS_KDE_LIB -lkdeui"
+# fi ;
+# done ;
+#
+# if [ ! "$KDE_LIB" ]; then
+# echo -e "\n\n*** KDE 3.x libs not found please set KDE_LIBS by hand\n\a"
+# exit 1
+# else
+# echo "Ok" ;
+# fi
+
+
+# echo -n "Checking for uic ... "
+# for GUESS_UIC in `ls /usr/bin/ | grep -E "uic|uic3"`; do
+# if [ -f /usr/bin/$GUESS_UIC ]; then
+# UIC=$GUESS_UIC;
+# fi ;
+# done ;
+#
+# if [ ! "$UIC" ]; then
+# echo -e "\n\n*** uic not found please set UIC by hand\n\a"
+# exit 1
+# else
+# echo "Ok" ;
+# fi
+
+MAPPING_ROOT=`pwd`
+
+
+BINDIR=$MAPPING_ROOT/bin
+echo -n "Checking bin directory $BINDIR ... "
+if [ ! -d $BINDIR ]; then
+ mkdir $BINDIR
+ echo "created."
+else
+ echo "Ok."
+fi
+
+LIBDIR=$MAPPING_ROOT/lib
+echo -n "Checking lib directory $LIBDIR ... "
+if [ ! -d $LIBDIR ]; then
+ mkdir $LIBDIR
+ echo "created."
+else
+ echo "Ok."
+fi
+
+CARMENFLAG=""
+CARMENSUPPORT="0"
+CARMEN_LIBS="libnavigator_interface.a libipc.a librobot_interface.a liblaser_interface.a libsimulator_interface.a liblocalize_interface.a libreadlog.a libwritelog.a libglobal.a libipc.a"
+if [ ! "$CARMEN_HOME" ]; then
+ echo -e "Carmen NOT FOUND."
+ echo -e "If you have a carmen version installed please set the"
+ echo -e "CARMEN_HOME variable to the carmen path."
+else
+ if [ -d $CARMEN_HOME ]; then
+ echo -e "carmen found in $CARMEN_HOME, enabling support"
+ CARMENFLAG="-DCARMEN_SUPPORT"
+ echo -e "generating shared objects"
+ for CARMEN_OBJECT in $CARMEN_LIBS ; do
+ if [ -f $CARMEN_HOME/lib/$CARMEN_OBJECT ]; then
+ cp $CARMEN_HOME/lib/$CARMEN_OBJECT $LIBDIR
+ ./build_tools/generate_shared_object $LIBDIR/$CARMEN_OBJECT
+ rm $LIBDIR/$CARMEN_OBJECT
+ else
+ echo -e "Compile carmen first "$CARMEN_HOME/lib/$CARMEN_OBJECT" not found"
+ exit -1
+ fi
+ done;
+ CARMENSUPPORT="1"
+ else
+ echo -e "CARMEN_HOME=$CARMEN_HOME does not exist, disabling support\n"
+ fi
+fi
+
+PLAYERFLAG=""
+PLAYERSUPPORT="0"
+echo -n "Checking for player (pkg-config --libs playercore)..."
+playerlibs=`pkg-config --libs playercore`
+if [ -z "$playerlibs" ]; then
+ echo -e "Player not found."
+else
+ echo -e "Player found."
+ PLAYERFLAG="-DPLAYER_SUPPORT"
+ PLAYERSUPPORT="1"
+fi
+
+
+CONFIG=global.mk
+rm -f $CONFIG
+
+cat << EOF > $CONFIG
+### You should not need to change anything below.
+LINUX=$LINUX
+MACOSX=$MACOSX
+
+# Compilers
+CC=$CC
+CXX=$CXX
+
+# Paths
+MAPPING_ROOT=$MAPPING_ROOT
+LIBDIR=$LIBDIR
+BINDIR=$BINDIR
+
+# Build tools
+PRETTY=$MAPPING_ROOT/build_tools/pretty_compiler
+MESSAGE=$MAPPING_ROOT/build_tools/message
+TESTLIB=$MAPPING_ROOT/build_tools/testlib
+
+# QT support
+MOC=$MOC
+QT_LIB=$QT_LIB
+QT_INCLUDE=$QT_INCLUDE
+
+# ARIA support
+ARIA_LIB=$ARIA_LIB
+ARIA_INCLUDE=$ARIA_INCLUDE
+
+
+# # KDE support
+# KDE_LIB=$KDE_LIB
+# KDE_INCLUDE=$KDE_INCLUDE
+# UIC=$UIC
+
+# Generic makefiles
+MAKEFILE_GENERIC=$MAPPING_ROOT/build_tools/Makefile.generic-shared-object
+MAKEFILE_APP=$MAPPING_ROOT/build_tools/Makefile.app
+MAKEFILE_SUBDIRS=$MAPPING_ROOT/build_tools/Makefile.subdirs
+
+
+# Flags
+CPPFLAGS+=$CPPFLAGS -I$MAPPING_ROOT $CARMENFLAG $PLAYERFLAG
+CXXFLAGS+=$CXXFLAGS
+LDFLAGS+=$LDFLAGS -Xlinker -rpath $MAPPING_ROOT/lib
+CARMENSUPPORT=$CARMENSUPPORT
+PLAYERSUPPORT=$PLAYERSUPPORT
+ARIASUPPORT=$ARIASUPPORT
+
+$OTHER
+
+include $MAPPING_ROOT/manual.mk
+
+EOF
+
Copied: pkg/branches/rosbus/unported/gmapping/docs (from rev 231, pkg/branches/rosbus/gmapping/docs)
Copied: pkg/branches/rosbus/unported/gmapping/gfs-carmen (from rev 231, pkg/branches/rosbus/gmapping/gfs-carmen)
Copied: pkg/branches/rosbus/unported/gmapping/grid (from rev 231, pkg/branches/rosbus/gmapping/grid)
Copied: pkg/branches/rosbus/unported/gmapping/gridfastslam (from rev 231, pkg/branches/rosbus/gmapping/gridfastslam)
Copied: pkg/branches/rosbus/unported/gmapping/gui (from rev 231, pkg/branches/rosbus/gmapping/gui)
Copied: pkg/branches/rosbus/unported/gmapping/ini (from rev 231, pkg/branches/rosbus/gmapping/ini)
Copied: pkg/branches/rosbus/unported/gmapping/lib (from rev 231, pkg/branches/rosbus/gmapping/lib)
Copied: pkg/branches/rosbus/unported/gmapping/log (from rev 231, pkg/branches/rosbus/gmapping/log)
Deleted: pkg/branches/rosbus/unported/gmapping/manual.mk
===================================================================
--- pkg/branches/rosbus/gmapping/manual.mk 2008-04-29 22:32:30 UTC (rev 229)
+++ pkg/branches/rosbus/unported/gmapping/manual.mk 2008-04-29 23:03:09 UTC (rev 232)
@@ -1,7 +0,0 @@
-#CPPFLAGS+= -DNDEBUG
-CXXFLAGS+= -O3 -Wall -ffast-math
-#CXXFLAGS+= -g -O0 -Wall
-PROFILE= false
-
-
-
Copied: pkg/branches/rosbus/unported/gmapping/manual.mk (from rev 231, pkg/branches/rosbus/gmapping/manual.mk)
===================================================================
--- pkg/branches/rosbus/unported/gmapping/manual.mk (rev 0)
+++ pkg/branches/rosbus/unported/gmapping/manual.mk 2008-04-29 23:03:09 UTC (rev 232)
@@ -0,0 +1,7 @@
+#CPPFLAGS+= -DNDEBUG
+CXXFLAGS+= -O3 -Wall -ffast-math
+#CXXFLAGS+= -g -O0 -Wall
+PROFILE= false
+
+
+
Deleted: pkg/branches/rosbus/unported/gmapping/manual.mk-template
===================================================================
--- pkg/branches/rosbus/gmapping/manual.mk-template 2008-04-29 22:32:30 UTC (rev 229)
+++ pkg/branches/rosbus/unported/gmapping/manual.mk-template 2008-04-29 23:03:09 UTC (rev 232)
@@ -1,7 +0,0 @@
-#CPPFLAGS+= -DNDEBUG
-#CXXFLAGS+= -O3 -Wall
-CXXFLAGS+= -g -O0 -Wall
-PROFILE= false
-
-
-
Copied: pkg/branches/rosbus/unported/gmapping/manual.mk-template (from rev 231, pkg/branches/rosbus/gmapping/manual.mk-template)
===================================================================
--- pkg/branches/rosbus/unported/gmapping/manual.mk-template (rev 0)
+++ pkg/branches/rosbus/unported/gmapping/manual.mk-template 2008-04-29 23:03:09 UTC (rev 232)
@@ -0,0 +1,7 @@
+#CPPFLAGS+= -DNDEBUG
+#CXXFLAGS+= -O3 -Wall
+CXXFLAGS+= -g -O0 -Wall
+PROFILE= false
+
+
+
Copied: pkg/branches/rosbus/unported/gmapping/particlefilter (from rev 231, pkg/branches/rosbus/gmapping/particlefilter)
Copied: pkg/branches/rosbus/unported/gmapping/playerwrapper (from rev 231, pkg/branches/rosbus/gmapping/playerwrapper)
Copied: pkg/branches/rosbus/unported/gmapping/scanmatcher (from rev 231, pkg/branches/rosbus/gmapping/scanmatcher)
Copied: pkg/branches/rosbus/unported/gmapping/sensor (from rev 231, pkg/branches/rosbus/gmapping/sensor)
Deleted: pkg/branches/rosbus/unported/gmapping/setlibpath
===================================================================
--- pkg/branches/rosbus/gmapping/setlibpath 2008-04-29 22:32:30 UTC (rev 229)
+++ pkg/branches/rosbus/unported/gmapping/setlibpath 2008-04-29 23:03:09 UTC (rev 232)
@@ -1,35 +0,0 @@
-# --- !/bin/bash
-
-LIBDIR="`pwd`/lib"
-
-ech...
[truncated message content] |
|
From: <ge...@us...> - 2008-04-29 23:06:13
|
Revision: 233
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=233&view=rev
Author: gerkey
Date: 2008-04-29 16:06:16 -0700 (Tue, 29 Apr 2008)
Log Message:
-----------
moving nodes to unported
Added Paths:
-----------
pkg/branches/rosbus/unported/roslogger/
pkg/branches/rosbus/unported/tilting_laser/
pkg/branches/rosbus/unported/unstable_flows/
Removed Paths:
-------------
pkg/branches/rosbus/roslogger/
pkg/branches/rosbus/tilting_laser/
pkg/branches/rosbus/unstable_flows/
Copied: pkg/branches/rosbus/unported/roslogger (from rev 231, pkg/branches/rosbus/roslogger)
Copied: pkg/branches/rosbus/unported/tilting_laser (from rev 231, pkg/branches/rosbus/tilting_laser)
Copied: pkg/branches/rosbus/unported/unstable_flows (from rev 231, pkg/branches/rosbus/unstable_flows)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2008-04-29 23:08:40
|
Revision: 234
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=234&view=rev
Author: gerkey
Date: 2008-04-29 16:08:44 -0700 (Tue, 29 Apr 2008)
Log Message:
-----------
moving nodes to unported
Added Paths:
-----------
pkg/branches/rosbus/unported/kdtree/
pkg/branches/rosbus/unported/pyImageViewer/
pkg/branches/rosbus/util/libTF/
Removed Paths:
-------------
pkg/branches/rosbus/kdtree/
pkg/branches/rosbus/libTF/
pkg/branches/rosbus/pyImageViewer/
Copied: pkg/branches/rosbus/unported/kdtree (from rev 233, pkg/branches/rosbus/kdtree)
Copied: pkg/branches/rosbus/unported/pyImageViewer (from rev 233, pkg/branches/rosbus/pyImageViewer)
Copied: pkg/branches/rosbus/util/libTF (from rev 233, pkg/branches/rosbus/libTF)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2008-04-29 23:10:29
|
Revision: 235
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=235&view=rev
Author: gerkey
Date: 2008-04-29 16:10:36 -0700 (Tue, 29 Apr 2008)
Log Message:
-----------
moving nodes to unported
Added Paths:
-----------
pkg/branches/rosbus/unported/libTF/
pkg/branches/rosbus/unported/vision/
Removed Paths:
-------------
pkg/branches/rosbus/util/libTF/
pkg/branches/rosbus/vision/
Copied: pkg/branches/rosbus/unported/libTF (from rev 234, pkg/branches/rosbus/util/libTF)
Copied: pkg/branches/rosbus/unported/vision (from rev 233, pkg/branches/rosbus/vision)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2008-04-29 23:13:42
|
Revision: 236
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=236&view=rev
Author: gerkey
Date: 2008-04-29 16:13:49 -0700 (Tue, 29 Apr 2008)
Log Message:
-----------
moving nodes to unported
Added Paths:
-----------
pkg/branches/rosbus/unported/cv_cam/
pkg/branches/rosbus/unported/ffmpeg/
pkg/branches/rosbus/unported/hokuyo_top_urg/
pkg/branches/rosbus/unported/opencv/
Removed Paths:
-------------
pkg/branches/rosbus/3rdparty/ffmpeg/
pkg/branches/rosbus/3rdparty/opencv/
pkg/branches/rosbus/drivers/cam/cv_cam/
pkg/branches/rosbus/drivers/laser/hokuyo_top_urg/
Copied: pkg/branches/rosbus/unported/cv_cam (from rev 235, pkg/branches/rosbus/drivers/cam/cv_cam)
Copied: pkg/branches/rosbus/unported/ffmpeg (from rev 235, pkg/branches/rosbus/3rdparty/ffmpeg)
Copied: pkg/branches/rosbus/unported/hokuyo_top_urg (from rev 235, pkg/branches/rosbus/drivers/laser/hokuyo_top_urg)
Copied: pkg/branches/rosbus/unported/opencv (from rev 235, pkg/branches/rosbus/3rdparty/opencv)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2008-04-29 23:14:07
|
Revision: 237
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=237&view=rev
Author: gerkey
Date: 2008-04-29 16:14:13 -0700 (Tue, 29 Apr 2008)
Log Message:
-----------
moving nodes to unported
Added Paths:
-----------
pkg/branches/rosbus/unported/laser_viewer/
pkg/branches/rosbus/unported/vacuum/
Removed Paths:
-------------
pkg/branches/rosbus/drivers/laser/laser_viewer/
pkg/branches/rosbus/util/vacuum/
Copied: pkg/branches/rosbus/unported/laser_viewer (from rev 235, pkg/branches/rosbus/drivers/laser/laser_viewer)
Copied: pkg/branches/rosbus/unported/vacuum (from rev 235, pkg/branches/rosbus/util/vacuum)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|