Skip to content

Commit 3dff453

Browse files
committed
started with including the openzwave control panel (still needs a lot of work!)
1 parent 1f1aebb commit 3dff453

File tree

13 files changed

+1651
-3
lines changed

13 files changed

+1651
-3
lines changed

CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,8 @@ hardware/Limitless.cpp
185185
hardware/Meteostick.cpp
186186
hardware/MochadTCP.cpp
187187
hardware/OpenZWave.cpp
188+
hardware/openzwave/control_panel/ozwcp.cpp
189+
hardware/openzwave/control_panel/zwavelib.cpp
188190
hardware/OTGWBase.cpp
189191
hardware/OTGWSerial.cpp
190192
hardware/OTGWTCP.cpp

hardware/OpenZWave.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -412,8 +412,13 @@ void COpenZWave::OnZWaveNotification(OpenZWave::Notification const* _notificatio
412412
{
413413
if (m_bIsShuttingDown)
414414
return;
415+
415416
// Must do this inside a critical section to avoid conflicts with the main thread
416417
boost::lock_guard<boost::mutex> l(m_NotificationMutex);
418+
419+
//Send 2 OZW control panel
420+
OnCPNotification(_notification);
421+
417422
OpenZWave::Manager* pManager = OpenZWave::Manager::Get();
418423
if (!pManager)
419424
return;

hardware/OpenZWave.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include "ZWaveBase.h"
99
#include "ASyncSerial.h"
1010
#include <list>
11+
#include "openzwave/control_panel/ozwcp.h"
1112

1213
namespace OpenZWave
1314
{
@@ -21,7 +22,7 @@ namespace Json
2122
class Value;
2223
}
2324

24-
class COpenZWave : public AsyncSerial, public ZWaveBase
25+
class COpenZWave : public AsyncSerial, public ZWaveBase, public COpenZWaveControlPanel
2526
{
2627
public:
2728
typedef struct

0 commit comments

Comments
 (0)