Make mooshimeter a package

Example.py

@@ -1,4 +1,5 @@
-from Mooshimeter import *
+from mooshimeter.meter import Mooshimeter
+from mooshimeter import bg_wrapper
 import threading
 import time
 
@@ -14,7 +15,7 @@ def run(self):
 
 """
 Example.py
-This script is meant to demonstrate use of the Mooshimeter and BGWrapper classes.
+This script is meant to demonstrate use of the Mooshimeter and bg_wrapper classes.
 The script does the following:
 - Scan for BLE devices
 - Filter for Mooshimeters
@@ -51,15 +52,15 @@ def writeCh2(self, meter, val):
 if __name__=="__main__":
     # Set up the lower level to talk to a BLED112 in port COM4
     # REPLACE THIS WITH THE BLED112 PORT ON YOUR SYSTEM
-    BGWrapper.initialize("COM4")
+    bg_wrapper.initialize("COM4")
     inputthread = InputThread()
     inputthread.start()
     cmd_queue = []
     def addToQueue(s):
         cmd_queue.append(s)
     inputthread.cb = addToQueue
     # Scan for 3 seconds
-    scan_results = BGWrapper.scan(5)
+    scan_results = bg_wrapper.scan(5)
     # Filter for devices advertising the Mooshimeter service
     results_wrapped = filter(lambda(p):Mooshimeter.mUUID.METER_SERVICE in p.ad_services, scan_results)
     if len(results_wrapped) == 0:
@@ -75,7 +76,7 @@ def addToQueue(s):
         m.loadTree()
         # Wait for us to load the command tree
         while m.tree.getNodeAtLongname('SAMPLING:TRIGGER')==None:
-            BGWrapper.idle()
+            bg_wrapper.idle()
         # Unlock the meter by writing the correct CRC32 value
         # The CRC32 node's value is written when the tree is received
         m.sendCommand('admin:crc32 '+str(m.tree.getNodeAtLongname('admin:crc32').value))
@@ -103,7 +104,7 @@ def addToQueue(s):
 
     while True:
         # This call checks the serial port and processes new data
-        BGWrapper.idle()
+        bg_wrapper.idle()
         if time.time()-last_heartbeat_time > 10:
             last_heartbeat_time = time.time()
             for m in meters:

MANIFEST.in

@@ -0,0 +1,2 @@
+include LICENSE
+include README.md

README.md

@@ -1,6 +1,19 @@
 # Mooshimeter-PythonAPI
 A python API relying on the BLED112 to talk to the Mooshimeter
 
+[![Build status](https://ci.appveyor.com/api/projects/status/5ajjxonexbaqsu6c/branch/master?svg=true)](https://ci.appveyor.com/project/spyoungtech/mooshimeter-pythonapi/branch/master)
+
+
+# Install
+
+```
+pip install mooshimeter
+```
+
+**NOTE:** This package is maintained unofficially.  
+It has no official connection to the [official Mooshim repository](https://github.com/mooshim/Mooshimeter-PythonAPI).
+
+
 Example.py:
 This script is meant to demonstrate use of the Mooshimeter and BGWrapper classes.
 The script does the following:

appveyor.yml

@@ -0,0 +1,31 @@
+install:
+  - ps: |
+      py -2.7 -m virtualenv venv
+      .\venv\Scripts\activate.ps1
+      python -m pip install --upgrade pip
+      python -m pip install --upgrade .
+
+
+build_script:
+  - ps: |
+      .\venv\Scripts\activate.ps1
+      python setup.py sdist bdist_wheel
+
+artifacts:
+  - name: dist
+    path: dist\*
+
+test: off
+
+deploy_script:
+  - ps: |
+      if ($env:APPVEYOR_REPO_TAG -eq "true") {
+        py -2.7 -m virtualenv deploy_venv
+        .\deploy_venv\Scripts\activate.ps1
+        python -m pip install --upgrade pip
+        pip install --upgrade wheel
+        pip install --upgrade twine
+        twine upload dist\*
+      } else {
+        echo "Skipping Deploy Because this is not a tagged commit"
+      }

BGWrapper.py → mooshimeter/bg_wrapper.py

@@ -1,7 +1,7 @@
-import bglib
+from mooshimeter.vendor import bglib
 import serial
 import time
-from UUID import *
+from mooshimeter.utils import UUID
 
 # This module is designed to be used like a singleton class
 # It wraps the functions of bglib in an easier to use way
@@ -126,7 +126,7 @@ def findHandleForUUID(self,uuid):
             if c.uuid == uuid:
                 rval.append(c.handle)
         if len(rval) != 1:
-            raise
+            raise Exception('Expected rval length to be exactly 1. Was %d length' % len(rval))
         return rval[0]
     def readByHandle(self,char_handle):
         return read(self.conn_handle,char_handle)

ConfigNode.py → mooshimeter/config_node.py

@@ -1,5 +1,5 @@
 import zlib
-import CArrayWriter
+from mooshimeter import utils
 
 class NTYPE:
     PLAIN   =0  # May be an informational node, or a choice in a chooser
@@ -198,13 +198,13 @@ def writeCHeader(self,f):
         f.write('} cmd_code_t;\n')
 
         packed = self.pack()
-        CArrayWriter.writeHeader(f,'config_tree_packed',packed)
+        utils.writeHeader(f, 'config_tree_packed', packed)
 
         f.write('extern const unsigned long config_tree_crc32;\n')
     def writeCDec(self,f):
         f.write('#pragma once\n')
         packed = self.pack()
-        CArrayWriter.writeAsCArray(f,'config_tree_packed',packed)
+        utils.writeAsCArray(f, 'config_tree_packed', packed)
 
         crc32 = zlib.crc32(packed)
         # adapt for wart in zlib.crc32... signed ints

Mooshimeter.py → mooshimeter/meter.py

@@ -1,14 +1,13 @@
 # coding=UTF-8
-import BGWrapper
-from UUID import *
-from ConfigNode import *
-from BytePack import *
+from mooshimeter import bg_wrapper
+from mooshimeter.config_node import NTYPE, ConfigNode, ConfigTree
+from mooshimeter.utils import BytePack, UnderflowException, UUID
 import binascii
 
-class MeterSerOut(BGWrapper.Characteristic):
+class MeterSerOut(bg_wrapper.Characteristic):
     def __init__(self, meter, parent, handle, uuid):
         """
