diff --git a/MMDVM.README b/MMDVM.README index b1221a7..f9718c2 100644 --- a/MMDVM.README +++ b/MMDVM.README @@ -21,7 +21,7 @@ your start. On a Raspberry Pi, you can do all of this with the configureation me 3) cd into the MMDVMHost directory and compile: make If you're system has multiple processors, use: make -jx where x is the number of processors on you system. - To tell how many processors you have: cat /cpu/info | grep processor | wc -l + To tell how many processors you have: cat /proc/cpuinfo | grep processor | wc -l 4) Copy the ini file template: cp MMDVM.ini MMDVM.qn diff --git a/QnetGateway.cpp b/QnetGateway.cpp index 9487057..8416724 100644 --- a/QnetGateway.cpp +++ b/QnetGateway.cpp @@ -1552,7 +1552,7 @@ void CQnetGateway::process() band_txt[i].num_dv_silent_frames = 0; band_txt[i].num_bit_errors = 0; - } else { + } else { // not the end of the voice stream int ber_data[3]; int ber_errs = dstar_dv_decode(rptrbuf.vpkt.vasd.voice, ber_data); if (ber_data[0] == 0xf85) @@ -1560,6 +1560,9 @@ void CQnetGateway::process() band_txt[i].num_bit_errors += ber_errs; band_txt[i].num_dv_frames++; + if (bool_dtmf_debug) + printf("ber_data = %X %X %X, ber_data[0] & 0xffc = %X\n", + ber_data[0], ber_data[1], ber_data[2], ber_data[0] & 0xffc); if ((ber_data[0] & 0x0ffc) == 0xfc0) { dtmf_digit = (ber_data[0] & 0x03) | ((ber_data[2] & 0x60) >> 3); if (dtmf_counter[i] > 0) { @@ -1576,7 +1579,8 @@ void CQnetGateway::process() dtmf_buf_count[i] ++; } } - const unsigned char silence[9] = { 0x4e,0x8d,0x32,0x88,0x26,0x1a,0x3f,0x61,0xe8 }; + // const unsigned char silence[9] = { 0x4e, 0x8d, 0x32, 0x88, 0x26, 0x1a, 0x3f, 0x61, 0xe8 }; + const unsigned char silence[9] = { 0x9E, 0x8D, 0x32, 0x88, 0x26, 0x1A, 0x3F, 0x61, 0xE8 }; memcpy(rptrbuf.vpkt.vasd.voice, silence, 9); } else dtmf_counter[i] = 0; diff --git a/QnetLink.cpp b/QnetLink.cpp index 241c14c..660e4cd 100644 --- a/QnetLink.cpp +++ b/QnetLink.cpp @@ -176,7 +176,7 @@ static regex_t preg; const char* G2_html = "
![]() | "
"" - "REPEATER G2_IRCDDB Gateway v3.09+" + "REPEATER QnetGateway v1.0+" " | " "