Merge pull request #6 from myDevicesIoT/revert-5-feature/multivalue

Revert "Add new data types and units."

Author: jburhenn

cayenne/__init__.py

@@ -1 +1 @@
-__version__ = "1.0.2a1"
+__version__ = "1.0.1"

cayenne/client.py

@@ -1,12 +1,31 @@
-"""
-This module contains the main agent client for connecting to the Cayenne server. The client connects
-to server, sends data to the server and handles commands from the server.
-"""
-
-import time
 import paho.mqtt.client as mqtt
+import time
 from cayenne import __version__
-from cayenne.datatypes import *
+
+# Data types
+TYPE_BAROMETRIC_PRESSURE = "bp" # Barometric pressure
+TYPE_BATTERY = "batt" # Battery
+TYPE_LUMINOSITY = "lum" # Luminosity
+TYPE_PROXIMITY = "prox" # Proximity
+TYPE_RELATIVE_HUMIDITY = "rel_hum" # Relative Humidity
+TYPE_TEMPERATURE = "temp" # Temperature
+TYPE_VOLTAGE = "voltage" # Voltage
+
+# Unit types
+UNIT_UNDEFINED = "null"
+UNIT_PASCAL = "pa" # Pascal
+UNIT_HECTOPASCAL = "hpa" # Hectopascal
+UNIT_PERCENT = "p" # % (0 to 100)
+UNIT_RATIO = "r" # Ratio
+UNIT_VOLTS = "v" # Volts
+UNIT_LUX = "lux" # Lux
+UNIT_CENTIMETER = "cm" # Centimeter
+UNIT_METER = "m" # Meter
+UNIT_DIGITAL = "d" # Digital (0/1)
+UNIT_FAHRENHEIT = "f" # Fahrenheit
+UNIT_CELSIUS = "c" # Celsius
+UNIT_KELVIN = "k" # Kelvin
+UNIT_MILLIVOLTS = "mv" # Millivolts
 
 # Topics
 COMMAND_TOPIC = "cmd"
@@ -33,7 +52,7 @@ def on_connect(client, cayenne, flags, rc):
         # reconnect then subscriptions will be renewed.
         cayenne.connected = True
         cayenne.reconnect = False
-        command_topic = cayenne.getCommandTopic()
+        command_topic = cayenne.getCommandTopic();
         print("SUB %s\n" % command_topic)
         client.subscribe(command_topic)
         cayenne.mqttPublish("%s/sys/model" % cayenne.rootTopic, "Python")
@@ -236,30 +255,6 @@ def hectoPascalWrite(self, channel, value):
         """
         self.virtualWrite(channel, value, TYPE_BAROMETRIC_PRESSURE, UNIT_HECTOPASCAL)
 
-    def accelWrite(self, channel, x=UNIT_UNDEFINED, y=UNIT_UNDEFINED, z=UNIT_UNDEFINED):
-        """Send an acceleration value list to Cayenne.
-
-        channel is the Cayenne channel to use.
-        x is the acceleration on the X-axis.
-        y is the acceleration on the Y-axis.
-        z is the acceleration on the Z-axis.
-        """
-        value = [x, y, z]
-        value = ''.join(c for c in repr(value) if c not in (" ", "'"))
-        self.virtualWrite(channel, value, TYPE_ACCELERATION, UNIT_G)
-
-    def gpsWrite(self, channel, latitude=UNIT_UNDEFINED, longitude=UNIT_UNDEFINED, altitude=UNIT_UNDEFINED):
-        """Send a GPS value list to Cayenne.
-
-        channel is the Cayenne channel to use.
-        latitude is the latitude in degrees.
-        longitude is the longitude in degrees.
-        altitude is the altitude in meters.
-        """
-        value = [latitude, longitude, altitude]
-        value = ''.join(c for c in repr(value) if c not in (" ", "'"))
-        self.virtualWrite(channel, value, TYPE_GPS, UNIT_METER)
-
     def mqttPublish(self, topic, payload):
         """Publish a payload to a topic
         

cayenne/datatypes.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from cayenne import client, datatypes
+import cayenne.client
 import time
 
 # Cayenne authentication info. This should be obtained from the Cayenne Dashboard.
@@ -13,20 +13,19 @@ def on_message(message):
     print("message received: " + str(message))
     # If there is an error processing the message return an error string, otherwise return nothing.
 
-cayenne_client = client.CayenneMQTTClient()
-cayenne_client.on_message = on_message
-cayenne_client.begin(MQTT_USERNAME, MQTT_PASSWORD, MQTT_CLIENT_ID)
+client = cayenne.client.CayenneMQTTClient()
+client.on_message = on_message
+client.begin(MQTT_USERNAME, MQTT_PASSWORD, MQTT_CLIENT_ID)
 
 i=0
 timestamp = 0
 
 while True:
-    cayenne_client.loop()
+    client.loop()
 
     if (time.time() > timestamp + 10):
-        cayenne_client.celsiusWrite(1, i)
-        cayenne_client.luxWrite(2, i*10)
-        cayenne_client.hectoPascalWrite(3, i+800)
-        cayenne_client.virtualWrite(4, i%2, datatypes.TYPE_DIGITAL_SENSOR, datatypes.UNIT_DIGITAL)
+        client.celsiusWrite(1, i)
+        client.luxWrite(2, i*10)
+        client.hectoPascalWrite(3, i+800)
         timestamp = time.time()
         i = i+1

examples/Example-03-CayenneClient.py

@@ -43,8 +43,6 @@ def on_message(message):
     client.luxWrite(4, 4)
     client.pascalWrite(5, 5)
     client.hectoPascalWrite(6, 6)
-    client.accelWrite(7, 7.01, 7.02, -7.03)
-    client.gpsWrite(8, 27.986065, 86.922623, 8848)
 
     print("Test receiving commands")
     client.mqttPublish(client.rootTopic + '/cmd/10', 'senderror,0')