andrius
/
s20
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Parse more stuff in SocketData messages.

This commit is contained in:
Andrius Štikonas 2015-02-09 21:09:50 +00:00
parent 8acd7a7178
commit f2037b01ef
3 changed files with 37 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
consolereader.cpp
View File

@ -53,8 +53,10 @@ void ConsoleReader::run()
break;
case 'n':
{
command.erase(0,1);
(*sockets) [number]->changeSocketName(QString::fromStdString(command));
std::string name;
std::cout << "Please enter a new name: ";
std::cin >> name;
(*sockets) [number]->changeSocketName(QString::fromStdString(name));
break;
}
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 << "___________________________________________________________________________\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
View File

File diff suppressed because one or more lines are too long

10
socket.h
View File

@ -62,12 +62,18 @@ private:
QByteArray datagram[MaxCommands];
QByteArray rmac; // Reveresed mac
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 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 zeros = QByteArray::fromHex ( "00 00 00 00" );
const QByteArray zero = QByteArray::fromHex ( "00" );
const QByteArray one = QByteArray::fromHex ( "01" );
const QByteArray zero = QByteArray::fromHex ( "00" );
const QByteArray one = QByteArray::fromHex ( "01" );
QUdpSocket *udpSocket;
QTimer *subscribeTimer;