Merge pull request #63 from jithinbp/development

 - Added Support for SX1276 LoRa module for long range wireless communication
 - Code edits and bug fixes for various sensor libraries
 - Added a transaction function (sciencelab.SPI.xfer) for bulk data exchange via the SPI bus

Author: jithinbp

PSL/Peripherals.py

@@ -427,7 +427,6 @@ def __captureStart__(self,address,location,sample_length,total_samples,tg):
     def __retrievebuffer__(self):
         '''
         Fetch data acquired by the I2C scope. refer to :func:`__captureStart__`
-        
         '''
         total_int_samples = self.total_bytes/2
         DATA_SPLITTING = 500
@@ -440,7 +439,7 @@ def __retrievebuffer__(self):
             self.H.__sendInt__(DATA_SPLITTING)
             self.H.__sendInt__(i*DATA_SPLITTING)
             rem = DATA_SPLITTING*2+1
-            for a in range(200):
+            for _ in range(200):
                 partial = self.H.fd.read(rem)       #reading int by int sometimes causes a communication error. this works better.
                 rem -=len(partial)
                 data+=partial
@@ -457,7 +456,7 @@ def __retrievebuffer__(self):
             self.H.__sendInt__(total_int_samples%DATA_SPLITTING)
             self.H.__sendInt__(total_int_samples-total_int_samples%DATA_SPLITTING)
             rem = 2*(total_int_samples%DATA_SPLITTING)+1
-            for a in range(20):
+            for _ in range(20):
                 partial = self.H.fd.read(rem)       #reading int by int sometimes causes a communication error. this works better.
                 rem -=len(partial)
                 data+=partial
@@ -825,6 +824,13 @@ def send16_burst(self, value):
         except Exception as ex:
             self.raiseException(ex, "Communication Error , Function : " + inspect.currentframe().f_code.co_name)
 
+    def xfer(self,chan,data):
+        self.start(chan)
+        reply=[]
+        for a in data:
+            reply.append(self.send8(a))
+        self.stop(chan)
+        return reply
 
 class DACCHAN:
     def __init__(self, name, span, channum, **kwargs):

PSL/SENSORS/BH1750.py

@@ -1,5 +1,4 @@
 from __future__ import print_function
-from numpy import int16
 
 
 def connect(route, **args):

PSL/SENSORS/HMC5883L.py

@@ -77,8 +77,8 @@ def setGain(self, gain):
         self.gainValue = self.gain_choices.index(gain)
         self.__writeCONFB__()
 
-    def getVals(self, addr, bytes):
-        vals = self.I2C.readBulk(self.ADDRESS, addr, bytes)
+    def getVals(self, addr, numbytes):
+        vals = self.I2C.readBulk(self.ADDRESS, addr, numbytes)
         return vals
 
     def getRaw(self):

PSL/SENSORS/MLX90614.py

@@ -1,5 +1,4 @@
 from __future__ import print_function
-from numpy import int16
 
 
 def connect(route, **args):
@@ -27,8 +26,8 @@ def __init__(self, I2C, **args):
         try:
             print('switching baud to 100k')
             self.I2C.configI2C(100e3)
-        except:
-            print('FAILED TO CHANGE BAUD RATE')
+        except Exception as e:
+            print('FAILED TO CHANGE BAUD RATE',e.message)
 
     def select_source(self, source):
         if source == 'object temperature':
@@ -40,8 +39,8 @@ def readReg(self, addr):
         x = self.getVals(addr, 2)
         print(hex(addr), hex(x[0] | (x[1] << 8)))
 
-    def getVals(self, addr, bytes):
-        vals = self.I2C.readBulk(self.ADDRESS, addr, bytes)
+    def getVals(self, addr, numbytes):
+        vals = self.I2C.readBulk(self.ADDRESS, addr, numbytes)
         return vals
 
     def getRaw(self):

PSL/SENSORS/MPU6050.py

@@ -37,12 +37,6 @@ def __init__(self, I2C, **args):
                        'KalmanFilter': {'dataType':'double','min':0,'max':1000,'prefix':'value: '} }
         self.setGyroRange(2000)
         self.setAccelRange(16)
-        '''
-        try:
-            self.I2C.configI2C(400e3)
-        except:
-            pass
-        '''
         self.powerUp()
         self.K = None
 
@@ -60,8 +54,8 @@ def KalmanFilter(self, opt):
             sd = std(noise[a])
             self.K[a] = KalmanFilter(1. / opt, sd ** 2)
 
-    def getVals(self, addr, bytes):
-        vals = self.I2C.readBulk(self.ADDRESS, addr, bytes)
+    def getVals(self, addr, numbytes):
+        vals = self.I2C.readBulk(self.ADDRESS, addr, numbytes)
         return vals
 
     def powerUp(self):

PSL/SENSORS/MPU925x.py

@@ -37,17 +37,9 @@ def __init__(self,I2C,**args):
 		self.params={'powerUp':None,'setGyroRange':[250,500,1000,2000],'setAccelRange':[2,4,8,16],'KalmanFilter':[.01,.1,1,10,100,1000,10000,'OFF']}
 		self.setGyroRange(2000)
 		self.setAccelRange(16)
-		'''
-		try:
-			self.I2C.configI2C(400e3)
-		except:
-			pass
-		'''
 		self.powerUp()
 		self.K=None
 
-
-
 	def KalmanFilter(self,opt):
 		if opt=='OFF':
 			self.K=None
@@ -62,9 +54,8 @@ def KalmanFilter(self,opt):
 			sd = std(noise[a])
 			self.K[a] = KalmanFilter(1./opt, sd**2)
 