-        :param other: a BGWrapper.Characteristic
+        :param other: a bg_wrapper.Characteristic
         :return:
         """
         super(MeterSerOut,self).__init__(parent, handle, uuid)
@@ -76,10 +75,10 @@ def unpack(self):
         self.aggregate += b.bytes[1:]
         # Attempt to decode a message, if we succeed pop the message off the byte queue
         self.interpretAggregate()
-class MeterSerIn(BGWrapper.Characteristic):
+class MeterSerIn(bg_wrapper.Characteristic):
     def __init__(self, meter, parent, handle, uuid):
         """
-        :param other: a BGWrapper.Characteristic
+        :param other: a bg_wrapper.Characteristic
         :return:
         """
         super(MeterSerIn,self).__init__(parent, handle, uuid)
@@ -132,7 +131,7 @@ def sendToMeter(self, payload):
     def __init__(self, peripheral):
         """
         Initialized instance variables
-        :param peripheral: a BGWrapper.Peripheral instance
+        :param peripheral: a bg_wrapper.Peripheral instance
         :return:
         """
         self.p = peripheral
@@ -221,7 +220,7 @@ def tmp_cb():
             wrap[0]+=1
         self.meter_serout.enableNotify(True,tmp_cb)
     def disconnect(self):
-        BGWrapper.disconnect(self.p.conn_handle)
+        bg_wrapper.disconnect(self.p.conn_handle)
     def getUUIDString(self):
         return self.p.getUUIDString()
     def attachCallback(self,node_path,notify_cb):