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

Reformat with astyle.

This commit is contained in:
Andrius Štikonas 2015-08-18 15:29:09 +01:00
parent 4497d1e1c1
commit 482a2a0e5b
8 changed files with 168 additions and 215 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
consolereader.cpp
View File

@ -36,13 +36,10 @@ void ConsoleReader::run()
unsigned int number = 0;
bool cont = true;
while ( cont )
{
while (cont) {
std::cin >> command;
switch ( command[0] )
{
case 'a':
{
switch (command[0]) {
case 'a': {
std::cout << "Please set your Orvibo socket to pair mode (rapidly blinking blue light) and wait until new wifi network (WiWo-S20) appears" << std::endl;
std::string ssid, password;
std::cout << "Wireless name (\"c\" for current wifi): ";
@ -52,8 +49,7 @@ void ConsoleReader::run()
Server *server = new Server(48899, QByteArray::fromStdString(ssid), QByteArray::fromStdString(password)); // HF-LPB100 chip can be controlled over port 48899
break;
}
case 'A':
{
case 'A': {
std::cout << "Please set your Orvibo socket to factory reset mode (rapidly blinking red light)" << std::endl;
std::string password;
std::cout << "Password: ";
@ -76,8 +72,7 @@ void ConsoleReader::run()
case 'D':
(*sockets) [number]->discover();
break;
case 'n':
{
case 'n': {
std::string name;
std::cout << "Please enter a new name: ";
std::cin >> name;
@ -93,8 +88,7 @@ void ConsoleReader::run()
else if (command == "on")
(*sockets) [number]->powerOn();
break;
case 'P':
{
case 'P': {
std::string password;
std::cout << "Please enter a new password: ";
std::cin >> password;
@ -110,8 +104,7 @@ void ConsoleReader::run()
--number; // count from 0
listSockets();
break;
case 't':
{
case 't': {
int timezone;
std::cout << "Please enter a new timezone (integer from -11 to 12): ";
std::cin >> timezone;
@ -126,8 +119,7 @@ void ConsoleReader::run()
void ConsoleReader::listSockets()
{
for ( std::vector<Socket*>::const_iterator i = sockets->begin() ; i != sockets->end(); ++i )
{
for (std::vector<Socket*>::const_iterator i = sockets->begin() ; i != sockets->end(); ++i) {
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;
@ -148,8 +140,7 @@ void ConsoleReader::listSockets()
void ConsoleReader::connectSignals()
{
for ( unsigned i = 0; i < sockets->size(); ++i )
{
for (unsigned i = 0; i < sockets->size(); ++i) {
connect((*sockets)[i], &Socket::stateChanged, this, &ConsoleReader::listSockets);
}
}

6
dialog.cpp
View File

@ -36,8 +36,7 @@ Dialog::~Dialog()
void Dialog::updateUi()
{
for ( unsigned int i = 0; i < (*sockets).size(); ++i)
{
for (unsigned int i = 0; i < (*sockets).size(); ++i) {
ui->toggleButton->setText((*sockets)[i]->powered ? QStringLiteral("Turn off") : QStringLiteral("Turn on"));
ui->comboBox->setItemText(i, (*sockets)[i]->socketName);
}
@ -46,8 +45,7 @@ void Dialog::updateUi()
void Dialog::discovered()
{
ui->comboBox->clear();
for ( std::vector<Socket*>::const_iterator i = sockets->begin() ; i != sockets->end(); ++i )
{
for (std::vector<Socket*>::const_iterator i = sockets->begin() ; i != sockets->end(); ++i) {
connect(*i, &Socket::stateChanged, this, &Dialog::updateUi);
connect(ui->toggleButton, &QPushButton::clicked, this, &Dialog::togglePower);
ui->comboBox->addItem("Socket");

3
dialog.h
View File

@ -22,7 +22,8 @@
#include <QDialog>
namespace Ui {
namespace Ui
{
class Dialog;
}

70
server.cpp
View File

@ -48,25 +48,20 @@ Server::Server(uint16_t port, QByteArray ssid, QByteArray password)
ncm->updateConfigurations();
*cfgInitial = ncm->defaultConfiguration();
if (ssid == "c")
{
if (ssid == "c") {
ssid = cfgInitial->name().toLocal8Bit();
qDebug() << "SSID unspecified, using current network: " << ssid;
}
bool stop = false;
while ( !stop )
{
while (!stop) {
QThread::sleep(1);
auto nc = ncm->allConfigurations();
for (auto &x : nc)
{
if (x.bearerType() == QNetworkConfiguration::BearerWLAN)
{
if (x.name() == "WiWo-S20")
{
for (auto & x : nc) {
if (x.bearerType() == QNetworkConfiguration::BearerWLAN) {
if (x.name() == "WiWo-S20") {
qWarning() << "Connecting to WiWo-S20 wireless";
cfg = &x;
stop = true;
@ -122,15 +117,12 @@ QByteArray Server::listen(QByteArray message)
QHostAddress sender;
quint16 senderPort;
bool stop = false;
while ( !stop )
{
while (!stop) {
QThread::msleep(50);
while ( udpSocketGet->hasPendingDatagrams() )
{
while (udpSocketGet->hasPendingDatagrams()) {
reply.resize(udpSocketGet->pendingDatagramSize());
udpSocketGet->readDatagram(reply.data(), reply.size(), &sender, &senderPort);
if (reply != message)
{
if (reply != message) {
stop = true;
}
}
@ -145,8 +137,7 @@ void Server::run()
void Server::readPendingDatagrams()
{
while ( udpSocketGet->hasPendingDatagrams() )
{
while (udpSocketGet->hasPendingDatagrams()) {
QByteArray reply, mac;
reply.resize(udpSocketGet->pendingDatagramSize());
QHostAddress sender;
@ -154,35 +145,26 @@ void Server::readPendingDatagrams()
udpSocketGet->readDatagram(reply.data(), reply.size(), &sender, &senderPort);
if ( reply != discover && reply.left ( 2 ) == magicKey ) // check for Magic Key
{
if ( reply.mid ( 4, 2 ) == QStringLiteral("qa").toLatin1() || reply.mid ( 4, 2 ) == QStringLiteral("qg").toLatin1()) // Reply to discover packet
{
if (reply != discover && reply.left(2) == magicKey) { // check for Magic Key
if (reply.mid(4, 2) == QStringLiteral("qa").toLatin1() || reply.mid(4, 2) == QStringLiteral("qg").toLatin1()) { // Reply to discover packet
bool duplicate = false;
for ( std::vector<Socket*>::const_iterator i = sockets->begin() ; i != sockets->end(); ++i )
{
if ( (*i)->ip == sender )
{
for (std::vector<Socket*>::const_iterator i = sockets->begin() ; i != sockets->end(); ++i) {
if ((*i)->ip == sender) {
duplicate = true;
break;
}
}
if ( !duplicate )
{
if (!duplicate) {
Socket *socket = new Socket(sender, reply);
sockets->push_back(socket);
Q_EMIT discovered();
}
mac = reply.mid(7, 6);
}
else
{
} else {
mac = reply.mid(6, 6);
}
for ( std::vector<Socket*>::iterator i = sockets->begin() ; i != sockets->end(); ++i )
{
if ( (*i)->mac == mac )
{
for (std::vector<Socket*>::iterator i = sockets->begin() ; i != sockets->end(); ++i) {
if ((*i)->mac == mac) {
(*i)->parseReply(reply);
break;
}
@ -207,34 +189,28 @@ void broadcastPassword(QString password)
QUdpSocket *udpSocket = new QUdpSocket();
udpSocket->connectToHost(QHostAddress::Broadcast, 49999);
uint sleep = 15;
for (uint j=0; j < 4; ++j) // FIXME: stopping loop on discovery
{
for (uint j = 0; j < 4; ++j) { // FIXME: stopping loop on discovery
qWarning() << j;
for (unsigned short int i = 0; i < 200; ++i)
{
for (unsigned short int i = 0; i < 200; ++i) {
udpSocket->write(fives(76));
QThread::msleep(sleep);
}
for (unsigned short int i = 0; i < 3; ++i)
{
for (unsigned short int i = 0; i < 3; ++i) {
udpSocket->write(fives(89));
QThread::msleep(sleep);
}
QChar *data = password.data();
while (!data->isNull())
{
while (!data->isNull()) {
udpSocket->write(fives(data->unicode() + 76));
QThread::msleep(sleep);
++data;
}
for (unsigned short int i = 0; i < 3; ++i)
{
for (unsigned short int i = 0; i < 3; ++i) {
udpSocket->write(fives(86));
QThread::msleep(sleep);
}
for (unsigned short int i = 0; i < 3; ++i)
{
for (unsigned short int i = 0; i < 3; ++i) {
udpSocket->write(fives(332 + password.length()));
QThread::msleep(sleep);
}

45
socket.cpp
View File

@ -78,22 +78,18 @@ void Socket::sendDatagram ( Datagram d )
void Socket::run()
{
QMutex mutex;
if ( !mutex.tryLock() )
{
if (!mutex.tryLock()) {
return;
}
unsigned short retryCount = 0;
QByteArray currentDatagram, previousDatagram = 0, recordLength;
while ( commands.size() > 0 )
{
while (commands.size() > 0) {
currentDatagram = datagram[commands.head()];
if ( previousDatagram == currentDatagram )
{
if (previousDatagram == currentDatagram) {
++retryCount;
}
if ( retryCount == 5 )
{
if (retryCount == 5) {
std::cout << "Stop retrying: " << currentDatagram.toHex().toStdString() << std::endl;
commands.dequeue();
retryCount = 0;
@ -196,18 +192,15 @@ void Socket::tableData()
bool Socket::parseReply(QByteArray reply)
{
if ( reply.left(2) != magicKey )
{
if (reply.left(2) != magicKey) {
return false;
}
QByteArray id = reply.mid(4, 2);
unsigned int datagram = std::distance(commandID, std::find(commandID, commandID + MaxCommands, id)); // match commandID with enum
if ( datagram == ReadTable ) // determine the table number
{
if (datagram == ReadTable) { // determine the table number
unsigned int table = reply[reply.indexOf(twenties) + 11];
switch ( table )
{
switch (table) {
case 1:
break;
case 3:
@ -224,11 +217,9 @@ bool Socket::parseReply ( QByteArray reply )
return false;
}
}
switch ( datagram )
{
switch (datagram) {
case QueryAll:
case Discover:
{
case Discover: {
QByteArray timeArray = reply.right(5).left(4);
QDataStream stream(&timeArray, QIODevice::ReadOnly);
stream.setByteOrder(QDataStream::LittleEndian);
@ -240,16 +231,13 @@ bool Socket::parseReply ( QByteArray reply )
}
case Subscribe:
case PowerOff:
case PowerOn:
{
case PowerOn: {
bool poweredOld = powered;
powered = reply.right(1) == one;
if ( powered != poweredOld )
{
if (powered != poweredOld) {
Q_EMIT stateChanged();
}
if ( datagram == PowerOff && powered == true ) // Required to deque
{
if (datagram == PowerOff && powered == true) { // Required to deque
datagram = PowerOn;
}
break;
@ -259,8 +247,7 @@ bool Socket::parseReply ( QByteArray reply )
socketTableVersion = reply.mid(reply.indexOf(QByteArray::fromHex("000100000600")) + 6, 2);
// 000100000600
break;
case SocketData:
{
case SocketData: {
// std::cout << reply.toHex().toStdString() << " " << datagram << std::endl; // for debugging purposes only
unsigned short int index = reply.indexOf(rmac + twenties);
versionID = reply.mid(index - 14, 2);
@ -314,10 +301,8 @@ bool Socket::parseReply ( QByteArray reply )
return false;
}
if (commands.size() > 0)
{
if ( datagram == commands.head() )
{
if (commands.size() > 0) {
if (datagram == commands.head()) {
commands.dequeue();
}
}

4
socket.h
View File

@ -76,7 +76,9 @@ private:
void sendDatagram(Datagram);
void subscribe();
void processQueue() { start(); }
void processQueue() {
start();
}
void run();
void writeSocketData(QByteArray socketName, QByteArray remotePassword, QByteArray timeZone, uint16_t countdown);