From 8ef4b5c37293916a961d90d7fa1eec7a59a38f2d Mon Sep 17 00:00:00 2001
From: dj2ls <dj2ls@protonmail.com>
Date: Fri, 11 Mar 2022 20:52:19 +0100
Subject: [PATCH] updated hamlib connection methods

---
 gui/src/index.html | 5 +++--
 tnc/main.py        | 2 +-
 tnc/rig.py         | 3 +++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/gui/src/index.html b/gui/src/index.html
index a381175f..19518c64 100644
--- a/gui/src/index.html
+++ b/gui/src/index.html
@@ -651,7 +651,7 @@
 										<option value="USB">USB</option>
 										<option value="RTS">Serial RTS</option>
 										<option value="DTR-H">Serial DTR-High</option>
-										<option value="DTR-H">Serial DTR-Low</option>
+										<option value="DTR-L">Serial DTR-Low</option>
 										<option value="PARALLEL">Rig PARALLEL</option>
 										<option value="MICDATA">Rig MICDATA</option>
 										<option value="CM108">Rig CM108</option>
@@ -1238,11 +1238,12 @@
 					</div>
 					<div class="input-group input-group-sm mb-1"> <span class="input-group-text" id="basic-addon1">PTT</span>
 						<select class="form-select form-select-sm" aria-label=".form-select-sm" id="hamlib_ptt_protocol_advanced" style="width: 0.5rem">
+							<option value="NONE">NONE</option>
 							<option value="RIG">RIG</option>
 							<option value="USB">USB</option>
 							<option value="RTS">Serial RTS</option>
 							<option value="DTR-H">Serial DTR-High</option>
-							<option value="DTR-H">Serial DTR-Low</option>
+							<option value="DTR-L">Serial DTR-Low</option>
 							<option value="PARALLEL">Rig PARALLEL</option>
 							<option value="MICDATA">Rig MICDATA</option>
 							<option value="CM108">Rig CM108</option>
diff --git a/tnc/main.py b/tnc/main.py
index dcaa6ba5..09b41a85 100755
--- a/tnc/main.py
+++ b/tnc/main.py
@@ -57,7 +57,7 @@ if __name__ == '__main__':
     PARSER.add_argument('--deviceport', dest="hamlib_device_port", default="/dev/ttyUSB0", help="Hamlib device port", type=str)
     PARSER.add_argument('--devicename', dest="hamlib_device_name", default="2028", help="Hamlib device name", type=str)    
     PARSER.add_argument('--serialspeed', dest="hamlib_serialspeed", choices=[1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200], default=9600, help="Serialspeed", type=int)    
-    PARSER.add_argument('--pttprotocol', dest="hamlib_ptt_type", choices=['USB', 'RIG', 'RTS', 'DTR'], default='USB', help="PTT Type", type=str)    
+    PARSER.add_argument('--pttprotocol', dest="hamlib_ptt_type", choices=['USB', 'RIG', 'RTS', 'DTR', 'CM108', 'MICDATA', 'PARALLEL', 'DTR-H', 'DTR-L', 'NONE'], default='USB', help="PTT Type", type=str)    
     PARSER.add_argument('--pttport', dest="hamlib_ptt_port", default="/dev/ttyUSB0", help="PTT Port", type=str)        
     PARSER.add_argument('--data_bits', dest="hamlib_data_bits", choices=[7, 8], default=8, help="Hamlib data bits", type=int)         
     PARSER.add_argument('--stop_bits', dest="hamlib_stop_bits", choices=[1, 2], default=1, help="Hamlib stop bits", type=int)          
diff --git a/tnc/rig.py b/tnc/rig.py
index 165c40d4..25c7c3be 100644
--- a/tnc/rig.py
+++ b/tnc/rig.py
@@ -174,6 +174,9 @@ class radio:
             elif self.hamlib_ptt_type == 'CM108':
                 self.hamlib_ptt_type = Hamlib.RIG_PTT_CM108
 
+            elif self.hamlib_ptt_type == 'RIG_PTT_NONE':
+                self.hamlib_ptt_type = Hamlib.RIG_PTT_NONE
+                
             else: #self.hamlib_ptt_type == 'RIG_PTT_NONE':
                 self.hamlib_ptt_type = Hamlib.RIG_PTT_NONE