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

Do not send wrong data in WriteSocketData datagram.

This commit is contained in:
Andrius Štikonas 2015-02-11 00:33:04 +00:00
parent f2037b01ef
commit 033b49e365
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
socket.cpp
View File

File diff suppressed because one or more lines are too long

7
socket.h
View File

@ -44,7 +44,7 @@ public:
void changeSocketName ( QString newName );
bool parseReply ( QByteArray );
QHostAddress ip, localIP;
QHostAddress ip;
QByteArray mac;
bool powered;
QByteArray name, remotePassword;
@ -53,7 +53,6 @@ private:
enum Datagram {Subscribe, PowerOff, PowerOn, TableData, SocketData, TimingData, WriteSocketData, MaxCommands};
void sendDatagram ( Datagram );
QByteArray fromIP ( unsigned char, unsigned char, unsigned char, unsigned char );
void subscribe();
void listen() { start(); }
void run();
@ -66,9 +65,11 @@ private:
QByteArray hardwareVersion;
QByteArray firmwareVersion;
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 localIP; // same as QHostAddress ip but in QByteArray, maybe fix later...
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 zeros = QByteArray::fromHex ( "00 00 00 00" );