Permalink
Browse files

Align with OpenZWave's rel.645 Driver.h enums

  • Loading branch information...
1 parent 9f1cd0c commit bfa53f46df723e7e767ac146302eeac7088172ab @ekarak ekarak committed Mar 9, 2013
View
@@ -44,7 +44,7 @@ INCLUDES := -I $(OPENZWAVE)/cpp/src -I $(OPENZWAVE)/cpp/src/command_classes/ \
-I . -I gen-cpp/
# Remove comment below for gnutls support
-GNUTLS := -lgnutls
+#GNUTLS := -lgnutls
LIBZWAVE_STATIC := $(OPENZWAVE)/cpp/lib/linux/libopenzwave.a
LIBZWAVE_DYNAMIC := $(OPENZWAVE)/cpp/lib/linux/libopenzwave.so
View
@@ -92,11 +92,11 @@ def abspath(path)
#
# must load all source files in a single batch (RbGCCXML gets confused otherwise...)
#
+ messages = []
files = [
File.join(Dir.getwd, "gen-cpp", "RemoteManager_server.skeleton.cpp"),
File.join(OZWRoot, 'cpp', "src", "Manager.h")
]
-
puts "Parsing:\n\t" + files.join("\n\t")
RootNode = RbGCCXML.parse(files, :includes => MANAGER_INCLUDES, :cxxflags => "-DHAVE_INTTYPES_H -DHAVE_NETINET_IN_H")
@@ -114,7 +114,7 @@ def abspath(path)
a = RootNode.classes("RemoteManagerHandler").methods.find(:access => :public)
b = RootNode.namespaces("OpenZWave").classes("Manager").methods.find(:access => :public)
- messages = []
+
messages << "RemoteManagerHandler: #{a.entries.size} public methods"
messages << "OpenZWave::Manager: #{b.entries.size} public methods"
messages << " --//-- ignored : #{MANAGER_API_IGNORE.size} methods"
@@ -557,14 +557,14 @@ class RemoteManagerHandler : virtual public RemoteManagerIf {
g_criticalSection.unlock();
}
- void GetValueListSelection_string(Bool_String& _return, const RemoteValueID& _id) {
+ void GetValueListSelection_String(Bool_String& _return, const RemoteValueID& _id) {
Manager* mgr = Manager::Get();
g_criticalSection.lock();
_return.retval = mgr->GetValueListSelection(_id.toValueID(), (std::string*) &_return.o_value);
g_criticalSection.unlock();
}
- void GetValueListSelection_int32(Bool_Int& _return, const RemoteValueID& _id) {
+ void GetValueListSelection_Int32(Bool_Int& _return, const RemoteValueID& _id) {
Manager* mgr = Manager::Get();
g_criticalSection.lock();
_return.retval = mgr->GetValueListSelection(_id.toValueID(), (::int32*) &_return.o_value);
@@ -585,31 +585,31 @@ class RemoteManagerHandler : virtual public RemoteManagerIf {
g_criticalSection.unlock();
}
- bool SetValue_bool(const RemoteValueID& _id, const bool _value) {
+ bool SetValue_Bool(const RemoteValueID& _id, const bool _value) {
Manager* mgr = Manager::Get();
g_criticalSection.lock();
bool function_result = mgr->SetValue(_id.toValueID(), (bool const) _value);
g_criticalSection.unlock();
return(function_result);
}
- bool SetValue_uint8(const RemoteValueID& _id, const int8_t _value) {
+ bool SetValue_UInt8(const RemoteValueID& _id, const int8_t _value) {
Manager* mgr = Manager::Get();
g_criticalSection.lock();
bool function_result = mgr->SetValue(_id.toValueID(), (::uint8 const) _value);
g_criticalSection.unlock();
return(function_result);
}
- bool SetValue_uint8_uint8(const RemoteValueID& _id, const int8_t _value, const int8_t _length) {
+ bool SetValue_UInt8_UInt8(const RemoteValueID& _id, const std::vector<int8_t> & _value, const int8_t _length) {
Manager* mgr = Manager::Get();
g_criticalSection.lock();
bool function_result = mgr->SetValue(_id.toValueID(), (::uint8 const*) &_value, (::uint8 const) _length);
g_criticalSection.unlock();
return(function_result);
}
- bool SetValue_float(const RemoteValueID& _id, const double _value) {
+ bool SetValue_Float(const RemoteValueID& _id, const double _value) {
Manager* mgr = Manager::Get();
g_criticalSection.lock();
bool function_result = mgr->SetValue(_id.toValueID(), (float const) _value);
@@ -633,7 +633,7 @@ class RemoteManagerHandler : virtual public RemoteManagerIf {
return(function_result);
}
- bool SetValue_string(const RemoteValueID& _id, const std::string& _value) {
+ bool SetValue_String(const RemoteValueID& _id, const std::string& _value) {
Manager* mgr = Manager::Get();
g_criticalSection.lock();
bool function_result = mgr->SetValue(_id.toValueID(), (const std::string&) _value);
@@ -1015,7 +1015,7 @@ class RemoteManagerHandler : virtual public RemoteManagerIf {
g_criticalSection.unlock();
}
- void SceneGetValueListSelection_string(Bool_String& _return, const int8_t _sceneId, const RemoteValueID& _valueId) {
+ void SceneGetValueListSelection_String(Bool_String& _return, const int8_t _sceneId, const RemoteValueID& _valueId) {
Manager* mgr = Manager::Get();
g_criticalSection.lock();
_return.retval = mgr->SceneGetValueListSelection((::uint8 const) _sceneId, _valueId.toValueID(), (std::string*) &_return.o_value);
@@ -1069,15 +1069,15 @@ class RemoteManagerHandler : virtual public RemoteManagerIf {
return(function_result);
}
- bool SetSceneValue_string(const int8_t _sceneId, const RemoteValueID& _valueId, const std::string& _value) {
+ bool SetSceneValue_String(const int8_t _sceneId, const RemoteValueID& _valueId, const std::string& _value) {
Manager* mgr = Manager::Get();
g_criticalSection.lock();
bool function_result = mgr->SetSceneValue((::uint8 const) _sceneId, _valueId.toValueID(), (const std::string&) _value);
g_criticalSection.unlock();
return(function_result);
}
- bool SetSceneValueListSelection_string(const int8_t _sceneId, const RemoteValueID& _valueId, const std::string& _value) {
+ bool SetSceneValueListSelection_String(const int8_t _sceneId, const RemoteValueID& _valueId, const std::string& _value) {
Manager* mgr = Manager::Get();
g_criticalSection.lock();
bool function_result = mgr->SetSceneValueListSelection((::uint8 const) _sceneId, _valueId.toValueID(), (const std::string&) _value);
Oops, something went wrong.

0 comments on commit bfa53f4

Please sign in to comment.