Parse more stuff in SocketData messages.
This commit is contained in:
parent
8acd7a7178
commit
f2037b01ef
|
@ -53,8 +53,10 @@ void ConsoleReader::run()
|
||||||
break;
|
break;
|
||||||
case 'n':
|
case 'n':
|
||||||
{
|
{
|
||||||
command.erase(0,1);
|
std::string name;
|
||||||
(*sockets) [number]->changeSocketName(QString::fromStdString(command));
|
std::cout << "Please enter a new name: ";
|
||||||
|
std::cin >> name;
|
||||||
|
(*sockets) [number]->changeSocketName(QString::fromStdString(name));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 'p':
|
case 'p':
|
||||||
|
@ -84,5 +86,6 @@ void ConsoleReader::listSockets()
|
||||||
std::cout << "Socket Name: " << (*i)->name.toStdString() << "\t Remote Password: " << (*i)->remotePassword.toStdString() << std::endl;
|
std::cout << "Socket Name: " << (*i)->name.toStdString() << "\t Remote Password: " << (*i)->remotePassword.toStdString() << std::endl;
|
||||||
}
|
}
|
||||||
std::cout << "___________________________________________________________________________\n" << std::endl;
|
std::cout << "___________________________________________________________________________\n" << std::endl;
|
||||||
std::cout << "d - update table data\nnName - change socket name to Name (max 16 characters)\ns - pick another socket (default is 1)\np - toggle power state\nq - quit" << std::endl;
|
std::cout << "d - update table data\nn - change socket name (max 16 characters)\ns - pick another socket (default is 1)\np - toggle power state\nq - quit" << std::endl;
|
||||||
|
std::cout << "Enter command: " << std::flush;
|
||||||
}
|
}
|
||||||
|
|
30
socket.cpp
30
socket.cpp
File diff suppressed because one or more lines are too long
10
socket.h
10
socket.h
|
@ -62,12 +62,18 @@ private:
|
||||||
QByteArray datagram[MaxCommands];
|
QByteArray datagram[MaxCommands];
|
||||||
QByteArray rmac; // Reveresed mac
|
QByteArray rmac; // Reveresed mac
|
||||||
QByteArray versionID;
|
QByteArray versionID;
|
||||||
|
QByteArray icon; // displayed icon
|
||||||
|
QByteArray hardwareVersion;
|
||||||
|
QByteArray firmwareVersion;
|
||||||
|
QByteArray wifiFirmwareVersion; // CC3000 firmware version
|
||||||
QByteArray socketTableNumber, socketTableVersion, timingTableNumber, timingTableVersion; // FIXME: not used yet
|
QByteArray socketTableNumber, socketTableVersion, timingTableNumber, timingTableVersion; // FIXME: not used yet
|
||||||
|
QByteArray port = QByteArray::fromHex ( "10:27" ); // 10000 in hex (little endian)
|
||||||
|
QByteArray localGatewayIP;
|
||||||
|
|
||||||
const QByteArray twenties = QByteArray::fromHex ( "20 20 20 20 20 20" ); // mac address padding, 6 spaces
|
const QByteArray twenties = QByteArray::fromHex ( "20 20 20 20 20 20" ); // mac address padding, 6 spaces
|
||||||
const QByteArray zeros = QByteArray::fromHex ( "00 00 00 00" );
|
const QByteArray zeros = QByteArray::fromHex ( "00 00 00 00" );
|
||||||
const QByteArray zero = QByteArray::fromHex ( "00" );
|
const QByteArray zero = QByteArray::fromHex ( "00" );
|
||||||
const QByteArray one = QByteArray::fromHex ( "01" );
|
const QByteArray one = QByteArray::fromHex ( "01" );
|
||||||
|
|
||||||
QUdpSocket *udpSocket;
|
QUdpSocket *udpSocket;
|
||||||
QTimer *subscribeTimer;
|
QTimer *subscribeTimer;
|
||||||
|
|
Loading…
Reference in New Issue