DTMF update

app/dtmf.c

@@ -400,11 +400,9 @@ bool DTMF_Reply(void)
 	switch (g_dtmf_reply_state)
 	{
 		case DTMF_REPLY_ANI:
-			if (g_dtmf_call_mode == DTMF_CALL_MODE_DTMF)
-			{
-				pString = g_dtmf_string;
-			}
-			else
+			pString = g_dtmf_string;
+
+			if (g_dtmf_call_mode != DTMF_CALL_MODE_DTMF)
 			{	// append our ID code onto the end of the DTMF code to send
 				sprintf(str, "%s%c%s", g_dtmf_string, g_eeprom.config.setting.dtmf.separate_code, g_eeprom.config.setting.dtmf.ani_id);
 				pString = str;

app/generic.c

@@ -213,17 +213,16 @@ void GENERIC_Key_PTT(bool key_pressed)
 		if (g_dtmf_input_box_index < sizeof(g_dtmf_input_box))
 			g_dtmf_input_box[g_dtmf_input_box_index] = 0;             // NULL term the string
 
-		#if 1
-			// append our DTMF ID to the inputted DTMF code -
-			//  IF the user inputted code is exactly 3 digits long
+		// append our DTMF ID to the inputted DTMF code -
+		#if 0
+			// QS
 			if (g_dtmf_input_box_index == 3)
 				g_dtmf_call_mode = DTMF_CheckGroupCall(g_dtmf_input_box, 3);
 			else
 				g_dtmf_call_mode = DTMF_CALL_MODE_DTMF;
 		#else
-			// append our DTMF ID to the inputted DTMF code -
-			//  IF the user inputted code is exactly 3 digits long and D-DCD is enabled
-			if (g_dtmf_input_box_index == 3 && g_tx_vfo->channel.dtmf_decoding_enable > 0)
+			// 1of11
+			if (g_dtmf_input_box_index == 3 && g_dtmf_input_box[0] != '*' && g_dtmf_input_box[0] != '#')
 				g_dtmf_call_mode = DTMF_CheckGroupCall(g_dtmf_input_box, 3);
 			else
 				g_dtmf_call_mode = DTMF_CALL_MODE_DTMF;