@@ -55,6 +55,9 @@ ptrDevice = None

 # CTCSS tone, and DCS code are translated to the repective FT991 parameter

 # value.

+# Binary On / Off state

+bState = { 'OFF':'0', 'ON':'1' }

+

 # Modulation modes

 dMode = { 'LSB':'1', 'USB':'2', 'CW':'3', 'FM':'4', 'AM':'5',

           'RTTY-LSB':'6', 'CW-R':'7', 'DATA-LSB':'8', 'RTTY-USB':'9',

@@ -113,9 +116,12 @@ dDcs = { '23':'000', '25':'001', '26':'002', '31':'003', '32':'004',

          '664':'095', '703':'096', '712':'097', '723':'098', '731':'099',

          '732':'100', '734':'101', '743':'102', '754':'103' }

-# Clarifier state

-dRxClar = { 'OFF':'0', 'ON':'1' }

-dTxClar = { 'OFF':'0', 'ON':'1' }

+# Preamplifier State

+dPreamp = { 'IPO':'0', 'AMP 1':'1', 'AMP 2':'2' }

+

+# Narror band filter state

+dNAR = { 'WIDE':'0', 'NARROW':'1' }

+

 #############################################################################

 # Define 'get' methods to encapsulate FT991 commands returning status info. #

@@ -135,24 +141,24 @@ def getMemory(memloc):

     # Parse memory settings string returned by the FT991

     memloc = sResult[2:5]

-    rxfreq = sResult[5:14]

+    vfoa = sResult[5:14]

     clarfreq = sResult[14:19]

     rxclar = sResult[19]

     txclar = sResult[20]

     mode = sResult[21]

     encode = sResult[23]

-    shift = sResult[26]

+    rpoffset = sResult[26]

     tag = sResult[28:40]

     # Store the memory settings in a dictionary object.

     dMem['memloc'] = str(int(memloc))

-    dMem['rxfreq'] = str(float(rxfreq) / 10**6)

+    dMem['vfoa'] = str(float(vfoa) / 10**6)

     dMem['clarfreq'] = str(int(clarfreq))

-    dMem['rxclar'] = dRxClar.keys()[dRxClar.values().index(rxclar)]

-    dMem['txclar'] = dTxClar.keys()[dTxClar.values().index(txclar)]

+    dMem['rxclar'] = bState.keys()[bState.values().index(rxclar)]

+    dMem['txclar'] = bState.keys()[bState.values().index(txclar)]

     dMem['mode'] = dMode.keys()[dMode.values().index(mode)]

     dMem['encode'] = dEncode.keys()[dEncode.values().index(encode)]

-    dMem['shift'] = dShift.keys()[dShift.values().index(shift)]

+    dMem['rpoffset'] = dShift.keys()[dShift.values().index(rpoffset)]

     dMem['tag'] = tag.strip()

     return dMem

@@ -190,10 +196,9 @@ def getRxClarifier():

     """

     # An exception will automatically be raised if incorrect data is

     # supplied - most likely a "key not found" error.

-    sCmd = 'RT;'

-    sResult = sendCommand(sCmd)

+    sResult = sendCommand('RT;')

     state = sResult[2]

-    return dRxClar.keys()[dRxClar.values().index(state)]

+    return bState.keys()[bState.values().index(state)]

 ## end def

 def getTxClarifier():

@@ -204,14 +209,182 @@ def getTxClarifier():

     """

     # An exception will automatically be raised if incorrect data is

     # supplied - most likely a "key not found" error.

-    sCmd = 'XT;'

-    sResult = sendCommand(sCmd)

+    sResult = sendCommand('XT;')

     state = sResult[2]

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

+    return bState.keys()[bState.values().index(state)]

+## end def

+

+def getPower():

+    """

+    Description:  Gets the transmit power level.

+    Parameters: none

+    Returns: string containing the power in Watts