-	def getVals(self,addr,bytes):
-		vals = self.I2C.readBulk(self.ADDRESS,addr,bytes) 
-		return vals
+	def getVals(self,addr,numbytes):
+		return self.I2C.readBulk(self.ADDRESS,addr,numbytes) 
 
 	def powerUp(self):
 		self.I2C.writeBulk(self.ADDRESS,[0x6B,0])
@@ -79,8 +70,7 @@ def setAccelRange(self,rs):
 
 	def getRaw(self):
 		'''
-		This method must be defined if you want GUIs to use this class to generate 
-		plots on the fly.
+		This method must be defined if you want GUIs to use this class to generate plots on the fly.
 		It must return a set of different values read from the sensor. such as X,Y,Z acceleration.
 		The length of this list must not change, and must be defined in the variable NUMPLOTS.
 		
@@ -151,8 +141,8 @@ def getMag(self):
 
 	def WhoAmI(self):
 		'''
-		Returns the ID . 
-		It is 71 for MPU9250 . 
+		Returns the ID.
+		It is 71 for MPU9250.
 		'''
 		v = self.I2C.readBulk(self.ADDRESS,0x75,1)[0]
 		if v not in [0x71,0x73]:return 'Error %s'%hex(v)
@@ -164,8 +154,8 @@ def WhoAmI(self):
 
 	def WhoAmI_AK8963(self):
 		'''
-		Returns the ID fo magnetometer AK8963 if found. 
-		It should be 0x48. 
+		Returns the ID fo magnetometer AK8963 if found.
+		It should be 0x48.
 		'''
 		self.initMagnetometer()
 		v= self.I2C.readBulk(self.AK8963_ADDRESS,0,1) [0]
@@ -175,10 +165,9 @@ def WhoAmI_AK8963(self):
 	def initMagnetometer(self):
 		'''
 		For MPU925x with integrated magnetometer.
-		It's called a 10 DoF sensor, but technically speaking , 
-		the 3-axis Accel , 3-Axis Gyro, temperature sensor are integrated in one IC, and the 3-axis magnetometer is implemented in a 
+		It's called a 10 DoF sensor, but technically speaking ,
+		the 3-axis Accel , 3-Axis Gyro, temperature sensor are integrated in one IC, and the 3-axis magnetometer is implemented in a
 		separate IC which can be accessed via an I2C passthrough.
-		
 		Therefore , in order to detect the magnetometer via an I2C scan, the passthrough must first be enabled on IC#1 (Accel,gyro,temp)
 		'''
 		self.I2C.writeBulk(self.ADDRESS,[self.INT_PIN_CFG,0x22]) #I2C passthrough
@@ -190,8 +179,8 @@ def initMagnetometer(self):
 if __name__ == "__main__":
 	from PSL import sciencelab
 	I = sciencelab.connect()
-	A = connect(I.I2C) 
-	t,x,y,z = I.I2C.capture(A.ADDRESS,0x43,6,5000,1000,'int') 
+	A = connect(I.I2C)
+	t,x,y,z = I.I2C.capture(A.ADDRESS,0x43,6,5000,1000,'int')
 	#print (t,x,y,z)
 	from pylab import *
 	plot(t,x)

PSL/SENSORS/SHT21.py

@@ -1,5 +1,4 @@
 from __future__ import print_function
-from numpy import int16
 import time
 
 
@@ -9,6 +8,27 @@ def connect(route, **args):
     '''
     return SHT21(route, **args)
 
+def rawToTemp( vals):
+        if vals:
+            if len(vals):
+                v = (vals[0] << 8) | (vals[1] & 0xFC)  # make integer & remove status bits
+                v *= 175.72
+                v /= (1 << 16)
+                v -= 46.85
+                return [v]
+        return False
+
+def rawToRH( vals):
+        if vals:
+            if len(vals):
+                v = (vals[0] << 8) | (vals[1] & 0xFC)  # make integer & remove status bits
+                v *= 125.
+                v /= (1 << 16)
+                v -= 6
+                return [v]
+        return False
+
+
 
 class SHT21():
     RESET = 0xFE
@@ -38,25 +58,6 @@ def init(self):
         self.I2C.writeBulk(self.ADDRESS, [self.RESET])  # soft reset
         time.sleep(0.1)
 
-    def rawToTemp(self, vals):
-        if vals:
-            if len(vals):
-                v = (vals[0] << 8) | (vals[1] & 0xFC)  # make integer & remove status bits
-                v *= 175.72
-                v /= (1 << 16)
-                v -= 46.85
-                return [v]
-        return False
-
-    def rawToRH(self, vals):
-        if vals:
-            if len(vals):
-                v = (vals[0] << 8) | (vals[1] & 0xFC)  # make integer & remove status bits
-                v *= 125.
-                v /= (1 << 16)
-                v -= 6
-                return [v]
-        return False
 
     @staticmethod
     def _calculate_checksum(data, number_of_bytes):
@@ -69,7 +70,7 @@ def _calculate_checksum(data, number_of_bytes):
         # calculates 8-Bit checksum with given polynomial
         for byteCtr in range(number_of_bytes):
             crc ^= (data[byteCtr])
-            for bit in range(8, 0, -1):
+            for _ in range(8, 0, -1):
                 if crc & 0x80:
                     crc = (crc << 1) ^ POLYNOMIAL
                 else:
@@ -95,6 +96,6 @@ def getRaw(self):
                 print(vals)
                 return False
         if self.selected == self.TEMP_ADDRESS:
-            return self.rawToTemp(vals)
+            return rawToTemp(vals)
         elif self.selected == self.HUMIDITY_ADDRESS:
-            return self.rawToRH(vals)
+            return rawToRH(vals)