From 75079d40a88651ca48298f332bc3b18c1b9757f4 Mon Sep 17 00:00:00 2001
From: George Baltz N3GB <GeoBaltz@gmail.com>
Date: Mon, 22 Jan 2024 19:05:30 -0500
Subject: [PATCH] Add remaining rigs, matching old behavior. Fix copy/paste
 foulup.

---
 rigs/kenwood/kenwood.c | 4 ++--
 rigs/kenwood/pihpsdr.c | 1 +
 rigs/kenwood/r5000.c   | 1 +
 rigs/kenwood/ts440.c   | 1 +
 rigs/kenwood/ts50s.c   | 1 +
 rigs/kenwood/ts590.c   | 1 +
 rigs/kenwood/ts711.c   | 1 +
 rigs/kenwood/ts790.c   | 1 +
 rigs/kenwood/ts811.c   | 1 +
 rigs/kenwood/ts850.c   | 1 +
 rigs/kenwood/ts940.c   | 3 ++-
 rigs/kenwood/tx500.c   | 1 +
 12 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/rigs/kenwood/kenwood.c b/rigs/kenwood/kenwood.c
index fb11b043f..960d5c9df 100644
--- a/rigs/kenwood/kenwood.c
+++ b/rigs/kenwood/kenwood.c
@@ -4623,11 +4623,11 @@ int kenwood_set_ctcss_sql(RIG *rig, vfo_t vfo, tone_t tone)
             RETURNFUNC(-RIG_EINVAL);
         }
 
-        SNPRINTF(buf, sizeof(buf), "CN%c%02d", c, i - kenwood_caps(rig)->tone_table_base);
+        SNPRINTF(buf, sizeof(buf), "CN%c%02d", c, i + kenwood_caps(rig)->tone_table_base);
     }
     else
     {
-        SNPRINTF(buf, sizeof(buf), "CN%02d", i - kenwood_caps(rig)->tone_table_base);
+        SNPRINTF(buf, sizeof(buf), "CN%02d", i + kenwood_caps(rig)->tone_table_base);
     }
 
     RETURNFUNC(kenwood_transaction(rig, buf, NULL, 0));
diff --git a/rigs/kenwood/pihpsdr.c b/rigs/kenwood/pihpsdr.c
index b802f3d5a..974214ec2 100644
--- a/rigs/kenwood/pihpsdr.c
+++ b/rigs/kenwood/pihpsdr.c
@@ -68,6 +68,7 @@ static int pihspdr_set_channel(RIG *rig, vfo_t vfo, const channel_t *chan);
 static struct kenwood_priv_caps  ts2000_priv_caps  =
 {
     .cmdtrm =  EOM_KEN,
+    .tone_table_base = 1,
 };
 
 /* memory capabilities */
