diff --git a/UHRR b/UHRR index b021c74..4ba0302 100755 --- a/UHRR +++ b/UHRR @@ -340,6 +340,18 @@ class TRXRIG: self.rig_pathname = config['HAMLIB']['rig_pathname'] self.rig = Hamlib.Rig(Hamlib.__dict__[self.rig_model]) # Look up the model's numerical index in Hamlib's symbol dictionary. self.rig.set_conf("rig_pathname", self.rig_pathname) + if(config['HAMLIB']['data_bits']!=""): + self.rig.set_conf("data_bits", str(config['HAMLIB']['data_bits'])) #8 as default + if(config['HAMLIB']['stop_bits']!=""): + self.rig.set_conf("stop_bits", str(config['HAMLIB']['stop_bits'])) #2 as default + if(config['HAMLIB']['serial_parity']!=""): + self.rig.set_conf("serial_parity", str(config['HAMLIB']['serial_parity']))# None as default NONE ODD EVEN MARK SPACE + if(config['HAMLIB']['serial_handshake']!=""): + self.rig.set_conf("serial_handshake", str(config['HAMLIB']['serial_handshake'])) # None as default NONE XONXOFF HARDWARE + if(config['HAMLIB']['dtr_state']!=""): + self.rig.set_conf("dtr_state", str(config['HAMLIB']['dtr_state'])) #ON or OFF + if(config['HAMLIB']['rts_state']!=""): + self.rig.set_conf("rts_state", str(config['HAMLIB']['rts_state'])) #ON or OFF self.rig.set_conf("retry", config['HAMLIB']['retry']) self.rig.open() except: @@ -547,14 +559,14 @@ class ConfigHandler(BaseHandler): self.write("""[AUDIO]

""") self.write("""AUDIO outputdevice: Output from audio soundcard to the mic input of TRX.

""") self.write("""AUDIO inputdevice:""") - if(config['HAMLIB']['rig_model']!="null"): + if(config['HAMLIB']['rig_model']!=""): self.write("""""") for c in rig_models: self.write("""""") self.write(""" Hamlib trx model.

""") self.write("""HAMLIB serial port: Serial port of the CAT interface.

""") self.write("""HAMLIB radio rate: Serial port baud rate.

""") self.write("""HAMLIB auto tx poweroff: Set to auto power off the trx when it's not in use

""") + CDVALUE="" + if(config['HAMLIB']['data_bits']!=""): + CDVALUE=config['HAMLIB']['data_bits'] + self.write("""HAMLIB serial data bits: Leave blank to use the HAMIB default value.

""") + + CDVALUE="" + if(config['HAMLIB']['stop_bits']!=""): + CDVALUE=config['HAMLIB']['stop_bits'] + self.write("""HAMLIB serial stop bits: Leave blank to use the HAMIB default value.

""") + + self.write("""HAMLIB serial parity: Leave blank to use the HAMIB default value.

""") + + self.write("""HAMLIB serial handshake: Leave blank to use the HAMIB default value.

""") + + self.write("""HAMLIB dtr state: Leave blank to use the HAMIB default value.

""") + + self.write("""HAMLIB rts state: Leave blank to use the HAMIB default value.

""") + self.write("""[PANADAPTER]

""") self.write("""PANADAPTER FI frequency (hz):

""") self.write("""HAMLIB radio rate (samples/s):

""") self.write("""PANADAPTER windowing: