Directory cleanup

moved old stuff into old directory for temporary reference
connectIOT · Jun 2, 2014 · 4488065 · 4488065
1 parent b4423b7
commit 4488065
Show file tree

Hide file tree

Showing 11 changed files with 50 additions and 5 deletions.
diff --git a/examples/InstanceConstructor.py b/examples/InstanceConstructor.py
@@ -81,18 +81,63 @@
         'resourceType': 'temperature',
         'interfaceType':'sensor',
         'subscriber': ['mqtt://smartobjectservice.com:1883/sensors/rhvWeather-01/outdoor_temperature'],
-        'publisher': '',
-        'bridge': ''
         },
     '/sensors/rhvWeather-01/outdoor_humidity': {
         'resourceName': 'outdoor_humidity',
         'resourceClass': 'ObservableProperty',
         '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 → old/CoapTest.py b/test/CoapTest.py → old/CoapTest.py
diff --git a/examples/WeatherSensorHttpCoap.py → old/WeatherSensorHttpCoap.py b/examples/WeatherSensorHttpCoap.py → old/WeatherSensorHttpCoap.py
diff --git a/examples/WeatherSensorHttpXively.py → old/WeatherSensorHttpXively.py b/examples/WeatherSensorHttpXively.py → old/WeatherSensorHttpXively.py
diff --git a/examples/WeatherSensorLocalMQTTBridge.py → old/WeatherSensorLocalMQTTBridge.py b/examples/WeatherSensorLocalMQTTBridge.py → old/WeatherSensorLocalMQTTBridge.py
diff --git a/examples/WeatherSensorMQTTGateway.py → old/WeatherSensorMQTTGateway.py b/examples/WeatherSensorMQTTGateway.py → old/WeatherSensorMQTTGateway.py
diff --git a/examples/WeatherSensorMQTTHttpCoapBridge.py → old/WeatherSensorMQTTHttpCoapBridge.py b/examples/WeatherSensorMQTTHttpCoapBridge.py → old/WeatherSensorMQTTHttpCoapBridge.py
diff --git a/examples/WeatherSensorMQTTSubscriber.py → old/WeatherSensorMQTTSubscriber.py b/examples/WeatherSensorMQTTSubscriber.py → old/WeatherSensorMQTTSubscriber.py
diff --git a/examples/WeatherSensorMQTTXively.py → old/WeatherSensorMQTTXively.py b/examples/WeatherSensorMQTTXively.py → old/WeatherSensorMQTTXively.py
diff --git a/test/WeatherSensorTest.py → old/WeatherSensorTest.py b/test/WeatherSensorTest.py → old/WeatherSensorTest.py
diff --git a/test/mqttTest.py → old/mqttTest.py b/test/mqttTest.py → old/mqttTest.py