From cb12231c444e688ffc2550180d471addfd6c15ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Sat, 4 Jan 2014 04:25:59 +0100 Subject: [PATCH] cleaned debug messages --- .../devicepluginelro/devicepluginelro.cpp | 20 ++++++++++++------- .../devicepluginintertechno.cpp | 13 +++++++++--- .../devicepluginmeisteranker.cpp | 20 ++++++++----------- 3 files changed, 31 insertions(+), 22 deletions(-) diff --git a/plugins/deviceplugins/devicepluginelro/devicepluginelro.cpp b/plugins/deviceplugins/devicepluginelro/devicepluginelro.cpp index 8fd298c3..3274a09b 100644 --- a/plugins/deviceplugins/devicepluginelro/devicepluginelro.cpp +++ b/plugins/deviceplugins/devicepluginelro/devicepluginelro.cpp @@ -19,6 +19,7 @@ QList DevicePluginElro::supportedDevices() const // TODO: load list from config with static uuid QList ret; + // ======================================= // Remote DeviceClass deviceClassElroRemote(pluginId(), elroRemoteId); deviceClassElroRemote.setName("Elro Remote"); @@ -79,6 +80,7 @@ QList DevicePluginElro::supportedDevices() const deviceClassElroRemote.setTriggers(buttonTriggers); ret.append(deviceClassElroRemote); + // ======================================= // Switch DeviceClass deviceClassElroSwitch(pluginId(), elroSwitchId); deviceClassElroSwitch.setName("Elro Power Switch"); @@ -187,6 +189,7 @@ void DevicePluginElro::executeAction(Device *device, const Action &action) binCode.append("01"); } + // ======================================= // Buttons if(device->params().value("A").toBool()){ binCode.append("00"); @@ -219,7 +222,7 @@ void DevicePluginElro::executeAction(Device *device, const Action &action) }else{ binCode.append("0100"); } - qDebug() << "bin code:" << binCode; + // ======================================= //create rawData timings list int delay = 350; @@ -241,7 +244,8 @@ void DevicePluginElro::executeAction(Device *device, const Action &action) // ======================================= // send data to driver - qDebug() << "rawData" << rawData; + //qDebug() << "rawData" << rawData; + qDebug() << "transmit" << pluginName() << action.params().value("power").toBool(); transmitData(rawData); } @@ -275,11 +279,13 @@ void DevicePluginElro::receiveData(QList rawData) divNext = 3; } - // _ - // if we have | |___ = 0 -> in 4 delays => 1000 - // _ - // if we have ___| | = 1 -> in 4 delays => 0001 - + /* + * _ + * | |___ = 0 -> in 4 delays => 1000 + * _ + * ___| | = 1 -> in 4 delays => 0001 + */ + if(div == 1 && divNext == 3){ binCode.append('0'); }else if(div == 3 && divNext == 1){ diff --git a/plugins/deviceplugins/devicepluginintertechno/devicepluginintertechno.cpp b/plugins/deviceplugins/devicepluginintertechno/devicepluginintertechno.cpp index f479061b..617e175f 100644 --- a/plugins/deviceplugins/devicepluginintertechno/devicepluginintertechno.cpp +++ b/plugins/deviceplugins/devicepluginintertechno/devicepluginintertechno.cpp @@ -18,6 +18,7 @@ QList DevicePluginIntertechno::supportedDevices() const { QList ret; + // ======================================= // Remote DeviceClass deviceClassIntertechnoRemote(pluginId(), intertechnoRemote); deviceClassIntertechnoRemote.setName("Intertechno Remote"); @@ -137,6 +138,7 @@ QList DevicePluginIntertechno::supportedDevices() const ret.append(deviceClassIntertechnoRemote); + // ======================================= // Switch DeviceClass deviceClassIntertechnoSwitch(pluginId(), intertechnoSwitch); deviceClassIntertechnoSwitch.setName("Intertechno Switch"); @@ -286,7 +288,7 @@ void DevicePluginIntertechno::executeAction(Device *device, const Action &action }else{ binCode.append("0100"); } - qDebug() << "bin code:" << binCode; + //qDebug() << "bin code:" << binCode; // ======================================= //create rawData timings list int delay = 350; @@ -308,7 +310,7 @@ void DevicePluginIntertechno::executeAction(Device *device, const Action &action // ======================================= // send data to driver - qDebug() << "rawData" << rawData; + qDebug() << "transmit" << pluginName() << familyCode << buttonCode << action.params().value("power").toBool(); transmitData(rawData); } @@ -330,6 +332,7 @@ void DevicePluginIntertechno::receiveData(QList rawData) int delay = rawData.first()/31; QByteArray binCode; + // ======================================= // average 314 if(delay > 300 && delay < 400){ // go trough all 48 timings (without sync signal) @@ -367,11 +370,13 @@ void DevicePluginIntertechno::receiveData(QList rawData) return; } + // ======================================= // Check nibble 16-19, must be 0001 if(binCode.mid(16,4) != "0001"){ return; } + // ======================================= // Get family code QString familyCode; bool ok; @@ -435,6 +440,7 @@ void DevicePluginIntertechno::receiveData(QList rawData) return; } + // ======================================= // Get button code QString buttonCode; QByteArray buttonCodeBin = binCode.mid(8,8); @@ -497,6 +503,7 @@ void DevicePluginIntertechno::receiveData(QList rawData) return; } + // ======================================= // get power status -> On = 0100, Off = 0001 bool power; if(binCode.right(4).toInt(0,2) == 5){ @@ -507,7 +514,7 @@ void DevicePluginIntertechno::receiveData(QList rawData) return; } - //qDebug() << "family code = " << familyCode << "button code =" << buttonCode << power; + qDebug() << "family code = " << familyCode << "button code =" << buttonCode << power; // =================================================== Device *device = 0; diff --git a/plugins/deviceplugins/devicepluginmeisteranker/devicepluginmeisteranker.cpp b/plugins/deviceplugins/devicepluginmeisteranker/devicepluginmeisteranker.cpp index ec9ea16a..64b51f36 100644 --- a/plugins/deviceplugins/devicepluginmeisteranker/devicepluginmeisteranker.cpp +++ b/plugins/deviceplugins/devicepluginmeisteranker/devicepluginmeisteranker.cpp @@ -155,6 +155,14 @@ void DevicePluginMeisterAnker::receiveData(QList rawData) return; } + // check if the battery is low + bool batteryStatus; + if(batteryBin.toInt(0,2) == 0){ + batteryStatus = true; + }else{ + batteryStatus = false; + } + // check sign of temperature -> if first bit of temperature byte is 1 -> temp is negativ int sign = 0; if(temperatureBin.left(1).toInt() == 1){ @@ -166,19 +174,7 @@ void DevicePluginMeisterAnker::receiveData(QList rawData) // calc temperature float temperature = sign*(temperatureBin.right(7).toInt(0,2) + (float)temperatureTenthBin.toInt(0,2)/10); - // check if the battery is low - bool batteryStatus; - if(batteryBin.toInt(0,2) == 0){ - batteryStatus = true; - }else{ - batteryStatus = false; - } - // TODO: check if it is the same temperature than the last time // QString timeStamp = QDateTime::currentDateTime().toString("dd.MM.yyyy, hh:mm:ss"); - - - - }