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

added AVR-X1000 avahi discovery

Browse Source
This commit is contained in:
nymea 2019-05-10 13:00:13 +02:00
parent ac3a209afe
commit 91da797dc5
3 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
denon/deviceplugindenon.cpp
View File

@ -60,8 +60,25 @@ DeviceManager::DeviceError DevicePluginDenon::discoverDevices(const DeviceClassI
Q_UNUSED(params) Q_UNUSED(params)
if (deviceClassId == AVRX1000DeviceClassId) { if (deviceClassId == AVRX1000DeviceClassId) {
QtAvahiServiceBrowser *avahiBrowser = hardwareManager()->avahiBrowser();
connect(avahiBrowser, &QtAvahiServiceBrowser::serviceEntryAdded, this, &DevicePluginDenon::onAvahiEntryAdded); QList<DeviceDescriptor> deviceDescriptors;
foreach (const AvahiServiceEntry &service, hardwareManager()->avahiBrowser()->serviceEntries()) {
if (service.name().contains("AVR-X1000")) {
DeviceDescriptor deviceDescriptor(AVRX1000DeviceClassId, service.hostName().remove(".local"), service.hostAddress().toString());
ParamList params;
qCDebug(dcDenon) << "Avahi discovered device: " << service.name() << service.hostName() << service.serviceType();
params.append(Param(AVRX1000DeviceIpParamTypeId, service.hostAddress().toString()));
deviceDescriptor.setParams(params);
foreach (Device *existingDevice, myDevices()) {
if (existingDevice->paramValue(AVRX1000DeviceIpParamTypeId).toString() == service.hostAddress().toString()) {
deviceDescriptor.setDeviceId(existingDevice->id());
break;
}
}
deviceDescriptors.append(deviceDescriptor);
}
}
emit devicesDiscovered(AVRX1000DeviceClassId, deviceDescriptors);
return DeviceManager::DeviceErrorAsync; return DeviceManager::DeviceErrorAsync;
} }
@ -173,7 +190,7 @@ Device::DeviceError DevicePluginDenon::executeAction(Device *device, const Actio
qCDebug(dcDenon) << "set power action" << action.id(); qCDebug(dcDenon) << "set power action" << action.id();
qCDebug(dcDenon) << "power: " << action.param(AVRX1000PowerActionPowerParamTypeId).value().Bool; qCDebug(dcDenon) << "power: " << action.param(AVRX1000PowerActionPowerParamTypeId).value().Bool;
if (action.param(AVRX1000PowerActionPowerParamTypeId).value().toBool() == true){ if (action.param(AVRX1000PowerActionPowerParamTypeId).value().toBool() == true) {
QByteArray cmd = "PWON\r"; QByteArray cmd = "PWON\r";
qCDebug(dcDenon) << "Execute power: " << action.id() << cmd; qCDebug(dcDenon) << "Execute power: " << action.id() << cmd;
denonConnection->sendData(cmd); denonConnection->sendData(cmd);
@ -192,8 +209,7 @@ Device::DeviceError DevicePluginDenon::executeAction(Device *device, const Actio
qCDebug(dcDenon) << "Execute volume" << action.id() << cmd; qCDebug(dcDenon) << "Execute volume" << action.id() << cmd;
denonConnection->sendData(cmd); denonConnection->sendData(cmd);
return DeviceManager::DeviceErrorNoError;
return Device::DeviceErrorNoError;
} else if (action.actionTypeId() == AVRX1000ChannelActionTypeId) { } else if (action.actionTypeId() == AVRX1000ChannelActionTypeId) {
@ -203,22 +219,20 @@ Device::DeviceError DevicePluginDenon::executeAction(Device *device, const Actio
qCDebug(dcDenon) << "Change to channel:" << cmd; qCDebug(dcDenon) << "Change to channel:" << cmd;
denonConnection->sendData(cmd); denonConnection->sendData(cmd);
return DeviceManager::DeviceErrorNoError; return DeviceManager::DeviceErrorNoError;
} else if (action.actionTypeId() == AVRX1000IncreaseVolumeActionTypeId) { } else if (action.actionTypeId() == AVRX1000IncreaseVolumeActionTypeId) {
QByteArray cmd = "MVUP\r"; QByteArray cmd = "MVUP\r";
qCDebug(dcDenon) << "Execute volume increase" << action.id() << cmd; qCDebug(dcDenon) << "Execute volume increase" << action.id() << cmd;
denonConnection->sendData(cmd); denonConnection->sendData(cmd);
return DeviceManager::DeviceErrorNoError; return DeviceManager::DeviceErrorNoError;
} else if (action.actionTypeId() == AVRX1000DecreaseVolumeActionTypeId) { } else if (action.actionTypeId() == AVRX1000DecreaseVolumeActionTypeId) {
QByteArray cmd = "MVDOWN\r"; QByteArray cmd = "MVDOWN\r";
qCDebug(dcDenon) << "Execute volume decrease" << action.id() << cmd; qCDebug(dcDenon) << "Execute volume decrease" << action.id() << cmd;
denonConnection->sendData(cmd); denonConnection->sendData(cmd);
return DeviceManager::DeviceErrorNoError; return DeviceManager::DeviceErrorNoError;
} }
return DeviceManager::DeviceErrorActionTypeNotFound; return DeviceManager::DeviceErrorActionTypeNotFound;
} }
@ -297,7 +311,6 @@ Device::DeviceError DevicePluginDenon::executeAction(Device *device, const Actio
heos->playNext(playerId); heos->playNext(playerId);
return DeviceManager::DeviceErrorNoError; return DeviceManager::DeviceErrorNoError;
} }
return DeviceManager::DeviceErrorActionTypeNotFound; return DeviceManager::DeviceErrorActionTypeNotFound;
} }
return Device::DeviceErrorDeviceClassNotFound; return Device::DeviceErrorDeviceClassNotFound;
@ -358,7 +371,6 @@ void DevicePluginDenon::onPluginTimer()
heos->registerForChangeEvents(true); heos->registerForChangeEvents(true);
} }
if (device->deviceClassId() == heosPlayerDeviceClassId) { if (device->deviceClassId() == heosPlayerDeviceClassId) {
Device *heosDevice = myDevices().findById(device->parentId()); Device *heosDevice = myDevices().findById(device->parentId());
Heos *heos = m_heos.value(heosDevice); Heos *heos = m_heos.value(heosDevice);
@ -408,7 +420,7 @@ void DevicePluginDenon::onAVRDataReceived(const QByteArray &data)
} }
if (data.contains("SI")) { if (data.contains("SI")) {
QString cmd = NULL; QString cmd;
if (data.contains("TUNER")) { if (data.contains("TUNER")) {
cmd = "TUNER"; cmd = "TUNER";
} else if (data.contains("DVD")) { } else if (data.contains("DVD")) {
@ -528,10 +540,6 @@ void DevicePluginDenon::onUpnpDiscoveryFinished()
emit devicesDiscovered(heosDeviceClassId, deviceDescriptors); emit devicesDiscovered(heosDeviceClassId, deviceDescriptors);
} }
void DevicePluginDenon::onAvahiEntryAdded() {
qCDebug(dcDenon) << "Avahi entry added";
}
void DevicePluginDenon::onHeosConnectionChanged() void DevicePluginDenon::onHeosConnectionChanged()
{ {
Heos *heos = static_cast<Heos *>(sender()); Heos *heos = static_cast<Heos *>(sender());

1
denon/deviceplugindenon.h
View File

@ -73,7 +73,6 @@ private slots:
void onAVRSocketError(); void onAVRSocketError();
void onUpnpDiscoveryFinished(); void onUpnpDiscoveryFinished();
void onAvahiEntryAdded();
void onHeosConnectionChanged(); void onHeosConnectionChanged();
void onHeosPlayerDiscovered(HeosPlayer *heosPlayer); void onHeosPlayerDiscovered(HeosPlayer *heosPlayer);

3
denon/deviceplugindenon.json
View File

@ -12,8 +12,7 @@
"id": "1cd3d67e-aba0-450e-9e2a-483a1527aba6", "id": "1cd3d67e-aba0-450e-9e2a-483a1527aba6",
"name": "AVRX1000", "name": "AVRX1000",
"displayName": "AVR X1000", "displayName": "AVR X1000",
"createMethods": ["user"], "createMethods": ["discovery"],
"deviceIcon": "Hifi",
"interfaces": ["connectable", "power", "extendedvolumecontroller"], "interfaces": ["connectable", "power", "extendedvolumecontroller"],
"paramTypes": [ "paramTypes": [
{ {