From 4488065711e9f9286e42dd6c6dc9a4b0db98a160 Mon Sep 17 00:00:00 2001 From: mjkoster Date: Sun, 1 Jun 2014 17:58:55 -0700 Subject: [PATCH] Directory cleanup moved old stuff into old directory for temporary reference --- examples/InstanceConstructor.py | 55 ++++++++++++++++++++-- {test => old}/CoapTest.py | 0 {examples => old}/WeatherSensorHttpCoap.py | 0 {examples => old}/WeatherSensorHttpXively.py | 0 {examples => old}/WeatherSensorLocalMQTTBridge.py | 0 {examples => old}/WeatherSensorMQTTGateway.py | 0 .../WeatherSensorMQTTHttpCoapBridge.py | 0 {examples => old}/WeatherSensorMQTTSubscriber.py | 0 {examples => old}/WeatherSensorMQTTXively.py | 0 {test => old}/WeatherSensorTest.py | 0 {test => old}/mqttTest.py | 0 11 files changed, 50 insertions(+), 5 deletions(-) rename {test => old}/CoapTest.py (100%) rename {examples => old}/WeatherSensorHttpCoap.py (100%) rename {examples => old}/WeatherSensorHttpXively.py (100%) rename {examples => old}/WeatherSensorLocalMQTTBridge.py (100%) rename {examples => old}/WeatherSensorMQTTGateway.py (100%) rename {examples => old}/WeatherSensorMQTTHttpCoapBridge.py (100%) rename {examples => old}/WeatherSensorMQTTSubscriber.py (100%) rename {examples => old}/WeatherSensorMQTTXively.py (100%) rename {test => old}/WeatherSensorTest.py (100%) rename {test => old}/mqttTest.py (100%) diff --git a/examples/InstanceConstructor.py b/examples/InstanceConstructor.py index 0c57993..b8f527d 100644 --- a/examples/InstanceConstructor.py +++ b/examples/InstanceConstructor.py @@ -81,8 +81,6 @@ 'resourceType': 'temperature', 'interfaceType':'sensor', 'subscriber': ['mqtt://smartobjectservice.com:1883/sensors/rhvWeather-01/outdoor_temperature'], - 'publisher': '', - 'bridge': '' }, '/sensors/rhvWeather-01/outdoor_humidity': { 'resourceName': 'outdoor_humidity', @@ -90,9 +88,56 @@ 'resourceType': 'humidity', 'interfaceType':'sensor', 'subscriber': ['mqtt://smartobjectservice.com:1883/sensors/rhvWeather-01/outdoor_humidity'], - 'publisher': '', - 'bridge': '' - } + }, + '/sensors/rhvWeather-01/sealevel_pressure': { + 'resourceName': 'sealevel_pressure', + 'resourceClass': 'ObservableProperty', + 'resourceType': 'pressure', + 'interfaceType':'sensor', + 'subscriber': ['mqtt://smartobjectservice.com:1883/sensors/rhvWeather-01/sealevel_pressure'], + }, + '/sensors/rhvWeather-01/wind_speed': { + 'resourceName': 'wind_speed', + 'resourceClass': 'ObservableProperty', + 'resourceType': 'speed', + 'interfaceType':'sensor', + 'subscriber': ['mqtt://smartobjectservice.com:1883/sensors/rhvWeather-01/wind_speed'], + }, + '/sensors/rhvWeather-01/wind_gust': { + 'resourceName': 'wind_gust', + 'resourceClass': 'ObservableProperty', + 'resourceType': 'speed', + 'interfaceType':'sensor', + 'subscriber': ['mqtt://smartobjectservice.com:1883/sensors/rhvWeather-01/wind_gust'], + }, + '/sensors/rhvWeather-01/wind_direction': { + 'resourceName': 'wind_direction', + 'resourceClass': 'ObservableProperty', + 'resourceType': 'direction', + 'interfaceType':'sensor', + 'subscriber': ['mqtt://smartobjectservice.com:1883/sensors/rhvWeather-01/wind_direction'], + }, + '/sensors/rhvWeather-01/current_rain': { + 'resourceName': 'current_rain', + 'resourceClass': 'ObservableProperty', + 'resourceType': 'depth', + 'interfaceType':'sensor', + 'subscriber': ['mqtt://smartobjectservice.com:1883/sensors/rhvWeather-01/current_rain'], + }, + '/sensors/rhvWeather-01/hourly_rain': { + 'resourceName': 'hourly_rain', + 'resourceClass': 'ObservableProperty', + 'resourceType': 'depth', + 'interfaceType':'sensor', + 'subscriber': ['mqtt://smartobjectservice.com:1883/sensors/rhvWeather-01/hourly_rain'], + }, + '/sensors/rhvWeather-01/daily_rain': { + 'resourceName': 'daily_rain', + 'resourceClass': 'ObservableProperty', + 'resourceType': 'depth', + 'interfaceType':'sensor', + 'subscriber': ['mqtt://smartobjectservice.com:1883/sensors/rhvWeather-01/daily_rain'], + } } diff --git a/test/CoapTest.py b/old/CoapTest.py similarity index 100% rename from test/CoapTest.py rename to old/CoapTest.py diff --git a/examples/WeatherSensorHttpCoap.py b/old/WeatherSensorHttpCoap.py similarity index 100% rename from examples/WeatherSensorHttpCoap.py rename to old/WeatherSensorHttpCoap.py diff --git a/examples/WeatherSensorHttpXively.py b/old/WeatherSensorHttpXively.py similarity index 100% rename from examples/WeatherSensorHttpXively.py rename to old/WeatherSensorHttpXively.py diff --git a/examples/WeatherSensorLocalMQTTBridge.py b/old/WeatherSensorLocalMQTTBridge.py similarity index 100% rename from examples/WeatherSensorLocalMQTTBridge.py rename to old/WeatherSensorLocalMQTTBridge.py diff --git a/examples/WeatherSensorMQTTGateway.py b/old/WeatherSensorMQTTGateway.py similarity index 100% rename from examples/WeatherSensorMQTTGateway.py rename to old/WeatherSensorMQTTGateway.py diff --git a/examples/WeatherSensorMQTTHttpCoapBridge.py b/old/WeatherSensorMQTTHttpCoapBridge.py similarity index 100% rename from examples/WeatherSensorMQTTHttpCoapBridge.py rename to old/WeatherSensorMQTTHttpCoapBridge.py diff --git a/examples/WeatherSensorMQTTSubscriber.py b/old/WeatherSensorMQTTSubscriber.py similarity index 100% rename from examples/WeatherSensorMQTTSubscriber.py rename to old/WeatherSensorMQTTSubscriber.py diff --git a/examples/WeatherSensorMQTTXively.py b/old/WeatherSensorMQTTXively.py similarity index 100% rename from examples/WeatherSensorMQTTXively.py rename to old/WeatherSensorMQTTXively.py diff --git a/test/WeatherSensorTest.py b/old/WeatherSensorTest.py similarity index 100% rename from test/WeatherSensorTest.py rename to old/WeatherSensorTest.py diff --git a/test/mqttTest.py b/old/mqttTest.py similarity index 100% rename from test/mqttTest.py rename to old/mqttTest.py