Permalink
Browse files

moved patches to root (gen-cpp is effectively untracked from trunk)

  • Loading branch information...
1 parent bfa53f4 commit ffac795e93a41e9d1add3e6ac403843f656cec18 @ekarak ekarak committed Mar 9, 2013
View
8 Makefile
@@ -71,11 +71,11 @@ LIBS := $(GNUTLS) $(LIBUSB) $(LIBBOOST) $(LIBTHRIFT) $(LIBBOOSTSTOMP)
all: openzwave booststomp ozwd
gen-cpp/RemoteManager_server.cpp: create_server.rb gen-cpp/RemoteManager.cpp
- patch -p0 gen-cpp/ozw_types.h <gen-cpp/ozw_types.h.patch
+ patch -p0 gen-cpp/ozw_types.h < ozw_types.h.patch
ruby create_server.rb --ozwroot=${OPENZWAVE} --thriftroot=$(THRIFT)
cp gen-cpp/RemoteManager_server.cpp gen-cpp/RemoteManager_server.cpp.orig
cp gen-cpp/ozw_types.h gen-cpp/ozw_types.h.orig
- patch -p0 gen-cpp/RemoteManager_server.cpp < gen-cpp/RemoteManager_server.cpp.patch
+ patch -p0 gen-cpp/RemoteManager_server.cpp < RemoteManager_server.cpp.patch
gen-cpp/RemoteManager.cpp: ozw.thrift
thrift --gen cocoa --gen cpp --gen csharp --gen erl --gen go --gen java --gen js --gen perl --gen php --gen py --gen rb ozw.thrift
@@ -122,5 +122,5 @@ binclean:
thrift: gen-cpp/RemoteManager.cpp
patchdiffs:
- - diff -C3 gen-cpp/ozw_types.h.orig gen-cpp/ozw_types.h.patched > gen-cpp/ozw_types.h.patch
- - diff -C3 gen-cpp/RemoteManager_server.cpp.orig gen-cpp/RemoteManager_server.cpp.patched > gen-cpp/RemoteManager_server.cpp.patch
+ - diff -C3 gen-cpp/ozw_types.h.orig gen-cpp/ozw_types.h.patched > ozw_types.h.patch
+ - diff -C3 gen-cpp/RemoteManager_server.cpp.orig gen-cpp/RemoteManager_server.cpp.patched > RemoteManager_server.cpp.patch
View
0 gen-cpp/RemoteManager_server.cpp.patch → RemoteManager_server.cpp.patch
File renamed without changes.
View
50 gen-csharp/OpenZWave/DriverControllerCommand.cs
@@ -13,65 +13,65 @@ public enum DriverControllerCommand
/// <summary>
/// < No command.
/// </summary>
- ControllerCommand_AddController = 1,
+ ControllerCommand_AddDevice = 1,
/// <summary>
- /// < Add a new controller to the Z-Wave network. The new controller will be a secondary.
+ /// < Add a new device or controller to the Z-Wave network.
/// </summary>
- ControllerCommand_AddDevice = 2,
+ ControllerCommand_CreateNewPrimary = 2,
/// <summary>
- /// < Add a new device (but not a controller) to the Z-Wave network.
+ /// < Add a new controller to the Z-Wave network. Used when old primary fails. Requires SUC.
/// </summary>
- ControllerCommand_CreateNewPrimary = 3,
- /// <summary>
- /// < Add a new controller to the Z-Wave network. The new controller will be the primary, and the current primary will become a secondary controller.
- /// </summary>
- ControllerCommand_ReceiveConfiguration = 4,
+ ControllerCommand_ReceiveConfiguration = 3,
/// <summary>
/// < Receive Z-Wave network configuration information from another controller.
/// </summary>
- ControllerCommand_RemoveController = 5,
- /// <summary>
- /// < Remove a controller from the Z-Wave network.
- /// </summary>
- ControllerCommand_RemoveDevice = 6,
+ ControllerCommand_RemoveDevice = 4,
/// <summary>
- /// < Remove a new device (but not a controller) from the Z-Wave network.
+ /// < Remove a device or controller from the Z-Wave network.
/// </summary>
- ControllerCommand_RemoveFailedNode = 7,
+ ControllerCommand_RemoveFailedNode = 5,
/// <summary>
/// < Move a node to the controller's failed nodes list. This command will only work if the node cannot respond.
/// </summary>
- ControllerCommand_HasNodeFailed = 8,
+ ControllerCommand_HasNodeFailed = 6,
/// <summary>
/// < Check whether a node is in the controller's failed nodes list.
/// </summary>
- ControllerCommand_ReplaceFailedNode = 9,
+ ControllerCommand_ReplaceFailedNode = 7,
/// <summary>
/// < Replace a non-responding node with another. The node must be in the controller's list of failed nodes for this command to succeed.
/// </summary>
- ControllerCommand_TransferPrimaryRole = 10,
+ ControllerCommand_TransferPrimaryRole = 8,
/// <summary>
/// < Make a different controller the primary.
/// </summary>
- ControllerCommand_RequestNetworkUpdate = 11,
+ ControllerCommand_RequestNetworkUpdate = 9,
/// <summary>
/// < Request network information from the SUC/SIS.
/// </summary>
- ControllerCommand_RequestNodeNeighborUpdate = 12,
+ ControllerCommand_RequestNodeNeighborUpdate = 10,
/// <summary>
- /// < Get a node to rebuild its neighbour list. This method also does ControllerCommand_RequestNodeNeighbors
+ /// < Get a node to rebuild its neighbour list. This method also does RequestNodeNeighbors
/// </summary>
- ControllerCommand_AssignReturnRoute = 13,
+ ControllerCommand_AssignReturnRoute = 11,
/// <summary>
/// < Assign a network return routes to a device.
/// </summary>
- ControllerCommand_DeleteAllReturnRoutes = 14,
+ ControllerCommand_DeleteAllReturnRoutes = 12,
/// <summary>
/// < Delete all return routes from a device.
/// </summary>
+ ControllerCommand_SendNodeInformation = 13,
+ /// <summary>
+ /// < Send a node information frame
+ /// </summary>
+ ControllerCommand_ReplicationSend = 14,
+ /// <summary>
+ /// < Send information from primary to secondary
+ /// </summary>
ControllerCommand_CreateButton = 15,
/// <summary>
- /// Create a handheld button id.
+ /// < Create an id that tracks handheld button presses
/// </summary>
ControllerCommand_DeleteButton = 16,
}
View
54 gen-erl/ozw_types.hrl
@@ -18,23 +18,49 @@
-define(ozw_RemoteValueType_ValueType_Button, 8).
-define(ozw_DriverControllerCommand_ControllerCommand_None, 0).
--define(ozw_DriverControllerCommand_ControllerCommand_AddController, 1).
--define(ozw_DriverControllerCommand_ControllerCommand_AddDevice, 2).
--define(ozw_DriverControllerCommand_ControllerCommand_CreateNewPrimary, 3).
--define(ozw_DriverControllerCommand_ControllerCommand_ReceiveConfiguration, 4).
--define(ozw_DriverControllerCommand_ControllerCommand_RemoveController, 5).
--define(ozw_DriverControllerCommand_ControllerCommand_RemoveDevice, 6).
--define(ozw_DriverControllerCommand_ControllerCommand_RemoveFailedNode, 7).
--define(ozw_DriverControllerCommand_ControllerCommand_HasNodeFailed, 8).
--define(ozw_DriverControllerCommand_ControllerCommand_ReplaceFailedNode, 9).
--define(ozw_DriverControllerCommand_ControllerCommand_TransferPrimaryRole, 10).
--define(ozw_DriverControllerCommand_ControllerCommand_RequestNetworkUpdate, 11).
--define(ozw_DriverControllerCommand_ControllerCommand_RequestNodeNeighborUpdate, 12).
--define(ozw_DriverControllerCommand_ControllerCommand_AssignReturnRoute, 13).
--define(ozw_DriverControllerCommand_ControllerCommand_DeleteAllReturnRoutes, 14).
+-define(ozw_DriverControllerCommand_ControllerCommand_AddDevice, 1).
+-define(ozw_DriverControllerCommand_ControllerCommand_CreateNewPrimary, 2).
+-define(ozw_DriverControllerCommand_ControllerCommand_ReceiveConfiguration, 3).
+-define(ozw_DriverControllerCommand_ControllerCommand_RemoveDevice, 4).
+-define(ozw_DriverControllerCommand_ControllerCommand_RemoveFailedNode, 5).
+-define(ozw_DriverControllerCommand_ControllerCommand_HasNodeFailed, 6).
+-define(ozw_DriverControllerCommand_ControllerCommand_ReplaceFailedNode, 7).
+-define(ozw_DriverControllerCommand_ControllerCommand_TransferPrimaryRole, 8).
+-define(ozw_DriverControllerCommand_ControllerCommand_RequestNetworkUpdate, 9).
+-define(ozw_DriverControllerCommand_ControllerCommand_RequestNodeNeighborUpdate, 10).
+-define(ozw_DriverControllerCommand_ControllerCommand_AssignReturnRoute, 11).
+-define(ozw_DriverControllerCommand_ControllerCommand_DeleteAllReturnRoutes, 12).
+-define(ozw_DriverControllerCommand_ControllerCommand_SendNodeInformation, 13).
+-define(ozw_DriverControllerCommand_ControllerCommand_ReplicationSend, 14).
-define(ozw_DriverControllerCommand_ControllerCommand_CreateButton, 15).
-define(ozw_DriverControllerCommand_ControllerCommand_DeleteButton, 16).
+-define(ozw_DriverControllerState_ControllerState_Normal, 0).
+-define(ozw_DriverControllerState_ControllerState_Starting, 1).
+-define(ozw_DriverControllerState_ControllerState_Cancel, 2).
+-define(ozw_DriverControllerState_ControllerState_Error, 3).
+-define(ozw_DriverControllerState_ControllerState_Waiting, 4).
+-define(ozw_DriverControllerState_ControllerState_Sleeping, 5).
+-define(ozw_DriverControllerState_ControllerState_InProgress, 6).
+-define(ozw_DriverControllerState_ControllerState_Completed, 7).
+-define(ozw_DriverControllerState_ControllerState_Failed, 8).
+-define(ozw_DriverControllerState_ControllerState_NodeOK, 9).
+-define(ozw_DriverControllerState_ControllerState_NodeFailed, 10).
+
+-define(ozw_DriverControllerError_ControllerError_None, 0).
+-define(ozw_DriverControllerError_ControllerError_ButtonNotFound, 1).
+-define(ozw_DriverControllerError_ControllerError_NodeNotFound, 2).
+-define(ozw_DriverControllerError_ControllerError_NotBridge, 3).
+-define(ozw_DriverControllerError_ControllerError_NotSUC, 4).
+-define(ozw_DriverControllerError_ControllerError_NotSecondary, 5).
+-define(ozw_DriverControllerError_ControllerError_NotPrimary, 6).
+-define(ozw_DriverControllerError_ControllerError_IsPrimary, 7).
+-define(ozw_DriverControllerError_ControllerError_NotFound, 8).
+-define(ozw_DriverControllerError_ControllerError_Busy, 9).
+-define(ozw_DriverControllerError_ControllerError_Failed, 10).
+-define(ozw_DriverControllerError_ControllerError_Disabled, 11).
+-define(ozw_DriverControllerError_ControllerError_Overflow, 12).
+
-define(ozw_DriverControllerInterface_ControllerInterface_Unknown, 0).
-define(ozw_DriverControllerInterface_ControllerInterface_Serial, 1).
-define(ozw_DriverControllerInterface_ControllerInterface_Hid, 2).
View
162 gen-go/OpenZWave/ttypes.go
@@ -102,31 +102,29 @@ func (p RemoteValueType) IsEnum() bool {
type DriverControllerCommand int
const (
ControllerCommand_None DriverControllerCommand = 0
- ControllerCommand_AddController DriverControllerCommand = 1
- ControllerCommand_AddDevice DriverControllerCommand = 2
- ControllerCommand_CreateNewPrimary DriverControllerCommand = 3
- ControllerCommand_ReceiveConfiguration DriverControllerCommand = 4
- ControllerCommand_RemoveController DriverControllerCommand = 5
- ControllerCommand_RemoveDevice DriverControllerCommand = 6
- ControllerCommand_RemoveFailedNode DriverControllerCommand = 7
- ControllerCommand_HasNodeFailed DriverControllerCommand = 8
- ControllerCommand_ReplaceFailedNode DriverControllerCommand = 9
- ControllerCommand_TransferPrimaryRole DriverControllerCommand = 10
- ControllerCommand_RequestNetworkUpdate DriverControllerCommand = 11
- ControllerCommand_RequestNodeNeighborUpdate DriverControllerCommand = 12
- ControllerCommand_AssignReturnRoute DriverControllerCommand = 13
- ControllerCommand_DeleteAllReturnRoutes DriverControllerCommand = 14
+ ControllerCommand_AddDevice DriverControllerCommand = 1
+ ControllerCommand_CreateNewPrimary DriverControllerCommand = 2
+ ControllerCommand_ReceiveConfiguration DriverControllerCommand = 3
+ ControllerCommand_RemoveDevice DriverControllerCommand = 4
+ ControllerCommand_RemoveFailedNode DriverControllerCommand = 5
+ ControllerCommand_HasNodeFailed DriverControllerCommand = 6
+ ControllerCommand_ReplaceFailedNode DriverControllerCommand = 7
+ ControllerCommand_TransferPrimaryRole DriverControllerCommand = 8
+ ControllerCommand_RequestNetworkUpdate DriverControllerCommand = 9
+ ControllerCommand_RequestNodeNeighborUpdate DriverControllerCommand = 10
+ ControllerCommand_AssignReturnRoute DriverControllerCommand = 11
+ ControllerCommand_DeleteAllReturnRoutes DriverControllerCommand = 12
+ ControllerCommand_SendNodeInformation DriverControllerCommand = 13
+ ControllerCommand_ReplicationSend DriverControllerCommand = 14
ControllerCommand_CreateButton DriverControllerCommand = 15
ControllerCommand_DeleteButton DriverControllerCommand = 16
)
func (p DriverControllerCommand) String() string {
switch p {
case ControllerCommand_None: return "ControllerCommand_None"
- case ControllerCommand_AddController: return "ControllerCommand_AddController"
case ControllerCommand_AddDevice: return "ControllerCommand_AddDevice"
case ControllerCommand_CreateNewPrimary: return "ControllerCommand_CreateNewPrimary"
case ControllerCommand_ReceiveConfiguration: return "ControllerCommand_ReceiveConfiguration"
- case ControllerCommand_RemoveController: return "ControllerCommand_RemoveController"
case ControllerCommand_RemoveDevice: return "ControllerCommand_RemoveDevice"
case ControllerCommand_RemoveFailedNode: return "ControllerCommand_RemoveFailedNode"
case ControllerCommand_HasNodeFailed: return "ControllerCommand_HasNodeFailed"
@@ -136,6 +134,8 @@ func (p DriverControllerCommand) String() string {
case ControllerCommand_RequestNodeNeighborUpdate: return "ControllerCommand_RequestNodeNeighborUpdate"
case ControllerCommand_AssignReturnRoute: return "ControllerCommand_AssignReturnRoute"
case ControllerCommand_DeleteAllReturnRoutes: return "ControllerCommand_DeleteAllReturnRoutes"
+ case ControllerCommand_SendNodeInformation: return "ControllerCommand_SendNodeInformation"
+ case ControllerCommand_ReplicationSend: return "ControllerCommand_ReplicationSend"
case ControllerCommand_CreateButton: return "ControllerCommand_CreateButton"
case ControllerCommand_DeleteButton: return "ControllerCommand_DeleteButton"
}
@@ -145,11 +145,9 @@ func (p DriverControllerCommand) String() string {
func FromDriverControllerCommandString(s string) DriverControllerCommand {
switch s {
case "ControllerCommand_None": return ControllerCommand_None
- case "ControllerCommand_AddController": return ControllerCommand_AddController
case "ControllerCommand_AddDevice": return ControllerCommand_AddDevice
case "ControllerCommand_CreateNewPrimary": return ControllerCommand_CreateNewPrimary
case "ControllerCommand_ReceiveConfiguration": return ControllerCommand_ReceiveConfiguration
- case "ControllerCommand_RemoveController": return ControllerCommand_RemoveController
case "ControllerCommand_RemoveDevice": return ControllerCommand_RemoveDevice
case "ControllerCommand_RemoveFailedNode": return ControllerCommand_RemoveFailedNode
case "ControllerCommand_HasNodeFailed": return ControllerCommand_HasNodeFailed
@@ -159,6 +157,8 @@ func FromDriverControllerCommandString(s string) DriverControllerCommand {
case "ControllerCommand_RequestNodeNeighborUpdate": return ControllerCommand_RequestNodeNeighborUpdate
case "ControllerCommand_AssignReturnRoute": return ControllerCommand_AssignReturnRoute
case "ControllerCommand_DeleteAllReturnRoutes": return ControllerCommand_DeleteAllReturnRoutes
+ case "ControllerCommand_SendNodeInformation": return ControllerCommand_SendNodeInformation
+ case "ControllerCommand_ReplicationSend": return ControllerCommand_ReplicationSend
case "ControllerCommand_CreateButton": return ControllerCommand_CreateButton
case "ControllerCommand_DeleteButton": return ControllerCommand_DeleteButton
}
@@ -174,7 +174,131 @@ func (p DriverControllerCommand) IsEnum() bool {
}
/**
- *Delete a handheld button id.
+ *< Delete id that tracks handheld button presses
+ */
+type DriverControllerState int
+const (
+ ControllerState_Normal DriverControllerState = 0
+ ControllerState_Starting DriverControllerState = 1
+ ControllerState_Cancel DriverControllerState = 2
+ ControllerState_Error DriverControllerState = 3
+ ControllerState_Waiting DriverControllerState = 4
+ ControllerState_Sleeping DriverControllerState = 5
+ ControllerState_InProgress DriverControllerState = 6
+ ControllerState_Completed DriverControllerState = 7
+ ControllerState_Failed DriverControllerState = 8
+ ControllerState_NodeOK DriverControllerState = 9
+ ControllerState_NodeFailed DriverControllerState = 10
+)
+func (p DriverControllerState) String() string {
+ switch p {
+ case ControllerState_Normal: return "ControllerState_Normal"
+ case ControllerState_Starting: return "ControllerState_Starting"
+ case ControllerState_Cancel: return "ControllerState_Cancel"
+ case ControllerState_Error: return "ControllerState_Error"
+ case ControllerState_Waiting: return "ControllerState_Waiting"
+ case ControllerState_Sleeping: return "ControllerState_Sleeping"
+ case ControllerState_InProgress: return "ControllerState_InProgress"
+ case ControllerState_Completed: return "ControllerState_Completed"
+ case ControllerState_Failed: return "ControllerState_Failed"
+ case ControllerState_NodeOK: return "ControllerState_NodeOK"
+ case ControllerState_NodeFailed: return "ControllerState_NodeFailed"
+ }
+ return ""
+}
+
+func FromDriverControllerStateString(s string) DriverControllerState {
+ switch s {
+ case "ControllerState_Normal": return ControllerState_Normal
+ case "ControllerState_Starting": return ControllerState_Starting
+ case "ControllerState_Cancel": return ControllerState_Cancel
+ case "ControllerState_Error": return ControllerState_Error
+ case "ControllerState_Waiting": return ControllerState_Waiting
+ case "ControllerState_Sleeping": return ControllerState_Sleeping
+ case "ControllerState_InProgress": return ControllerState_InProgress
+ case "ControllerState_Completed": return ControllerState_Completed
+ case "ControllerState_Failed": return ControllerState_Failed
+ case "ControllerState_NodeOK": return ControllerState_NodeOK
+ case "ControllerState_NodeFailed": return ControllerState_NodeFailed
+ }
+ return DriverControllerState(-10000)
+}
+
+func (p DriverControllerState) Value() int {
+ return int(p)
+}
+
+func (p DriverControllerState) IsEnum() bool {
+ return true
+}
+
+/**
+ *< Used only with ControllerCommand_HasNodeFailed to indicate that the controller thinks the node has failed.
+ */
+type DriverControllerError int
+const (
+ ControllerError_None DriverControllerError = 0
+ ControllerError_ButtonNotFound DriverControllerError = 1
+ ControllerError_NodeNotFound DriverControllerError = 2
+ ControllerError_NotBridge DriverControllerError = 3
+ ControllerError_NotSUC DriverControllerError = 4
+ ControllerError_NotSecondary DriverControllerError = 5
+ ControllerError_NotPrimary DriverControllerError = 6
+ ControllerError_IsPrimary DriverControllerError = 7
+ ControllerError_NotFound DriverControllerError = 8
+ ControllerError_Busy DriverControllerError = 9
+ ControllerError_Failed DriverControllerError = 10
+ ControllerError_Disabled DriverControllerError = 11
+ ControllerError_Overflow DriverControllerError = 12
+)
+func (p DriverControllerError) String() string {
+ switch p {
+ case ControllerError_None: return "ControllerError_None"
+ case ControllerError_ButtonNotFound: return "ControllerError_ButtonNotFound"
+ case ControllerError_NodeNotFound: return "ControllerError_NodeNotFound"
+ case ControllerError_NotBridge: return "ControllerError_NotBridge"
+ case ControllerError_NotSUC: return "ControllerError_NotSUC"
+ case ControllerError_NotSecondary: return "ControllerError_NotSecondary"
+ case ControllerError_NotPrimary: return "ControllerError_NotPrimary"
+ case ControllerError_IsPrimary: return "ControllerError_IsPrimary"
+ case ControllerError_NotFound: return "ControllerError_NotFound"
+ case ControllerError_Busy: return "ControllerError_Busy"
+ case ControllerError_Failed: return "ControllerError_Failed"
+ case ControllerError_Disabled: return "ControllerError_Disabled"
+ case ControllerError_Overflow: return "ControllerError_Overflow"
+ }
+ return ""
+}
+
+func FromDriverControllerErrorString(s string) DriverControllerError {
+ switch s {
+ case "ControllerError_None": return ControllerError_None
+ case "ControllerError_ButtonNotFound": return ControllerError_ButtonNotFound
+ case "ControllerError_NodeNotFound": return ControllerError_NodeNotFound
+ case "ControllerError_NotBridge": return ControllerError_NotBridge
+ case "ControllerError_NotSUC": return ControllerError_NotSUC
+ case "ControllerError_NotSecondary": return ControllerError_NotSecondary
+ case "ControllerError_NotPrimary": return ControllerError_NotPrimary
+ case "ControllerError_IsPrimary": return ControllerError_IsPrimary
+ case "ControllerError_NotFound": return ControllerError_NotFound
+ case "ControllerError_Busy": return ControllerError_Busy
+ case "ControllerError_Failed": return ControllerError_Failed
+ case "ControllerError_Disabled": return ControllerError_Disabled
+ case "ControllerError_Overflow": return ControllerError_Overflow
+ }
+ return DriverControllerError(-10000)
+}
+
+func (p DriverControllerError) Value() int {
+ return int(p)
+}
+
+func (p DriverControllerError) IsEnum() bool {
+ return true
+}
+
+/**
+ *< RequestNetworkUpdate error
*/
type DriverControllerInterface int
const (
View
78 gen-java/OpenZWave/DriverControllerCommand.java
@@ -16,65 +16,65 @@
/**
* < No command.
*/
- ControllerCommand_AddController(1),
+ ControllerCommand_AddDevice(1),
/**
- * < Add a new controller to the Z-Wave network. The new controller will be a secondary.
+ * < Add a new device or controller to the Z-Wave network.
*/
- ControllerCommand_AddDevice(2),
+ ControllerCommand_CreateNewPrimary(2),
/**
- * < Add a new device (but not a controller) to the Z-Wave network.
+ * < Add a new controller to the Z-Wave network. Used when old primary fails. Requires SUC.
*/
- ControllerCommand_CreateNewPrimary(3),
- /**
- * < Add a new controller to the Z-Wave network. The new controller will be the primary, and the current primary will become a secondary controller.
- */
- ControllerCommand_ReceiveConfiguration(4),
+ ControllerCommand_ReceiveConfiguration(3),
/**
* < Receive Z-Wave network configuration information from another controller.
*/
- ControllerCommand_RemoveController(5),
- /**
- * < Remove a controller from the Z-Wave network.
- */
- ControllerCommand_RemoveDevice(6),
+ ControllerCommand_RemoveDevice(4),
/**
- * < Remove a new device (but not a controller) from the Z-Wave network.
+ * < Remove a device or controller from the Z-Wave network.
*/
- ControllerCommand_RemoveFailedNode(7),
+ ControllerCommand_RemoveFailedNode(5),
/**
* < Move a node to the controller's failed nodes list. This command will only work if the node cannot respond.
*/
- ControllerCommand_HasNodeFailed(8),
+ ControllerCommand_HasNodeFailed(6),
/**
* < Check whether a node is in the controller's failed nodes list.
*/
- ControllerCommand_ReplaceFailedNode(9),
+ ControllerCommand_ReplaceFailedNode(7),
/**
* < Replace a non-responding node with another. The node must be in the controller's list of failed nodes for this command to succeed.
*/
- ControllerCommand_TransferPrimaryRole(10),
+ ControllerCommand_TransferPrimaryRole(8),
/**
* < Make a different controller the primary.
*/
- ControllerCommand_RequestNetworkUpdate(11),
+ ControllerCommand_RequestNetworkUpdate(9),
/**
* < Request network information from the SUC/SIS.
*/
- ControllerCommand_RequestNodeNeighborUpdate(12),
+ ControllerCommand_RequestNodeNeighborUpdate(10),
/**
- * < Get a node to rebuild its neighbour list. This method also does ControllerCommand_RequestNodeNeighbors
+ * < Get a node to rebuild its neighbour list. This method also does RequestNodeNeighbors
*/
- ControllerCommand_AssignReturnRoute(13),
+ ControllerCommand_AssignReturnRoute(11),
/**
* < Assign a network return routes to a device.
*/
- ControllerCommand_DeleteAllReturnRoutes(14),
+ ControllerCommand_DeleteAllReturnRoutes(12),
/**
* < Delete all return routes from a device.
*/
+ ControllerCommand_SendNodeInformation(13),
+ /**
+ * < Send a node information frame
+ */
+ ControllerCommand_ReplicationSend(14),
+ /**
+ * < Send information from primary to secondary
+ */
ControllerCommand_CreateButton(15),
/**
- * Create a handheld button id.
+ * < Create an id that tracks handheld button presses
*/
ControllerCommand_DeleteButton(16);
@@ -100,33 +100,33 @@ public static DriverControllerCommand findByValue(int value) {
case 0:
return ControllerCommand_None;
case 1:
- return ControllerCommand_AddController;
- case 2:
return ControllerCommand_AddDevice;
- case 3:
+ case 2:
return ControllerCommand_CreateNewPrimary;
- case 4:
+ case 3:
return ControllerCommand_ReceiveConfiguration;
+ case 4:
+ return ControllerCommand_RemoveDevice;
case 5:
- return ControllerCommand_RemoveController;
+ return ControllerCommand_RemoveFailedNode;
case 6:
- return ControllerCommand_RemoveDevice;
+ return ControllerCommand_HasNodeFailed;
case 7:
- return ControllerCommand_RemoveFailedNode;
+ return ControllerCommand_ReplaceFailedNode;
case 8:
- return ControllerCommand_HasNodeFailed;
+ return ControllerCommand_TransferPrimaryRole;
case 9:
- return ControllerCommand_ReplaceFailedNode;
+ return ControllerCommand_RequestNetworkUpdate;
case 10:
- return ControllerCommand_TransferPrimaryRole;
+ return ControllerCommand_RequestNodeNeighborUpdate;
case 11:
- return ControllerCommand_RequestNetworkUpdate;
+ return ControllerCommand_AssignReturnRoute;
case 12:
- return ControllerCommand_RequestNodeNeighborUpdate;
+ return ControllerCommand_DeleteAllReturnRoutes;
case 13:
- return ControllerCommand_AssignReturnRoute;
+ return ControllerCommand_SendNodeInformation;
case 14:
- return ControllerCommand_DeleteAllReturnRoutes;
+ return ControllerCommand_ReplicationSend;
case 15:
return ControllerCommand_CreateButton;
case 16:
View
56 gen-js/ozw_types.js
@@ -27,23 +27,51 @@ OpenZWave.RemoteValueType = {
};
OpenZWave.DriverControllerCommand = {
'ControllerCommand_None' : 0,
-'ControllerCommand_AddController' : 1,
-'ControllerCommand_AddDevice' : 2,
-'ControllerCommand_CreateNewPrimary' : 3,
-'ControllerCommand_ReceiveConfiguration' : 4,
-'ControllerCommand_RemoveController' : 5,
-'ControllerCommand_RemoveDevice' : 6,
-'ControllerCommand_RemoveFailedNode' : 7,
-'ControllerCommand_HasNodeFailed' : 8,
-'ControllerCommand_ReplaceFailedNode' : 9,
-'ControllerCommand_TransferPrimaryRole' : 10,
-'ControllerCommand_RequestNetworkUpdate' : 11,
-'ControllerCommand_RequestNodeNeighborUpdate' : 12,
-'ControllerCommand_AssignReturnRoute' : 13,
-'ControllerCommand_DeleteAllReturnRoutes' : 14,
+'ControllerCommand_AddDevice' : 1,
+'ControllerCommand_CreateNewPrimary' : 2,
+'ControllerCommand_ReceiveConfiguration' : 3,
+'ControllerCommand_RemoveDevice' : 4,
+'ControllerCommand_RemoveFailedNode' : 5,
+'ControllerCommand_HasNodeFailed' : 6,
+'ControllerCommand_ReplaceFailedNode' : 7,
+'ControllerCommand_TransferPrimaryRole' : 8,
+'ControllerCommand_RequestNetworkUpdate' : 9,
+'ControllerCommand_RequestNodeNeighborUpdate' : 10,
+'ControllerCommand_AssignReturnRoute' : 11,
+'ControllerCommand_DeleteAllReturnRoutes' : 12,
+'ControllerCommand_SendNodeInformation' : 13,
+'ControllerCommand_ReplicationSend' : 14,
'ControllerCommand_CreateButton' : 15,
'ControllerCommand_DeleteButton' : 16
};
+OpenZWave.DriverControllerState = {
+'ControllerState_Normal' : 0,
+'ControllerState_Starting' : 1,
+'ControllerState_Cancel' : 2,
+'ControllerState_Error' : 3,
+'ControllerState_Waiting' : 4,
+'ControllerState_Sleeping' : 5,
+'ControllerState_InProgress' : 6,
+'ControllerState_Completed' : 7,
+'ControllerState_Failed' : 8,
+'ControllerState_NodeOK' : 9,
+'ControllerState_NodeFailed' : 10
+};
+OpenZWave.DriverControllerError = {
+'ControllerError_None' : 0,
+'ControllerError_ButtonNotFound' : 1,
+'ControllerError_NodeNotFound' : 2,
+'ControllerError_NotBridge' : 3,
+'ControllerError_NotSUC' : 4,
+'ControllerError_NotSecondary' : 5,
+'ControllerError_NotPrimary' : 6,
+'ControllerError_IsPrimary' : 7,
+'ControllerError_NotFound' : 8,
+'ControllerError_Busy' : 9,
+'ControllerError_Failed' : 10,
+'ControllerError_Disabled' : 11,
+'ControllerError_Overflow' : 12
+};
OpenZWave.DriverControllerInterface = {
'ControllerInterface_Unknown' : 0,
'ControllerInterface_Serial' : 1,
View
54 gen-perl/OpenZWave/Types.pm
@@ -26,22 +26,48 @@ use constant ValueType_String => 7;
use constant ValueType_Button => 8;
package OpenZWave::DriverControllerCommand;
use constant ControllerCommand_None => 0;
-use constant ControllerCommand_AddController => 1;
-use constant ControllerCommand_AddDevice => 2;
-use constant ControllerCommand_CreateNewPrimary => 3;
-use constant ControllerCommand_ReceiveConfiguration => 4;
-use constant ControllerCommand_RemoveController => 5;
-use constant ControllerCommand_RemoveDevice => 6;
-use constant ControllerCommand_RemoveFailedNode => 7;
-use constant ControllerCommand_HasNodeFailed => 8;
-use constant ControllerCommand_ReplaceFailedNode => 9;
-use constant ControllerCommand_TransferPrimaryRole => 10;
-use constant ControllerCommand_RequestNetworkUpdate => 11;
-use constant ControllerCommand_RequestNodeNeighborUpdate => 12;
-use constant ControllerCommand_AssignReturnRoute => 13;
-use constant ControllerCommand_DeleteAllReturnRoutes => 14;
+use constant ControllerCommand_AddDevice => 1;
+use constant ControllerCommand_CreateNewPrimary => 2;
+use constant ControllerCommand_ReceiveConfiguration => 3;
+use constant ControllerCommand_RemoveDevice => 4;
+use constant ControllerCommand_RemoveFailedNode => 5;
+use constant ControllerCommand_HasNodeFailed => 6;
+use constant ControllerCommand_ReplaceFailedNode => 7;
+use constant ControllerCommand_TransferPrimaryRole => 8;
+use constant ControllerCommand_RequestNetworkUpdate => 9;
+use constant ControllerCommand_RequestNodeNeighborUpdate => 10;
+use constant ControllerCommand_AssignReturnRoute => 11;
+use constant ControllerCommand_DeleteAllReturnRoutes => 12;
+use constant ControllerCommand_SendNodeInformation => 13;
+use constant ControllerCommand_ReplicationSend => 14;
use constant ControllerCommand_CreateButton => 15;
use constant ControllerCommand_DeleteButton => 16;
+package OpenZWave::DriverControllerState;
+use constant ControllerState_Normal => 0;
+use constant ControllerState_Starting => 1;
+use constant ControllerState_Cancel => 2;
+use constant ControllerState_Error => 3;
+use constant ControllerState_Waiting => 4;
+use constant ControllerState_Sleeping => 5;
+use constant ControllerState_InProgress => 6;
+use constant ControllerState_Completed => 7;
+use constant ControllerState_Failed => 8;
+use constant ControllerState_NodeOK => 9;
+use constant ControllerState_NodeFailed => 10;
+package OpenZWave::DriverControllerError;
+use constant ControllerError_None => 0;
+use constant ControllerError_ButtonNotFound => 1;
+use constant ControllerError_NodeNotFound => 2;
+use constant ControllerError_NotBridge => 3;
+use constant ControllerError_NotSUC => 4;
+use constant ControllerError_NotSecondary => 5;
+use constant ControllerError_NotPrimary => 6;
+use constant ControllerError_IsPrimary => 7;
+use constant ControllerError_NotFound => 8;
+use constant ControllerError_Busy => 9;
+use constant ControllerError_Failed => 10;
+use constant ControllerError_Disabled => 11;
+use constant ControllerError_Overflow => 12;
package OpenZWave::DriverControllerInterface;
use constant ControllerInterface_Unknown => 0;
use constant ControllerInterface_Serial => 1;
View
180 gen-py/OpenZWave/ttypes.py
@@ -76,66 +76,160 @@ class RemoteValueType:
class DriverControllerCommand:
ControllerCommand_None = 0
- ControllerCommand_AddController = 1
- ControllerCommand_AddDevice = 2
- ControllerCommand_CreateNewPrimary = 3
- ControllerCommand_ReceiveConfiguration = 4
- ControllerCommand_RemoveController = 5
- ControllerCommand_RemoveDevice = 6
- ControllerCommand_RemoveFailedNode = 7
- ControllerCommand_HasNodeFailed = 8
- ControllerCommand_ReplaceFailedNode = 9
- ControllerCommand_TransferPrimaryRole = 10
- ControllerCommand_RequestNetworkUpdate = 11
- ControllerCommand_RequestNodeNeighborUpdate = 12
- ControllerCommand_AssignReturnRoute = 13
- ControllerCommand_DeleteAllReturnRoutes = 14
+ ControllerCommand_AddDevice = 1
+ ControllerCommand_CreateNewPrimary = 2
+ ControllerCommand_ReceiveConfiguration = 3
+ ControllerCommand_RemoveDevice = 4
+ ControllerCommand_RemoveFailedNode = 5
+ ControllerCommand_HasNodeFailed = 6
+ ControllerCommand_ReplaceFailedNode = 7
+ ControllerCommand_TransferPrimaryRole = 8
+ ControllerCommand_RequestNetworkUpdate = 9
+ ControllerCommand_RequestNodeNeighborUpdate = 10
+ ControllerCommand_AssignReturnRoute = 11
+ ControllerCommand_DeleteAllReturnRoutes = 12
+ ControllerCommand_SendNodeInformation = 13
+ ControllerCommand_ReplicationSend = 14
ControllerCommand_CreateButton = 15
ControllerCommand_DeleteButton = 16
_VALUES_TO_NAMES = {
0: "ControllerCommand_None",
- 1: "ControllerCommand_AddController",
- 2: "ControllerCommand_AddDevice",
- 3: "ControllerCommand_CreateNewPrimary",
- 4: "ControllerCommand_ReceiveConfiguration",
- 5: "ControllerCommand_RemoveController",
- 6: "ControllerCommand_RemoveDevice",
- 7: "ControllerCommand_RemoveFailedNode",
- 8: "ControllerCommand_HasNodeFailed",
- 9: "ControllerCommand_ReplaceFailedNode",
- 10: "ControllerCommand_TransferPrimaryRole",
- 11: "ControllerCommand_RequestNetworkUpdate",
- 12: "ControllerCommand_RequestNodeNeighborUpdate",
- 13: "ControllerCommand_AssignReturnRoute",
- 14: "ControllerCommand_DeleteAllReturnRoutes",
+ 1: "ControllerCommand_AddDevice",
+ 2: "ControllerCommand_CreateNewPrimary",
+ 3: "ControllerCommand_ReceiveConfiguration",
+ 4: "ControllerCommand_RemoveDevice",
+ 5: "ControllerCommand_RemoveFailedNode",
+ 6: "ControllerCommand_HasNodeFailed",
+ 7: "ControllerCommand_ReplaceFailedNode",
+ 8: "ControllerCommand_TransferPrimaryRole",
+ 9: "ControllerCommand_RequestNetworkUpdate",
+ 10: "ControllerCommand_RequestNodeNeighborUpdate",
+ 11: "ControllerCommand_AssignReturnRoute",
+ 12: "ControllerCommand_DeleteAllReturnRoutes",
+ 13: "ControllerCommand_SendNodeInformation",
+ 14: "ControllerCommand_ReplicationSend",
15: "ControllerCommand_CreateButton",
16: "ControllerCommand_DeleteButton",
}
_NAMES_TO_VALUES = {
"ControllerCommand_None": 0,
- "ControllerCommand_AddController": 1,
- "ControllerCommand_AddDevice": 2,
- "ControllerCommand_CreateNewPrimary": 3,
- "ControllerCommand_ReceiveConfiguration": 4,
- "ControllerCommand_RemoveController": 5,
- "ControllerCommand_RemoveDevice": 6,
- "ControllerCommand_RemoveFailedNode": 7,
- "ControllerCommand_HasNodeFailed": 8,
- "ControllerCommand_ReplaceFailedNode": 9,
- "ControllerCommand_TransferPrimaryRole": 10,
- "ControllerCommand_RequestNetworkUpdate": 11,
- "ControllerCommand_RequestNodeNeighborUpdate": 12,
- "ControllerCommand_AssignReturnRoute": 13,
- "ControllerCommand_DeleteAllReturnRoutes": 14,
+ "ControllerCommand_AddDevice": 1,
+ "ControllerCommand_CreateNewPrimary": 2,
+ "ControllerCommand_ReceiveConfiguration": 3,
+ "ControllerCommand_RemoveDevice": 4,
+ "ControllerCommand_RemoveFailedNode": 5,
+ "ControllerCommand_HasNodeFailed": 6,
+ "ControllerCommand_ReplaceFailedNode": 7,
+ "ControllerCommand_TransferPrimaryRole": 8,
+ "ControllerCommand_RequestNetworkUpdate": 9,
+ "ControllerCommand_RequestNodeNeighborUpdate": 10,
+ "ControllerCommand_AssignReturnRoute": 11,
+ "ControllerCommand_DeleteAllReturnRoutes": 12,
+ "ControllerCommand_SendNodeInformation": 13,
+ "ControllerCommand_ReplicationSend": 14,
"ControllerCommand_CreateButton": 15,
"ControllerCommand_DeleteButton": 16,
}
+class DriverControllerState:
+ """
+ < Delete id that tracks handheld button presses
+ """
+ ControllerState_Normal = 0
+ ControllerState_Starting = 1
+ ControllerState_Cancel = 2
+ ControllerState_Error = 3
+ ControllerState_Waiting = 4
+ ControllerState_Sleeping = 5
+ ControllerState_InProgress = 6
+ ControllerState_Completed = 7
+ ControllerState_Failed = 8
+ ControllerState_NodeOK = 9
+ ControllerState_NodeFailed = 10
+
+ _VALUES_TO_NAMES = {
+ 0: "ControllerState_Normal",
+ 1: "ControllerState_Starting",
+ 2: "ControllerState_Cancel",
+ 3: "ControllerState_Error",
+ 4: "ControllerState_Waiting",
+ 5: "ControllerState_Sleeping",
+ 6: "ControllerState_InProgress",
+ 7: "ControllerState_Completed",
+ 8: "ControllerState_Failed",
+ 9: "ControllerState_NodeOK",
+ 10: "ControllerState_NodeFailed",
+ }
+
+ _NAMES_TO_VALUES = {
+ "ControllerState_Normal": 0,
+ "ControllerState_Starting": 1,
+ "ControllerState_Cancel": 2,
+ "ControllerState_Error": 3,
+ "ControllerState_Waiting": 4,
+ "ControllerState_Sleeping": 5,
+ "ControllerState_InProgress": 6,
+ "ControllerState_Completed": 7,
+ "ControllerState_Failed": 8,
+ "ControllerState_NodeOK": 9,
+ "ControllerState_NodeFailed": 10,
+ }
+
+class DriverControllerError:
+ """
+ < Used only with ControllerCommand_HasNodeFailed to indicate that the controller thinks the node has failed.
+ """
+ ControllerError_None = 0
+ ControllerError_ButtonNotFound = 1
+ ControllerError_NodeNotFound = 2
+ ControllerError_NotBridge = 3
+ ControllerError_NotSUC = 4
+ ControllerError_NotSecondary = 5
+ ControllerError_NotPrimary = 6
+ ControllerError_IsPrimary = 7
+ ControllerError_NotFound = 8
+ ControllerError_Busy = 9
+ ControllerError_Failed = 10
+ ControllerError_Disabled = 11
+ ControllerError_Overflow = 12
+
+ _VALUES_TO_NAMES = {
+ 0: "ControllerError_None",
+ 1: "ControllerError_ButtonNotFound",
+ 2: "ControllerError_NodeNotFound",
+ 3: "ControllerError_NotBridge",
+ 4: "ControllerError_NotSUC",
+ 5: "ControllerError_NotSecondary",
+ 6: "ControllerError_NotPrimary",
+ 7: "ControllerError_IsPrimary",
+ 8: "ControllerError_NotFound",
+ 9: "ControllerError_Busy",
+ 10: "ControllerError_Failed",
+ 11: "ControllerError_Disabled",
+ 12: "ControllerError_Overflow",
+ }
+
+ _NAMES_TO_VALUES = {
+ "ControllerError_None": 0,
+ "ControllerError_ButtonNotFound": 1,
+ "ControllerError_NodeNotFound": 2,
+ "ControllerError_NotBridge": 3,
+ "ControllerError_NotSUC": 4,
+ "ControllerError_NotSecondary": 5,
+ "ControllerError_NotPrimary": 6,
+ "ControllerError_IsPrimary": 7,
+ "ControllerError_NotFound": 8,
+ "ControllerError_Busy": 9,
+ "ControllerError_Failed": 10,
+ "ControllerError_Disabled": 11,
+ "ControllerError_Overflow": 12,
+ }
+
class DriverControllerInterface:
"""
- Delete a handheld button id.
+ < RequestNetworkUpdate error
"""
ControllerInterface_Unknown = 0
ControllerInterface_Serial = 1
View
101 gen-rb/ozw_types.rb
@@ -34,39 +34,94 @@ module RemoteValueType
module DriverControllerCommand
ControllerCommand_None = 0
# < No command.
- ControllerCommand_AddController = 1
- # < Add a new controller to the Z-Wave network. The new controller will be a secondary.
- ControllerCommand_AddDevice = 2
- # < Add a new device (but not a controller) to the Z-Wave network.
- ControllerCommand_CreateNewPrimary = 3
- # < Add a new controller to the Z-Wave network. The new controller will be the primary, and the current primary will become a secondary controller.
- ControllerCommand_ReceiveConfiguration = 4
+ ControllerCommand_AddDevice = 1
+ # < Add a new device or controller to the Z-Wave network.
+ ControllerCommand_CreateNewPrimary = 2
+ # < Add a new controller to the Z-Wave network. Used when old primary fails. Requires SUC.
+ ControllerCommand_ReceiveConfiguration = 3
# < Receive Z-Wave network configuration information from another controller.
- ControllerCommand_RemoveController = 5
- # < Remove a controller from the Z-Wave network.
- ControllerCommand_RemoveDevice = 6
- # < Remove a new device (but not a controller) from the Z-Wave network.
- ControllerCommand_RemoveFailedNode = 7
+ ControllerCommand_RemoveDevice = 4
+ # < Remove a device or controller from the Z-Wave network.
+ ControllerCommand_RemoveFailedNode = 5
# < Move a node to the controller's failed nodes list. This command will only work if the node cannot respond.
- ControllerCommand_HasNodeFailed = 8
+ ControllerCommand_HasNodeFailed = 6
# < Check whether a node is in the controller's failed nodes list.
- ControllerCommand_ReplaceFailedNode = 9
+ ControllerCommand_ReplaceFailedNode = 7
# < Replace a non-responding node with another. The node must be in the controller's list of failed nodes for this command to succeed.
- ControllerCommand_TransferPrimaryRole = 10
+ ControllerCommand_TransferPrimaryRole = 8
# < Make a different controller the primary.
- ControllerCommand_RequestNetworkUpdate = 11
+ ControllerCommand_RequestNetworkUpdate = 9
# < Request network information from the SUC/SIS.
- ControllerCommand_RequestNodeNeighborUpdate = 12
- # < Get a node to rebuild its neighbour list. This method also does ControllerCommand_RequestNodeNeighbors
- ControllerCommand_AssignReturnRoute = 13
+ ControllerCommand_RequestNodeNeighborUpdate = 10
+ # < Get a node to rebuild its neighbour list. This method also does RequestNodeNeighbors
+ ControllerCommand_AssignReturnRoute = 11
# < Assign a network return routes to a device.
- ControllerCommand_DeleteAllReturnRoutes = 14
+ ControllerCommand_DeleteAllReturnRoutes = 12
# < Delete all return routes from a device.
+ ControllerCommand_SendNodeInformation = 13
+ # < Send a node information frame
+ ControllerCommand_ReplicationSend = 14
+ # < Send information from primary to secondary
ControllerCommand_CreateButton = 15
- # Create a handheld button id.
+ # < Create an id that tracks handheld button presses
ControllerCommand_DeleteButton = 16
- VALUE_MAP = {0 => "ControllerCommand_None", 1 => "ControllerCommand_AddController", 2 => "ControllerCommand_AddDevice", 3 => "ControllerCommand_CreateNewPrimary", 4 => "ControllerCommand_ReceiveConfiguration", 5 => "ControllerCommand_RemoveController", 6 => "ControllerCommand_RemoveDevice", 7 => "ControllerCommand_RemoveFailedNode", 8 => "ControllerCommand_HasNodeFailed", 9 => "ControllerCommand_ReplaceFailedNode", 10 => "ControllerCommand_TransferPrimaryRole", 11 => "ControllerCommand_RequestNetworkUpdate", 12 => "ControllerCommand_RequestNodeNeighborUpdate", 13 => "ControllerCommand_AssignReturnRoute", 14 => "ControllerCommand_DeleteAllReturnRoutes", 15 => "ControllerCommand_CreateButton", 16 => "ControllerCommand_DeleteButton"}
- VALID_VALUES = Set.new([ControllerCommand_None, ControllerCommand_AddController, ControllerCommand_AddDevice, ControllerCommand_CreateNewPrimary, ControllerCommand_ReceiveConfiguration, ControllerCommand_RemoveController, ControllerCommand_RemoveDevice, ControllerCommand_RemoveFailedNode, ControllerCommand_HasNodeFailed, ControllerCommand_ReplaceFailedNode, ControllerCommand_TransferPrimaryRole, ControllerCommand_RequestNetworkUpdate, ControllerCommand_RequestNodeNeighborUpdate, ControllerCommand_AssignReturnRoute, ControllerCommand_DeleteAllReturnRoutes, ControllerCommand_CreateButton, ControllerCommand_DeleteButton]).freeze
+ VALUE_MAP = {0 => "ControllerCommand_None", 1 => "ControllerCommand_AddDevice", 2 => "ControllerCommand_CreateNewPrimary", 3 => "ControllerCommand_ReceiveConfiguration", 4 => "ControllerCommand_RemoveDevice", 5 => "ControllerCommand_RemoveFailedNode", 6 => "ControllerCommand_HasNodeFailed", 7 => "ControllerCommand_ReplaceFailedNode", 8 => "ControllerCommand_TransferPrimaryRole", 9 => "ControllerCommand_RequestNetworkUpdate", 10 => "ControllerCommand_RequestNodeNeighborUpdate", 11 => "ControllerCommand_AssignReturnRoute", 12 => "ControllerCommand_DeleteAllReturnRoutes", 13 => "ControllerCommand_SendNodeInformation", 14 => "ControllerCommand_ReplicationSend", 15 => "ControllerCommand_CreateButton", 16 => "ControllerCommand_DeleteButton"}
+ VALID_VALUES = Set.new([ControllerCommand_None, ControllerCommand_AddDevice, ControllerCommand_CreateNewPrimary, ControllerCommand_ReceiveConfiguration, ControllerCommand_RemoveDevice, ControllerCommand_RemoveFailedNode, ControllerCommand_HasNodeFailed, ControllerCommand_ReplaceFailedNode, ControllerCommand_TransferPrimaryRole, ControllerCommand_RequestNetworkUpdate, ControllerCommand_RequestNodeNeighborUpdate, ControllerCommand_AssignReturnRoute, ControllerCommand_DeleteAllReturnRoutes, ControllerCommand_SendNodeInformation, ControllerCommand_ReplicationSend, ControllerCommand_CreateButton, ControllerCommand_DeleteButton]).freeze
+ end
+
+ module DriverControllerState
+ ControllerState_Normal = 0
+ # < No command in progress.
+ ControllerState_Starting = 1
+ # < The command is starting.
+ ControllerState_Cancel = 2
+ # < The command was cancelled.
+ ControllerState_Error = 3
+ # < Command invocation had error(s) and was aborted
+ ControllerState_Waiting = 4
+ # < Controller is waiting for a user action.
+ ControllerState_Sleeping = 5
+ # < Controller command is on a sleep queue wait for device.
+ ControllerState_InProgress = 6
+ # < The controller is communicating with the other device to carry out the command.
+ ControllerState_Completed = 7
+ # < The command has completed successfully.
+ ControllerState_Failed = 8
+ # < The command has failed.
+ ControllerState_NodeOK = 9
+ # < Used only with ControllerCommand_HasNodeFailed to indicate that the controller thinks the node is OK.
+ ControllerState_NodeFailed = 10
+ VALUE_MAP = {0 => "ControllerState_Normal", 1 => "ControllerState_Starting", 2 => "ControllerState_Cancel", 3 => "ControllerState_Error", 4 => "ControllerState_Waiting", 5 => "ControllerState_Sleeping", 6 => "ControllerState_InProgress", 7 => "ControllerState_Completed", 8 => "ControllerState_Failed", 9 => "ControllerState_NodeOK", 10 => "ControllerState_NodeFailed"}
+ VALID_VALUES = Set.new([ControllerState_Normal, ControllerState_Starting, ControllerState_Cancel, ControllerState_Error, ControllerState_Waiting, ControllerState_Sleeping, ControllerState_InProgress, ControllerState_Completed, ControllerState_Failed, ControllerState_NodeOK, ControllerState_NodeFailed]).freeze
+ end
+
+ module DriverControllerError
+ ControllerError_None = 0
+ ControllerError_ButtonNotFound = 1
+ # < Button
+ ControllerError_NodeNotFound = 2
+ # < Button
+ ControllerError_NotBridge = 3
+ # < Button
+ ControllerError_NotSUC = 4
+ # < CreateNewPrimary
+ ControllerError_NotSecondary = 5
+ # < CreateNewPrimary
+ ControllerError_NotPrimary = 6
+ # < RemoveFailedNode, AddNodeToNetwork
+ ControllerError_IsPrimary = 7
+ # < ReceiveConfiguration
+ ControllerError_NotFound = 8
+ # < RemoveFailedNode
+ ControllerError_Busy = 9
+ # < RemoveFailedNode, RequestNetworkUpdate
+ ControllerError_Failed = 10
+ # < RemoveFailedNode, RequestNetworkUpdate
+ ControllerError_Disabled = 11
+ # < RequestNetworkUpdate error
+ ControllerError_Overflow = 12
+ VALUE_MAP = {0 => "ControllerError_None", 1 => "ControllerError_ButtonNotFound", 2 => "ControllerError_NodeNotFound", 3 => "ControllerError_NotBridge", 4 => "ControllerError_NotSUC", 5 => "ControllerError_NotSecondary", 6 => "ControllerError_NotPrimary", 7 => "ControllerError_IsPrimary", 8 => "ControllerError_NotFound", 9 => "ControllerError_Busy", 10 => "ControllerError_Failed", 11 => "ControllerError_Disabled", 12 => "ControllerError_Overflow"}
+ VALID_VALUES = Set.new([ControllerError_None, ControllerError_ButtonNotFound, ControllerError_NodeNotFound, ControllerError_NotBridge, ControllerError_NotSUC, ControllerError_NotSecondary, ControllerError_NotPrimary, ControllerError_IsPrimary, ControllerError_NotFound, ControllerError_Busy, ControllerError_Failed, ControllerError_Disabled, ControllerError_Overflow]).freeze
end
module DriverControllerInterface
View
4 ozw.thrift
@@ -81,7 +81,7 @@ enum DriverControllerState
ControllerState_Failed, /**< The command has failed. */
ControllerState_NodeOK, /**< Used only with ControllerCommand_HasNodeFailed to indicate that the controller thinks the node is OK. */
ControllerState_NodeFailed /**< Used only with ControllerCommand_HasNodeFailed to indicate that the controller thinks the node has failed. */
-};
+}
enum DriverControllerError
{
@@ -98,7 +98,7 @@ enum DriverControllerError
ControllerError_Failed, /**< RemoveFailedNode, RequestNetworkUpdate */
ControllerError_Disabled, /**< RequestNetworkUpdate error */
ControllerError_Overflow /**< RequestNetworkUpdate error */
-};
+}
enum DriverControllerInterface {
ControllerInterface_Unknown = 0,
View
0 gen-cpp/ozw_types.h.patch → ozw_types.h.patch
File renamed without changes.
View
BIN ozwd
Binary file not shown.

0 comments on commit ffac795

Please sign in to comment.