dominic/YSFClients
1
0
Fork 0
Code Releases Activity

Alternate Disconnect

Browse source 
Clicking the connected reflector on the Yaesu FT2D screen issues a command that WiresX.cpp could not cope with;

M: 2019-01-29 20:27:58.615 0000:  2B 5D 63 5F 28 30 30 30 30 34 38 36 32 32 36 03    *+]c_(0000486226.*
M: 2019-01-29 20:27:58.615 0010:  71 00 00 00

After a little trial and error, the radio appears to expect that to disconnect the connected reflector.
This PR adds in this functionality.
This commit is contained in:
Andy Taylor 2019-01-29 20:32:28 +00:00 committed by GitHub
parent 12499a3169
commit a848ccb216
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
YSFGateway/WiresX.cpp
View file

@ -31,6 +31,7 @@
const unsigned char DX_REQ[] = {0x5DU, 0x71U, 0x5FU};
const unsigned char CONN_REQ[] = {0x5DU, 0x23U, 0x5FU};
const unsigned char DISC_REQ[] = {0x5DU, 0x2AU, 0x5FU};
const unsigned char DISC_REQ2[] = {0x5DU, 0x63U, 0x5FU};
const unsigned char ALL_REQ[] = {0x5DU, 0x66U, 0x5FU};
const unsigned char CAT_REQ[] = {0x5DU, 0x67U, 0x5FU};
@ -238,6 +239,9 @@ WX_STATUS CWiresX::process(const unsigned char* data, const unsigned char* sourc
} else if (::memcmp(m_command + 1U, DISC_REQ, 3U) == 0) {
processDisconnect(source);
return WXS_DISCONNECT;
} else if (::memcmp(m_command + 1U, DISC_REQ2, 3U) == 0) {
processDisconnect(source);
return WXS_DISCONNECT;
} else if (::memcmp(m_command + 1U, CAT_REQ, 3U) == 0) {
return WXS_NONE;
} else {
@ -258,6 +262,9 @@ WX_STATUS CWiresX::process(const unsigned char* data, const unsigned char* sourc
} else if (::memcmp(m_command + 1U, DISC_REQ, 3U) == 0) {
processDisconnect(source);
return WXS_DISCONNECT;
} else if (::memcmp(m_command + 1U, DISC_REQ2, 3U) == 0) {
processDisconnect(source);
return WXS_DISCONNECT;
} else if (::memcmp(m_command + 1U, CAT_REQ, 3U) == 0) {
processCategory(source, m_command + 5U);
return WXS_NONE;