Remove commandID magic numbers.
This commit is contained in:
parent
de16fea254
commit
ba52a9862e
|
@ -28,6 +28,7 @@ ConsoleReader::ConsoleReader ( std::vector<Socket*> *sockets_vector )
|
||||||
|
|
||||||
void ConsoleReader::run()
|
void ConsoleReader::run()
|
||||||
{
|
{
|
||||||
|
std::cout << "Copyright (C) 2015 Andrius Štikonas.\nLicense GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\nThis is free software: you are free to change and redistribute it.\nThere is NO WARRANTY, to the extent permitted by law." << std::endl;
|
||||||
connectSignals();
|
connectSignals();
|
||||||
listSockets();
|
listSockets();
|
||||||
|
|
||||||
|
|
16
socket.cpp
16
socket.cpp
|
@ -30,20 +30,18 @@ Socket::Socket ( QHostAddress IPaddress, QByteArray reply )
|
||||||
mac = reply.mid ( 7, 6 );
|
mac = reply.mid ( 7, 6 );
|
||||||
rmac = mac;
|
rmac = mac;
|
||||||
std::reverse ( rmac.begin(), rmac.end() );
|
std::reverse ( rmac.begin(), rmac.end() );
|
||||||
|
|
||||||
powered = reply.right ( 1 ) == one;
|
powered = reply.right ( 1 ) == one;
|
||||||
// 68:64:00:06:71:61 initial detection ??
|
|
||||||
|
|
||||||
commandID[GlobalDiscover] = QByteArray::fromHex ( "71 61" );
|
commandID[GlobalDiscover] = QStringLiteral( "qa" ).toLatin1(); // Query All
|
||||||
commandID[Discover] = QByteArray::fromHex ( "71 67" );
|
commandID[Discover] = QStringLiteral( "qg" ).toLatin1(); // qg
|
||||||
commandID[Subscribe] = QByteArray::fromHex ( "63 6c" );
|
commandID[Subscribe] = QStringLiteral( "cl" ).toLatin1(); // Login Command
|
||||||
commandID[PowerOn] = QByteArray::fromHex ( "73 66" );
|
commandID[PowerOn] = QStringLiteral( "sf" ).toLatin1(); // sf (change of power state)
|
||||||
commandID[PowerOff] = commandID[PowerOn];
|
commandID[PowerOff] = commandID[PowerOn];
|
||||||
commandID[TableData] = QByteArray::fromHex ( "72 74" );
|
commandID[TableData] = QStringLiteral( "rt" ).toLatin1(); // Read Table
|
||||||
commandID[SocketData] = commandID[TableData];
|
commandID[SocketData] = commandID[TableData];
|
||||||
commandID[TimingData] = commandID[TableData];
|
commandID[TimingData] = commandID[TableData];
|
||||||
commandID[WriteSocketData] = QByteArray::fromHex ( "74 6d" );
|
commandID[WriteSocketData] = QStringLiteral( "tm" ).toLatin1(); // Table Modify
|
||||||
QByteArray commandIDPower = QByteArray::fromHex ( "64 63" );
|
QByteArray commandIDPower = QStringLiteral( "dc" ).toLatin1(); // Socket change responce
|
||||||
|
|
||||||
// 2 hex bytes are the total length of the message
|
// 2 hex bytes are the total length of the message
|
||||||
datagram[Discover] = commandID[Discover] + mac + twenties;
|
datagram[Discover] = commandID[Discover] + mac + twenties;
|
||||||
|
|
Loading…
Reference in New Issue