Raspberries/upm
Public Access
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ozw: Rework and add some device specific drivers and examples.

Browse Source 
This commit reworks ozw somewhat and adds some device specific drivers
with examples.  All of these drivers are kept in the UPM ozw library.

The OZW class has been reworked to make it a proper singleton, since
the OpenZWave::Manager() it depends on is already a singleton.  This
avoids issues such as opening and initializing OpenZWave multiple
times.

A new, relatively thin base class, ozwInterface is also now present.
This class wraps some basic functionality, and handles initialization
of the OZW base class.  It is intended to be inherited by device
driver classes.  It operates on a node id for a device.  Each OZW
device is referenced by a node id, which does not change unless the
device is removed (and possibly re-added) to a Z-Wave network.

Finally, a series of device specific drivers have been implemented.
These provide basic functionality to monitor and in some cases control
the operation of a Z-Wave device.  They are the following:

ozwdump - This is a fake 'device' driver that initializes an OZW
network and dumps information on all of the nodes (devices) present.
Along with each node, available information on each valueid associated
with that node is also printed.  This fake device and it's examples
replace the original ozw example.

aeotecss6 - Aeotec Smart Switch 6.  This device allows control of the
switch, as well as reporting of information the switch makes
available, such as current consumption, volts, watts, and accumulated
energy use (kWh).

aeotecsdg2 - Aeotec Smart Dimmer Gen 2.  This device is similar to the
Smart Switch 6, but also provides dimming functionality.  It also
provides information on energy use.

aeotecdw2e - Aeotec Door/Window Sensor 2nd Edition.  This device is a
magnetic switch with an embedded tamper switch used to detect the
opening/closing of windows and doors.  This is a battery powered
device.

aeotecdsb09104 - Aeotec Home Energy Monitor.  This device is intended
to be installed at the MAINS or Breaker box.  It reports current and
cumulative energy consumption.

tzemt400 - Trane TZEMT400 Thermostat.  This device is a thermostat
with Z-Wave functionality.  The variant tested was the
TZEMT400BB32MAA.  The driver reports various information on the status
of the thermostat, as well as the current measured temperature.

Signed-off-by: Jon Trulson <jtrulson@ics.com>
This commit is contained in:
Jon Trulson
2016-07-06 13:25:39 -06:00
parent 8da6095c35
commit 9ab9e2c403
47 changed files with 4067 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/ozw/zwNode.cxx
View File

@@ -1,6 +1,6 @@
/*
* Author: Jon Trulson <jtrulson@ics.com>
* Copyright (c) 2015 Intel Corporation.
* Copyright (c) 2015-2016 Intel Corporation.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
@@ -38,6 +38,9 @@ zwNode::zwNode(uint32_t homeId, uint8_t nodeId)
m_nodeId = nodeId;
m_vindex = 0;
m_list.clear();
m_values.clear();
m_autoUpdate = false;
}
zwNode::~zwNode()
@@ -56,23 +59,33 @@ uint32_t zwNode::homeId()
void zwNode::addValueID(ValueID vid)
{
// We need to use insert since ValueID's default ctor is private
m_values.insert(std::pair<int, ValueID>(m_vindex++, vid));
m_list.push_back(vid);
if (m_autoUpdate)
updateVIDMap();
}
void zwNode::removeValueID(ValueID vid)
{
//we have to get a little complicated here since we need to delete
//the value id, but the map is indexed by m_vindex
for (valueMap_t::iterator it = m_values.begin();
it != m_values.end(); ++it)
m_list.remove(vid);
if (m_autoUpdate)
updateVIDMap();
}
void zwNode::updateVIDMap()
{
m_values.clear();
m_vindex = 0;
m_list.sort();
for (auto it = m_list.cbegin(); it != m_list.cend(); ++it)
{
if ((*it).second == vid)
{
m_values.erase((*it).first);
break;
}
// We need to use insert since ValueID's default ctor is private
m_values.insert(std::pair<int, ValueID>(m_vindex++, *it));
}
}
bool zwNode::indexToValueID(int index, ValueID *vid)
@@ -94,17 +107,25 @@ bool zwNode::indexToValueID(int index, ValueID *vid)
void zwNode::dumpNode(bool all)
{
for (valueMap_t::iterator it = m_values.begin();
it != m_values.end(); ++it)
for (auto it = m_values.cbegin();
it != m_values.cend(); ++it)
{
int vindex = (*it).first;
ValueID vid = (*it).second;
int vindex = it->first;
ValueID vid = it->second;
string label = Manager::Get()->GetValueLabel(vid);
string valueAsStr;
Manager::Get()->GetValueAsString(vid, &valueAsStr);
string valueUnits = Manager::Get()->GetValueUnits(vid);
ValueID::ValueType vType = vid.GetType();
string vTypeStr;
string perms;
if (Manager::Get()->IsValueWriteOnly(vid))
perms = "WO";
else if (Manager::Get()->IsValueReadOnly(vid))
perms = "RO";
else
perms = "RW";
switch (vType)
{
@@ -155,12 +176,18 @@ void zwNode::dumpNode(bool all)
// by default we only want user values, unless 'all' is true
if (all || (vid.GetGenre() == ValueID::ValueGenre_User))
fprintf(stderr, "\t Index: %2d, Type: %s, Label: %s, Value: %s %s\n",
{
fprintf(stderr, "\t Index: %d, Type: %s, Label: %s, Value: %s %s (%s)\n",
vindex,
vTypeStr.c_str(),
label.c_str(),
valueAsStr.c_str(),
valueUnits.c_str());
valueUnits.c_str(),
perms.c_str());
fprintf(stderr, "\t\t VID: %016x\n",
vid.GetId());
}
}
}