Browse Source

Added namespace and units for params

pull/65/head
Hongyu Li 2 years ago
parent
commit
635001bf12
3 changed files with 10 additions and 10 deletions
  1. +1
    -1
      vz_acoustic_scene_analysis/config/audio_params.yaml
  2. +1
    -1
      vz_acoustic_scene_analysis/launch/wav_audio.launch
  3. +8
    -8
      vz_acoustic_scene_analysis/scripts/stretch_audio.py

+ 1
- 1
vz_acoustic_scene_analysis/config/audio_params.yaml View File

@ -1,4 +1,4 @@
TIMEOUT: 100000
TIMEOUT_SECONDS: 100000
VENDOR_ID: 0x2886 VENDOR_ID: 0x2886
PRODUCT_ID: 0x0018 PRODUCT_ID: 0x0018
RESPEAKER_RATE: 16000 RESPEAKER_RATE: 16000

+ 1
- 1
vz_acoustic_scene_analysis/launch/wav_audio.launch View File

@ -1,4 +1,4 @@
<launch> <launch>
<rosparam command="load" file="$(find vz_acoustic_scene_analysis)/config/audio_params.yaml" />
<rosparam ns="VZ_ACOUSTIC_SCENE_ANALYSIS" command="load" file="$(find vz_acoustic_scene_analysis)/config/audio_params.yaml" />
<node name="stretch_audio" pkg="vz_acoustic_scene_analysis" type="stretch_audio.py" output="screen" /> <node name="stretch_audio" pkg="vz_acoustic_scene_analysis" type="stretch_audio.py" output="screen" />
</launch> </launch>

+ 8
- 8
vz_acoustic_scene_analysis/scripts/stretch_audio.py View File

@ -86,11 +86,11 @@ PARAMETERS = {
class Tuning: class Tuning:
TIMEOUT = 100000
# TIMEOUT = rospy.get_param("/TIMEOUT_SECONDS", 100000)
audio_list = [] audio_list = []
def __init__(self): def __init__(self):
self.TIMEOUT = 100000
self.TIMEOUT = rospy.get_param("/VZ_ACOUSTIC_SCENE_ANALYSIS/TIMEOUT_SECONDS", 100000)
self.dev = usb.core.find(idVendor=0x2886, idProduct=0x0018) self.dev = usb.core.find(idVendor=0x2886, idProduct=0x0018)
if not self.dev: if not self.dev:
@ -185,11 +185,11 @@ def get_respeaker_device_id():
return device_id return device_id
RESPEAKER_RATE = rospy.get_param("/RESPEAKER_RATE", 16000)
RESPEAKER_CHANNELS = rospy.get_param("/RESPEAKER_CHANNELS", 6) # 6 must flash 6_channels_firmware.bin first
RESPEAKER_WIDTH = rospy.get_param("/RESPEAKER_WIDTH", 2)
RESPEAKER_RATE = rospy.get_param("/VZ_ACOUSTIC_SCENE_ANALYSIS/RESPEAKER_RATE", 16000)
RESPEAKER_CHANNELS = rospy.get_param("/VZ_ACOUSTIC_SCENE_ANALYSIS/RESPEAKER_CHANNELS", 6) # 6 must flash 6_channels_firmware.bin first
RESPEAKER_WIDTH = rospy.get_param("/VZ_ACOUSTIC_SCENE_ANALYSIS/RESPEAKER_WIDTH", 2)
RESPEAKER_INDEX = get_respeaker_device_id() RESPEAKER_INDEX = get_respeaker_device_id()
CHUNK = rospy.get_param("/CHUNK", 1024)
CHUNK = rospy.get_param("/VZ_ACOUSTIC_SCENE_ANALYSIS/CHUNK", 1024)
class ROSInterface: class ROSInterface:
def __init__(self): def __init__(self):
@ -197,8 +197,8 @@ class ROSInterface:
self.wav_list = [] self.wav_list = []
self.record_count = 0 # Count how many times we've recorded f seconds of audio self.record_count = 0 # Count how many times we've recorded f seconds of audio
self.file_name = "/home/hello-robot/Desktop/output_audio.wav" self.file_name = "/home/hello-robot/Desktop/output_audio.wav"
self.secs = rospy.get_param("/seconds")
self.chunk_size = rospy.get_param("/chunk_size")
self.secs = rospy.get_param("/VZ_ACOUSTIC_SCENE_ANALYSIS/seconds")
self.chunk_size = rospy.get_param("/VZ_ACOUSTIC_SCENE_ANALYSIS/chunk_size")
self.respeaker = Tuning() self.respeaker = Tuning()
# Publisher for Audio Data # Publisher for Audio Data
self.audio_data_pub = rospy.Publisher("/wav_data", numpy_msg(VZ_AudioData), queue_size=10) self.audio_data_pub = rospy.Publisher("/wav_data", numpy_msg(VZ_AudioData), queue_size=10)

Loading…
Cancel
Save