Commit 3de52745 authored by Nicolas Federico Furquez Morena's avatar Nicolas Federico Furquez Morena
Browse files

Renombre de paquete

parent 24d1fbca
......@@ -19,7 +19,7 @@ services:
#- /home/oskysal/fing/git/superrobot/alfred:/root/fing/git/superrobot/alfred
- /home/oskysal/docker/ros/container/root/.ros:/root/.ros
- /home/oskysal/docker/ros/container/root/catkin_ws:/root/catkin_ws
- /home/oskysal/git/Repo-pgLocRobIn2018/Desarrollo/Integracion ROS/localization_localino:/root/catkin_ws/src/localization_localino
- /home/oskysal/git/Repo-pgLocRobIn2018/Desarrollo/Integracion ROS/localization:/root/catkin_ws/src/localization
#command: "/etc/bootstrap.sh -d -namenode"
command: "roscore"
......@@ -42,13 +42,13 @@ services:
#- /home/oskysal/fing/git/superrobot/alfred:/root/fing/git/superrobot/alfred
- /home/oskysal/docker/ros/container/root/.ros:/root/.ros
- /home/oskysal/docker/ros/container/root/catkin_ws:/root/catkin_ws
- /home/oskysal/git/Repo-pgLocRobIn2018/Desarrollo/Integracion ROS/localization_localino:/root/catkin_ws/src/localization_localino
- /home/oskysal/git/Repo-pgLocRobIn2018/Desarrollo/Integracion ROS/localization:/root/catkin_ws/src/localization
#entrypoint: "tail -f /dev/null"
command: bash -c "source /root/catkin_ws/devel/setup.bash && roslaunch --wait localization_localino publish_anchors_tf.launch anchors_csv:=/root/catkin_ws/src/localization_localino/scripts/anchors.csv"
#command: bash -c "sleep 10s && roslaunch localization_localino publish_anchors_tf.launch anchors_csv:=/root/catkin_ws/src/localization_localino/scripts/anchors.csv ; roscore"
command: bash -c "source /root/catkin_ws/devel/setup.bash && roslaunch --wait localization publish_anchors_tf.launch anchors_csv:=/root/catkin_ws/src/localization/scripts/anchors.csv"
#command: bash -c "sleep 10s && roslaunch localization publish_anchors_tf.launch anchors_csv:=/root/catkin_ws/src/localization/scripts/anchors.csv ; roscore"
#command: bash -c "sleep 10s && roscore"
#command: tail -f /dev/null
#command: "roslaunch localization_localino publish_anchors_tf.launch anchors_csv:=/root/catkin_ws/src/localization_localino/scripts/anchors.csv"
#command: "roslaunch localization publish_anchors_tf.launch anchors_csv:=/root/catkin_ws/src/localization/scripts/anchors.csv"
devices:
- "/dev/ttyS0:/dev/ttyS0"
......
......@@ -17,14 +17,14 @@ services:
#- /home/oskysal/fing/git/superrobot/alfred:/root/fing/git/superrobot/alfred
- /home/oskysal/docker/ros/container/root/.ros:/root/.ros
- /home/oskysal/docker/ros/container/root/catkin_ws:/root/catkin_ws
- /home/oskysal/git/Repo-pgLocRobIn2018/Desarrollo/Integracion ROS/localization_localino:/root/catkin_ws/src/localization_localino
- /home/oskysal/git/Repo-pgLocRobIn2018/Desarrollo/Integracion ROS/localization:/root/catkin_ws/src/localization
- /home/oskysal/git/Repo-pgLocRobIn2018:/root/pg
#entrypoint: "tail -f /dev/null"
command: bash -c "cd /root/catkin_ws/ && catkin_make && source /root/catkin_ws/devel/setup.bash && roslaunch localization_localino run_anchors_static_tf_publisher.launch"
#command: bash -c "sleep 10s && roslaunch localization_localino publish_anchors_tf.launch anchors_csv:=/root/catkin_ws/src/localization_localino/scripts/anchors.csv ; roscore"
command: bash -c "cd /root/catkin_ws/ && catkin_make && source /root/catkin_ws/devel/setup.bash && roslaunch localization run_anchors_static_tf_publisher.launch"
#command: bash -c "sleep 10s && roslaunch localization publish_anchors_tf.launch anchors_csv:=/root/catkin_ws/src/localization/scripts/anchors.csv ; roscore"
#command: bash -c "sleep 10s && roscore"
#command: tail -f /dev/null
#command: "roslaunch localization_localino publish_anchors_tf.launch anchors_csv:=/root/catkin_ws/src/localization_localino/scripts/anchors.csv"
#command: "roslaunch localization publish_anchors_tf.launch anchors_csv:=/root/catkin_ws/src/localization/scripts/anchors.csv"
#devices:
# - "/dev/ttyACM0:/dev/ttyACM0"
......
......@@ -10,13 +10,13 @@ services:
#- /home/oskysal/fing/git/superrobot/alfred:/root/fing/git/superrobot/alfred
- /home/oskysal/docker/ros/container/root/.ros:/root/.ros
- /home/oskysal/docker/ros/container/root/catkin_ws:/root/catkin_ws
- /home/oskysal/git/Repo-pgLocRobIn2018/Desarrollo/Integracion ROS/localization_localino:/root/catkin_ws/src/localization_localino
- /home/oskysal/git/Repo-pgLocRobIn2018/Desarrollo/Integracion ROS/localization:/root/catkin_ws/src/localization
#entrypoint: "tail -f /dev/null"
command: bash -c "cd /root/catkin_ws/ && catkin_make && source /root/catkin_ws/devel/setup.bash && roslaunch localization_localino run_calibrar.launch"
#command: bash -c "sleep 10s && roslaunch localization_localino publish_anchors_tf.launch anchors_csv:=/root/catkin_ws/src/localization_localino/scripts/anchors.csv ; roscore"
command: bash -c "cd /root/catkin_ws/ && catkin_make && source /root/catkin_ws/devel/setup.bash && roslaunch localization run_calibrar.launch"
#command: bash -c "sleep 10s && roslaunch localization publish_anchors_tf.launch anchors_csv:=/root/catkin_ws/src/localization/scripts/anchors.csv ; roscore"
#command: bash -c "sleep 10s && roscore"
#command: tail -f /dev/null
#command: "roslaunch localization_localino publish_anchors_tf.launch anchors_csv:=/root/catkin_ws/src/localization_localino/scripts/anchors.csv"
#command: "roslaunch localization publish_anchors_tf.launch anchors_csv:=/root/catkin_ws/src/localization/scripts/anchors.csv"
devices:
- "/dev/ttyACM0:/dev/ttyACM0"
......@@ -10,14 +10,14 @@ services:
#- /home/oskysal/fing/git/superrobot/alfred:/root/fing/git/superrobot/alfred
- /home/oskysal/docker/ros/container/root/.ros:/root/.ros
- /home/oskysal/docker/ros/container/root/catkin_ws:/root/catkin_ws
- /home/oskysal/git/Repo-pgLocRobIn2018/Desarrollo/Integracion ROS/localization_localino:/root/catkin_ws/src/localization_localino
- /home/oskysal/git/Repo-pgLocRobIn2018/Desarrollo/Integracion ROS/localization:/root/catkin_ws/src/localization
- /home/oskysal/git/Repo-pgLocRobIn2018:/root/pg
#entrypoint: "tail -f /dev/null"
command: bash -c "cd /root/catkin_ws/ && catkin_make && source /root/catkin_ws/devel/setup.bash && roslaunch localization_localino run_multi_filters.launch"
#command: bash -c "sleep 10s && roslaunch localization_localino publish_anchors_tf.launch anchors_csv:=/root/catkin_ws/src/localization_localino/scripts/anchors.csv ; roscore"
command: bash -c "cd /root/catkin_ws/ && catkin_make && source /root/catkin_ws/devel/setup.bash && roslaunch localization run_multi_filters.launch"
#command: bash -c "sleep 10s && roslaunch localization publish_anchors_tf.launch anchors_csv:=/root/catkin_ws/src/localization/scripts/anchors.csv ; roscore"
#command: bash -c "sleep 10s && roscore"
#command: tail -f /dev/null
#command: "roslaunch localization_localino publish_anchors_tf.launch anchors_csv:=/root/catkin_ws/src/localization_localino/scripts/anchors.csv"
#command: "roslaunch localization publish_anchors_tf.launch anchors_csv:=/root/catkin_ws/src/localization/scripts/anchors.csv"
#devices:
# - "/dev/ttyACM0:/dev/ttyACM0"
......@@ -2,7 +2,7 @@
docker container create \
-v "/home/oskysal/docker/ros/container/root/.ros/:/root/.ros/" \
-v "/home/oskysal/docker/ros/container/root/catkin_ws:/root/host/ros/workspace/" \
--mount type=bind,source="/home/oskysal/git/localino/Integracion ROS/localization_localino/",target="/root/catkin_ws/src/localization_localino/" \
--mount type=bind,source="/home/oskysal/git/localino/Integracion ROS/localization/",target="/root/catkin_ws/src/localization/" \
-p 11311:11311 \
--name ros-kinetic-devel-tmp2 \
osrf/ros:kinetic-desktop-full-xenial-devel-tmp \
......
......@@ -5,7 +5,7 @@
docker container run \
-it \
-v "/home/oskysal/docker/ros/runtime/:/root/.ros/" \
-v "/home/oskysal/catkin_ws/:/root/catkin_ws/src/localization_localino/" \
-v "/home/oskysal/catkin_ws/:/root/catkin_ws/src/localization/" \
-p 11311:11311 \
--name ros-kinetic-devel-temp \
fing:ros-kinetic-robot-xenial \
......
......@@ -25,7 +25,7 @@
#include "DW1000Time.h"
#include "DW1000.h"
#include <localization_localino/Distance.h>
#include <localization/Distance.h>
#include "LocalinoHardware.h"
#define turnOn(led) (digitalWrite(led, HIGH))
......@@ -40,7 +40,7 @@ void ROS_doRange(const std_msgs::Bool& value);
void ROS_performDump(const std_msgs::Empty& value);
std_msgs::String str_msg;
localization_localino::Distance distancia;
localization::Distance distancia;
ros::Publisher localization("localization", &distancia);
ros::Publisher localization_status("localization_status", &str_msg);
......
......@@ -24,7 +24,7 @@
#include "DW1000Time.h"
#include "DW1000.h"
#include <localization_localino/Distance.h>
#include <localization/Distance.h>
#include "LocalinoHardware.h"
// ======================= ROS ==========================
......@@ -35,7 +35,7 @@ void ROS_newAntennaDelayValue(const std_msgs::UInt32& value);
void ROS_performDump(const std_msgs::Empty& value);
std_msgs::String str_msg;
localization_localino::Distance distancia;
localization::Distance distancia;
ros::Publisher localization("localization", &distancia);
ros::Publisher localization_status("localization_status", &str_msg);
......
......@@ -13,7 +13,7 @@
#include <ros.h>
#include <localization_localino/Distance.h>
#include <localization/Distance.h>
#include "LocalinoHardware.h"
......@@ -24,7 +24,7 @@ ros::NodeHandle_<LocalinoHardware> nh;
const unsigned int BUFFER_SIZE = 100;
localization_localino::Distance distancia;
localization::Distance distancia;
ros::Publisher localization("localization", &distancia);
char _bufferSerial[BUFFER_SIZE];
......
......@@ -13,7 +13,7 @@
#include <ros.h>
#include <localization_localino/Distance.h>
#include <localization/Distance.h>
#include "LocalinoHardware.h"
#include "DW1000Ranging.h"
......@@ -23,7 +23,7 @@ ros::NodeHandle_<LocalinoHardware> nh;
const unsigned int BUFFER_SIZE = 100;
localization_localino::Distance distancia;
localization::Distance distancia;
ros::Publisher localization("localization", &distancia);
// ======================================================
......
cmake_minimum_required(VERSION 3.0.2)
project(localization_localino)
project(localization)
## Compile as C++11, supported in ROS Kinetic and newer
# add_compile_options(-std=c++11)
......@@ -104,7 +104,7 @@ generate_messages(
## DEPENDS: system dependencies of this project that dependent projects also need
catkin_package(
# INCLUDE_DIRS include
# LIBRARIES localization_localino
# LIBRARIES localization
CATKIN_DEPENDS roscpp rospy std_msgs message_runtime
# DEPENDS system_lib
)
......@@ -122,7 +122,7 @@ include_directories(
## Declare a C++ library
# add_library(${PROJECT_NAME}
# src/${PROJECT_NAME}/localization_localino.cpp
# src/${PROJECT_NAME}/localization.cpp
# )
## Add cmake target dependencies of the library
......@@ -133,7 +133,7 @@ include_directories(
## Declare a C++ executable
## With catkin_make all packages are built within a single CMake context
## The recommended prefix ensures that target names across packages don't collide
# add_executable(${PROJECT_NAME}_node src/localization_localino_node.cpp)
# add_executable(${PROJECT_NAME}_node src/localization_node.cpp)
## Rename C++ executable without prefix
## The above recommended prefix causes long target names, the following renames the
......@@ -197,7 +197,7 @@ include_directories(
#############
## Add gtest based cpp test target and link libraries
# catkin_add_gtest(${PROJECT_NAME}-test test/test_localization_localino.cpp)
# catkin_add_gtest(${PROJECT_NAME}-test test/test_localization.cpp)
# if(TARGET ${PROJECT_NAME}-test)
# target_link_libraries(${PROJECT_NAME}-test ${PROJECT_NAME})
# endif()
......
......@@ -3,6 +3,6 @@
<node pkg="rosbag" type="play" name="player3" args="--wait-for-subscribers -q --clock --skip-empty=1 $(arg carpeta)/pto_19.bag" output="screen" />
<node pkg="localization_localino" required="true" type="comprobacion.py" name="salida" output="screen" />
<node pkg="localization" required="true" type="comprobacion.py" name="salida" output="screen" />
</launch>
\ No newline at end of file
......@@ -2,10 +2,10 @@
<arg name="anchors_csv" doc="/home/nico/Proyecto/RepoFinal/Investigacion/error_localizacion/posiciones1.csv"/>
<!-- Output to screen -->
<!-- <node name="anchors_static_tf_publisher" pkg="localization_localino" type="anchors_static_tf_publisher.py" args="$(arg anchors_csv)" respawn="true" output="screen" /> -->
<!-- <node name="anchors_static_tf_publisher" pkg="localization" type="anchors_static_tf_publisher.py" args="$(arg anchors_csv)" respawn="true" output="screen" /> -->
<!-- Output to log -->
<node name="anchors_static_tf_publisher" pkg="localization_localino" type="anchors_static_tf_publisher.py" args="/home/nico/Proyecto/RepoFinal/Investigacion/pruebas.csv" respawn="true" />
<node name="anchors_static_tf_publisher" pkg="localization" type="anchors_static_tf_publisher.py" args="/home/nico/Proyecto/RepoFinal/Investigacion/pruebas.csv" respawn="true" />
<!-- Original -->
<!-- <node name="anchors" pkg="localization_localino" type="anchors_static_tf_publisher.py" args="/root/catkin_ws/src/localization_localino/scripts/anchors.csv" respawn="true"/> -->
<!-- <node name="anchors" pkg="localization" type="anchors_static_tf_publisher.py" args="/root/catkin_ws/src/localization/scripts/anchors.csv" respawn="true"/> -->
</launch>
<launch>
<node name="reader" pkg="localization_localino" type="reader.py" output="screen">
<node name="reader" pkg="localization" type="reader.py" output="screen">
<rosparam>
#0 sin filtro, 1 Afa beta, 2 Kalman, 3 Promedio
......
<launch>
<arg name="anchors_csv" default="/root/catkin_ws/src/localization/scripts/puntos.csv" doc="ruta arvhico CSV con posiciones de los anchors" />
<!-- Output to screen -->
<node name="anchors_static_tf_publisher" pkg="localization" type="anchors_static_tf_publisher.py" args="$(arg anchors_csv)" respawn="true" output="screen" />
<!-- Output to log -->
<!--<node name="anchors_static_tf_publisher" pkg="localization" type="anchors_static_tf_publisher.py" args="/home/nico/Proyecto/RepoFinal/Investigacion/error_localizacion/posiciones1.csv" respawn="true" />-->
<!-- Original -->
<!-- <node name="anchors" pkg="localization" type="anchors_static_tf_publisher.py" args="/root/catkin_ws/src/localization/scripts/anchors.csv" respawn="true"/> -->
</launch>
<launch>
<node name="reader" pkg="localization_localino" type="reader.py" output="screen">
<node name="reader" pkg="localization" type="reader.py" output="screen">
<rosparam>
#0 sin filtro, 1 Alfa beta, 2 Kalman, 3 Promedio
......
<launch>
<node name="reader" pkg="localization_localino" type="reader.py" output="screen">
<node name="reader" pkg="localization" type="reader.py" output="screen">
<rosparam>
filter: 0
......@@ -28,8 +28,8 @@ tagheight = 1.725
</rosparam>
</node>
<!-- <node name="roserial" pkg="rosserial_python" type="serial_node.py" args="_port:=/dev/ttyACM0 _baud:=115200" respawn="true"/> -->
<!-- <node name="visualizar" pkg="rviz" type="rviz" respawn="true" args="-d $(find localization_localino)/rviz/nodos.rviz"/> -->
<!-- <node name="fixed_frame" pkg="localization_localino" type="fixed_frame.py" respawn="true" args="-d $(find localization_localino)/rviz/nodos.rviz"/> -->
<!-- <node name="visualizar" pkg="rviz" type="rviz" respawn="true" args="-d $(find localization)/rviz/nodos.rviz"/> -->
<!-- <node name="fixed_frame" pkg="localization" type="fixed_frame.py" respawn="true" args="-d $(find localization)/rviz/nodos.rviz"/> -->
<node pkg="rosbag" type="play" name="player1" output="screen" args=" /home/nico/run/*"/>
<!-- <node pkg="rosbag" type="play" name="player3" output="screen" args=" /home/nico/rosserial-in-3.bag"/> -->
......
<launch>
<node name="reader" pkg="localization_localino" type="calibrate.py" output="screen">
<node name="reader" pkg="localization" type="calibrate.py" output="screen">
</node>
......
......@@ -2,7 +2,7 @@
diferencia entre la posicion calculada y la posicion estimada por el sistema -->
<launch>
<node name="reader_0" pkg="localization_localino" type="reader.py">
<node name="reader_0" pkg="localization" type="reader.py">
<rosparam>
#0 sin filtro, 1 Afa beta, 2 Kalman, 3 Promedio
filter: 0
......@@ -62,7 +62,7 @@ debug: true
</rosparam>
</node>
<node name="position_processor_0" pkg="localization_localino" type="position-processor.py" output="screen">
<node name="position_processor_0" pkg="localization" type="position-processor.py" output="screen">
<rosparam>
tag_real_pos: [0.091, 4.091, 1.725]
input_topic: debug_position_0
......@@ -73,7 +73,7 @@ cant_medidas: 1020
<node name="reader_1" pkg="localization_localino" type="reader.py" >
<node name="reader_1" pkg="localization" type="reader.py" >
<rosparam>
#0 sin filtro, 1 Afa beta, 2 Kalman, 3 Promedio
filter: 1
......@@ -133,7 +133,7 @@ debug: true
</rosparam>
</node>
<node name="position_processor_1" pkg="localization_localino" type="position-processor.py" output="screen">
<node name="position_processor_1" pkg="localization" type="position-processor.py" output="screen">
<rosparam>
tag_real_pos: [0.091, 4.091, 1.725]
input_topic: debug_position_1
......@@ -144,7 +144,7 @@ cant_medidas: 1020
<node name="reader_2" pkg="localization_localino" type="reader.py" >
<node name="reader_2" pkg="localization" type="reader.py" >
<rosparam>
#0 sin filtro, 1 Afa beta, 2 Kalman, 3 Promedio
filter: 2
......@@ -204,7 +204,7 @@ debug: true
</rosparam>
</node>
<node name="position_processor_2" pkg="localization_localino" type="position-processor.py" output="screen">
<node name="position_processor_2" pkg="localization" type="position-processor.py" output="screen">
<rosparam>
tag_real_pos: [0.091, 4.091, 1.725]
input_topic: debug_position_2
......@@ -215,7 +215,7 @@ cant_medidas: 1020
<node name="reader_3" pkg="localization_localino" type="reader.py" >
<node name="reader_3" pkg="localization" type="reader.py" >
<rosparam>
#0 sin filtro, 1 Afa beta, 2 Kalman, 3 Promedio
filter: 3
......@@ -275,7 +275,7 @@ debug: true
</rosparam>
</node>
<node name="position_processor_3" pkg="localization_localino" type="position-processor.py" output="screen">
<node name="position_processor_3" pkg="localization" type="position-processor.py" output="screen">
<rosparam>
tag_real_pos: [0.091, 4.091, 1.725]
input_topic: debug_position_3
......@@ -284,7 +284,7 @@ cant_medidas: 1020
</rosparam>
</node>
<node name="stop" required="true" pkg="localization_localino" type="stop_launch.py" output="screen">
<node name="stop" required="true" pkg="localization" type="stop_launch.py" output="screen">
<rosparam>
cant_procesos: 4
</rosparam>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment