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

fixed some bugs in eq-3 and penweathermap plugins

Browse Source
This commit is contained in:
Simon Stürz 2014-07-29 00:03:26 +02:00 committed by Michael Zanetti
parent 3a8908c982
commit aab7a6ec47
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libguh/hardware/radio433transmitter.h
View File

@ -37,10 +37,7 @@ public:
bool startTransmitter(); bool startTransmitter();
bool stopTransmitter(); bool stopTransmitter();
<<<<<<< HEAD
bool setUpGpio(); bool setUpGpio();
=======
>>>>>>> fixed some Radio433 bugs
void sendData(QList<int> rawData); void sendData(QList<int> rawData);

9
plugins/deviceplugins/eq-3/deviceplugineq-3.cpp
View File

@ -107,15 +107,16 @@ QList<ParamType> DevicePluginEQ3::configurationDescription() const
return params; return params;
} }
DeviceManager::DeviceError DevicePluginEQ3::discoverDevices(const DeviceClassId &deviceClassId, const QList<Param> &params) const QPair<DeviceManager::DeviceError, QString> DevicePluginEQ3::discoverDevices(const DeviceClassId &deviceClassId, const ParamList &params)
{ {
if(deviceClassId == cubeDeviceClassId){ if(deviceClassId == cubeDeviceClassId){
m_cubeDiscovery->detectCubes(); m_cubeDiscovery->detectCubes();
return DeviceManager::DeviceErrorAsync; return report(DeviceManager::DeviceErrorAsync);
} }
return DeviceManager::DeviceErrorDeviceClassNotFound; return report(DeviceManager::DeviceErrorDeviceClassNotFound);
} }
QPair<DeviceManager::DeviceSetupStatus, QString> DevicePluginEQ3::setupDevice(Device *device) QPair<DeviceManager::DeviceSetupStatus, QString> DevicePluginEQ3::setupDevice(Device *device)
{ {
qDebug() << "setupDevice" << device->params(); qDebug() << "setupDevice" << device->params();
@ -167,7 +168,7 @@ void DevicePluginEQ3::discoveryDone(const QList<MaxCube *> &cubeList)
QList<DeviceDescriptor> retList; QList<DeviceDescriptor> retList;
foreach (MaxCube *cube, cubeList) { foreach (MaxCube *cube, cubeList) {
DeviceDescriptor descriptor(cubeDeviceClassId, "Max! Cube LAN Gateway",cube->serialNumber()); DeviceDescriptor descriptor(cubeDeviceClassId, "Max! Cube LAN Gateway",cube->serialNumber());
QList<Param> params; ParamList params;
Param hostParam("host address", cube->hostAddress().toString()); Param hostParam("host address", cube->hostAddress().toString());
params.append(hostParam); params.append(hostParam);
Param portParam("port", cube->port()); Param portParam("port", cube->port());

2
plugins/deviceplugins/eq-3/deviceplugineq-3.h
View File

@ -44,7 +44,7 @@ public:
PluginId pluginId() const override; PluginId pluginId() const override;
QList<ParamType> configurationDescription() const override; QList<ParamType> configurationDescription() const override;
DeviceManager::DeviceError discoverDevices(const DeviceClassId &deviceClassId, const QList<Param> &params) const override; QPair<DeviceManager::DeviceError, QString> discoverDevices(const DeviceClassId &deviceClassId, const ParamList &params) override;
QPair<DeviceManager::DeviceSetupStatus, QString> setupDevice(Device *device) override; QPair<DeviceManager::DeviceSetupStatus, QString> setupDevice(Device *device) override;

4
plugins/deviceplugins/openweathermap/devicepluginopenweathermap.cpp
View File

@ -439,9 +439,9 @@ QPair<DeviceManager::DeviceError, QString> DevicePluginOpenweathermap::discoverD
}else{ }else{
m_openweaher->search(location); m_openweaher->search(location);
} }
return DeviceManager::DeviceErrorAsync; return report(DeviceManager::DeviceErrorAsync);
}else{ }else{
return DeviceManager::DeviceErrorDeviceClassNotFound; return report(DeviceManager::DeviceErrorDeviceClassNotFound);
} }
} }