Skip to content

Commit

Permalink
Merge pull request #2 from CentraleNantesRobotics/develop
Browse files Browse the repository at this point in the history
Bugfixes and refacto
  • Loading branch information
Stormix authored Dec 6, 2019
2 parents 55f3e09 + e8673a8 commit 9ee429b
Show file tree
Hide file tree
Showing 17 changed files with 1,521 additions and 12 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
.vscode
**/*.pyc
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 2.8.3)
project(ros-ping360-sonar)
project(ping360_sonar)

## Compile as C++11, supported in ROS Kinetic and newer
# add_compile_options(-std=c++11)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# ros-ping360-sonar
# ping360_sonar
ROS package for Blue Robotics Ping360 Sonar
16 changes: 16 additions & 0 deletions find_usb_port.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#!/bin/bash

for sysdevpath in $(find /sys/bus/usb/devices/usb*/ -name dev); do
(
syspath="${sysdevpath%/dev}"
devname="$(udevadm info -q name -p $syspath)"
[[ "$devname" == "bus/"* ]] && continue
eval "$(udevadm info -q property --export -p $syspath)"
[[ -z "$ID_SERIAL" ]] && continue
# echo "$ID_SERIAL"
if [ $ID_SERIAL == "FTDI_FT230X_Basic_UART_DO01F2RQ" ]; then
echo "$devname"
fi
)
done

15 changes: 15 additions & 0 deletions launch/example.launch
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<launch>
<node pkg="ping360_sonar" type="ping360_node" name="ping360_node" output="screen">
<param name="device" value="/dev/ttyUSB0"/>
<param name="baudrate" value="115200"/>
<param name="debug" value="True"/>
<param name="imgSize" value="500"/>
<param name="gain" value="0"/>
<param name="step" value="1"/>
<param name="numberOfSamples" value="200"/>
<param name="transmitFrequency" value="740"/>
<param name="sonarRange" value="1"/>
<param name="speedOfSound" value="1500"/>
<param name="queueSize" value="1"/>
</node>
</launch>
5 changes: 3 additions & 2 deletions nodes/ping360_node
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/usr/bin/env python
from ping360 import main
import sys

from ping360_sonar import main

if __name__ == '__main__':
main()
2 changes: 1 addition & 1 deletion package.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<package format="2">
<name>ros-ping360-sonar</name>
<name>ping360_sonar</name>
<version>0.0.0</version>
<description>The sonar-ping360 package</description>

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from catkin_pkg.python_setup import generate_distutils_setup

setup_args = generate_distutils_setup(
packages=['ping360'],
packages=['ping360_sonar'],
package_dir={'': 'src'},
install_requires=['bluerobotics-ping']
)
Expand Down
1 change: 0 additions & 1 deletion src/ping360/__init__.py

This file was deleted.

5 changes: 0 additions & 5 deletions src/ping360/polarplot.py

This file was deleted.

Binary file removed src/ping360/polarplot.pyc
Binary file not shown.
5 changes: 5 additions & 0 deletions src/ping360_sonar/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
from polarplot import main
from brping.definitions import *
from brping.pingmessage import *
from brping.device import PingDevice
from brping.ping360 import Ping360
Loading

0 comments on commit 9ee429b

Please sign in to comment.