From a7f6d856356a701b470286ec6fbd36015e63c690 Mon Sep 17 00:00:00 2001
From: David Freese <w1hkj@w1hkj.com>
Date: Sat, 5 Jun 2010 21:10:12 -0500
Subject: [PATCH] RSID new codes

  * CONTESTIA 32-2000
  * CONTESTIA 64-500
  * CONTESTIA 64-1000
  * CONTESTIA 64-2000
---
 src/rsid/rsid.cxx | 46 +++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 39 insertions(+), 7 deletions(-)

diff --git a/src/rsid/rsid.cxx b/src/rsid/rsid.cxx
index 026e4dba..785e71b1 100644
--- a/src/rsid/rsid.cxx
+++ b/src/rsid/rsid.cxx
@@ -120,15 +120,19 @@ LOG_FILE_SOURCE(debug::LOG_MODEM);
         ELEM_(47, THROBX_2, MODE_THROBX2)               \
         ELEM_(146, THROBX_4, MODE_THROBX4)              \
                                                         \
-        ELEM_(49, CONTESTIA_8_250, MODE_CONTESTIA)      \
-        ELEM_(50, CONTESTIA_16_500, MODE_CONTESTIA)     \
-        ELEM_(51, CONTESTIA_32_1000, MODE_CONTESTIA)    \
-        ELEM_(52, CONTESTIA_8_500, MODE_CONTESTIA)      \
-        ELEM_(53, CONTESTIA_16_1000, MODE_CONTESTIA)    \
-        ELEM_(54, CONTESTIA_4_500, MODE_CONTESTIA)      \
         ELEM_(55, CONTESTIA_4_250, MODE_CONTESTIA)      \
-        ELEM_(117, CONTESTIA_8_1000, MODE_CONTESTIA)    \
+        ELEM_(54, CONTESTIA_4_500, MODE_CONTESTIA)      \
         ELEM_(169, CONTESTIA_8_125, MODE_CONTESTIA)     \
+        ELEM_(49, CONTESTIA_8_250, MODE_CONTESTIA)      \
+        ELEM_(52, CONTESTIA_8_500, MODE_CONTESTIA)      \
+        ELEM_(117, CONTESTIA_8_1000, MODE_CONTESTIA)    \
+        ELEM_(50, CONTESTIA_16_500, MODE_CONTESTIA)     \
+        ELEM_(53, CONTESTIA_16_1000, MODE_CONTESTIA)    \
+        ELEM_(51, CONTESTIA_32_1000, MODE_CONTESTIA)    \
+        ELEM_(201, CONTESTIA_32_2000, MODE_CONTESTIA)   \
+        ELEM_(194, CONTESTIA_64_500, MODE_CONTESTIA)    \
+        ELEM_(193, CONTESTIA_64_1000, MODE_CONTESTIA)   \
+        ELEM_(191, CONTESTIA_64_2000, MODE_CONTESTIA)   \
                                                         \
         ELEM_(56, VOICE, NUM_MODES)                     \
                                                         \
@@ -621,6 +625,26 @@ void cRsId::apply(int iSymbol, int iBin)
 		progdefaults.contestiabw = 3;
 		REQ(&set_contestia_tab_widgets);
 		break;
+	case RSID_CONTESTIA_32_2000:
+		progdefaults.contestiatones = 4;
+		progdefaults.contestiabw = 4;
+		REQ(&set_contestia_tab_widgets);
+		break;
+	case RSID_CONTESTIA_64_500:
+		progdefaults.contestiatones = 5;
+		progdefaults.contestiabw = 2;
+		REQ(&set_contestia_tab_widgets);
+		break;
+	case RSID_CONTESTIA_64_1000:
+		progdefaults.contestiatones = 5;
+		progdefaults.contestiabw = 3;
+		REQ(&set_contestia_tab_widgets);
+		break;
+	case RSID_CONTESTIA_64_2000:
+		progdefaults.contestiatones = 5;
+		progdefaults.contestiabw = 4;
+		REQ(&set_contestia_tab_widgets);
+		break;
 	// mt63
 	case RSID_MT63_500_LG: case RSID_MT63_1000_LG: case RSID_MT63_2000_LG:
 		progdefaults.mt63_interleave = 64;
@@ -816,6 +840,14 @@ void cRsId::send(bool preRSID)
 			rmode = RSID_CONTESTIA_8_1000;
 		else if (progdefaults.contestiatones == 2 && progdefaults.contestiabw == 0)
 			rmode = RSID_CONTESTIA_8_125;
+		else if (progdefaults.contestiatones == 4 && progdefaults.contestiabw == 4)
+			rmode = RSID_CONTESTIA_32_2000;
+		else if (progdefaults.contestiatones == 5 && progdefaults.contestiabw == 2)
+			rmode = RSID_CONTESTIA_64_500;
+		else if (progdefaults.contestiatones == 5 && progdefaults.contestiabw == 3)
+			rmode = RSID_CONTESTIA_64_1000;
+		else if (progdefaults.contestiatones == 5 && progdefaults.contestiabw == 4)
+			rmode = RSID_CONTESTIA_64_2000;
 		else
 			return;
 		break;