ETM-Schurig
/
nymea
mirror of https://github.com/nymea/nymea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/HiveFive/Hive 

Conflicts:
	plugins/deviceplugins/rfswitch/rfswitch.cpp
pull/1/head
Michael Zanetti 2013-12-31 02:16:02 +01:00
parent 085f02ce30 4f3d1c7f83
commit 46b750e6e3
4 changed files with 107 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libhive/gpio.cpp
View File

@ -22,9 +22,13 @@ void Gpio::run()
int timeout = 3000;
char buf[64];
bool enabled = true;
m_mutex.lock();
m_enabled = true;
m_mutex.unlock();
while(enabled){
memset((void*)fdset, 0, sizeof(fdset));
fdset[0].fd = STDIN_FILENO;
@ -46,7 +50,6 @@ void Gpio::run()
read(fdset[1].fd, buf, 64);
emit pinInterrupt();
}
m_mutex.lock();
enabled = m_enabled;
m_mutex.unlock();

19
libhive/radio433.cpp
View File

@ -30,7 +30,7 @@ Radio433::~Radio433()
void Radio433::sendData(QList<int> rawData)
{
//first we have to disable our receiver, to prevent reading the hive signal it self
//first we have to disable our receiver, to prevent reading this signal
m_receiver->stop();
m_transmitter->setValue(LOW);
@ -43,7 +43,7 @@ void Radio433::sendData(QList<int> rawData)
delayMicroseconds(delay);
}
// reenable it
// re-enable it
m_receiver->start();
}
@ -92,6 +92,7 @@ void Radio433::handleInterrupt()
// filter nois
if (m_duration > 5000 && m_duration > m_timings[0] - 200 && m_duration < m_timings[0] + 200) {
m_repeatCount++;
m_changeCount--;
@ -119,22 +120,10 @@ void Radio433::handleInterrupt()
}else if(m_duration > 5000){
m_changeCount = 0;
}
if (m_changeCount > RC_MAX_CHANGES) {
if (m_changeCount >= RC_MAX_CHANGES+1) {
m_changeCount = 0;
m_repeatCount = 0;
}
m_timings[m_changeCount++] = m_duration;
m_lastTime = currentTime;
}
void Radio433::enableReceiver()
{
qDebug() << "starting receiver";
m_receiver->start();
}
void Radio433::disableReceiver()
{
m_receiver->stop();
qDebug() << "receiver disabeld.";
}

4
libhive/radio433.h
View File

@ -32,10 +32,6 @@ private:
int micros();
void delayMicroseconds(int pulseLength);
void enableReceiver();
void disableReceiver();
private slots:
void handleInterrupt();

122
plugins/deviceplugins/rfswitch/rfswitch.cpp
View File

