fixed issue with H and V in SET command packets

Author: timothyscherer

docs/rot2prog/rot2prog.html

@@ -50,8 +50,8 @@ <h1 class="title">Module <code>rot2prog.utils.run</code></h1>
         port = input(&#39;Please enter the serial port: &#39;)
         try:
                 return rot2prog.ROT2Prog(port)
-        except:
-                pass
+        except Exception as e:
+                print(e)
 
 if __name__ == &#39;__main__&#39;:
         logging.basicConfig(level = logging.DEBUG)
@@ -118,8 +118,8 @@ <h2 class="section-title" id="header-functions">Functions</h2>
         port = input(&#39;Please enter the serial port: &#39;)
         try:
                 return rot2prog.ROT2Prog(port)
-        except:
-                pass</code></pre>
+        except Exception as e:
+                print(e)</code></pre>
 </details>
 </dd>
 <dt id="rot2prog.utils.run.help"><code class="name flex">

docs/rot2prog/utils/run.html

@@ -33,27 +33,23 @@ <h1 class="title">Module <code>rot2prog.utils.sim</code></h1>
 import rot2prog
 
 if __name__ == &#39;__main__&#39;:
-        debug = &#39;&#39;
-        resolution = 0
+        pulses_per_degree = 0
 
-        while debug.lower() not in [&#39;y&#39;, &#39;n&#39;]:
-                debug = input(&#39;Run debugger? (y/n) &#39;)
+        # set log level
+        logging.basicConfig(level = logging.DEBUG)
 
-        if debug.lower() == &#39;y&#39;:
-                logging.basicConfig(level = logging.DEBUG)
-                print(&#39;Running in debug mode&#39;)
-        else:
-                logging.basicConfig(level = logging.INFO)
+        # get serial port
+        port = input(&#39;Please enter the serial port: &#39;)
 
-        while resolution not in [1, 2, 4]:
-                resolution = input(&#39;Pulses per degree: &#39;)
+        # set pulses per degree
+        while pulses_per_degree not in [1, 2, 4]:
+                pulses_per_degree = input(&#39;Pulses per degree: &#39;)
                 try:
-                        resolution = int(resolution)
+                        pulses_per_degree = int(pulses_per_degree)
                 except ValueError:
-                        pass
+                        print(&#39;Please select 1, 2, or 4 pulses per degree.&#39;)
 
-        port = input(&#39;Please enter the serial port: &#39;)
-        sim = rot2prog.ROT2ProgSim(port, resolution)
+        sim = rot2prog.ROT2ProgSim(port, pulses_per_degree)
 
         logging.getLogger().info(&#39;Press [Enter] to close simulator&#39;)
         input()

docs/rot2prog/utils/sim.html

@@ -9,7 +9,7 @@
 
 setuptools.setup(
 	name = "rot2prog",
-	version = "0.0.8",
+	version = "0.0.9",
 	author = "TJ Scherer",
 	author_email = "[email protected]",
 	description = "A python interface to the Alfa ROT2Prog Controller.",

setup.py

@@ -31,10 +31,6 @@ class ROT2Prog:
 	_pulses_per_degree = 1
 
 	_limits_lock = Lock()
-	_min_az = 0.0
-	_max_az = 360.0
-	_min_el = 0.0
-	_max_el = 180.0
 
 	def __init__(self, port, timeout = 5):
 		"""Creates object and opens serial connection.
@@ -60,15 +56,15 @@ def __init__(self, port, timeout = 5):
 		# set the limits to default values
 		self.set_limits()
 
-	def _send_command(self, cmd):
+	def _send_command(self, command_packet):
 		"""Sends a command packet.
 		
 		Args:
-		    cmd (list of int): Command packet queued.
+		    command_packet (list of int): Command packet queued.
 		"""
-		self._ser.write(bytearray(cmd))
-		self._log.debug('Command packet sent: ' + str(cmd))
-
+		self._ser.write(bytearray(command_packet))
+		self._log.debug('Command packet sent: ' + str(list(map(hex, list(command_packet)))))
+		
 	def _recv_response(self):
 		"""Receives a response packet.
 		
@@ -83,14 +79,13 @@ def _recv_response(self):
 		response_packet = list(self._ser.read(12))
 
 		# attempt to receive 12 bytes, the length of response packet
-		if len(response_packet) == 0:
-			raise ReadTimeout('response timed out')
-		elif len(response_packet) != 12:
-			self._log.debug('Response packet received: ' + str(list(response_packet)))
-			raise PacketError('incomplete response packet')
+		self._log.debug('Response packet received: ' + str(list(map(hex, list(response_packet)))))
+		if len(response_packet) != 12:
+			if len(response_packet) == 0:
+				raise ReadTimeout('Response timed out')
+			else:
+				raise PacketError('Incomplete response packet')
 		else:
-			self._log.debug('Response packet received: ' + str(list(response_packet)))
-
 			# convert from byte values
 			az = (response_packet[1] * 100) + (response_packet[2] * 10) + response_packet[3] + (response_packet[4] / 10.0) - 360.0
 			el = (response_packet[6] * 100) + (response_packet[7] * 10) + response_packet[8] + (response_packet[9] / 10.0) - 360.0
@@ -156,9 +151,9 @@ def set(self, az, el):
 
 		with self._limits_lock:
 			if az > self._max_az or az < self._min_az:
-				raise ValueError('Azimuth of ' + str(az) + '° is out of range: [' + str(self._min_az) + '°, ' + str(self._max_az) + '°]')
+				raise ValueError('Azimuth of ' + str(az) + '° is out of range [' + str(self._min_az) + '°, ' + str(self._max_az) + '°]')
 			if el > self._max_el or el < self._min_el:
-				raise ValueError('Elevation of ' + str(el) + '° is out of range: [' + str(self._min_el) + '°, ' + str(self._max_el) + '°]')
+				raise ValueError('Elevation of ' + str(el) + '° is out of range [' + str(self._min_el) + '°, ' + str(self._max_el) + '°]')
 
 		self._log.debug('Set command queued')
 		self._log.debug('-> Azimuth:   ' + str(az) + '°')
@@ -178,9 +173,9 @@ def set(self, az, el):
 		# build command
 		cmd = [
 			0x57,
-			int(H[-4]), int(H[-3]), int(H[-2]), int(H[-1]),
+			int(H[-4]) + 0x30, int(H[-3]) + 0x30, int(H[-2]) + 0x30, int(H[-1]) + 0x30,
 			resolution,
-			int(V[-4]), int(V[-3]), int(V[-2]), int(V[-1]),
+			int(V[-4]) + 0x30, int(V[-3]) + 0x30, int(V[-2]) + 0x30, int(V[-1]) + 0x30,
 			resolution,
 			0x2f,
 			0x20]
@@ -265,45 +260,43 @@ def _run(self):
 		"""
 		while self._keep_running:
 			command_packet = list(self._ser.read(13))
+			self._log.debug('Command packet received: ' + str(list(map(hex, list(command_packet)))))
 			if len(command_packet) != 13:
-				self._log.debug('Command packet received: ' + str(command_packet))
 				self._log.critical('Incomplete command packet')
 			else:
-				self._log.debug('Command packet received: ' + str(command_packet))
-
 				K = command_packet[11]
 
 				if K in [0x0F, 0x1F]:
 					if K == 0x0F:
-						self._log.info('Stop command received')
+						self._log.debug('Stop command received')
 					elif K == 0x1F:
-						self._log.info('Status command received')
+						self._log.debug('Status command received')
 
 					# convert to byte values
 					H = "00000" + str(round(float(self._az + 360), 1))
 					V = "00000" + str(round(float(self._el + 360), 1))
 
-					rsp = [
+					response_packet = [
 						0x57,
 						int(H[-5]), int(H[-4]), int(H[-3]), int(H[-1]),
 						self._pulses_per_degree,
 						int(V[-5]), int(V[-4]), int(V[-3]), int(V[-1]),
 						self._pulses_per_degree,
 						0x20]
 
-					self._log.info('Response queued')
-					self._log.info('-> Azimuth:   ' + str(self._az) + '°')
-					self._log.info('-> Elevation: ' + str(self._el) + '°')
-					self._log.info('-> PH:        ' + str(self._pulses_per_degree))
-					self._log.info('-> PV:        ' + str(self._pulses_per_degree))
+					self._log.debug('Response queued')
+					self._log.debug('-> Azimuth:   ' + str(self._az) + '°')
+					self._log.debug('-> Elevation: ' + str(self._el) + '°')
+					self._log.debug('-> PH:        ' + hex(self._pulses_per_degree))
+					self._log.debug('-> PV:        ' + hex(self._pulses_per_degree))
 
-					self._ser.write(bytearray(rsp))
+					self._ser.write(bytearray(response_packet))
 
-					self._log.debug('Response packet sent: ' + str(rsp))
+					self._log.debug('Response packet sent: ' + str(list(map(hex, list(response_packet)))))
 				elif K == 0x2F:
 					# convert from ascii characters
-					H = (command_packet[1] * 1000) + (command_packet[2] * 100) + (command_packet[3] * 10) + command_packet[4]
-					V = (command_packet[6] * 1000) + (command_packet[7] * 100) + (command_packet[8] * 10) + command_packet[9]
+					H = ((command_packet[1] - 0x30) * 1000) + ((command_packet[2] - 0x30) * 100) + ((command_packet[3] - 0x30) * 10) + (command_packet[4] - 0x30)
+					V = ((command_packet[6] - 0x30) * 1000) + ((command_packet[7] - 0x30) * 100) + ((command_packet[8] - 0x30) * 10) + (command_packet[9] - 0x30)
 
 					# decode with resolution
 					self._az = H/self._pulses_per_degree - 360.0
@@ -312,9 +305,9 @@ def _run(self):
 					self._az = float(round(self._az, 1))
 					self._el = float(round(self._el, 1))
 
-					self._log.info('Set command received')
-					self._log.info('-> Azimuth:   ' + str(self._az) + '°')
-					self._log.info('-> Elevation: ' + str(self._el) + '°')
+					self._log.debug('Set command received')
+					self._log.debug('-> Azimuth:   ' + str(self._az) + '°')
+					self._log.debug('-> Elevation: ' + str(self._el) + '°')
 				else:
 					self._log.error('Invalid command received (K = ' + str(hex(K)) + ')')
 

src/rot2prog/rot2prog.py

@@ -21,8 +21,8 @@ def connect():
 	port = input('Please enter the serial port: ')
 	try:
 		return rot2prog.ROT2Prog(port)
-	except:
-		pass
+	except Exception as e:
+		print(e)
 
 if __name__ == '__main__':
 	logging.basicConfig(level = logging.DEBUG)

src/rot2prog/utils/run.py

@@ -4,27 +4,23 @@
 import rot2prog
 
 if __name__ == '__main__':
-	debug = ''
-	resolution = 0
+	pulses_per_degree = 0
 
-	while debug.lower() not in ['y', 'n']:
-		debug = input('Run debugger? (y/n) ')
+	# set log level
+	logging.basicConfig(level = logging.DEBUG)
 
-	if debug.lower() == 'y':
-		logging.basicConfig(level = logging.DEBUG)
-		print('Running in debug mode')
-	else:
-		logging.basicConfig(level = logging.INFO)
+	# get serial port
+	port = input('Please enter the serial port: ')
 
-	while resolution not in [1, 2, 4]:
-		resolution = input('Pulses per degree: ')
+	# set pulses per degree
+	while pulses_per_degree not in [1, 2, 4]:
+		pulses_per_degree = input('Pulses per degree: ')
 		try:
-			resolution = int(resolution)
+			pulses_per_degree = int(pulses_per_degree)
 		except ValueError:
-			pass
+			print('Please select 1, 2, or 4 pulses per degree.')
 
-	port = input('Please enter the serial port: ')
-	sim = rot2prog.ROT2ProgSim(port, resolution)
+	sim = rot2prog.ROT2ProgSim(port, pulses_per_degree)
 
 	logging.getLogger().info('Press [Enter] to close simulator')
 	input()