ETM-Schurig/powersync-core
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

working tune communication

Browse Source 
disabled rf433 gpio
This commit is contained in:
Simon Stürz 2015-03-29 12:20:43 +02:00 committed by Michael Zanetti
parent 184a904b67
commit 245043aff7
4 changed files with 238 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libguh/hardware/radio433/radio433.cpp
View File

@ -86,20 +86,20 @@ bool Radio433::enable()
// check if GPIOs are available
QFileInfo gpioFile("/sys/class/gpio/export");
if (gpioFile.exists()) {
bool receiverAvailable = m_receiver->startReceiver();
if (!receiverAvailable) {
//qWarning() << "ERROR: radio 433 MHz receiver not available on GPIO's";
}
// bool receiverAvailable = m_receiver->startReceiver();
// if (!receiverAvailable) {
// //qWarning() << "ERROR: radio 433 MHz receiver not available on GPIO's";
// }
bool transmitterAvailable = m_transmitter->startTransmitter();
if (!transmitterAvailable) {
//qWarning() << "ERROR: radio 433 MHz transmitter not available on GPIO's";
}
// bool transmitterAvailable = m_transmitter->startTransmitter();
// if (!transmitterAvailable) {
// //qWarning() << "ERROR: radio 433 MHz transmitter not available on GPIO's";
// }
if (!receiverAvailable && !transmitterAvailable) {
qWarning() << "--> Radio 433 MHz GPIO's not available.";
return false;
}
// if (!receiverAvailable && !transmitterAvailable) {
// qWarning() << "--> Radio 433 MHz GPIO's not available.";
// return false;
// }
}
qDebug() << "--> Radio 433 MHz GPIO's enabled.";
#endif

187
plugins/deviceplugins/tune/deviceplugintune.cpp
View File

