rigcontrol: Fix PTT STATE 3 experiment

Ref la5nta/pat#184
la5nta · Jan 22, 2025 · c52b1a2 · c52b1a2
1 parent c435dba
commit c52b1a2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/rigcontrol/hamlib/experimental_ptt.go b/rigcontrol/hamlib/experimental_ptt.go
@@ -7,14 +7,10 @@ import (
 )
 
 // Experimental PTT STATE 3 (https://github.com/la5nta/pat/issues/184)
-
-func init() {
-	if experimentalPTT3Enabled() {
+var experimentalPTT3Enabled = func() bool {
+	ok, _ := strconv.ParseBool(os.Getenv("EXPERIMENTAL_HAMLIB_PTT3"))
+	if ok {
 		log.Println("Experimental PTT3 enabled (https://github.com/la5nta/pat/issues/184)")
 	}
-}
-
-func experimentalPTT3Enabled() bool {
-	ok, _ := strconv.ParseBool(os.Getenv("EXPERIMENTAL_HAMLIB_PTT3"))
 	return ok
-}
+}()
diff --git a/rigcontrol/hamlib/rigctld.go b/rigcontrol/hamlib/rigctld.go
@@ -165,13 +165,11 @@ func (v *tcpVFO) GetPTT() (bool, error) {
 // Enable (or disable) PTT on this VFO.
 func (v *tcpVFO) SetPTT(on bool) error {
 	bInt := 0
-	if on == true {
+	if on {
 		bInt = 1
-	}
-
-	// Experimental PTT STATE 3 (https://github.com/la5nta/pat/issues/184)
-	if experimentalPTT3Enabled() {
-		bInt = 3
+		if experimentalPTT3Enabled {
+			bInt = 3
+		}
 	}
 
 	_, err := v.cmd(`\set_ptt %d`, bInt)