add ability to specify door access

Author: pawl

README.md

@@ -50,7 +50,7 @@ Add user (using 10-digit format RFID number):
 
 	badge = ten_digit_to_comma_format(11111111) # badge number needs to be converted to "comma format"
 
-	client.add_user(badge)
+	client.add_user(badge, [1, 2]) # add privileges for door 1 & 2
 
 Remove user (using 10-digit format RFID number):
 

examples/add_user.py

@@ -6,4 +6,7 @@
 
 badge = ten_digit_to_comma_format(11111111) # badge number needs to be in "comma format"
 
-client.add_user(badge)
+client.add_user(badge, [1]) # add badge to door 1
+client.add_user(badge, [1, 2]) # add badge to door 1 and 2
+client.add_user(badge, [1, 2, 3]) # add badge to door 1, 2, and 3
+client.add_user(badge, [1, 2, 3, 4]) # add badge to door 1, 2, 3, and 4

examples/webserver.py

@@ -20,7 +20,7 @@ def index(self, apiKey=None, action=None, badge=None):
 						return "Failed To Remove User"
 				elif (action == "add"):
 					try:
-						client.add_user(badge)
+						client.add_user(badge, [1,2])
 						return "User Added Successfully"
 					except:
 						return "Failed To Add User"

rfid.py

@@ -96,10 +96,20 @@ def CRC_16_IBM(self, data):
 		listString[4:8] = struct.pack('<H', code).encode('hex') # switch order to little endian and return unsigned short, then replace characters in list with the CRC values
 		return "".join(listString) 
 
-	def add_user(self, badge):
+	def add_user(self, badge, doors):
 		if not isinstance(badge, int):
 			raise TypeError("RFID number must be set to an integer")
 
+		if not isinstance(doors, list):
+			raise Exception("doors must be set to a list")
+		
+		# create a list of "01"'s (enabled) and "00"'s (disabled), then later join to create "01000000" (which is only door 1 enabled)
+		doorsList = []
+		doorsList.append("01") if 1 in doors else doorsList.append("00") # door 1
+		doorsList.append("01") if 2 in doors else doorsList.append("00") # door 2
+		doorsList.append("01") if 3 in doors else doorsList.append("00") # door 3
+		doorsList.append("01") if 4 in doors else doorsList.append("00") # door 4
+			
 		badge = struct.pack('<I', badge).encode('hex') # pack as little endian integer
 
 		add_packet1 = self.CRC_16_IBM('2010' + self.source_port + '2800000000000000' + self.controller_serial + '00000200ffffffff').decode('hex')
@@ -109,7 +119,7 @@ def add_user(self, badge):
 		if (recv_data1[:4] != '2011'):
 			raise Exception("Unexpected Result Received: %s" % recv_data1)
 
-		add_packet2 = self.CRC_16_IBM('2320' + self.source_port + '2900000000000000' + self.controller_serial + '00000200' + badge + '00000000a04e4605' + '87' + '1c9f3b0100000000000000').decode('hex')
+		add_packet2 = self.CRC_16_IBM('2320' + self.source_port + '2900000000000000' + self.controller_serial + '00000200' + badge + '00000000a04e4605' + '87' + '1c9f3b' + "".join(doorsList) + '00000000').decode('hex')
 		self.s.send(self.start_transaction)
 		self.s.send(add_packet2)
 		recv_data2 =  binascii.b2a_hex(self.s.recv(1024))

setup.py

@@ -10,14 +10,14 @@
 
 setup(
     name='Chinese-RFID-Access-Control-Library',
-    version='0.0.5',
+    version='0.0.6',
     description='A library for interfacing with one of the most common RFID Access Control System sold in China.',
     long_description=readme,
     author='Paul Brown',
     author_email='paul90brown@gmail.com',
     url='https://github.com/pawl/Chinese-RFID-Access-Control-Library',
     license=license,
-	download_url = ['https://github.com/pawl/Chinese-RFID-Access-Control-Library/tarball/master#egg=package-0.0.5'],
+	download_url = ['https://github.com/pawl/Chinese-RFID-Access-Control-Library/tarball/master#egg=package-0.0.6'],
 	keywords = ['rfid', 'access control'],
     py_modules = ['rfid']
 )