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

Add partial support for countdown.

This commit is contained in:
Andrius Štikonas 2015-08-18 14:25:32 +01:00
parent 20b97aed8c
commit 4497d1e1c1
3 changed files with 37 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
consolereader.cpp
View File

@ -61,6 +61,15 @@ void ConsoleReader::run()
broadcastPassword(QString::fromStdString(password)); // HF-LPB100 chip can be controlled over port 49999
break;
}
case 'c':
uint16_t countdown;
std::cout << "Countdown time in seconds: ";
std::cin >> countdown;
(*sockets) [number]->setCountDown(countdown);
break;
case 'C':
(*sockets) [number]->setCountDown(countdown);
break;
case 'd':
(*sockets) [number]->tableData();
break;
@ -122,11 +131,13 @@ void ConsoleReader::listSockets()
std::cout << "_____________________________________________________________________________\n" << std::endl;
std::cout << "IP Address: " << (*i)->ip.toString().toStdString() << "\t MAC Address: " << (*i)->mac.toHex().toStdString() << "\t Power: " << ( (*i)->powered ? "On" : "Off" ) << std::endl;
std::cout << "Socket Name: " << (*i)->socketName.toStdString() << "\t Remote Password: " << (*i)->remotePassword.toStdString() << "\t Timezone: " << (*i)->timeZone.toHex().toStdString() << std::endl;
std::cout << "Countdown: " << (*i)->countdown.toHex().toStdString() << "\t\t\t Time: " << (*i)->socketDateTime.toString().toStdString() << std::endl;
std::cout << "Countdown: " << (*i)->countdown << " " << ( (*i)->countdownEnabled ? "(enabled)" : "(disabled)" ) << "\t\t Time: " << (*i)->socketDateTime.toString().toStdString() << std::endl;
}
std::cout << "_____________________________________________________________________________\n" << std::endl;
std::cout << "a - add unpaired socket (WiFi needed)\n";
std::cout << "A - add unpaired socket (no WiFi needed)\n";
std::cout << "c - set countdown\n";
std::cout << "C - enable/disable countdown\n";
std::cout << "d - update table data\n";
std::cout << "D - resend discovery packet to the current socket\n";
std::cout << "n - change socket name (max 16 characters)\n";

27
socket.cpp
View File

File diff suppressed because one or more lines are too long

6
socket.h
View File

@ -48,6 +48,7 @@ public:
void changeSocketName ( QString newName );
void changeSocketPassword ( QString newPassword );
void changeTimezone ( int8_t newTimezone );
void setCountDown ( uint16_t countdown );
bool parseReply ( QByteArray );
QHostAddress ip;
@ -55,7 +56,8 @@ public:
bool powered;
QByteArray socketName, remotePassword;
QByteArray timeZone;
QByteArray countdown;
uint16_t countdown;
bool countdownEnabled;
QDateTime socketDateTime;
private:
@ -76,7 +78,7 @@ private:
void subscribe();
void processQueue() { start(); }
void run();
void writeSocketData (QByteArray name, QByteArray password, QByteArray timezone);
void writeSocketData (QByteArray socketName, QByteArray remotePassword, QByteArray timeZone, uint16_t countdown);
QByteArray commandID[MaxCommands];
QByteArray datagram[MaxCommands];