@ -24,8 +24,8 @@ QList<DeviceClass> RfSwitch::supportedDevices() const
QList<DeviceClass> ret;
DeviceClass deviceClassRfRemote(mumbiRemote);
deviceClassRfRemote.setName("RF Remote");
deviceClassRfRemote.setName("Mumbi Remote");
QVariantList deviceParams;
QVariantMap channelParam;
channelParam.insert("name", "channel");
@ -39,51 +39,51 @@ QList<DeviceClass> RfSwitch::supportedDevices() const
channelParam.insert("name", "channel5");
channelParam.insert("type", "bool");
deviceParams.append(channelParam);
deviceClassRfRemote.setParams(deviceParams);
QList<TriggerType> buttonTriggers;
QVariantList params;
QVariantMap param;
param.insert("name", "power");
param.insert("type", "bool");
params.append(param);
TriggerType buttonATrigger(QUuid::createUuid());
buttonATrigger.setName("Button A");
buttonATrigger.setParameters(params);
buttonTriggers.append(buttonATrigger);
TriggerType buttonBTrigger(QUuid::createUuid());
buttonBTrigger.setName("Button B");
buttonBTrigger.setParameters(params);
buttonTriggers.append(buttonBTrigger);
TriggerType buttonCTrigger(QUuid::createUuid());
buttonCTrigger.setName("Button C");
buttonCTrigger.setParameters(params);
buttonTriggers.append(buttonCTrigger);
TriggerType buttonDTrigger(QUuid::createUuid());
buttonDTrigger.setName("Button D");
buttonDTrigger.setParameters(params);
buttonTriggers.append(buttonDTrigger);
TriggerType buttonETrigger(QUuid::createUuid());
buttonETrigger.setName("Button E");
buttonETrigger.setParameters(params);
buttonTriggers.append(buttonETrigger);
deviceClassRfRemote.setTriggers(buttonTriggers);
ret.append(deviceClassRfRemote);
DeviceClass deviceClassRfSwitch(mumbiRfSwitch);
deviceClassRfSwitch.setName("RF Switch");
deviceClassRfSwitch.setName("Mumbi Power Switch");
ret.append(deviceClassRfSwitch);
return ret;
}
@ -93,16 +93,90 @@ QString RfSwitch::pluginName() const
}
void RfSwitch::dataReceived(QList<int> rawData)
{
qDebug() << "data received from Radio433" << rawData;
{
// filter right here a wrong signal length
if(rawData.length() != 49){
return;
}
int delay = rawData.first()/31;
QByteArray binCode;
// new Remote -> average 314
if(delay > 300 && delay < 400){
// go trough all 48 timings (without sync signal)
for(int i = 1; i <= 48; i+=2 ){
int div;
int divNext;
// if short
if(rawData.at(i) < 700){
div = 1;
}else{
div = 3;
}
// if long
if(rawData.at(i+1) < 700){
divNext = 1;
}else{
divNext = 3;
}
// _
// if we have | |___ = 0 -> in 4 delays => 1000
// _
// if we have ___| | = 1 -> in 4 delays => 0001
if(div == 1 && divNext == 3){
binCode.append('0');
}else if(div == 3 && divNext == 1){
binCode.append('1');
}else{
return;
}
}
}
qDebug() << "bincode" << binCode;
// TODO: Lets assume we found a device of class "deviceClassRfRemote"
DeviceClass deviceClassRfRemote = supportedDevices().first();
// TODO: Lets assume we received group "1000"
// get the channel of the remote signal (5 channels, true=1, false=0)
QList<bool> group;
group << true << false << false << false << false;
for(int i = 1; i < 10; i+=2){
if(binCode.at(i-1) == '0' && binCode.at(i) == '1'){
group << false;
}else if(binCode.at(i-1) == '0' && binCode.at(i) == '0'){
group << true;
}else {
return;
}
}
//qDebug() << "group" << group;
// get the button letter
QString button;
QByteArray buttonCode = binCode.mid(10,10);
qDebug() << "Buttoncode -> " << buttonCode;
if(buttonCode == "0001010101"){
button = "A";
}else if(buttonCode == "0100010101"){
button = "B";
}else if(buttonCode == "0101000101"){
button = "C";
}else if(buttonCode == "0101010001"){
button = "D";
}else if(buttonCode == "0101010100"){
button = "E";
}else{
return;
}
DeviceClass deviceClassRfRemote = supportedDevices().first();
// // TODO: Lets assume we received group "1000"
// QList<bool> group;
// group << true << false << false << false << false;
Device *device = 0;
QList<Device*> deviceList = deviceManager()->findConfiguredDevices(deviceClassRfRemote.id());
foreach (Device *dev, deviceList) {
@ -118,14 +192,14 @@ void RfSwitch::dataReceived(QList<int> rawData)
}
}
if (!device) {
qWarning() << "couldn't find any configured device for data:" << rawData;
//qWarning() << "couldn't find any configured device for data:" << rawData;
return;
}
// TODO: Lets assume we received button "A" "on"
QString button = "A";
// QString button = "A";
bool power = true;
QVariantMap params;
params.insert("button", button);
params.insert("power", power);