diff --git a/rigs/kenwood/r5000.c b/rigs/kenwood/r5000.c
index 324ff87b8..670ccd579 100644
--- a/rigs/kenwood/r5000.c
+++ b/rigs/kenwood/r5000.c
@@ -46,6 +46,7 @@ static struct kenwood_priv_caps  r5000_priv_caps  =
 {
     .cmdtrm =  EOM_KEN,
     .if_len =  32,
+    .tone_table_base = 1,
 };
 
 /*
diff --git a/rigs/kenwood/ts440.c b/rigs/kenwood/ts440.c
index b6c7d9f8d..2bb78ba6d 100644
--- a/rigs/kenwood/ts440.c
+++ b/rigs/kenwood/ts440.c
@@ -43,6 +43,7 @@ static struct kenwood_priv_caps  ts440_priv_caps  =
 {
     .cmdtrm =  EOM_KEN,
     .if_len =  37,
+    .tone_table_base = 1,
 };
 
 /*
diff --git a/rigs/kenwood/ts50s.c b/rigs/kenwood/ts50s.c
index b2c7b1415..0107f0ce6 100644
--- a/rigs/kenwood/ts50s.c
+++ b/rigs/kenwood/ts50s.c
@@ -39,6 +39,7 @@
 static struct kenwood_priv_caps  ts50_priv_caps  =
 {
     .cmdtrm =  EOM_KEN,
+    .tone_table_base = 1,
 };
 
 /*
diff --git a/rigs/kenwood/ts590.c b/rigs/kenwood/ts590.c
index b829d575e..8a5194710 100644
--- a/rigs/kenwood/ts590.c
+++ b/rigs/kenwood/ts590.c
@@ -1683,6 +1683,7 @@ static struct kenwood_priv_caps ts590_priv_caps =
     .filter_width = ts590_filter_width,
     .slope_filter_high = ts590_slope_filter_high,
     .slope_filter_low = ts590_slope_filter_low,
+    .tone_table_base = 0,
 };
 
 /**
diff --git a/rigs/kenwood/ts711.c b/rigs/kenwood/ts711.c
index 6c0ebaef9..8e3500c46 100644
--- a/rigs/kenwood/ts711.c
+++ b/rigs/kenwood/ts711.c
@@ -52,6 +52,7 @@
 static struct kenwood_priv_caps  ts711_priv_caps  =
 {
     .cmdtrm =  EOM_KEN,
+    .tone_table_base = 1,
 };
 
 /*
diff --git a/rigs/kenwood/ts790.c b/rigs/kenwood/ts790.c
index 20d84196f..d70b8973e 100644
--- a/rigs/kenwood/ts790.c
+++ b/rigs/kenwood/ts790.c
@@ -53,6 +53,7 @@
 static struct kenwood_priv_caps  ts790_priv_caps  =
 {
     .cmdtrm =  EOM_KEN,
+    .tone_table_base = 1,
 };
 
 /*
diff --git a/rigs/kenwood/ts811.c b/rigs/kenwood/ts811.c
index 88edac4c1..043c78311 100644
--- a/rigs/kenwood/ts811.c
+++ b/rigs/kenwood/ts811.c
@@ -38,6 +38,7 @@
 static struct kenwood_priv_caps  ts811_priv_caps  =
 {
     .cmdtrm =  EOM_KEN,
+    .tone_table_base = 1,
 };
 
 /*
diff --git a/rigs/kenwood/ts850.c b/rigs/kenwood/ts850.c
index f649c51e2..1f7d84d89 100644
--- a/rigs/kenwood/ts850.c
+++ b/rigs/kenwood/ts850.c
@@ -62,6 +62,7 @@
 static struct kenwood_priv_caps  ts850_priv_caps  =
 {
     .cmdtrm =  EOM_KEN,
+    .tone_table_base = 1,
 };
 
 /* forward definitions */
diff --git a/rigs/kenwood/ts940.c b/rigs/kenwood/ts940.c
index 009691fa1..c88a455f1 100644
--- a/rigs/kenwood/ts940.c
+++ b/rigs/kenwood/ts940.c
@@ -63,7 +63,8 @@ static rmode_t ts940_mode_table[KENWOOD_MODE_TABLE_MAX] =
 static struct kenwood_priv_caps  ts940_priv_caps  =
 {
     .cmdtrm =  EOM_KEN,
-    .mode_table = ts940_mode_table
+    .mode_table = ts940_mode_table,
+    .tone_table_base = 1,
 };
 
 /*
diff --git a/rigs/kenwood/tx500.c b/rigs/kenwood/tx500.c
index 260016e34..f8b8184f0 100644
--- a/rigs/kenwood/tx500.c
+++ b/rigs/kenwood/tx500.c
@@ -94,6 +94,7 @@ tone_t tx500_dcs_list[] =
 static struct kenwood_priv_caps  tx500_priv_caps  =
 {
     .cmdtrm =  EOM_KEN,
+    .tone_table_base = 1,     /* TS-2000 compatible ??? */
 };
 
 /* memory capabilities */