more complete vocoder config response check

main
Tom Early 4 years ago
parent d4838c0d86
commit a7a6d7358b

@ -422,6 +422,7 @@ void CController::ReadDevice(std::shared_ptr<CDV3003> device, EAmbeType type)
} }
} }
#ifdef DEBUG
void CController::AppendWave(const std::shared_ptr<CTranscoderPacket> packet) const void CController::AppendWave(const std::shared_ptr<CTranscoderPacket> packet) const
{ {
std::stringstream sstr; std::stringstream sstr;
@ -437,7 +438,6 @@ void CController::AppendWave(const std::shared_ptr<CTranscoderPacket> packet) co
std::cerr << "could not open pcm file " << sstr.str(); std::cerr << "could not open pcm file " << sstr.str();
} }
#ifdef DEBUG
void CController::Dump(const std::shared_ptr<CTranscoderPacket> p, const std::string &title) const void CController::Dump(const std::shared_ptr<CTranscoderPacket> p, const std::string &title) const
{ {
std::string codec; std::string codec;
@ -480,13 +480,13 @@ void CController::Dump(const std::shared_ptr<CTranscoderPacket> p, const std::st
// std::cout << std::setw(2) << std::setfill('0') << unsigned(*(p->GetDMRData()+i)); // std::cout << std::setw(2) << std::setfill('0') << unsigned(*(p->GetDMRData()+i));
// std::cout << std::endl; // std::cout << std::endl;
// } // }
if (p->M17IsSet()) // if (p->M17IsSet())
{ // {
std::cout << "M17 Data: "; // std::cout << "M17 Data: ";
for (unsigned int i=0; i<16; i++) // for (unsigned int i=0; i<16; i++)
std::cout << std::setw(2) << std::setfill('0') << unsigned(*(p->GetM17Data()+i)); // std::cout << std::setw(2) << std::setfill('0') << unsigned(*(p->GetM17Data()+i));
std::cout << std::endl; // std::cout << std::endl;
} // }
std::cout << std::dec; std::cout << std::dec;
} }

@ -263,6 +263,8 @@ bool CDV3003::ConfigureCodec(uint8_t pkt_ch, Encoding type)
} }
if ((ntohs(responsePacket.header.payload_length) != 6) || if ((ntohs(responsePacket.header.payload_length) != 6) ||
(responsePacket.field_id != pkt_ch) ||
(responsePacket.payload.ctrl.data.resp[0] != 0x00) ||
(responsePacket.payload.ctrl.data.resp[1] != PKT_RATEP) || (responsePacket.payload.ctrl.data.resp[1] != PKT_RATEP) ||
(responsePacket.payload.ctrl.data.resp[2] != 0x00) || (responsePacket.payload.ctrl.data.resp[2] != 0x00) ||
(responsePacket.payload.ctrl.data.resp[3] != PKT_INIT) || (responsePacket.payload.ctrl.data.resp[3] != PKT_INIT) ||

Loading…
Cancel
Save

Powered by TurnKey Linux.