Merge pull request fossasia#34 from fossasia/development

wavicles · web-flow · commit 9d2778040cf5 · 2016-09-09T21:47:52.000+05:30
merge from development
diff --git a/PSL/sciencelab.py b/PSL/sciencelab.py
@@ -211,7 +211,6 @@ def __runInitSequence__(self,**kwargs):
 						self.__print__( b,poly)
 						self.aboutArray.append([b]+['%.3e'%v for v in poly])
 						polyDict[a[:3]].append(poly)
-
 				
 				#Load calibration data (slopes and offsets) for ADC channels
 				inl_slope_intercept=struct.unpack('2f',inl_slope_intercept)
@@ -367,7 +366,7 @@ def capture1(self,ch,ns,tg,*args,**kwargs):
 		tg              Timegap between samples in microseconds
 		==============  ============================================================================================
 
-		.. figure:: ../images/capture1.png
+		.. figure:: images/capture1.png
 			:width: 11cm
 			:align: center
 			:alt: alternate text
@@ -404,7 +403,7 @@ def capture2(self,ns,tg,TraceOneRemap='CH1'):
 		TraceOneRemap   Choose the analog input for channel 1. It is connected to CH1 by default. Channel 2 always reads CH2.
 		==============  =======================================================================================================
 
-		.. figure:: ../images/capture2.png
+		.. figure:: images/capture2.png
 			:width: 11cm
 			:align: center
 			:alt: alternate text
@@ -457,7 +456,7 @@ def capture4(self,ns,tg,TraceOneRemap='CH1'):
 		TraceOneRemap   Choose the analog input for channel 1. It is connected to CH1 by default. Channel 2 always reads CH2.
 		==============  ======================================================================================================
 
-		.. figure:: ../images/capture4.png
+		.. figure:: images/capture4.png
 			:width: 11cm
 			:align: center
 			:alt: alternate text
@@ -763,7 +762,7 @@ def capture_traces(self,num,samples,tg,channel_one_input='CH1',CH123SA=0,**kwarg
 
 		.. _adc_example:
 
-			.. figure:: ../images/transient.png
+			.. figure:: images/transient.png
 				:width: 11cm
 				:align: center
 				:alt: alternate text
@@ -2584,6 +2583,7 @@ def capacitance_via_RC_discharge(self):
 				RC = self.__capture_capacitance__(samples,int(T/samples))[3][1]
 				return RC/10e3
 			else:
+				self.__print__('cap out of range %f %f'%(T,cap))
 				return 0
 		except Exception as e:
 			self.__print__(e)
@@ -3872,6 +3872,7 @@ def servo4(self,a1,a2,a3,a4):
 		"""
 		Operate Four servo motors independently using SQR1, SQR2, SQR3, SQR4.
 		tested with SG-90 9G servos.
+		For high current servos, please use a different power source, and a level convertor for the PWm output signals(if needed)
 		
 		.. tabularcolumns:: |p{3cm}|p{11cm}|
 		
@@ -3971,6 +3972,7 @@ def estimateDistance(self):
 		except Exception as ex:
 			self.raiseException(ex, "Communication Error , Function : "+inspect.currentframe().f_code.co_name)
 
+	"""
 	def TemperatureAndHumidity(self):
 		'''
 		init  AM2302.  
@@ -3984,6 +3986,7 @@ def TemperatureAndHumidity(self):
 		except Exception as ex:
 			self.raiseException(ex, "Communication Error , Function : "+inspect.currentframe().f_code.co_name)
 		self.digital_channels_in_buffer=1
+	"""
 
 	def opticalArray(self,SS,delay,channel = 'CH3',**kwargs):
 		'''
@@ -4081,5 +4084,5 @@ def raiseException(self,ex, msg):
 	I.get_average_voltage('CH1')
 	""")
 	#I=connect(verbose = True)
-	#print (I.get_capacitance())
+	#for a in range(20):print (I.get_capacitance())
 	#I=connect(verbose=True,load_calibration=False)
diff --git a/README.md b/README.md
@@ -72,4 +72,6 @@ To set up the development environment, install the packages mentioned in depende
 ### Blog posts related to PSLab on FOSSASIA blog 
 * [Installation of PSLab](http://blog.fossasia.org/pslab-code-repository-and-installation/)
 * [Communicating with PSLab](http://blog.fossasia.org/communicating-with-pocket-science-lab-via-usb-and-capturing-and-plotting-sine-waves/)
+* [Features and Controls of PSLab](http://blog.fossasia.org/features-and-controls-of-pocket-science-lab/)
+* [Design your own Experiments](http://blog.fossasia.org/design-your-own-experiments-with-pslab/)
 * [New Tools and Sensors for Fossasia PSLab and ExpEYES](http://blog.fossasia.org/new-tools-and-sensors-fossasia-pslab-and-expeyes/) 
