@@ -132,8 +132,6 @@ def getMemory(memloc):

     # Send the get memory settings string to the FT991.

     sCmd = 'MT%0.3d;' % (memloc)

     sResult = sendCommand(sCmd)

-    if sResult == '?;':

-        return None

     # Parse memory settings string returned by the FT991

     memloc = sResult[2:5]

@@ -212,9 +210,9 @@ def getTxClarifier():

     return dTxClar.keys()[dTxClar.values().index(state)]

 ## end def

-#########################################################################

-# Define 'set' functions to encapsulate the various FT991 CAT commands. #

-#########################################################################

+#############################################################################

+# Define 'set' functions to encapsulate the various FT991 CAT commands.     #

+#############################################################################

 def setMemory(dMem):

     """

@@ -372,7 +370,8 @@ def setMemoryLocation(iLocation):

     Description:  Sends a formatted MC command that sets the current

                   memory location.

     Parameters: location - integer specifying memory location

-    Returns: nothing

+    Returns: None if the memory location is blank, otherwise

+             returns a string containing the memory location.

     """

     # Validate memory location data and send the command.

     if iLocation < 1 or iLocation > 118:

@@ -382,12 +381,14 @@ def setMemoryLocation(iLocation):

     # Send the completed command.

     sResult = sendCommand(sCmd)

     if sResult == '?;':

-        raise Exception('setMemoryLocation error')

+        return None

+    else:

+        return str(iLocation)

 ## end def

-############################################################################

-# Helper functions to assist in various tasks.                             #

-############################################################################

+#############################################################################

+# Helper functions to assist in various tasks.                              #

+#############################################################################

 def parseCsvData(sline):

     """

@@ -447,7 +448,9 @@ def sendCommand(sCmd):

     return sResult

 ## end def

-# Low level serial communications functions.

+#############################################################################

+# Low level serial communications functions.                                #

+#############################################################################

 def begin(baud=9600):

     """

@@ -562,28 +565,28 @@ def main():

             'mode': 'FM', 'encode': 'TONE ENC', 'tag': 'KA7JLO', \

             'clarfreq': '1234', 'rxclar': 'ON', 'txclar': 'ON' \

            }

-    setMemory(dMem)

     setMemoryLocation(int(dMem['memloc']))

+    setMemory(dMem)

     setRxClarifier(dMem['rxclar'])

     setTxClarifier(dMem['txclar'])

     setCTCSS('127.3 Hz')

     setDCS('115')

     print

-    getMemory(98)

+    getMemory(int(dMem['memloc']))

     print

     # Set and receive a memory channel

     dMem = {'memloc': '99', 'rxfreq': '146.52', 'shift': 'OFF', \

             'mode': 'FM', 'encode': 'OFF', 'tag': 'KA7JLO', \

             'clarfreq': '0', 'rxclar': 'OFF', 'txclar': 'OFF' \

            }

-    setMemory(dMem)

     setMemoryLocation(int(dMem['memloc']))

+    setMemory(dMem)

     setRxClarifier(dMem['rxclar'])

     setTxClarifier(dMem['txclar'])

     setCTCSS('141.3 Hz')

     setDCS('445')

     print

-    getMemory(99)

+    getMemory(int(dMem['memloc']))

     print

     # Test set commands

@@ -264,28 +264,26 @@ def readMemorySettings():

     # Define the column headers as the first item in the list.

     lSettings = [ 'Memory Ch,Rx Frequency,Tx Frequency,Offset,' \

                         'Repeater Shift,Mode,Tag,Encoding,Tone,DCS,' \

-                        'Clarifier, RxClar, TxClar' ]

+                        'Clarifier,RxClar,TxClar' ]

     for iLocation in range(1, _MAX_NUMBER_OF_MEMORY_ITEMS):

+        # If a memory location is empty (has not been programmed or has

+        # been erased), skip that location and do not create a list entry

+        # for that location.

+        if ft991.setMemoryLocation(iLocation) == None:

+            continue

         # For each memory location get the memory contents.  Note that

         # several CAT commands are required to get the entire contents

         # of a memory location.  Specifically, additional commands are

         # required to get DCS code and CTCSS tone.

         dMem = ft991.getMemory(iLocation)

-        # If a memory location is empty (has not been programmed or has

-        # been erased), do not created a list entry for that location.

-        if dMem == None:

-            continue

-        # Set current memory location to the channel being set.

-        sResult = ft991.setMemoryLocation(iLocation)

-        # Get DCS and CTCSS.

         tone = ft991.getCTCSS()

         dcs = ft991.getDCS()

         # getMemory, above, stores data in a dictionary object.  Format

         # the data in this object, as well as, the DCS code and CTCSS

         # tone into a comma-delimited string.

-        sCsvFormat = '%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,' % \

+        sCsvFormat = '%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s' % \

                ( dMem['memloc'], dMem['rxfreq'], '', '', \

                  dMem['shift'], dMem['mode'], dMem['tag'], dMem['encode'], \

                  tone, dcs, dMem['clarfreq'], dMem['rxclar'], \

@@ -310,10 +308,10 @@ def writeMemorySettings(lSettings):

         if dItem == None:

             continue

         try:

-            # Set the parameters for the memory location.

-            ft991.setMemory(dItem)

             # Set current channel to memory location being set.

             ft991.setMemoryLocation(int(dItem['memloc']))

+            # Set the parameters for the memory location.

+            ft991.setMemory(dItem)

             # Set CTCSS tone for memory channel.

             ft991.setCTCSS(dItem['tone'])

             # Set DCS code for memory channel. 

@@ -520,7 +518,7 @@ def main():

     # Else enter user interactive mode.

     printMenuSplash()

-    while(1):

+    while(True):

         doUserCommand()

 ## end def