From fb6ed5525f8f638f10831fb6edcec5064803c034 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Wed, 25 Oct 2017 12:21:10 +0100 Subject: [PATCH] Reprocess the P25NX audio files again. --- P25Gateway/CTone.h | 8 +------- P25Gateway/CTone1.h | 8 +------- P25Gateway/CTone2.h | 5 ++--- P25Gateway/SpeechDefault.h | 8 +------- P25Gateway/SpeechEUTAC1.h | 6 +----- P25Gateway/SpeechEUTAC2.h | 8 +------- P25Gateway/SpeechEUTAC3.h | 8 +------- P25Gateway/SpeechFrance.h | 5 +++-- P25Gateway/SpeechGermany.h | 9 ++------- P25Gateway/SpeechNA.h | 7 ++----- P25Gateway/SpeechNATAC1.h | 8 +------- P25Gateway/SpeechNATAC2.h | 8 +------- P25Gateway/SpeechNATAC3.h | 11 ++--------- P25Gateway/SpeechPacific.h | 5 ++--- P25Gateway/SpeechPacificTAC1.h | 11 ++--------- P25Gateway/SpeechPacificTAC2.h | 8 +------- P25Gateway/SpeechWW.h | 8 +------- P25Gateway/SpeechWWTAC1.h | 5 ++--- P25Gateway/SpeechWWTAC3.h | 6 +----- 19 files changed, 28 insertions(+), 114 deletions(-) diff --git a/P25Gateway/CTone.h b/P25Gateway/CTone.h index 148db0a..6be715f 100644 --- a/P25Gateway/CTone.h +++ b/P25Gateway/CTone.h @@ -119,14 +119,8 @@ const unsigned char C_TONE[] = { 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U}; -const unsigned int C_TONE_COUNT = 105U; +const unsigned int C_TONE_COUNT = 99U; #endif diff --git a/P25Gateway/CTone1.h b/P25Gateway/CTone1.h index 950439f..a408ceb 100644 --- a/P25Gateway/CTone1.h +++ b/P25Gateway/CTone1.h @@ -119,14 +119,8 @@ const unsigned char C_TONE1[] = { 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U}; -const unsigned int C_TONE1_COUNT = 105U; +const unsigned int C_TONE1_COUNT = 99U; #endif diff --git a/P25Gateway/CTone2.h b/P25Gateway/CTone2.h index 5ed213d..9d336df 100644 --- a/P25Gateway/CTone2.h +++ b/P25Gateway/CTone2.h @@ -83,9 +83,8 @@ const unsigned char C_TONE2[] = { 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U}; + 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U}; -const unsigned int C_TONE2_COUNT = 64U; +const unsigned int C_TONE2_COUNT = 63U; #endif diff --git a/P25Gateway/SpeechDefault.h b/P25Gateway/SpeechDefault.h index f4581dd..c2c1b6f 100644 --- a/P25Gateway/SpeechDefault.h +++ b/P25Gateway/SpeechDefault.h @@ -146,14 +146,8 @@ const unsigned char SPEECH_DEFAULT[] = { 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U}; -const unsigned int SPEECH_DEFAULT_COUNT = 132U; +const unsigned int SPEECH_DEFAULT_COUNT = 126U; #endif diff --git a/P25Gateway/SpeechEUTAC1.h b/P25Gateway/SpeechEUTAC1.h index 66f5ebf..1b93464 100644 --- a/P25Gateway/SpeechEUTAC1.h +++ b/P25Gateway/SpeechEUTAC1.h @@ -173,12 +173,8 @@ const unsigned char SPEECH_EU_TAC1[] = { 0xA0U, 0x55U, 0x39U, 0x4DU, 0xBFU, 0x0DU, 0x00U, 0x08U, 0x9CU, 0x4DU, 0xF0U, 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U}; -const unsigned int SPEECH_EU_TAC1_COUNT = 157U; +const unsigned int SPEECH_EU_TAC1_COUNT = 153U; #endif diff --git a/P25Gateway/SpeechEUTAC2.h b/P25Gateway/SpeechEUTAC2.h index 963b158..5d10db6 100644 --- a/P25Gateway/SpeechEUTAC2.h +++ b/P25Gateway/SpeechEUTAC2.h @@ -146,14 +146,8 @@ const unsigned char SPEECH_EU_TAC2[] = { 0x80U, 0x90U, 0x40U, 0xC8U, 0xE8U, 0x77U, 0xEAU, 0x38U, 0x0AU, 0x36U, 0x88U, 0x90U, 0x54U, 0x47U, 0x9DU, 0xECU, 0x5DU, 0x10U, 0x0BU, 0xA9U, 0x85U, 0x5FU, 0x90U, 0x4CU, 0x90U, 0x93U, 0x8CU, 0xB3U, 0x18U, 0x4BU, 0x74U, 0xE6U, 0xFEU, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U}; -const unsigned int SPEECH_EU_TAC2_COUNT = 132U; +const unsigned int SPEECH_EU_TAC2_COUNT = 126U; #endif diff --git a/P25Gateway/SpeechEUTAC3.h b/P25Gateway/SpeechEUTAC3.h index c3f00e4..7b82d3d 100644 --- a/P25Gateway/SpeechEUTAC3.h +++ b/P25Gateway/SpeechEUTAC3.h @@ -137,14 +137,8 @@ const unsigned char SPEECH_EU_TAC3[] = { 0x80U, 0x90U, 0x35U, 0x41U, 0xF3U, 0xEEU, 0x90U, 0x08U, 0x4CU, 0x5DU, 0x81U, 0x90U, 0x4CU, 0x87U, 0x8CU, 0x46U, 0x05U, 0x09U, 0x0BU, 0x79U, 0xBFU, 0x1CU, 0x90U, 0x5CU, 0x20U, 0xD5U, 0xB2U, 0xD9U, 0x8AU, 0x48U, 0x52U, 0xA0U, 0xBFU, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U}; -const unsigned int SPEECH_EU_TAC3_COUNT = 123U; +const unsigned int SPEECH_EU_TAC3_COUNT = 117U; #endif diff --git a/P25Gateway/SpeechFrance.h b/P25Gateway/SpeechFrance.h index 3b46397..f672f10 100644 --- a/P25Gateway/SpeechFrance.h +++ b/P25Gateway/SpeechFrance.h @@ -91,8 +91,9 @@ const unsigned char SPEECH_FRANCE[] = { 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U}; + 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, + 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U}; -const unsigned int SPEECH_FRANCE_COUNT = 71U; +const unsigned int SPEECH_FRANCE_COUNT = 72U; #endif diff --git a/P25Gateway/SpeechGermany.h b/P25Gateway/SpeechGermany.h index e8b203d..0208ba5 100644 --- a/P25Gateway/SpeechGermany.h +++ b/P25Gateway/SpeechGermany.h @@ -110,13 +110,8 @@ const unsigned char SPEECH_GERMANY[] = { 0x95U, 0x2FU, 0xA0U, 0x59U, 0xF5U, 0x92U, 0x00U, 0x02U, 0x5AU, 0xB0U, 0xBBU, 0x55U, 0x41U, 0x9EU, 0xF8U, 0xCDU, 0x98U, 0x00U, 0x06U, 0x4EU, 0xFCU, 0x38U, 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U}; + 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U}; -const unsigned int SPEECH_GERMANY_COUNT = 95U; +const unsigned int SPEECH_GERMANY_COUNT = 90U; #endif diff --git a/P25Gateway/SpeechNA.h b/P25Gateway/SpeechNA.h index 8b3afac..3ebe9b2 100644 --- a/P25Gateway/SpeechNA.h +++ b/P25Gateway/SpeechNA.h @@ -110,11 +110,8 @@ const unsigned char SPEECH_NA[] = { 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U}; + 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U}; -const unsigned int SPEECH_NA_COUNT = 93U; +const unsigned int SPEECH_NA_COUNT = 90U; #endif diff --git a/P25Gateway/SpeechNATAC1.h b/P25Gateway/SpeechNATAC1.h index e4bb2f7..4e23dd0 100644 --- a/P25Gateway/SpeechNATAC1.h +++ b/P25Gateway/SpeechNATAC1.h @@ -146,14 +146,8 @@ const unsigned char SPEECH_NA_TAC1[] = { 0x50U, 0x35U, 0x53U, 0xECU, 0xCAU, 0x3FU, 0x20U, 0x6FU, 0x6DU, 0x81U, 0x98U, 0x94U, 0x4AU, 0x8CU, 0x50U, 0x4AU, 0x24U, 0x00U, 0x0AU, 0x17U, 0x5BU, 0x19U, 0xB8U, 0x6CU, 0xACU, 0xFDU, 0x84U, 0x88U, 0x00U, 0x0AU, 0xF3U, 0xF5U, 0xBCU, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U}; -const unsigned int SPEECH_NA_TAC1_COUNT = 132U; +const unsigned int SPEECH_NA_TAC1_COUNT = 126U; #endif diff --git a/P25Gateway/SpeechNATAC2.h b/P25Gateway/SpeechNATAC2.h index 81a13cf..c2c55f8 100644 --- a/P25Gateway/SpeechNATAC2.h +++ b/P25Gateway/SpeechNATAC2.h @@ -137,14 +137,8 @@ const unsigned char SPEECH_NA_TAC2[] = { 0x90U, 0x49U, 0x8BU, 0xF4U, 0xCDU, 0xCFU, 0x70U, 0x4EU, 0x78U, 0xC1U, 0x77U, 0x84U, 0x22U, 0xFFU, 0x24U, 0xAFU, 0x1AU, 0x00U, 0x0EU, 0x31U, 0x15U, 0x84U, 0x80U, 0x84U, 0x50U, 0x98U, 0x3AU, 0x1BU, 0xFEU, 0x18U, 0x0DU, 0x32U, 0xDEU, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U}; -const unsigned int SPEECH_NA_TAC2_COUNT = 123U; +const unsigned int SPEECH_NA_TAC2_COUNT = 117U; #endif diff --git a/P25Gateway/SpeechNATAC3.h b/P25Gateway/SpeechNATAC3.h index 6340cdb..5a474cc 100644 --- a/P25Gateway/SpeechNATAC3.h +++ b/P25Gateway/SpeechNATAC3.h @@ -146,15 +146,8 @@ const unsigned char SPEECH_NA_TAC3[] = { 0x78U, 0x40U, 0x0AU, 0x85U, 0xD7U, 0x06U, 0x00U, 0x0EU, 0xE5U, 0x32U, 0x5AU, 0x90U, 0x48U, 0x8EU, 0xD1U, 0x82U, 0xA9U, 0x18U, 0x4EU, 0x7EU, 0xAFU, 0xDFU, 0x84U, 0x41U, 0xBAU, 0x44U, 0x1EU, 0xC4U, 0x18U, 0x0FU, 0x5AU, 0xBFU, 0x5CU, - 0x78U, 0x48U, 0x2FU, 0xF7U, 0x3DU, 0x41U, 0x50U, 0x0EU, 0x35U, 0x44U, 0x5BU, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U}; + 0x78U, 0x48U, 0x2FU, 0xF7U, 0x3DU, 0x41U, 0x50U, 0x0EU, 0x35U, 0x44U, 0x5BU}; -const unsigned int SPEECH_NA_TAC3_COUNT = 133U; +const unsigned int SPEECH_NA_TAC3_COUNT = 126U; #endif diff --git a/P25Gateway/SpeechPacific.h b/P25Gateway/SpeechPacific.h index cd6428c..d5e567e 100644 --- a/P25Gateway/SpeechPacific.h +++ b/P25Gateway/SpeechPacific.h @@ -101,9 +101,8 @@ const unsigned char SPEECH_PACIFIC[] = { 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U}; + 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U}; -const unsigned int SPEECH_PACIFIC_COUNT = 82U; +const unsigned int SPEECH_PACIFIC_COUNT = 81U; #endif diff --git a/P25Gateway/SpeechPacificTAC1.h b/P25Gateway/SpeechPacificTAC1.h index 81af726..aa3d798 100644 --- a/P25Gateway/SpeechPacificTAC1.h +++ b/P25Gateway/SpeechPacificTAC1.h @@ -146,15 +146,8 @@ const unsigned char SPEECH_PACIFIC_TAC1[] = { 0x90U, 0x50U, 0x76U, 0xF3U, 0xA9U, 0x94U, 0x18U, 0x4FU, 0x7AU, 0xB6U, 0xC7U, 0x90U, 0x44U, 0xC0U, 0xEDU, 0x5FU, 0x2EU, 0x08U, 0x4AU, 0x59U, 0x24U, 0x3EU, 0x90U, 0x48U, 0x8FU, 0x90U, 0xFDU, 0x93U, 0x18U, 0x4FU, 0x5FU, 0x8AU, 0x57U, - 0x90U, 0x40U, 0xCBU, 0xFDU, 0xD7U, 0x8CU, 0x18U, 0x4CU, 0x35U, 0xE6U, 0x16U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U}; + 0x90U, 0x40U, 0xCBU, 0xFDU, 0xD7U, 0x8CU, 0x18U, 0x4CU, 0x35U, 0xE6U, 0x16U}; -const unsigned int SPEECH_PACIFIC_TAC1_COUNT = 133U; +const unsigned int SPEECH_PACIFIC_TAC1_COUNT = 126U; #endif diff --git a/P25Gateway/SpeechPacificTAC2.h b/P25Gateway/SpeechPacificTAC2.h index fc11afb..32fc4da 100644 --- a/P25Gateway/SpeechPacificTAC2.h +++ b/P25Gateway/SpeechPacificTAC2.h @@ -137,14 +137,8 @@ const unsigned char SPEECH_PACIFIC_TAC2[] = { 0x90U, 0x48U, 0x8AU, 0xB1U, 0xF3U, 0x1FU, 0x50U, 0x4BU, 0x25U, 0xA1U, 0x5FU, 0x90U, 0x40U, 0xDDU, 0x8EU, 0x8DU, 0xF6U, 0x11U, 0x4EU, 0x48U, 0xB6U, 0xF6U, 0x90U, 0x54U, 0x60U, 0x79U, 0xCAU, 0x4DU, 0x18U, 0x4DU, 0x3FU, 0xA7U, 0x07U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U}; -const unsigned int SPEECH_PACIFIC_TAC2_COUNT = 123U; +const unsigned int SPEECH_PACIFIC_TAC2_COUNT = 117U; #endif diff --git a/P25Gateway/SpeechWW.h b/P25Gateway/SpeechWW.h index 4ab9132..ef949b3 100644 --- a/P25Gateway/SpeechWW.h +++ b/P25Gateway/SpeechWW.h @@ -110,14 +110,8 @@ const unsigned char SPEECH_WW[] = { 0xA0U, 0x5DU, 0x24U, 0x6BU, 0x85U, 0x1DU, 0x98U, 0x4DU, 0x70U, 0xA2U, 0x58U, 0xA0U, 0x26U, 0xC4U, 0xC3U, 0x5BU, 0x99U, 0x00U, 0x09U, 0xBEU, 0x24U, 0xEDU, 0x80U, 0x94U, 0x4DU, 0xA6U, 0x3DU, 0xA4U, 0x76U, 0x88U, 0x4EU, 0x3BU, 0xFCU, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U}; -const unsigned int SPEECH_WW_COUNT = 96U; +const unsigned int SPEECH_WW_COUNT = 90U; #endif diff --git a/P25Gateway/SpeechWWTAC1.h b/P25Gateway/SpeechWWTAC1.h index 38feeb1..6fe6335 100644 --- a/P25Gateway/SpeechWWTAC1.h +++ b/P25Gateway/SpeechWWTAC1.h @@ -155,9 +155,8 @@ const unsigned char SPEECH_WW_TAC1[] = { 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U}; + 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U}; -const unsigned int SPEECH_WW_TAC1_COUNT = 136U; +const unsigned int SPEECH_WW_TAC1_COUNT = 135U; #endif diff --git a/P25Gateway/SpeechWWTAC3.h b/P25Gateway/SpeechWWTAC3.h index 7e743f3..a92e210 100644 --- a/P25Gateway/SpeechWWTAC3.h +++ b/P25Gateway/SpeechWWTAC3.h @@ -146,12 +146,8 @@ const unsigned char SPEECH_WW_TAC3[] = { 0x50U, 0xCCU, 0xB3U, 0xD0U, 0xC2U, 0x0EU, 0x04U, 0x03U, 0x06U, 0x7FU, 0x01U, 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U, - 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x45U, 0x04U, 0x0CU, 0xFDU, 0x7BU, 0xFBU, 0x7DU, 0xF2U, 0x7BU, 0x3DU, 0x9EU, 0x44U}; -const unsigned int SPEECH_WW_TAC3_COUNT = 130U; +const unsigned int SPEECH_WW_TAC3_COUNT = 126U; #endif