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

do some testing

master
nymea 2019-07-18 18:49:43 +02:00
parent 09738d80ee
commit 9de7ca9b39
2 changed files with 147 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

138
onewire/devicepluginonewire.json
View File

@ -79,10 +79,66 @@
}
]
},
{
"id": "6db42501-5451-4aac-9525-5f886b3188e2",
"name": "singleChannelSwitch",
"displayName": "1-channel switch",
"interfaces": [ ],
"createMethods": ["discovery"],
"paramTypes": [
{
"id": "c9d6b7fd-fa21-473a-b5ed-9c5227749f06",
"name": "address",
"displayName": "Address",
"type": "QString",
"readOnly": true
},
{
"id": "6efc8cb6-81ae-45c0-8910-708401d1ba68",
"name": "type",
"displayName": "Type",
"type": "QString",
"inputType": "TextLine",
"readOnly": true
}
],
"stateTypes": [
{
}
]
},
{
"id": "023f2b93-61e1-4422-97f5-3d5c14a6628f",
"name": "dualChannelSwitch",
"displayName": "2-channel switch",
"interfaces": [ ],
"createMethods": ["discovery"],
"paramTypes": [
{
"id": "b9a1a23d-1fbf-4849-8aa2-2855e7deaf84",
"name": "address",
"displayName": "Address",
"type": "QString",
"readOnly": true
},
{
"id": "b71ed57b-e768-4119-829e-a0f2c9fa5e18",
"name": "type",
"displayName": "Type",
"type": "QString",
"inputType": "TextLine",
"readOnly": true
}
],
"stateTypes": [
{
}
]
},
{
"id": "71691119-3bda-4424-b853-1a00f21086e1",
"name": "switch",
"displayName": "Switch",
"name": "eightChannelSwitch",
"displayName": "8-channel switch",
"interfaces": [ ],
"createMethods": ["discovery"],
"paramTypes": [
@ -105,10 +161,80 @@
"stateTypes": [
{
"id": "78fa12c0-246c-4112-8be6-5943d3c3cda5",
"name": "digitalOutput",
"displayName": "Digital output",
"displayNameEvent": "Digital output changed",
"displayNameAction": "Set digital output",
"name": "digitalOutput1",
"displayName": "Digital output 1",
"displayNameEvent": "Digital output 1 changed",
"displayNameAction": "Set digital output 1",
"type": "bool",
"defaultValue": false,
"writable": true
},
{
"id": "c7d2f4a8-2b13-4a48-81a8-72f4908c775b",
"name": "digitalOutput2",
"displayName": "Digital output 2",
"displayNameEvent": "Digital output 2 changed",
"displayNameAction": "Set digital output 2",
"type": "bool",
"defaultValue": false,
"writable": true
},
{
"id": "4b2ac595-eba9-4364-8cd7-00ff8bccda5a",
"name": "digitalOutput3",
"displayName": "Digital output 3",
"displayNameEvent": "Digital output 3 changed",
"displayNameAction": "Set digital output 3",
"type": "bool",
"defaultValue": false,
"writable": true
},
{
"id": "bbbd1863-ef04-4687-803d-3c9ccdfc8d8f",
"name": "digitalOutput4",
"displayName": "Digital output 4",
"displayNameEvent": "Digital output 4 changed",
"displayNameAction": "Set digital output 4",
"type": "bool",
"defaultValue": false,
"writable": true
},
{
"id": "50855d2b-a700-4030-8674-fee00cc0b4e2",
"name": "digitalOutput5",
"displayName": "Digital output 5",
"displayNameEvent": "Digital output 5 changed",
"displayNameAction": "Set digital output 5",
"type": "bool",
"defaultValue": false,
"writable": true
},
{
"id": "a91ce593-09ba-4754-8a2e-e3f507313585",
"name": "digitalOutput6",
"displayName": "Digital output 6",
"displayNameEvent": "Digital output 6 changed",
"displayNameAction": "Set digital output 6",
"type": "bool",
"defaultValue": false,
"writable": true
},
{
"id": "5f46047c-b00d-486f-b169-b738fbc89cdb",
"name": "digitalOutput7",
"displayName": "Digital output 7",
"displayNameEvent": "Digital output 7 changed",
"displayNameAction": "Set digital output 7",
"type": "bool",
"defaultValue": false,
"writable": true
},
{
"id": "63334a17-0847-4f53-8007-1b5e72b88aa8",
"name": "digitalOutput8",
"displayName": "Digital output 8",
"displayNameEvent": "Digital output 8 changed",
"displayNameAction": "Set digital output 8",
"type": "bool",
"defaultValue": false,
"writable": true

32
onewire/onewire.cpp
View File

@ -38,27 +38,14 @@ OneWire::~OneWire()
bool OneWire::init()
{
QByteArray initArguments;
initArguments.append("--fake 28 --fake 10");
//initArguments.append("--fake 28 --fake 10"); //fake temperature sensors
//initArguments.append("--fake 29 --fake 12 --fake 05"); //fake temperature sensors
initArguments.append("--i2c=ALL:ALL");
if (OW_init(initArguments) < 0) {
qWarning(dcOneWire()) << "ERROR initialising one wire" << strerror(errno);
return false;
}
m_path = "/";
/*QByteArray defaultPath = "/";
size_t dir_length ;
char *dir_buffer = nullptr;
if (OW_get(defaultPath, &dir_buffer, &dir_length) < 0) {
qWarning(dcOneWire()) << "ERROR initialising one wire" << strerror(errno);
return false;
}
m_path = QByteArray(dir_buffer, dir_length);
if(m_path[0] != '/') {
m_path.prepend('/');
}
m_path.append('\0');
qDebug(dcOneWire()) << "Path:" << m_path;
free(dir_buffer);*/
return true;
}
@ -79,9 +66,20 @@ bool OneWire::discoverDevices()
QList<OneWireDevice> oneWireDevices;
foreach(QByteArray member, dirMembers) {
/* Other system members:
* bus.0
* uncached
* settings
* system
* statistics
* structure
* simultaneous
* alarm
*/
int family = member.split('.').first().toInt(nullptr, 16);
if (family != 0) {
qDebug(dcOneWire()) << "Member" << member << member.left(2) << family;
member.remove(member.indexOf('/'), 1);
QByteArray type;
OneWireDevice device;