From 23dbd0618124cfa9d9d637f66cd9f8afbb3d32ad Mon Sep 17 00:00:00 2001
From: Martin Hepp <mfhepp@gmail.com>
Date: Fri, 28 Oct 2016 00:24:59 +0200
Subject: [PATCH] bugfix for SSIDs from 10-15

---
 afsk/ax25.py | 39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/afsk/ax25.py b/afsk/ax25.py
index 1b081a8..bdd585f 100644
--- a/afsk/ax25.py
+++ b/afsk/ax25.py
@@ -47,7 +47,7 @@ def digest(self):
 #		print "%r" % "".join([chr((~self.fcs & 0xff) % 256), chr((~self.fcs >> 8) % 256)])
 		# digest is two bytes, little endian
 		return struct.pack("<H", ~self.fcs % 2**16)
-		
+
 def fcs(bits):
 	'''
 	Append running bitwise FCS CRC checksum to end of generator
@@ -83,16 +83,16 @@ def fcs_validate(bits):
 			bit = buffer.pop(0)
 			fcs.update(bit)
 			yield bit
-	
+
 	if buffer.tobytes() != fcs.digest():
 		raise Exception("FCS checksum invalid.")
 
 class AX25(object):
 	def __init__(
 		self,
-		destination=b"APRS", 
-		source=b"", 
-		digipeaters=(b"RELAY", b"WIDE2-1"), 
+		destination=b"APRS",
+		source=b"",
+		digipeaters=(b"RELAY", b"WIDE2-1"),
 		info=b"\""
 	):
 		self.flag = b"\x7e"
@@ -102,7 +102,7 @@ def __init__(
 		self.digipeaters = digipeaters
 
 		self.info = info
-	
+
 	@classmethod
 	def callsign_encode(self, callsign):
 		callsign = callsign.upper()
@@ -111,6 +111,9 @@ def callsign_encode(self, callsign):
 		else:
 			ssid = b"0"
 
+		if 10 <= int(ssid) <= 15:
+			ssid = chr(ord(ssid[1])+10)
+
 		assert(len(ssid) == 1)
 		assert(len(callsign) <= 6)
 
@@ -153,7 +156,7 @@ def unparse(self):
 		bits.frombytes("".join([self.header(), self.info, self.fcs()]))
 
 		return flag + bit_stuff(bits) + flag
-	
+
 	def __repr__(self):
 		return self.__str__()
 	def __str__(self):
@@ -174,7 +177,7 @@ def parse(cls, bits):
 			digipeaters=None,
 			info=None
 		)
-	
+
 	def fcs(self):
 		content = bitarray(endian="little")
 		content.frombytes("".join([self.header(), self.info]))
@@ -189,31 +192,31 @@ def fcs(self):
 class UI(AX25):
 	def __init__(
 		self,
-		destination=b"APRS", 
-		source=b"", 
+		destination=b"APRS",
+		source=b"",
 		digipeaters=(b"WIDE1-1", b"WIDE2-1"),
 		info=b""
 	):
 		AX25.__init__(
-			self, 
-			destination, 
-			source, 
+			self,
+			destination,
+			source,
 			digipeaters,
 			info
 		)
 		self.control_field = b"\x03"
 		self.protocol_id = b"\xf0"
-			
+
 def main(arguments=None):
 	parser = argparse.ArgumentParser(description='')
 	parser.add_argument(
 		'-c',
-		'--callsign', 
+		'--callsign',
 		required=True,
 		help='Your ham callsign. REQUIRED.'
 	)
 	parser.add_argument(
-		'info', 
+		'info',
 		metavar='INFO',
 		help='APRS message body'
 	)
@@ -230,7 +233,7 @@ def main(arguments=None):
 	)
 	parser.add_argument(
 		'-o',
-		'--output', 
+		'--output',
 		default=None,
 		help='Write audio to wav file. Use \'-\' for stdout.'
 	)
@@ -249,7 +252,7 @@ def main(arguments=None):
 
 	packet = UI(
 		destination=args.destination,
-		source=args.callsign, 
+		source=args.callsign,
 		info=args.info,
 		digipeaters=args.digipeaters.split(b','),
 	)