- refactored

git-svn-id: http://moon:8086/svn/projects/HendiControl@380 fda53097-d464-4ada-af97-ba876c37ca34

Control/brewpi/hendiCtrl.py

@@ -43,6 +43,7 @@ class HendiCtrl():
 		self.sw_ver = self.getSoftwareVersion()
 		self.log("Create {}, Version {}".format(self.sw_id, self.sw_ver))
 
+
 	def toDigits(self, power_watts):
 		return np.polyval(self.poly_w2d, float(power_watts))
 
@@ -99,7 +100,7 @@ class HendiCtrl():
 
 	def __read(self):
 		# Read line echo
-		self.ser.readline()
+		echo = self.ser.readline()
 
 		# Read answer line
 		answer = self.ser.readline().decode('utf-8').replace('\r', '').replace('\n', '')
@@ -116,7 +117,7 @@ class HendiCtrl():
 		if "OK" not in rsp[0]:
 			raise Exception(rsp[1])
 
-		return rsp[1] == '1'
+		return rsp[1]
 		
 	def getCapabilties(self):
 		return self.caps
@@ -178,6 +179,10 @@ class HendiCtrl():
 
 if __name__ == '__main__':
 
+	logging.getLogger().setLevel(logging.INFO)
+	FORMAT = '%(asctime)-15s %(user)-8s %(message)s'
+	logging.basicConfig(format=FORMAT)
+
 	hendi = HendiCtrl('/dev/ttyUSB0', 115200)
 
 #	hendi.firmware_update("HendiCtrl.srec")
@@ -199,7 +204,7 @@ if __name__ == '__main__':
 	print ("Test Hendi")
 	hendi.remoteEnable(True)
 	hendi.setSwitch(1)
-	time.sleep(10.0)
+	time.sleep(1.0)
 	for pwr in range(500, 3600, 100):
 		hendi.setPowerWatts(pwr)
 		pw = hendi.getPowerWatts()