From 9d869fb698700b593a3c982bd550961895495d68 Mon Sep 17 00:00:00 2001
From: dj2ls <dj2ls@protonmail.com>
Date: Sun, 26 Dec 2021 10:43:55 +0100
Subject: [PATCH] changed getting ptt state

getting ptt now via own function
---
 tnc/daemon.py |  2 +-
 tnc/rig.py    | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/tnc/daemon.py b/tnc/daemon.py
index c3ad013d..3e1da96b 100755
--- a/tnc/daemon.py
+++ b/tnc/daemon.py
@@ -294,7 +294,7 @@ class CMDTCPRequestHandler(socketserver.BaseRequestHandler):
                         hamlib.open_rig(devicename=devicename, deviceport=deviceport, hamlib_ptt_type=pttprotocol, serialspeed=serialspeed)
                         
                         hamlib.set_ptt(True)      
-                        pttstate = hamlib.get_rig_data()[3]
+                        pttstate = hamlib.get_ptt()
                         if pttstate:
                             structlog.get_logger("structlog").info("[DMN] Hamlib PTT", status = 'SUCCESS')
                             data = {'COMMAND': 'TEST_HAMLIB', 'RESULT': 'SUCCESS'}
diff --git a/tnc/rig.py b/tnc/rig.py
index 0e9a80ef..3f42ad1b 100644
--- a/tnc/rig.py
+++ b/tnc/rig.py
@@ -34,11 +34,11 @@ except Exception as e:
 class radio:
     def __init__(self):
     
-        self.deviceid = '2'
+        self.devicename = ''
         self.devicenumber = ''
-        self.deviceport = '/dev/ttyUSB0'
-        self.serialspeed = 9600
-        self.hamlib_ptt_type = 'RIG'
+        self.deviceport = ''
+        self.serialspeed = 0
+        self.hamlib_ptt_type = ''
         self.my_rig = ''
     
 
@@ -118,7 +118,8 @@ class radio:
                 structlog.get_logger("structlog").info("[DMN] Hamlib device openend", status='SUCCESS')
 
 
-
+            # set ptt to false if ptt is stuck for some reason
+            self.set_ptt(False)
 
             # set rig mode to USB
             self.my_rig.set_mode(Hamlib.RIG_MODE_USB)
@@ -133,7 +134,7 @@ class radio:
         freq = int(self.my_rig.get_freq())
         (hamlib_mode, bandwith) = self.my_rig.get_mode()
         mode = Hamlib.rig_strrmode(hamlib_mode)
-        ptt = self.my_rig.get_ptt()
+        ptt = self.get_ptt()
         if ptt:
             ptt = True
         else:
@@ -143,7 +144,10 @@ class radio:
     
     def set_mode(self, mode):
         return 0
-                
+      
+    def get_ptt(self):
+        return self.my_rig.get_ptt()
+                  
     def set_ptt(self, state):
         if state:
             self.my_rig.set_ptt(self.hamlib_ptt_type, 1)