@ -30,8 +30,6 @@ DevicePluginTune::DevicePluginTune()
connect(m_manager, &TuneManager::tuneConnectionStatusChanged, this, &DevicePluginTune::tuneConnectionStatusChanged);
connect(m_manager, &TuneManager::dataReady, this, &DevicePluginTune::tuneDataAvailable);
m_manager->start();
}
DeviceManager::HardwareResources DevicePluginTune::requiredHardware() const
@ -39,28 +37,41 @@ DeviceManager::HardwareResources DevicePluginTune::requiredHardware() const
return DeviceManager::HardwareResourceNone;
}
void DevicePluginTune::startMonitoringAutoDevices()
{
m_manager->start();
}
DeviceManager::DeviceSetupStatus DevicePluginTune::setupDevice(Device *device)
{
// check index position
int position = device->paramValue("position").toInt();
if (position >= myDevices().count()) {
device->setParamValue("position", myDevices().count());
} else {
if (position <= 0) {
device->setParamValue("position", 0);
position = 0;
}
foreach (Device *d, myDevices()) {
int currentPosition = d->paramValue("position").toInt();
if (currentPosition >= position) {
d->setParamValue("position", currentPosition + 1);
}
}
// tune
if (device->deviceClassId() == tuneDeviceClassId && !tuneAdded()) {
m_tuneDeviceId = device->id();
return DeviceManager::DeviceSetupStatusSuccess;
}
// mood
if (device->deviceClassId() == moodDeviceClassId) {
if ((device->deviceClassId() == moodDeviceClassId) && tuneAdded()) {
// check index position
int position = device->paramValue("position").toInt();
if (position >= myDevices().count()) {
device->setParamValue("position", myDevices().count());
} else {
if (position <= 0) {
device->setParamValue("position", 0);
position = 0;
}
foreach (Device *d, myDevices()) {
int currentPosition = d->paramValue("position").toInt();
if (currentPosition >= position) {
d->setParamValue("position", currentPosition + 1);
}
}
}
device->setName(device->paramValue("name").toString() + " (Mood)");
return DeviceManager::DeviceSetupStatusSuccess;
}
@ -76,15 +87,20 @@ void DevicePluginTune::postSetupDevice(Device *device)
void DevicePluginTune::deviceRemoved(Device *device)
{
int position = device->paramValue("position").toInt();
if (device->deviceClassId() == moodDeviceClassId) {
int position = device->paramValue("position").toInt();
foreach (Device *d, myDevices()) {
int currentPosition = d->paramValue("position").toInt();
if (currentPosition >= position ) {
d->setParamValue("position", currentPosition - 1);
foreach (Device *d, myDevices()) {
int currentPosition = d->paramValue("position").toInt();
if (currentPosition >= position ) {
d->setParamValue("position", currentPosition - 1);
}
}
sync();
}
if (device->deviceClassId() == tuneDeviceClassId && m_manager->tuneAvailable()) {
tuneAutodetected();
}
sync();
}
bool DevicePluginTune::sync()
@ -96,12 +112,12 @@ bool DevicePluginTune::sync()
QVariantMap message;
QVariantList moods;
QVariantMap tune;
foreach (Device* device, myDevices()) {
if (device->deviceClassId() == moodDeviceClassId) {
QVariantMap mood;
mood.insert("name", device->paramValue("name"));
mood.insert("deviceId", device->id());
mood.insert("deviceClassId", device->deviceClassId().toString());
mood.insert("position", device->paramValue("position"));
mood.insert("icon", device->paramValue("icon"));
QVariantMap states;
@ -110,15 +126,24 @@ bool DevicePluginTune::sync()
mood.insert("states", states);
moods.append(mood);
}
if (device->deviceClassId() == tuneDeviceClassId) {
tune.insert("name", device->paramValue("name"));
tune.insert("deviceId", device->id());
QVariantMap states;
states.insert("value", device->stateValue(brightnessStateTypeId).toInt());
states.insert("active", device->stateValue(powerStateTypeId).toBool());
tune.insert("states", states);
}
}
message.insert("method", "Items.Sync");
message.insert("moods", moods);
message.insert("tune", tune);
QJsonDocument jsonDoc = QJsonDocument::fromVariant(message);
QByteArray data = jsonDoc.toJson(QJsonDocument::Compact);
//qDebug() << data;
//qDebug() << jsonDoc.toJson();
m_manager->sendData(data);
return true;
@ -127,29 +152,70 @@ bool DevicePluginTune::sync()
void DevicePluginTune::syncStates(Device *device)
{
QVariantMap message;
QVariantMap mood;
QVariantMap states;
states.insert("value", device->stateValue(valueStateTypeId).toInt());
states.insert("active", device->stateValue(activeStateTypeId).toBool());
mood.insert("states", states);
mood.insert("deviceId", device->id());
mood.insert("position", device->paramValue("position"));
message.insert("method", "Items.SyncStates");
message.insert("mood", mood);
if (device->deviceClassId() == moodDeviceClassId) {
QVariantMap mood;
QVariantMap states;
states.insert("value", device->stateValue(valueStateTypeId).toInt());
states.insert("active", device->stateValue(activeStateTypeId).toBool());
mood.insert("states", states);
mood.insert("deviceId", device->id());
message.insert("method", "Items.SyncStates");
message.insert("mood", mood);
}
if (device->deviceClassId() == tuneDeviceClassId) {
QVariantMap tune;
QVariantMap states;
states.insert("value", device->stateValue(brightnessStateTypeId).toInt());
states.insert("active", device->stateValue(powerStateTypeId).toBool());
tune.insert("states", states);
tune.insert("deviceId", device->id());
message.insert("method", "Items.SyncStates");
message.insert("tune", tune);
}
QJsonDocument jsonDoc = QJsonDocument::fromVariant(message);
QByteArray data = jsonDoc.toJson(QJsonDocument::Compact);
//qDebug() << jsonDoc.toJson();
m_manager->sendData(data);
}
bool DevicePluginTune::tuneAdded()
{
foreach (Device *device, myDevices()) {
if (device->deviceClassId() == tuneDeviceClassId) {
return true;
}
}
return false;
}
void DevicePluginTune::tuneAutodetected()
{
QList<DeviceDescriptor> descriptorList;
DeviceDescriptor descriptor(tuneDeviceClassId);
ParamList params;
params.append(Param("name", "Wohnzimmer"));
descriptor.setParams(params);
descriptorList.append(descriptor);
metaObject()->invokeMethod(this, "autoDevicesAppeared", Qt::QueuedConnection, Q_ARG(DeviceClassId, tuneDeviceClassId), Q_ARG(QList<DeviceDescriptor>, descriptorList));
}
void DevicePluginTune::tuneConnectionStatusChanged(const bool &connected)
{
if (connected) {
if (!tuneAdded()) {
tuneAutodetected();
} else {
Device *device = deviceManager()->findConfiguredDevice(m_tuneDeviceId);
device->setStateValue(reachableStateTypeId, true);
}
sync();
} else {
Device *device = deviceManager()->findConfiguredDevice(m_tuneDeviceId);
device->setStateValue(reachableStateTypeId, false);
}
}
@ -162,18 +228,35 @@ void DevicePluginTune::tuneDataAvailable(const QByteArray &data)
qDebug() << "failed to parse data" << data << ":" << error.errorString();
}
qDebug() << jsonDoc.toJson();
QVariantMap message = jsonDoc.toVariant().toMap();
if (message.contains("method")) {
if (message.value("method").toString() == "Items.SyncStates") {
if (message.value("method").toString() == "Items.SyncStates") {
if (message.contains("mood")) {
QVariantMap mood = message.value("mood").toMap();
Device *device = deviceManager()->findConfiguredDevice(DeviceId(mood.value("deviceId").toString()));
if (device) {
qDebug() << "update device" << device->name();
QVariantMap states = mood.value("states").toMap();
bool activeValue = states.value("active").toBool();
int value = states.value("value").toInt();
// TODO: disable other mood befor enabling this one...
foreach (Device *device, myDevices()) {
if (device->id() == DeviceId(mood.value("deviceId").toString())) {
device->setStateValue(activeStateTypeId, mood.value("states").toMap().value("active"));
device->setStateValue(valueStateTypeId, mood.value("states").toMap().value("value"));
return;
}
device->setStateValue(activeStateTypeId, activeValue);
device->setStateValue(valueStateTypeId, value);
}
} else if (message.contains("tune")) {
QVariantMap tune = message.value("tune").toMap();
Device *device = deviceManager()->findConfiguredDevice(DeviceId(tune.value("deviceId").toString()));
if (device) {
QVariantMap states = tune.value("states").toMap();
device->setStateValue(powerStateTypeId, states.value("active").toBool());
device->setStateValue(brightnessStateTypeId, states.value("value").toInt());
device->setStateValue(approximationDetectedStateTypeId, states.value("approximationDetected").toBool());
device->setStateValue(lightIntensityStateTypeId, states.value("lightIntensity").toInt());
device->setStateValue(humidityStateTypeId, states.value("humidity").toInt());
device->setStateValue(temperatureStateTypeId, states.value("temperature").toDouble());
}
}
}
@ -201,6 +284,20 @@ DeviceManager::DeviceError DevicePluginTune::executeAction(Device *device, const
return DeviceManager::DeviceErrorActionTypeNotFound;
}
if (device->deviceClassId() == tuneDeviceClassId) {
if (action.actionTypeId() == toggleLightActionTypeId) {
bool currentState = device->stateValue(powerStateTypeId).toBool();
device->setStateValue(powerStateTypeId, !currentState);
syncStates(device);
return DeviceManager::DeviceErrorNoError;
}
if (action.actionTypeId() == setBrightnessActionTypeId) {
device->setStateValue(brightnessStateTypeId, action.param("brightness").value().toInt());
syncStates(device);
return DeviceManager::DeviceErrorNoError;
}
}
return DeviceManager::DeviceErrorDeviceClassNotFound;
}

5
plugins/deviceplugins/tune/deviceplugintune.h
View File

@ -33,15 +33,20 @@ public:
explicit DevicePluginTune();
DeviceManager::HardwareResources requiredHardware() const override;
void startMonitoringAutoDevices() override;
DeviceManager::DeviceSetupStatus setupDevice(Device *device) override;
void postSetupDevice(Device *device) override;
void deviceRemoved(Device *device) override;
private:
TuneManager *m_manager;
DeviceId m_tuneDeviceId;
bool sync();
void syncStates(Device *device);
bool tuneAdded();
void tuneAutodetected();
private slots:
void tuneConnectionStatusChanged(const bool &connected);
void tuneDataAvailable(const QByteArray &data);

79
plugins/deviceplugins/tune/deviceplugintune.json
View File

@ -26,6 +26,7 @@
"type": "QString",
"allowedValues": [
"IconCouch",
"IconTv",
"IconLamp",
"IconLamp1",
"IconLamp2",
@ -73,6 +74,84 @@
]
}
]
},
{
"deviceClassId": "3a928446-923a-4777-b653-1f71324888c7",
"idName": "tune",
"name": "Tune",
"createMethods": ["auto"],
"paramTypes": [
{
"name": "name",
"type": "QString",
"inputType": "TextLine"
}
],
"stateTypes": [
{
"id": "7c6cbed1-1b04-4b7e-bce5-df9cc8a56029",
"idName": "reachable",
"name": "reachable",
"type": "bool",
"defaultValue": false
},
{
"id": "a5bc1855-91e7-4f3b-acaf-a1209121586b",
"idName": "approximationDetected",
"name": "approximation detected",
"type": "bool"
},
{
"id": "ccc656b0-7b66-473d-875e-b0b9a47d300c",
"idName": "temperature",
"name": "temperature",
"type": "double"
},
{
"id": "94df310d-32eb-40f7-b80e-32781b3f8a3e",
"idName": "humidity",
"name": "humidity",
"type": "int"
},
{
"id": "9f1212c9-0523-4a00-991e-b652c79b04ed",
"idName": "lightIntensity",
"name": "light intensity",
"type": "int"
},
{
"id": "6c049f8f-408f-4265-a4f7-46a855d5c340",
"idName": "power",
"name": "power",
"type": "bool"
},
{
"id": "677cd9ec-c264-47ee-9d2e-d3662237792c",
"idName": "brightness",
"name": "brightness",
"type": "int"
}
],
"actionTypes": [
{
"id": "cfc35f13-2a17-4c7b-9343-b5bd8a242eef",
"idName": "setBrightness",
"name": "set brightness",
"paramTypes": [
{
"name": "brightness",
"type": "int",
"minimumValue": 0,
"maximumValue": 100
}
]
},
{
"id": "36c3cb61-45ee-4549-a0f9-cf34f0efae2b",
"idName": "toggleLight",
"name": "toggle light"
}
]
}
]
}