Do not send wrong data in WriteSocketData datagram.
This commit is contained in:
parent
f2037b01ef
commit
033b49e365
18
socket.cpp
18
socket.cpp
File diff suppressed because one or more lines are too long
7
socket.h
7
socket.h
|
@ -44,7 +44,7 @@ public:
|
||||||
void changeSocketName ( QString newName );
|
void changeSocketName ( QString newName );
|
||||||
bool parseReply ( QByteArray );
|
bool parseReply ( QByteArray );
|
||||||
|
|
||||||
QHostAddress ip, localIP;
|
QHostAddress ip;
|
||||||
QByteArray mac;
|
QByteArray mac;
|
||||||
bool powered;
|
bool powered;
|
||||||
QByteArray name, remotePassword;
|
QByteArray name, remotePassword;
|
||||||
|
@ -53,7 +53,6 @@ private:
|
||||||
enum Datagram {Subscribe, PowerOff, PowerOn, TableData, SocketData, TimingData, WriteSocketData, MaxCommands};
|
enum Datagram {Subscribe, PowerOff, PowerOn, TableData, SocketData, TimingData, WriteSocketData, MaxCommands};
|
||||||
|
|
||||||
void sendDatagram ( Datagram );
|
void sendDatagram ( Datagram );
|
||||||
QByteArray fromIP ( unsigned char, unsigned char, unsigned char, unsigned char );
|
|
||||||
void subscribe();
|
void subscribe();
|
||||||
void listen() { start(); }
|
void listen() { start(); }
|
||||||
void run();
|
void run();
|
||||||
|
@ -66,9 +65,11 @@ private:
|
||||||
QByteArray hardwareVersion;
|
QByteArray hardwareVersion;
|
||||||
QByteArray firmwareVersion;
|
QByteArray firmwareVersion;
|
||||||
QByteArray wifiFirmwareVersion; // CC3000 firmware version
|
QByteArray wifiFirmwareVersion; // CC3000 firmware version
|
||||||
QByteArray socketTableNumber, socketTableVersion, timingTableNumber, timingTableVersion; // FIXME: not used yet
|
QByteArray staticServerIP;
|
||||||
QByteArray port = QByteArray::fromHex ( "10:27" ); // 10000 in hex (little endian)
|
QByteArray port = QByteArray::fromHex ( "10:27" ); // 10000 in hex (little endian)
|
||||||
|
QByteArray localIP; // same as QHostAddress ip but in QByteArray, maybe fix later...
|
||||||
QByteArray localGatewayIP;
|
QByteArray localGatewayIP;
|
||||||
|
QByteArray socketTableNumber, socketTableVersion, timingTableNumber, timingTableVersion; // FIXME: not used yet
|
||||||
|
|
||||||
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" );
|
||||||
|
|
Loading…
Reference in New Issue