MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-20 22:45:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove the P25 debugging code.

Browse Source
This commit is contained in:
Jonathan Naylor
2016-09-22 19:43:55 +01:00
parent 21ce2abcb2
commit 55a34bc995
2 changed files with 1 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
Modem.cpp
View File

@@ -36,98 +36,6 @@
#include <unistd.h>
#endif
const unsigned char P25_DATA[6U][222U] = {
{ 0xE0U, 0x67U, 0x30U, 0x01U, 0x55U, 0x75U, 0xF5U, 0xFFU, 0x77U, 0xFFU, 0x29U, 0x30U, 0x0EU, 0xCEU, 0xD7U, 0x7EU,
0x00U, 0x70U, 0x80U, 0x00U, 0x00U, 0x02U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x02U, 0x00U,
0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x02U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U,
0x0AU, 0x37U, 0x18U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x02U, 0x00U, 0x00U, 0x00U, 0x00U, 0x01U, 0x8EU,
0xB5U, 0xE0U, 0x96U, 0x52U, 0x7CU, 0x2AU, 0x23U, 0x54U, 0x0DU, 0x9FU, 0x34U, 0x7EU, 0xF1U, 0xD4U, 0x1EU, 0x42U,
0x1EU, 0xA2U, 0x35U, 0x8BU, 0xFEU, 0x31U, 0x2AU, 0x5EU, 0x37U, 0x18U, 0x4AU, 0x96U, 0x51U, 0xBAU, 0x30U, 0xA4U,
0xF8U, 0x0CU, 0x75U, 0x4CU, 0x75U, 0x10U, 0x02U, 0x00U, 0x00U, 0x0FU, 0x3AU, 0x14U, 0xE9U, 0x4DU, 0x8CU, 0xCEU,
0xE7U, 0x52U, 0x17U, 0x28U, 0xD6U, 0x45U, 0x77U, 0xF0U, 0xD2U, 0x23U, 0x25U, 0x6BU, 0x00U, 0x00U, 0x27U, 0x6CU,
0xF2U, 0x86U, 0x46U, 0x45U, 0xE0U, 0x1AU, 0x90U, 0xD1U, 0x27U, 0x00U, 0x0AU, 0xD0U, 0x02U, 0x67U, 0x6AU, 0x13U,
0x36U, 0xF9U, 0x4AU, 0xFEU, 0xFEU, 0x2AU, 0x8CU, 0x41U, 0xC3U, 0xCFU, 0x94U, 0x30U, 0x56U, 0xEBU, 0x10U, 0xC0U,
0x8AU, 0xEFU, 0x5FU, 0x14U, 0xB3U, 0x82U, 0xE7U, 0xC4U, 0x4FU, 0x55U, 0x18U, 0xDEU, 0x33U, 0xDCU, 0x7EU, 0x69U,
0x71U, 0xFFU, 0xB1U, 0xE9U, 0x10U, 0x27U, 0xD8U, 0x1AU, 0x28U, 0xF4U, 0xBFU, 0xB6U, 0x85U, 0x9AU, 0x12U, 0xB7U,
0x92U, 0x42U, 0x33U, 0xB9U, 0x55U, 0xE0U, 0x8FU, 0x22U, 0x2FU, 0xD6U, 0x2FU, 0x71U, 0x07U, 0x61U, 0x38U, 0xFDU,
0xF8U, 0x22U, 0xB2U, 0x11U, 0xCBU, 0x8FU, 0x3EU, 0x69U, 0x88U, 0x6FU, 0xDDU, 0x22U, 0x00U, 0x00U },
{ 0xE0U, 0xDEU, 0x31U, 0x01U, 0x55U, 0x75U, 0xF5U, 0xFFU, 0x77U, 0xFFU, 0x29U, 0x35U, 0x56U, 0x7BU, 0xCBU, 0x19U,
0x4DU, 0x0DU, 0xDBU, 0x10U, 0xBAU, 0x16U, 0xDEU, 0x2EU, 0x82U, 0x69U, 0x36U, 0x3DU, 0x98U, 0x1FU, 0x9AU, 0xF8U,
0x8EU, 0xC6U, 0x2BU, 0x80U, 0x11U, 0xB1U, 0x0BU, 0xA2U, 0x5DU, 0xE2U, 0xE8U, 0x26U, 0x93U, 0x63U, 0xD9U, 0x81U,
0xFAU, 0x6FU, 0x88U, 0xECU, 0x62U, 0xB8U, 0x01U, 0x80U, 0x00U, 0x02U, 0x00U, 0x00U, 0x06U, 0xC4U, 0x2EU, 0x85U,
0xDEU, 0x2EU, 0x82U, 0x9AU, 0x4DU, 0x8FU, 0x66U, 0x07U, 0xE6U, 0xF8U, 0x8EU, 0xC6U, 0x8AU, 0xE0U, 0x04U, 0x00U,
0x00U, 0x00U, 0x00U, 0x1CU, 0x6EU, 0x10U, 0xBAU, 0x17U, 0x78U, 0xBAU, 0x09U, 0xA4U, 0xD8U, 0xF6U, 0x98U, 0x1FU,
0x9BU, 0xE2U, 0x3BU, 0x18U, 0xAEU, 0x00U, 0x62U, 0x00U, 0x00U, 0x0FU, 0x3AU, 0x14U, 0xE9U, 0x4DU, 0x8CU, 0xCEU,
0xE7U, 0x52U, 0x17U, 0x28U, 0xD6U, 0x45U, 0x77U, 0xF0U, 0xD2U, 0x23U, 0x25U, 0x6BU, 0x00U, 0x00U, 0x27U, 0x6CU,
0xF2U, 0x86U, 0x46U, 0x45U, 0xE0U, 0x1AU, 0x90U, 0xD1U, 0x27U, 0x00U, 0x0AU, 0xD0U, 0x02U, 0x67U, 0x6AU, 0x13U,
0x36U, 0xF9U, 0x4AU, 0xFEU, 0xFEU, 0x2AU, 0x8CU, 0x41U, 0xC3U, 0xCFU, 0x94U, 0x30U, 0x56U, 0xEBU, 0x10U, 0xC0U,
0x8AU, 0xEFU, 0x5FU, 0x14U, 0xB3U, 0x82U, 0xE7U, 0xC4U, 0x4FU, 0x55U, 0x18U, 0xDEU, 0x33U, 0xDCU, 0x7EU, 0x69U,
0x71U, 0xFFU, 0xB1U, 0xE9U, 0x10U, 0x27U, 0xD8U, 0x1AU, 0x28U, 0xF4U, 0xBFU, 0xB6U, 0x85U, 0x9AU, 0x12U, 0xB7U,
0x92U, 0x42U, 0x33U, 0xB9U, 0x55U, 0xE0U, 0x8FU, 0x22U, 0x2FU, 0xD6U, 0x2FU, 0x71U, 0x07U, 0x61U, 0x38U, 0xFDU,
0xF8U, 0x22U, 0xB2U, 0x11U, 0xCBU, 0x8FU, 0x3EU, 0x69U, 0x88U, 0x6FU, 0xDDU, 0x22U, 0x00U, 0x00U },
{ 0xE0U, 0xDCU, 0x31U, 0x01U, 0x55U, 0x75U, 0xF5U, 0xFEU, 0x77U, 0xFFU, 0x29U, 0x3AU, 0xBAU, 0xA4U, 0xEFU, 0xB0U,
0x9AU, 0x8AU, 0xCEU, 0x9DU, 0xADU, 0x1EU, 0xCDU, 0x06U, 0xFBU, 0xF6U, 0xA8U, 0x28U, 0xEDU, 0x7BU, 0x5AU, 0x8CU,
0x15U, 0xC7U, 0x08U, 0xEEU, 0x38U, 0xD1U, 0x4BU, 0xEEU, 0xA5U, 0xE7U, 0xE0U, 0xD5U, 0x5DU, 0x49U, 0x05U, 0x0DU,
0x72U, 0xFAU, 0xB0U, 0xD4U, 0xA6U, 0x08U, 0x64U, 0x40U, 0x00U, 0x02U, 0x00U, 0x00U, 0x07U, 0xA3U, 0x36U, 0x5CU,
0x96U, 0x5AU, 0x26U, 0xFDU, 0xD6U, 0x35U, 0x64U, 0x11U, 0x82U, 0x0CU, 0x8DU, 0xFAU, 0x75U, 0xF6U, 0xD7U, 0x00U,
0x00U, 0x00U, 0x00U, 0x00U, 0x72U, 0x20U, 0x56U, 0x60U, 0xA5U, 0xEBU, 0x24U, 0x6BU, 0xF6U, 0x1AU, 0x83U, 0xECU,
0xA9U, 0x39U, 0xACU, 0x7DU, 0x44U, 0xC4U, 0x42U, 0x00U, 0x00U, 0x00U, 0x00U, 0x01U, 0x4AU, 0x00U, 0xDAU, 0x66U,
0xF2U, 0x8FU, 0x3BU, 0xBAU, 0xA5U, 0x8EU, 0x9BU, 0xC4U, 0x0EU, 0x49U, 0x17U, 0xE9U, 0x5AU, 0x14U, 0xA0U, 0xE0U,
0x00U, 0x02U, 0x00U, 0x03U, 0x75U, 0xD6U, 0xB9U, 0x6CU, 0x54U, 0x24U, 0x56U, 0x5CU, 0xACU, 0x5AU, 0x81U, 0xA5U,
0x9BU, 0x06U, 0x47U, 0x96U, 0xE9U, 0x49U, 0xAEU, 0x8BU, 0x48U, 0xB6U, 0x49U, 0x9CU, 0x42U, 0xD8U, 0xA1U, 0x5DU,
0x58U, 0xC0U, 0x70U, 0xC4U, 0xBAU, 0xEEU, 0x39U, 0x99U, 0xC8U, 0x2EU, 0xFFU, 0x31U, 0x37U, 0xA9U, 0xAAU, 0xF4U,
0xF1U, 0xFDU, 0x63U, 0x0BU, 0xC2U, 0x71U, 0xD9U, 0x12U, 0xA7U, 0x35U, 0x13U, 0x15U, 0xBAU, 0x31U, 0x1EU, 0xAEU,
0x6EU, 0xC7U, 0x3CU, 0x70U, 0x96U, 0x7CU, 0x41U, 0x1CU, 0x1CU, 0xE2U, 0xA2U, 0x44U, 0x59U, 0xE8U, 0x46U, 0x88U,
0x3AU, 0x70U, 0xFEU, 0xD3U, 0xD3U, 0x13U, 0x44U, 0xA1U, 0x67U, 0xECU, 0xF8U, 0xAEU },
{ 0xE0U, 0xDCU, 0x31U, 0x01U, 0x55U, 0x75U, 0xF5U, 0xFEU, 0x77U, 0xFFU, 0x29U, 0x35U, 0x56U, 0x7BU, 0xCBU, 0x19U,
0x4DU, 0x0DU, 0xFDU, 0x2AU, 0x9AU, 0x12U, 0x2BU, 0x2AU, 0xE1U, 0xB0U, 0xA1U, 0xDBU, 0x88U, 0x26U, 0x82U, 0x5FU,
0x40U, 0xFEU, 0x15U, 0x3DU, 0x20U, 0x92U, 0x1BU, 0x2EU, 0x49U, 0xF3U, 0xACU, 0x3FU, 0xB3U, 0x8DU, 0x39U, 0x2AU,
0xF6U, 0x09U, 0x14U, 0x58U, 0xF1U, 0xE7U, 0x23U, 0x80U, 0x00U, 0x02U, 0x00U, 0x00U, 0x04U, 0x23U, 0x01U, 0xC3U,
0x59U, 0x60U, 0xFAU, 0xD9U, 0xE1U, 0x12U, 0x6DU, 0x32U, 0x23U, 0x44U, 0x86U, 0xEEU, 0x11U, 0x87U, 0x68U, 0x00U,
0x00U, 0x00U, 0x00U, 0x1CU, 0x52U, 0xB4U, 0xD1U, 0x4DU, 0x55U, 0x33U, 0x6EU, 0x63U, 0x92U, 0x42U, 0x8CU, 0xB1U,
0x9BU, 0x37U, 0xE9U, 0x42U, 0x9BU, 0x2DU, 0xA2U, 0x00U, 0x00U, 0x0FU, 0x3AU, 0x17U, 0x2EU, 0xDBU, 0x20U, 0x0EU,
0x55U, 0xA3U, 0x6FU, 0x53U, 0xF1U, 0x25U, 0x31U, 0x3EU, 0xDEU, 0x12U, 0x42U, 0x69U, 0xA3U, 0x42U, 0x67U, 0x6CU,
0xF2U, 0x86U, 0x46U, 0x4DU, 0x6AU, 0x91U, 0x60U, 0x8FU, 0x64U, 0xAAU, 0x1EU, 0xCAU, 0x52U, 0xA0U, 0x60U, 0x49U,
0xA9U, 0x0CU, 0x70U, 0xCAU, 0x4EU, 0x3BU, 0x8CU, 0x41U, 0xC3U, 0xCFU, 0x90U, 0x80U, 0xBAU, 0x5EU, 0x59U, 0x39U,
0x21U, 0x12U, 0x19U, 0x3FU, 0xEFU, 0x4AU, 0x2CU, 0xA6U, 0x36U, 0x1AU, 0x07U, 0xCBU, 0xFEU, 0x4CU, 0x7EU, 0x69U,
0x71U, 0xFFU, 0xB1U, 0xF1U, 0xC7U, 0xE9U, 0x42U, 0x86U, 0xCFU, 0xE9U, 0x48U, 0xC0U, 0xAEU, 0xA4U, 0x58U, 0x97U,
0xA6U, 0xE6U, 0x71U, 0x82U, 0x52U, 0xEAU, 0x90U, 0xAAU, 0x90U, 0x82U, 0x67U, 0x51U, 0xB5U, 0x5AU, 0x12U, 0xB8U,
0x1BU, 0xFDU, 0x8AU, 0xBAU, 0xCBU, 0x93U, 0x21U, 0xEEU, 0xA3U, 0x60U, 0x46U, 0x66U },
{ 0xE0U, 0xDCU, 0x31U, 0x01U, 0x55U, 0x75U, 0xF5U, 0xEFU, 0x77U, 0xFFU, 0x29U, 0x3AU, 0xBAU, 0xA4U, 0xEEU, 0xB0U,
0x9AU, 0x8AU, 0xC5U, 0x11U, 0xD1U, 0xA2U, 0x0CU, 0x58U, 0xF4U, 0x8DU, 0xC8U, 0xF1U, 0xEDU, 0xA6U, 0x6EU, 0x2CU,
0x67U, 0xA9U, 0x57U, 0xD1U, 0x38U, 0x02U, 0x91U, 0x2AU, 0xEBU, 0x63U, 0x28U, 0x49U, 0x1AU, 0xAFU, 0xA9U, 0xC6U,
0xBAU, 0x3CU, 0xD3U, 0x61U, 0x2DU, 0x13U, 0x31U, 0x00U, 0x00U, 0x02U, 0x00U, 0x00U, 0x05U, 0x2BU, 0x48U, 0x4DU,
0x8DU, 0x7EU, 0x82U, 0x7DU, 0xECU, 0x39U, 0x61U, 0x82U, 0x1DU, 0x3EU, 0xBCU, 0xF2U, 0x66U, 0x8BU, 0x02U, 0x00U,
0x00U, 0x00U, 0x00U, 0x00U, 0x06U, 0x31U, 0x30U, 0x79U, 0xF1U, 0xBBU, 0x5AU, 0x5AU, 0x51U, 0xB6U, 0x74U, 0x17U,
0xEEU, 0x3EU, 0xA8U, 0x2BU, 0xA0U, 0xC3U, 0x02U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0xCAU, 0x9CU, 0xA2U, 0x2AU,
0x82U, 0xC7U, 0x03U, 0x4DU, 0xF1U, 0xE8U, 0xF1U, 0x20U, 0xAEU, 0xA9U, 0xC4U, 0xE9U, 0x1CU, 0xC0U, 0xA0U, 0xE0U,
0x00U, 0x02U, 0x00U, 0x05U, 0x4AU, 0x05U, 0x38U, 0xE3U, 0x4EU, 0xEAU, 0x92U, 0x7AU, 0x51U, 0x23U, 0x32U, 0x12U,
0xDEU, 0x69U, 0x0BU, 0x42U, 0x3AU, 0x85U, 0xAEU, 0x8BU, 0x48U, 0xB6U, 0x49U, 0x0AU, 0x36U, 0x16U, 0x9DU, 0xFDU,
0x51U, 0x67U, 0xD0U, 0x76U, 0x44U, 0x6AU, 0x6DU, 0x4AU, 0x22U, 0x47U, 0xA1U, 0x91U, 0xEAU, 0xA9U, 0xAAU, 0xF4U,
0xF1U, 0xFDU, 0x62U, 0x9FU, 0x1BU, 0x80U, 0xAFU, 0x4EU, 0xEEU, 0x4DU, 0x48U, 0x7CU, 0x99U, 0x41U, 0xA9U, 0xFAU,
0x62U, 0xEFU, 0x9DU, 0x79U, 0x92U, 0x6AU, 0x90U, 0xA0U, 0x8FU, 0x2AU, 0xDDU, 0x20U, 0x70U, 0x62U, 0x1CU, 0xF1U,
0x5FU, 0x71U, 0x4EU, 0xC0U, 0x54U, 0x80U, 0xE2U, 0x76U, 0x71U, 0xA9U, 0x30U, 0xCAU },
{ 0xE0U, 0xDCU, 0x31U, 0x01U, 0x55U, 0x75U, 0xF5U, 0xFEU, 0x77U, 0xFFU, 0x29U, 0x33U, 0x3AU, 0x5DU, 0xDCU, 0xA3U,
0x3BU, 0x5BU, 0x80U, 0x00U, 0x00U, 0x02U, 0x16U, 0x60U, 0x02U, 0x80U, 0x08U, 0x00U, 0x20U, 0x20U, 0x00U, 0x80U,
0x00U, 0x00U, 0x00U, 0x80U, 0x00U, 0x00U, 0x25U, 0x88U, 0x00U, 0x28U, 0x22U, 0x20U, 0x01U, 0xB3U, 0x81U, 0x6AU,
0x95U, 0x16U, 0x61U, 0x23U, 0xE7U, 0x20U, 0x00U, 0xD8U, 0xDFU, 0xE9U, 0xACU, 0xC9U, 0x07U, 0x69U, 0xB6U, 0x41U,
0x92U, 0x04U, 0x63U, 0x4AU, 0xF4U, 0xA1U, 0x6FU, 0xF4U, 0xA7U, 0xEAU, 0xACU, 0xE6U, 0xD8U, 0x71U, 0xE3U, 0xE6U,
0x95U, 0x2DU, 0x3CU, 0xBAU, 0x64U, 0x9EU, 0x97U, 0xF3U, 0x4AU, 0x66U, 0x85U, 0x40U, 0x73U, 0xDCU, 0x28U, 0x83U,
0x7AU, 0x71U, 0xC7U, 0x01U, 0x5DU, 0xFCU, 0x19U, 0xBAU, 0x61U, 0xD1U, 0xCAU, 0xC7U, 0x82U, 0x96U, 0xF7U, 0x29U,
0x7BU, 0xD2U, 0xB0U, 0xFBU, 0x21U, 0x13U, 0x31U, 0x54U, 0xFFU, 0x1BU, 0x50U, 0x0DU, 0xD7U, 0x68U, 0x76U, 0xCBU,
0xA5U, 0xA7U, 0x86U, 0x5EU, 0xE0U, 0x21U, 0x45U, 0x7AU, 0x31U, 0x3EU, 0x50U, 0xAEU, 0x2AU, 0x30U, 0x80U, 0x25U,
0xA9U, 0x9BU, 0x7DU, 0x4AU, 0x0EU, 0x17U, 0x92U, 0x2AU, 0xA6U, 0xD4U, 0xB2U, 0x60U, 0xCAU, 0xC7U, 0x9AU, 0x5EU,
0x0AU, 0x14U, 0xD3U, 0xE2U, 0x35U, 0x04U, 0x48U, 0xBAU, 0xE6U, 0x44U, 0xE9U, 0x2EU, 0x73U, 0xB8U, 0xAEU, 0xD8U,
0xA9U, 0x66U, 0x0DU, 0xA4U, 0x8AU, 0xB2U, 0x5FU, 0xE6U, 0x01U, 0x97U, 0xF4U, 0x1AU, 0x33U, 0x09U, 0x60U, 0x44U,
0x8EU, 0xA6U, 0xB5U, 0xACU, 0x43U, 0x50U, 0xAFU, 0x5BU, 0xF6U, 0x42U, 0xA3U, 0x27U, 0x01U, 0x44U, 0xAFU, 0x7AU,
0xB1U, 0x05U, 0x01U, 0x9FU, 0xA4U, 0xFDU, 0x2DU, 0x8FU, 0x48U, 0xA3U, 0xC1U, 0xA3U } };
const unsigned char MMDVM_FRAME_START = 0xE0U;
const unsigned char MMDVM_GET_VERSION = 0x00U;
@@ -219,8 +127,7 @@ m_p25Space(0U),
m_tx(false),
m_lockout(false),
m_error(false),
m_hwType(HWT_UNKNOWN),
m_nn(0U)
m_hwType(HWT_UNKNOWN)
{
assert(!port.empty());
@@ -307,29 +214,6 @@ void CModem::clock(unsigned int ms)
if (m_statusTimer.hasExpired()) {
readStatus();
m_statusTimer.start();
#ifdef notdef
const unsigned char* dat = P25_DATA[m_nn];
if (m_nn == 0U) {
unsigned char data = 101U;
m_rxP25Data.addData(&data, 1U);
data = TAG_HEADER;
m_rxP25Data.addData(&data, 1U);
m_rxP25Data.addData(dat + 3U, 100U);
} else if (m_nn > 0U && m_nn < 6U) {
unsigned char data = 220U;
m_rxP25Data.addData(&data, 1U);
data = TAG_DATA;
m_rxP25Data.addData(&data, 1U);
m_rxP25Data.addData(dat + 3U, 219U);
}
m_nn++;
#endif
}
m_inactivityTimer.clock(ms);

1
Modem.h
View File

@@ -129,7 +129,6 @@ private:
bool m_lockout;
bool m_error;
HW_TYPE m_hwType;
unsigned int m_nn;
bool readVersion();
bool readStatus();