.
This commit is contained in:
@@ -6,7 +6,7 @@ project(hos_dummy)
|
||||
## is used, also find other catkin packages
|
||||
find_package(catkin REQUIRED COMPONENTS
|
||||
hos_core_msgs
|
||||
hos_python_json
|
||||
hos_python_utils
|
||||
rospy
|
||||
)
|
||||
|
||||
@@ -82,7 +82,7 @@ catkin_python_setup()
|
||||
catkin_package(
|
||||
# INCLUDE_DIRS include
|
||||
# LIBRARIES hos_dummy
|
||||
CATKIN_DEPENDS hos_core_msgs hos_python_json rospy
|
||||
CATKIN_DEPENDS hos_core_msgs hos_python_utils rospy
|
||||
# DEPENDS system_lib
|
||||
)
|
||||
|
||||
@@ -122,6 +122,7 @@ include_directories(
|
||||
#And this will install python nodes
|
||||
catkin_install_python(PROGRAMS
|
||||
nodes/hos_dummy_devices.py
|
||||
nodes/hos_dummy_controller.py
|
||||
DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
|
||||
|
||||
# all install targets should use catkin DESTINATION variables
|
||||
|
||||
@@ -41,10 +41,10 @@
|
||||
<!-- <test_depend>gtest</test_depend> -->
|
||||
<buildtool_depend>catkin</buildtool_depend>
|
||||
<build_depend>hos_core_msgs</build_depend>
|
||||
<build_depend>hos_python_json</build_depend>
|
||||
<build_depend>hos_python_utils</build_depend>
|
||||
<build_depend>rospy</build_depend>
|
||||
<run_depend>hos_core_msgs</run_depend>
|
||||
<run_depend>hos_python_json</run_depend>
|
||||
<run_depend>hos_python_utils</run_depend>
|
||||
<run_depend>rospy</run_depend>
|
||||
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ from hos_pyhue import pyhue
|
||||
from hos_core_msgs.msg import DeviceCommand
|
||||
from hos_core_msgs.msg import DeviceStatusUpdate
|
||||
from hos_core_msgs.msg import HosStatusUpdate
|
||||
from jsonspec_hos.reference.providers import HOSParamServerProvider
|
||||
from hos.utils.schemaloader import SchemaLoader
|
||||
from jsonspec.validators import load
|
||||
from time import sleep
|
||||
|
||||
@@ -55,7 +55,7 @@ class HosDummyController(tk.Frame):
|
||||
rospy.set_param(key_base + "/cmd_topic", self.cmd_topic)
|
||||
print "Added dummy dimmer \"" + name + "\""
|
||||
# Create JSON schema provider
|
||||
self.schemaProvider = HOSParamServerProvider()
|
||||
self.schemaProvider = SchemaLoader()
|
||||
# Create message publisher
|
||||
self.commandPublisher = rospy.Publisher(self.cmd_topic, DeviceCommand, queue_size=10)
|
||||
# Init GUI
|
||||
|
||||
@@ -8,7 +8,7 @@ from hos_pyhue import pyhue
|
||||
from hos_core_msgs.msg import DeviceCommand
|
||||
from hos_core_msgs.msg import DeviceStatusUpdate
|
||||
from hos_core_msgs.msg import HosStatusUpdate
|
||||
from jsonspec_hos.reference.providers import HOSParamServerProvider
|
||||
from hos.utils.schemaloader import SchemaLoader
|
||||
from jsonspec.validators import load
|
||||
from time import sleep
|
||||
|
||||
@@ -58,7 +58,7 @@ class HosDummyDevices(tk.Frame):
|
||||
print "Added dummy dimmer \"" + name + "\""
|
||||
new_devices.append(name)
|
||||
# Create JSON schema provider
|
||||
self.schemaProvider = HOSParamServerProvider()
|
||||
self.schemaProvider = SchemaLoader()
|
||||
# Create message publisher
|
||||
self.statusPublisher = rospy.Publisher(self.status_topic, DeviceStatusUpdate, queue_size=10)
|
||||
self.hosUpdatePublisher = rospy.Publisher(self.hos_update_topic, HosStatusUpdate, queue_size=10)
|
||||
|
||||
Reference in New Issue
Block a user