Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

create_server.rb: refactored code

  • Loading branch information...
commit 4951e1d95ad1f5ad0acf83b073eae8ef1b20c48c 1 parent b7226f0
Elias Karakoulakis authored
View
60 Main.cpp
@@ -8,6 +8,17 @@
#include <server/TSimpleServer.h>
#include <transport/TServerSocket.h>
#include <transport/TBufferTransports.h>
+#include <string>
+#include <sstream>
+#include <iostream>
+
+//~ template <class T>
+//~ std::string to_string(T t, std::ios_base & (*f)(std::ios_base&))
+//~ {
+ //~ std::ostringstream oss;
+ //~ oss << f << t;
+ //~ return oss.str();
+//~ }
using namespace ::apache::thrift;
using namespace ::apache::thrift::protocol;
@@ -42,8 +53,6 @@ static std::map<uint64, ValueID*> g_values;
// PocoStromp
#include "PocoStomp.h"
-
-
static uint32 g_homeId = 0;
static bool g_initFailed = false;
//
@@ -88,6 +97,8 @@ void OnNotification
void* _context
)
{
+ bool notify_stomp = true;
+
// Must do this inside a critical section to avoid conflicts with the main thread
g_criticalSection.lock();
@@ -107,8 +118,10 @@ void OnNotification
uint64 key = v.GetId();
nodeInfo->m_values[ key] = &v;
// ekarak: also add it to global ValueID map
+ std::cout << "========================= Adding "<<key<<std::hex<< " to g_values..."<<std::endl;
g_values[ key ] = &v;
}
+ //send_valueID = true;
break;
}
@@ -116,11 +129,9 @@ void OnNotification
This only occurs when a node is removed. */
case Notification::Type_ValueRemoved:
{
- if( NodeInfo* nodeInfo = GetNodeInfo( _notification ) )
- {
+ //~ if( NodeInfo* nodeInfo = GetNodeInfo( _notification ) )
+ //~ {
// Remove the value from out list
- // ekarak: no need to iterate a map
- nodeInfo->m_values.erase(_notification->GetValueID().GetId());
//~ for( list<ValueID>::iterator it = nodeInfo->m_values.begin(); it != nodeInfo->m_values.end(); ++it )
//~ {
//~ if( (*it) == _notification->GetValueID() )
@@ -129,14 +140,17 @@ void OnNotification
//~ break;
//~ }
//~ }
- }
+ //~ }
+ //send_valueID = true;
break;
}
/**< A node value has been updated from the Z-Wave network. */
- case Notification::Type_ValueChanged:
+ case Notification::Type_ValueChanged: {
+ //send_valueID = true;
/**< The associations for the node have changed. The application
should rebuild any group information it holds about the node. */
+ }
case Notification::Type_Group:
/**< A new node has been found (not already stored in zwcfg*.xml file) */
case Notification::Type_NodeNew:
@@ -251,25 +265,19 @@ void OnNotification
}
// now we can send the captured event to STOMP queue
- char *val1 = (char*) malloc(10); // notification type
- char *val2 = (char*) malloc(6); // notification byte
- char *val3 = (char*) malloc(14); // ValueID m_id and m_id1 as 64-bit integer
- char *val4 = (char*) malloc(10); // ValueID._homeId
- sprintf(val1, "0x%08x", _notification->GetType());
- sprintf(val2, "0x%02x", _notification->GetByte());
- sprintf(val3, "0x%10x", _notification->GetValueID().GetId()); // uint64 ValueID::GetId()const{ return (uint64) ( ( (uint64)m_id1 << 32 ) | m_id );}
- sprintf(val4, "0x%08x", _notification->GetValueID().GetHomeId()); // uint32 GetHomeId()const{ return m_homeId; }
- //
- STOMP::hdrmap headers;
- headers["NotificationType"] = val1;
- headers["NotificationByte"] = val2;
- headers["NotificationValueID"] = val3;
- headers["NotificationValueHomeID"] = val4;
//
- string empty = "" ;
- stomp_client->send(*notifications_topic, headers, empty);
- //
- free(val1); free(val2); free(val3); free(val4);
+ if (notify_stomp) {
+ STOMP::hdrmap headers;
+ headers["NotificationValueHomeID"] = to_string<uint32_t>(_notification->GetValueID().GetHomeId(), std::hex);
+ headers["NotificationType"] = to_string<uint32_t>(_notification->GetType(), std::hex);
+ headers["NotificationByte"] = to_string<uint8_t>(_notification->GetByte(), std::hex);
+ //if (send_valueID) {
+ headers["NotificationValueID"] = to_string<uint64_t>(_notification->GetValueID().GetId(), std::hex);
+ //}
+ //
+ string empty = "" ;
+ stomp_client->send(*notifications_topic, headers, empty);
+ }
//
g_criticalSection.unlock();
}
View
5 Makefile
@@ -54,7 +54,10 @@ LIBS := $(LIBZWAVE) $(GNUTLS) $(LIBMICROHTTPD) $(LIBTHRIFT) $(LIBUSB) $(LIBPOCO)
all: main
-gen-cpp:
+gen-cpp/RemoteManager_server.cpp: create_server.rb
+ ruby1.9.1 create_server.rb
+
+gen-cpp/RemoteManager.cpp: ozw.thrift
$(THRIFT) --gen cpp ozw.thrift
gen-cpp/RemoteManager.o: gen-cpp/RemoteManager.cpp
View
4 PocoStomp.h
@@ -48,6 +48,8 @@
#include "StompSocket.h"
// helpers
+using namespace std;
+
namespace STOMP {
// a STOMP connection
@@ -89,10 +91,12 @@ namespace STOMP {
// the state machine must be included here (uses the structs above)
#include "Stomp_sm.h"
+// helper template function for pretty-printing just about anything
template <class T>
std::string to_string(T t, std::ios_base & (*f)(std::ios_base&))
{
std::ostringstream oss;
+ oss.setf (ios_base::showbase);
oss << f << t;
return oss.str();
}
View
43 README-ThriftServerCreator.txt
@@ -8,7 +8,7 @@ Requirements:
-------------
Apache Thrift >= 0.7.0
Ruby >= 1.9.1
- RbGCCXML (http://rbplusplus.rubyforge.org/rbgccxml/) >= 1.0.1
+ RbGCCXML (http://rbplusplus.rubyforge.org/rbgccxml/) >= 1.0.2
About the script:
-----------------
@@ -18,7 +18,7 @@ What it lacks though is the "sauce" that binds it to your infrastructure, and wh
This little script is a nice complement to Apache Thrift. All it does is to parse two sets of files: 1) the server skeleton file produced by Thrift, and 2) the headers of the library you want to expose with Thrift. It uses the excellent tool "RbGCCXML" to build an XML-like tree of the two interfaces and binds them together (*ahem* at least it tries to).
-So say you want to expose your shiny app/lib to the world. Only problem is it's API is of monstrous size (hundreds of methods) and you need it quick. Use this script and you can have the skeleton file automatically generate the actual server code for Thrift. And, if you're lucky, you even might compile it without errors!
+So say you want to expose your shiny app/lib to the world. Only problem is it's API is of monstrous size (hundreds of methods) and you need it quick. Use this script and you can have the skeleton file automatically generate the actual server code for Thrift. And, if you're lucky (and the library's API is consistent), you even might compile it without errors!
For example, OpenZWave has a single "Manager" class for interfacing with the rest of the world.
@@ -62,9 +62,44 @@ turns into:
return(function_result);
}
-Got it? S&S (silly and simple....)
+The critical section is needed to serialize access to OZW from the thrift server's thread. Got it? S&S (silly and simple....)
-The produced C++ server file will probably still need some manual tweaking, but that's up to the quality of the library's API. In my case (the OpenZWave library), I only had to write some 15 lines of extra code for 3 methods with "peculiar" arguments.
+The produced C++ server file will probably still need some manual tweaking, but that's up to the quality of the library's API. In my case (the OpenZWave library), I only had to write some 15 lines of extra code for 3 methods with "peculiar" arguments.
+
+For instance, there's the "Manager::GetNodeNeighbors" method:
+(uint32 GetNodeNeighbors( uint32 const _homeId, uint8 const _nodeId, uint8** _nodeNeighbors );
+
+Look at the last argument: am I dreaming?? a double star in C++?? The method is a C-style call to get a bitmap of node neighbors, its return value is the size of the array pointed by _nodeNeighbors. If the map is empty, you don't need to delete the map. so does the API say.
+
+Its thrift definition is:
+struct UInt32_ListByte {
+ 1:i32 retval;
+ 2:list<byte> _nodeNeighbors;
+}
+UInt32_ListByte GetNodeNeighbors( 1:i32 _homeId, 2:byte _nodeId);
+
+And the produced Thrift server code for C++ is:
+
+ void GetNodeNeighbors(UInt32_ListByte& _return, const int32_t _homeId, const int8_t _nodeId) {
+ Manager* mgr = Manager::Get();
+ g_criticalSection.lock();
+ _return.retval = mgr->GetNodeNeighbors((::uint32 const) _homeId, (::uint8 const) _nodeId, (::uint8**) &_return._nodeNeighbors); // ERROR, vector<uint8> is not uint8**
+ g_criticalSection.unlock();
+ }
+
+The create_server.rb script tried to cast a vector<uint8> to the _nodeNeighbors argument but it will fail because the method is expecting a plain-old C-style pointer to pointer of uint8. Alas, you have to manually write a simple iterator.
+
+ void GetNodeNeighbors(UInt32_ListByte& _return, const int32_t _homeId, const int8_t _nodeId) {
+ uint8* arr;
+ Manager* mgr = Manager::Get();
+ g_criticalSection.lock();
+ _return.retval = mgr->GetNodeNeighbors((::uint32 const) _homeId, (::uint8 const) _nodeId, (::uint8**) &arr);
+ g_criticalSection.unlock();
+ if (_return.retval > 0) {
+ for (int i=0; i<_return.retval; i++) _return._nodeNeighbors.push_back(arr[i]);
+ delete arr;
+ }
+ }
View
127 create_server.rb
@@ -24,7 +24,7 @@
#
files = [
"/home/ekarak/ozw/thrift4ozw/gen-cpp/RemoteManager_server.skeleton.cpp",
- "/home/ekarak/ozw/open-zwave-read-only/cpp/src/Manager.cpp"
+ "/home/ekarak/ozw/open-zwave-read-only/cpp/src/Manager.h"
]
puts "Parsing:" + files.join("\n\t")
RootNode = RbGCCXML.parse(files, :includes => MANAGER_INCLUDES)
@@ -43,6 +43,10 @@ def ValueID_converter(arg)
#lineno = foo.classes("RemoteManagerHandler").constructors[1]['endline'].to_i
#output[lineno] = Converter
+a = RootNode.classes("RemoteManagerHandler").methods.find(:access => :public)
+b = RootNode.namespaces("OpenZWave").classes("Manager").methods.find(:access => :public)
+puts "RemoteManagerHandler: #{a.size} public methods, OpenZWave::Manager: #{b.size} public methods"
+
RootNode.classes("RemoteManagerHandler").methods.each { |meth|
# find line number, insert critical section enter code
lineno = meth['line'].to_i
@@ -107,85 +111,80 @@ def ValueID_converter(arg)
# (C++) bool GetValueListItems( ValueID const& _id, vector<string>* o_value );
# (thrift) Bool_ListString GetValueListItems( 1:RemoteValueID _id );
# (skeleton) void GetValueListItems(Bool_ListString& _return, const RemoteValueID _id)
- # ozw_types.h:class Bool_ListString {
+ # where the Thrift definition for Bool_ListString is:
+ # (ozw_types.h):class Bool_ListString {
# bool retval;
# std::vector<std::string> arg;
# }
#
- # is the skeleton function's return type composite?
- composite_return = false
- #
- function_return_clause = ''
#
- returnarg = nil
+ # STEP 1. Map arguments from target (OpenZWave::Manager) to source (skeleton server)
#
- last_argument = nil
-
- # gather all required arguments
- # key = target_method_argument (RbGCCXML::Node)
- # value => source argument cpp definition (string) - e.g. "(cast) argname"
-
- #arr = target_method.arguments.map {|tma| meth.arguments.select { |a| a.name == tma.name}[0]}
-
- args = {} # source node => target node
- meth.arguments.each {|a| args[a] = target_method.arguments.select { |tma| a.name == tma.name}[0]}
+ argmap = {}
+ # KEY: target argument node
+ # VALUE: hash with
+ # :descriptor => source argument DESCRIPTOR STRING (eg "_return._className")
+ # :node => the actual source argument node (Argument or Field)
+ target_method.arguments.each {|a|
+ # 1) match directly by name
+ if (arg = meth.arguments.find(:name => a.name )).is_a?RbGCCXML::Argument then
+ argmap[a] = {}
+ argmap[a][:descriptor] = arg.name
+ argmap[a][:node] = arg
+ # 2) else, match as a member of Thrift's special "_return" argument (class struct)
+ elsif (_ret = meth.arguments.find(:name => "_return" )) and (_ret.cpp_type.base_type.is_a?RbGCCXML::Class) and
+ (arg = _ret.cpp_type.base_type.variables.find(:name => a.name)).is_a?RbGCCXML::Field then
+ argmap[a] = {}
+ argmap[a][:descriptor] = "_return.#{a.name}"
+ argmap[a][:node] = arg
+ else
+ raise ("Reverse argument mapping: couldn't resolve argument '#{a.name}' in method '#{target_method.name}'!!!")
+ end
+ }
#
- # create the function call
+ # STEP 2. Resolve the function call's return clause
#
- arg_array = []
+ function_return_clause = ''
+ if (_return = meth.arguments.find(:name => '_return')).is_a?RbGCCXML::Argument then
+ puts "Thrift special _return argument detected!" if $DEBUG
+ if (_return.cpp_type.base_type.is_a?RbGCCXML::Class) and
+ (retval = _return.cpp_type.base_type.variables.find(:name => 'retval')) and
+ (retval.is_a?RbGCCXML::Field) then
+ function_return_clause = "_return.retval = "
+ else
+ unless meth.return_type.name == "void" then
+ function_return_clause = "_return = "
+ end
+ end
+ end
+
#
- meth.arguments.each { | src_arg|
- tgt_arg= args[src_arg]
- puts "src=#{src_arg and src_arg.qualified_name} \t tgt=#{tgt_arg and tgt_arg.qualified_name}"
-
- if tgt_arg then # argument names matched
+ # STEP 3. Prepare argument array (ordered by target_method's argument order)
+ #
+ arg_array = []
+ target_method.arguments.each { |tgt_arg|
+ if (hsh = argmap[tgt_arg]) then
+ src_arg = hsh[:node]
+ descriptor = hsh[:descriptor]
+ #puts " src=#{descriptor}\ttgt=#{tgt_arg.qualified_name}"
ampersand = (tgt_arg.cpp_type.to_cpp.include?('*') ? '&' : '')
- # maybe it's an OpenZWave::ValueID ???
- if (tgt_arg.to_cpp =~ /ValueID/) then
- arg_array << ValueID_converter(src_arg.name)
- else
- arg_array << "(#{tgt_arg.cpp_type.to_cpp}) #{ampersand}#{src_arg.name}"
- end
- else # source argument not found by name, search elsewhere
- puts "method #{meth.name}, argument #{src_arg.name} not found by name..."
- # 1) try searching through thrift's special '_return' argument (if there is one)
- if (returnarg = meth.arguments.select{ |a| a.name == "_return"}[0]).is_a?(RbGCCXML::Argument) then
- puts "Thrift special _return argument detected!"
- last_argument_type = target_method.arguments[-1].cpp_type.to_cpp
- ampersand = (last_argument_type.include?('*') ? '&' : '')
- if md = OverloadedRE.match(returnarg.cpp_type.to_cpp) then
- # ...and it's a complex type (Thrift struct)
- # 1st match is the function's return type
- composite_return = true
- function_return_clause = " _return.retval = "
- # 2nd match is function's last argument type
- last_argument = "(#{last_argument_type}) #{ampersand}_return#{composite_return ? '.arg' : ''}"
+ case src_arg.to_cpp
+ when /ValueID/
+ arg_array << ValueID_converter(descriptor)
else
- # _return is a simple data type used
- if meth.return_type.name == "void" then
- #_return is used as the main function return clause
- function_return_clause = " _return = "
- else
- # _return is the last argument to target function
- last_argument = "(#{last_argument_type}) #{ampersand}_return"
- end
- end
- else
- raise "ERROR:couldn't match argument '#{src_arg.name}' in method '#{meth.name}'!!!"
+ arg_array << "(#{tgt_arg.cpp_type.to_cpp}) #{ampersand}#{descriptor}"
+ size_src = src_arg.cpp_type.base_type['size'].to_i
+ size_tgt = tgt_arg.cpp_type.base_type['size'].to_i
+ # sanity check
+ puts "WARNING!!! method '#{meth.name}': Argument '#{descriptor}' size mismatch (src=#{size_src} tgt=#{size_tgt}) - CHECK GENERATED CODE!" unless size_src == size_tgt
end
end
}
-
- # add last argument to array (it's about time...)
- arg_array << last_argument
- # unleash the beast
+
+ # Unleash the beast!
fcall = "#{function_return_clause} mgr->#{target_method.name}(#{arg_array.compact.join(', ')})"
-
- #
- # FUNCTION RETURN CLAUSE
- #
case meth.return_type.name
when "void"
output[lineno+1] = "\t#{fcall};\n"
@@ -205,4 +204,6 @@ def ValueID_converter(arg)
output[0] = "// Automatically generated OpenZWave::Manager_server wrapper\n"
output[1] = "// (c) 2011 Elias Karakoulakis <elias.karakoulakis@gmail.com>\n"
# write out the generated file
+puts "Writing generated server...."
File.new("gen-cpp/RemoteManager_server.cpp", File::CREAT|File::TRUNC|File::RDWR, 0644) << output.join
+puts "Done!"
View
750 gen-cpp/RemoteManager.cpp
@@ -460,6 +460,164 @@ uint32_t RemoteManager_IsPrimaryController_presult::read(::apache::thrift::proto
return xfer;
}
+uint32_t RemoteManager_IsStaticUpdateController_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+ uint32_t xfer = 0;
+ std::string fname;
+ ::apache::thrift::protocol::TType ftype;
+ int16_t fid;
+
+ xfer += iprot->readStructBegin(fname);
+
+ using ::apache::thrift::protocol::TProtocolException;
+
+
+ while (true)
+ {
+ xfer += iprot->readFieldBegin(fname, ftype, fid);
+ if (ftype == ::apache::thrift::protocol::T_STOP) {
+ break;
+ }
+ switch (fid)
+ {
+ case 1:
+ if (ftype == ::apache::thrift::protocol::T_I32) {
+ xfer += iprot->readI32(this->_homeId);
+ this->__isset._homeId = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ default:
+ xfer += iprot->skip(ftype);
+ break;
+ }
+ xfer += iprot->readFieldEnd();
+ }
+
+ xfer += iprot->readStructEnd();
+
+ return xfer;
+}
+
+uint32_t RemoteManager_IsStaticUpdateController_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+ uint32_t xfer = 0;
+ xfer += oprot->writeStructBegin("RemoteManager_IsStaticUpdateController_args");
+ xfer += oprot->writeFieldBegin("_homeId", ::apache::thrift::protocol::T_I32, 1);
+ xfer += oprot->writeI32(this->_homeId);
+ xfer += oprot->writeFieldEnd();
+ xfer += oprot->writeFieldStop();
+ xfer += oprot->writeStructEnd();
+ return xfer;
+}
+
+uint32_t RemoteManager_IsStaticUpdateController_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+ uint32_t xfer = 0;
+ xfer += oprot->writeStructBegin("RemoteManager_IsStaticUpdateController_pargs");
+ xfer += oprot->writeFieldBegin("_homeId", ::apache::thrift::protocol::T_I32, 1);
+ xfer += oprot->writeI32((*(this->_homeId)));
+ xfer += oprot->writeFieldEnd();
+ xfer += oprot->writeFieldStop();
+ xfer += oprot->writeStructEnd();
+ return xfer;
+}
+
+uint32_t RemoteManager_IsStaticUpdateController_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+ uint32_t xfer = 0;
+ std::string fname;
+ ::apache::thrift::protocol::TType ftype;
+ int16_t fid;
+
+ xfer += iprot->readStructBegin(fname);
+
+ using ::apache::thrift::protocol::TProtocolException;
+
+
+ while (true)
+ {
+ xfer += iprot->readFieldBegin(fname, ftype, fid);
+ if (ftype == ::apache::thrift::protocol::T_STOP) {
+ break;
+ }
+ switch (fid)
+ {
+ case 0:
+ if (ftype == ::apache::thrift::protocol::T_BOOL) {
+ xfer += iprot->readBool(this->success);
+ this->__isset.success = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ default:
+ xfer += iprot->skip(ftype);
+ break;
+ }
+ xfer += iprot->readFieldEnd();
+ }
+
+ xfer += iprot->readStructEnd();
+
+ return xfer;
+}
+
+uint32_t RemoteManager_IsStaticUpdateController_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+
+ uint32_t xfer = 0;
+
+ xfer += oprot->writeStructBegin("RemoteManager_IsStaticUpdateController_result");
+
+ if (this->__isset.success) {
+ xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_BOOL, 0);
+ xfer += oprot->writeBool(this->success);
+ xfer += oprot->writeFieldEnd();
+ }
+ xfer += oprot->writeFieldStop();
+ xfer += oprot->writeStructEnd();
+ return xfer;
+}
+
+uint32_t RemoteManager_IsStaticUpdateController_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+ uint32_t xfer = 0;
+ std::string fname;
+ ::apache::thrift::protocol::TType ftype;
+ int16_t fid;
+
+ xfer += iprot->readStructBegin(fname);
+
+ using ::apache::thrift::protocol::TProtocolException;
+
+
+ while (true)
+ {
+ xfer += iprot->readFieldBegin(fname, ftype, fid);
+ if (ftype == ::apache::thrift::protocol::T_STOP) {
+ break;
+ }
+ switch (fid)
+ {
+ case 0:
+ if (ftype == ::apache::thrift::protocol::T_BOOL) {
+ xfer += iprot->readBool((*(this->success)));
+ this->__isset.success = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ default:
+ xfer += iprot->skip(ftype);
+ break;
+ }
+ xfer += iprot->readFieldEnd();
+ }
+
+ xfer += iprot->readStructEnd();
+
+ return xfer;
+}
+
uint32_t RemoteManager_IsBridgeController_args::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
@@ -6371,18 +6529,182 @@ uint32_t RemoteManager_SetNodeLevel_result::read(::apache::thrift::protocol::TPr
return xfer;
}
-uint32_t RemoteManager_SetNodeLevel_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t RemoteManager_SetNodeLevel_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+
+ uint32_t xfer = 0;
+
+ xfer += oprot->writeStructBegin("RemoteManager_SetNodeLevel_result");
+
+ xfer += oprot->writeFieldStop();
+ xfer += oprot->writeStructEnd();
+ return xfer;
+}
+
+uint32_t RemoteManager_SetNodeLevel_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+ uint32_t xfer = 0;
+ std::string fname;
+ ::apache::thrift::protocol::TType ftype;
+ int16_t fid;
+
+ xfer += iprot->readStructBegin(fname);
+
+ using ::apache::thrift::protocol::TProtocolException;
+
+
+ while (true)
+ {
+ xfer += iprot->readFieldBegin(fname, ftype, fid);
+ if (ftype == ::apache::thrift::protocol::T_STOP) {
+ break;
+ }
+ switch (fid)
+ {
+ default:
+ xfer += iprot->skip(ftype);
+ break;
+ }
+ xfer += iprot->readFieldEnd();
+ }
+
+ xfer += iprot->readStructEnd();
+
+ return xfer;
+}
+
+uint32_t RemoteManager_IsNodeInfoReceived_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+ uint32_t xfer = 0;
+ std::string fname;
+ ::apache::thrift::protocol::TType ftype;
+ int16_t fid;
+
+ xfer += iprot->readStructBegin(fname);
+
+ using ::apache::thrift::protocol::TProtocolException;
+
+
+ while (true)
+ {
+ xfer += iprot->readFieldBegin(fname, ftype, fid);
+ if (ftype == ::apache::thrift::protocol::T_STOP) {
+ break;
+ }
+ switch (fid)
+ {
+ case 1:
+ if (ftype == ::apache::thrift::protocol::T_I32) {
+ xfer += iprot->readI32(this->_homeId);
+ this->__isset._homeId = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 2:
+ if (ftype == ::apache::thrift::protocol::T_BYTE) {
+ xfer += iprot->readByte(this->_nodeId);
+ this->__isset._nodeId = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ default:
+ xfer += iprot->skip(ftype);
+ break;
+ }
+ xfer += iprot->readFieldEnd();
+ }
+
+ xfer += iprot->readStructEnd();
+
+ return xfer;
+}
+
+uint32_t RemoteManager_IsNodeInfoReceived_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+ uint32_t xfer = 0;
+ xfer += oprot->writeStructBegin("RemoteManager_IsNodeInfoReceived_args");
+ xfer += oprot->writeFieldBegin("_homeId", ::apache::thrift::protocol::T_I32, 1);
+ xfer += oprot->writeI32(this->_homeId);
+ xfer += oprot->writeFieldEnd();
+ xfer += oprot->writeFieldBegin("_nodeId", ::apache::thrift::protocol::T_BYTE, 2);
+ xfer += oprot->writeByte(this->_nodeId);
+ xfer += oprot->writeFieldEnd();
+ xfer += oprot->writeFieldStop();
+ xfer += oprot->writeStructEnd();
+ return xfer;
+}
+
+uint32_t RemoteManager_IsNodeInfoReceived_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+ uint32_t xfer = 0;
+ xfer += oprot->writeStructBegin("RemoteManager_IsNodeInfoReceived_pargs");
+ xfer += oprot->writeFieldBegin("_homeId", ::apache::thrift::protocol::T_I32, 1);
+ xfer += oprot->writeI32((*(this->_homeId)));
+ xfer += oprot->writeFieldEnd();
+ xfer += oprot->writeFieldBegin("_nodeId", ::apache::thrift::protocol::T_BYTE, 2);
+ xfer += oprot->writeByte((*(this->_nodeId)));
+ xfer += oprot->writeFieldEnd();
+ xfer += oprot->writeFieldStop();
+ xfer += oprot->writeStructEnd();
+ return xfer;
+}
+
+uint32_t RemoteManager_IsNodeInfoReceived_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+ uint32_t xfer = 0;
+ std::string fname;
+ ::apache::thrift::protocol::TType ftype;
+ int16_t fid;
+
+ xfer += iprot->readStructBegin(fname);
+
+ using ::apache::thrift::protocol::TProtocolException;
+
+
+ while (true)
+ {
+ xfer += iprot->readFieldBegin(fname, ftype, fid);
+ if (ftype == ::apache::thrift::protocol::T_STOP) {
+ break;
+ }
+ switch (fid)
+ {
+ case 0:
+ if (ftype == ::apache::thrift::protocol::T_BOOL) {
+ xfer += iprot->readBool(this->success);
+ this->__isset.success = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ default:
+ xfer += iprot->skip(ftype);
+ break;
+ }
+ xfer += iprot->readFieldEnd();
+ }
+
+ xfer += iprot->readStructEnd();
+
+ return xfer;
+}
+
+uint32_t RemoteManager_IsNodeInfoReceived_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("RemoteManager_SetNodeLevel_result");
+ xfer += oprot->writeStructBegin("RemoteManager_IsNodeInfoReceived_result");
+ if (this->__isset.success) {
+ xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_BOOL, 0);
+ xfer += oprot->writeBool(this->success);
+ xfer += oprot->writeFieldEnd();
+ }
xfer += oprot->writeFieldStop();
xfer += oprot->writeStructEnd();
return xfer;
}
-uint32_t RemoteManager_SetNodeLevel_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t RemoteManager_IsNodeInfoReceived_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -6402,6 +6724,14 @@ uint32_t RemoteManager_SetNodeLevel_presult::read(::apache::thrift::protocol::TP
}
switch (fid)
{
+ case 0:
+ if (ftype == ::apache::thrift::protocol::T_BOOL) {
+ xfer += iprot->readBool((*(this->success)));
+ this->__isset.success = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
default:
xfer += iprot->skip(ftype);
break;
@@ -6414,7 +6744,7 @@ uint32_t RemoteManager_SetNodeLevel_presult::read(::apache::thrift::protocol::TP
return xfer;
}
-uint32_t RemoteManager_IsNodeInfoReceived_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t RemoteManager_GetNodeClassInformation_args::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -6450,6 +6780,14 @@ uint32_t RemoteManager_IsNodeInfoReceived_args::read(::apache::thrift::protocol:
xfer += iprot->skip(ftype);
}
break;
+ case 3:
+ if (ftype == ::apache::thrift::protocol::T_BYTE) {
+ xfer += iprot->readByte(this->_commandClassId);
+ this->__isset._commandClassId = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
default:
xfer += iprot->skip(ftype);
break;
@@ -6462,35 +6800,41 @@ uint32_t RemoteManager_IsNodeInfoReceived_args::read(::apache::thrift::protocol:
return xfer;
}
-uint32_t RemoteManager_IsNodeInfoReceived_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t RemoteManager_GetNodeClassInformation_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("RemoteManager_IsNodeInfoReceived_args");
+ xfer += oprot->writeStructBegin("RemoteManager_GetNodeClassInformation_args");
xfer += oprot->writeFieldBegin("_homeId", ::apache::thrift::protocol::T_I32, 1);
xfer += oprot->writeI32(this->_homeId);
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldBegin("_nodeId", ::apache::thrift::protocol::T_BYTE, 2);
xfer += oprot->writeByte(this->_nodeId);
xfer += oprot->writeFieldEnd();
+ xfer += oprot->writeFieldBegin("_commandClassId", ::apache::thrift::protocol::T_BYTE, 3);
+ xfer += oprot->writeByte(this->_commandClassId);
+ xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldStop();
xfer += oprot->writeStructEnd();
return xfer;
}
-uint32_t RemoteManager_IsNodeInfoReceived_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t RemoteManager_GetNodeClassInformation_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("RemoteManager_IsNodeInfoReceived_pargs");
+ xfer += oprot->writeStructBegin("RemoteManager_GetNodeClassInformation_pargs");
xfer += oprot->writeFieldBegin("_homeId", ::apache::thrift::protocol::T_I32, 1);
xfer += oprot->writeI32((*(this->_homeId)));
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldBegin("_nodeId", ::apache::thrift::protocol::T_BYTE, 2);
xfer += oprot->writeByte((*(this->_nodeId)));
xfer += oprot->writeFieldEnd();
+ xfer += oprot->writeFieldBegin("_commandClassId", ::apache::thrift::protocol::T_BYTE, 3);
+ xfer += oprot->writeByte((*(this->_commandClassId)));
+ xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldStop();
xfer += oprot->writeStructEnd();
return xfer;
}
-uint32_t RemoteManager_IsNodeInfoReceived_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t RemoteManager_GetNodeClassInformation_result::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -6511,8 +6855,8 @@ uint32_t RemoteManager_IsNodeInfoReceived_result::read(::apache::thrift::protoco
switch (fid)
{
case 0:
- if (ftype == ::apache::thrift::protocol::T_BOOL) {
- xfer += iprot->readBool(this->success);
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->success.read(iprot);
this->__isset.success = true;
} else {
xfer += iprot->skip(ftype);
@@ -6530,15 +6874,15 @@ uint32_t RemoteManager_IsNodeInfoReceived_result::read(::apache::thrift::protoco
return xfer;
}
-uint32_t RemoteManager_IsNodeInfoReceived_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t RemoteManager_GetNodeClassInformation_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("RemoteManager_IsNodeInfoReceived_result");
+ xfer += oprot->writeStructBegin("RemoteManager_GetNodeClassInformation_result");
if (this->__isset.success) {
- xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_BOOL, 0);
- xfer += oprot->writeBool(this->success);
+ xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_STRUCT, 0);
+ xfer += this->success.write(oprot);
xfer += oprot->writeFieldEnd();
}
xfer += oprot->writeFieldStop();
@@ -6546,7 +6890,7 @@ uint32_t RemoteManager_IsNodeInfoReceived_result::write(::apache::thrift::protoc
return xfer;
}
-uint32_t RemoteManager_IsNodeInfoReceived_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t RemoteManager_GetNodeClassInformation_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -6567,8 +6911,8 @@ uint32_t RemoteManager_IsNodeInfoReceived_presult::read(::apache::thrift::protoc
switch (fid)
{
case 0:
- if (ftype == ::apache::thrift::protocol::T_BOOL) {
- xfer += iprot->readBool((*(this->success)));
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += (*(this->success)).read(iprot);
this->__isset.success = true;
} else {
xfer += iprot->skip(ftype);
@@ -13343,20 +13687,8 @@ uint32_t RemoteManager_GetAssociations_result::read(::apache::thrift::protocol::
switch (fid)
{
case 0:
- if (ftype == ::apache::thrift::protocol::T_LIST) {
- {
- this->success.clear();
- uint32_t _size12;
- ::apache::thrift::protocol::TType _etype15;
- iprot->readListBegin(_etype15, _size12);
- this->success.resize(_size12);
- uint32_t _i16;
- for (_i16 = 0; _i16 < _size12; ++_i16)
- {
- xfer += iprot->readByte(this->success[_i16]);
- }
- iprot->readListEnd();
- }
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->success.read(iprot);
this->__isset.success = true;
} else {
xfer += iprot->skip(ftype);
@@ -13381,16 +13713,8 @@ uint32_t RemoteManager_GetAssociations_result::write(::apache::thrift::protocol:
xfer += oprot->writeStructBegin("RemoteManager_GetAssociations_result");
if (this->__isset.success) {
- xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
- {
- xfer += oprot->writeListBegin(::apache::thrift::protocol::T_BYTE, static_cast<uint32_t>(this->success.size()));
- std::vector<int8_t> ::const_iterator _iter17;
- for (_iter17 = this->success.begin(); _iter17 != this->success.end(); ++_iter17)
- {
- xfer += oprot->writeByte((*_iter17));
- }
- xfer += oprot->writeListEnd();
- }
+ xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_STRUCT, 0);
+ xfer += this->success.write(oprot);
xfer += oprot->writeFieldEnd();
}
xfer += oprot->writeFieldStop();
@@ -13419,20 +13743,8 @@ uint32_t RemoteManager_GetAssociations_presult::read(::apache::thrift::protocol:
switch (fid)
{
case 0:
- if (ftype == ::apache::thrift::protocol::T_LIST) {
- {
- (*(this->success)).clear();
- uint32_t _size18;
- ::apache::thrift::protocol::TType _etype21;
- iprot->readListBegin(_etype21, _size18);
- (*(this->success)).resize(_size18);
- uint32_t _i22;
- for (_i22 = 0; _i22 < _size18; ++_i22)
- {
- xfer += iprot->readByte((*(this->success))[_i22]);
- }
- iprot->readListEnd();
- }
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += (*(this->success)).read(iprot);
this->__isset.success = true;
} else {
xfer += iprot->skip(ftype);
@@ -14667,20 +14979,8 @@ uint32_t RemoteManager_GetAllScenes_result::read(::apache::thrift::protocol::TPr
switch (fid)
{
case 0:
- if (ftype == ::apache::thrift::protocol::T_LIST) {
- {
- this->success.clear();
- uint32_t _size23;
- ::apache::thrift::protocol::TType _etype26;
- iprot->readListBegin(_etype26, _size23);
- this->success.resize(_size23);
- uint32_t _i27;
- for (_i27 = 0; _i27 < _size23; ++_i27)
- {
- xfer += iprot->readByte(this->success[_i27]);
- }
- iprot->readListEnd();
- }
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->success.read(iprot);
this->__isset.success = true;
} else {
xfer += iprot->skip(ftype);
@@ -14705,16 +15005,8 @@ uint32_t RemoteManager_GetAllScenes_result::write(::apache::thrift::protocol::TP
xfer += oprot->writeStructBegin("RemoteManager_GetAllScenes_result");
if (this->__isset.success) {
- xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
- {
- xfer += oprot->writeListBegin(::apache::thrift::protocol::T_BYTE, static_cast<uint32_t>(this->success.size()));
- std::vector<int8_t> ::const_iterator _iter28;
- for (_iter28 = this->success.begin(); _iter28 != this->success.end(); ++_iter28)
- {
- xfer += oprot->writeByte((*_iter28));
- }
- xfer += oprot->writeListEnd();
- }
+ xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_STRUCT, 0);
+ xfer += this->success.write(oprot);
xfer += oprot->writeFieldEnd();
}
xfer += oprot->writeFieldStop();
@@ -14743,20 +15035,8 @@ uint32_t RemoteManager_GetAllScenes_presult::read(::apache::thrift::protocol::TP
switch (fid)
{
case 0:
- if (ftype == ::apache::thrift::protocol::T_LIST) {
- {
- (*(this->success)).clear();
- uint32_t _size29;
- ::apache::thrift::protocol::TType _etype32;
- iprot->readListBegin(_etype32, _size29);
- (*(this->success)).resize(_size29);
- uint32_t _i33;
- for (_i33 = 0; _i33 < _size29; ++_i33)
- {
- xfer += iprot->readByte((*(this->success))[_i33]);
- }
- iprot->readListEnd();
- }
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += (*(this->success)).read(iprot);
this->__isset.success = true;
} else {
xfer += iprot->skip(ftype);
@@ -16819,20 +17099,8 @@ uint32_t RemoteManager_SceneGetValues_result::read(::apache::thrift::protocol::T
switch (fid)
{
case 0:
- if (ftype == ::apache::thrift::protocol::T_LIST) {
- {
- this->success.clear();
- uint32_t _size34;
- ::apache::thrift::protocol::TType _etype37;
- iprot->readListBegin(_etype37, _size34);
- this->success.resize(_size34);
- uint32_t _i38;
- for (_i38 = 0; _i38 < _size34; ++_i38)
- {
- xfer += iprot->readI64(this->success[_i38]);
- }
- iprot->readListEnd();
- }
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->success.read(iprot);
this->__isset.success = true;
} else {
xfer += iprot->skip(ftype);
@@ -16857,16 +17125,8 @@ uint32_t RemoteManager_SceneGetValues_result::write(::apache::thrift::protocol::
xfer += oprot->writeStructBegin("RemoteManager_SceneGetValues_result");
if (this->__isset.success) {
- xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
- {
- xfer += oprot->writeListBegin(::apache::thrift::protocol::T_I64, static_cast<uint32_t>(this->success.size()));
- std::vector<RemoteValueID> ::const_iterator _iter39;
- for (_iter39 = this->success.begin(); _iter39 != this->success.end(); ++_iter39)
- {
- xfer += oprot->writeI64((*_iter39));
- }
- xfer += oprot->writeListEnd();
- }
+ xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_STRUCT, 0);
+ xfer += this->success.write(oprot);
xfer += oprot->writeFieldEnd();
}
xfer += oprot->writeFieldStop();
@@ -16895,20 +17155,8 @@ uint32_t RemoteManager_SceneGetValues_presult::read(::apache::thrift::protocol::
switch (fid)
{
case 0:
- if (ftype == ::apache::thrift::protocol::T_LIST) {
- {
- (*(this->success)).clear();
- uint32_t _size40;
- ::apache::thrift::protocol::TType _etype43;
- iprot->readListBegin(_etype43, _size40);
- (*(this->success)).resize(_size40);
- uint32_t _i44;
- for (_i44 = 0; _i44 < _size40; ++_i44)
- {
- xfer += iprot->readI64((*(this->success))[_i44]);
- }
- iprot->readListEnd();
- }
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += (*(this->success)).read(iprot);
this->__isset.success = true;
} else {
xfer += iprot->skip(ftype);
@@ -20584,6 +20832,64 @@ bool RemoteManagerClient::recv_IsPrimaryController()
throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "IsPrimaryController failed: unknown result");
}
+bool RemoteManagerClient::IsStaticUpdateController(const int32_t _homeId)
+{
+ send_IsStaticUpdateController(_homeId);
+ return recv_IsStaticUpdateController();
+}
+
+void RemoteManagerClient::send_IsStaticUpdateController(const int32_t _homeId)
+{
+ int32_t cseqid = 0;
+ oprot_->writeMessageBegin("IsStaticUpdateController", ::apache::thrift::protocol::T_CALL, cseqid);
+
+ RemoteManager_IsStaticUpdateController_pargs args;
+ args._homeId = &_homeId;
+ args.write(oprot_);
+
+ oprot_->writeMessageEnd();
+ oprot_->getTransport()->writeEnd();
+ oprot_->getTransport()->flush();
+}
+
+bool RemoteManagerClient::recv_IsStaticUpdateController()
+{
+
+ int32_t rseqid = 0;
+ std::string fname;
+ ::apache::thrift::protocol::TMessageType mtype;
+
+ iprot_->readMessageBegin(fname, mtype, rseqid);
+ if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+ ::apache::thrift::TApplicationException x;
+ x.read(iprot_);
+ iprot_->readMessageEnd();
+ iprot_->getTransport()->readEnd();
+ throw x;
+ }
+ if (mtype != ::apache::thrift::protocol::T_REPLY) {
+ iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+ iprot_->readMessageEnd();
+ iprot_->getTransport()->readEnd();
+ }
+ if (fname.compare("IsStaticUpdateController") != 0) {
+ iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+ iprot_->readMessageEnd();
+ iprot_->getTransport()->readEnd();
+ }
+ bool _return;
+ RemoteManager_IsStaticUpdateController_presult result;
+ result.success = &_return;
+ result.read(iprot_);
+ iprot_->readMessageEnd();
+ iprot_->getTransport()->readEnd();
+
+ if (result.__isset.success) {
+ return _return;
+ }
+ throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "IsStaticUpdateController failed: unknown result");
+}
+
bool RemoteManagerClient::IsBridgeController(const int32_t _homeId)
{
send_IsBridgeController(_homeId);
@@ -22722,6 +23028,66 @@ bool RemoteManagerClient::recv_IsNodeInfoReceived()
throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "IsNodeInfoReceived failed: unknown result");
}
+void RemoteManagerClient::GetNodeClassInformation(Bool_GetNodeClassInformation& _return, const int32_t _homeId, const int8_t _nodeId, const int8_t _commandClassId)
+{
+ send_GetNodeClassInformation(_homeId, _nodeId, _commandClassId);
+ recv_GetNodeClassInformation(_return);
+}
+
+void RemoteManagerClient::send_GetNodeClassInformation(const int32_t _homeId, const int8_t _nodeId, const int8_t _commandClassId)
+{
+ int32_t cseqid = 0;
+ oprot_->writeMessageBegin("GetNodeClassInformation", ::apache::thrift::protocol::T_CALL, cseqid);
+
+ RemoteManager_GetNodeClassInformation_pargs args;
+ args._homeId = &_homeId;
+ args._nodeId = &_nodeId;
+ args._commandClassId = &_commandClassId;
+ args.write(oprot_);
+
+ oprot_->writeMessageEnd();
+ oprot_->getTransport()->writeEnd();
+ oprot_->getTransport()->flush();
+}
+
+void RemoteManagerClient::recv_GetNodeClassInformation(Bool_GetNodeClassInformation& _return)
+{
+
+ int32_t rseqid = 0;
+ std::string fname;
+ ::apache::thrift::protocol::TMessageType mtype;
+
+ iprot_->readMessageBegin(fname, mtype, rseqid);
+ if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+ ::apache::thrift::TApplicationException x;
+ x.read(iprot_);
+ iprot_->readMessageEnd();
+ iprot_->getTransport()->readEnd();
+ throw x;
+ }
+ if (mtype != ::apache::thrift::protocol::T_REPLY) {
+ iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+ iprot_->readMessageEnd();
+ iprot_->getTransport()->readEnd();
+ }
+ if (fname.compare("GetNodeClassInformation") != 0) {
+ iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+ iprot_->readMessageEnd();
+ iprot_->getTransport()->readEnd();
+ }
+ RemoteManager_GetNodeClassInformation_presult result;
+ result.success = &_return;
+ result.read(iprot_);
+ iprot_->readMessageEnd();
+ iprot_->getTransport()->readEnd();
+
+ if (result.__isset.success) {
+ // _return pointer has now been filled
+ return;
+ }
+ throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "GetNodeClassInformation failed: unknown result");
+}
+
void RemoteManagerClient::GetValueLabel(std::string& _return, const RemoteValueID _id)
{
send_GetValueLabel(_id);
@@ -25084,7 +25450,7 @@ int8_t RemoteManagerClient::recv_GetNumGroups()
throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "GetNumGroups failed: unknown result");
}
-void RemoteManagerClient::GetAssociations(std::vector<int8_t> & _return, const int32_t _homeId, const int8_t _nodeId, const int8_t _groupIdx)
+void RemoteManagerClient::GetAssociations(GetAssociationsReturnStruct& _return, const int32_t _homeId, const int8_t _nodeId, const int8_t _groupIdx)
{
send_GetAssociations(_homeId, _nodeId, _groupIdx);
recv_GetAssociations(_return);
@@ -25106,7 +25472,7 @@ void RemoteManagerClient::send_GetAssociations(const int32_t _homeId, const int8
oprot_->getTransport()->flush();
}
-void RemoteManagerClient::recv_GetAssociations(std::vector<int8_t> & _return)
+void RemoteManagerClient::recv_GetAssociations(GetAssociationsReturnStruct& _return)
{
int32_t rseqid = 0;
@@ -25539,7 +25905,7 @@ int8_t RemoteManagerClient::recv_GetNumScenes()
throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "GetNumScenes failed: unknown result");
}
-void RemoteManagerClient::GetAllScenes(std::vector<int8_t> & _return)
+void RemoteManagerClient::GetAllScenes(GetAllScenesReturnStruct& _return)
{
send_GetAllScenes();
recv_GetAllScenes(_return);
@@ -25558,7 +25924,7 @@ void RemoteManagerClient::send_GetAllScenes()
oprot_->getTransport()->flush();
}
-void RemoteManagerClient::recv_GetAllScenes(std::vector<int8_t> & _return)
+void RemoteManagerClient::recv_GetAllScenes(GetAllScenesReturnStruct& _return)
{
int32_t rseqid = 0;
@@ -26250,7 +26616,7 @@ bool RemoteManagerClient::recv_RemoveSceneValue()
throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "RemoveSceneValue failed: unknown result");
}
-void RemoteManagerClient::SceneGetValues(std::vector<RemoteValueID> & _return, const int8_t _sceneId)
+void RemoteManagerClient::SceneGetValues(SceneGetValuesReturnStruct& _return, const int8_t _sceneId)
{
send_SceneGetValues(_sceneId);
recv_SceneGetValues(_return);
@@ -26270,7 +26636,7 @@ void RemoteManagerClient::send_SceneGetValues(const int8_t _sceneId)
oprot_->getTransport()->flush();
}
-void RemoteManagerClient::recv_SceneGetValues(std::vector<RemoteValueID> & _return)
+void RemoteManagerClient::recv_SceneGetValues(SceneGetValuesReturnStruct& _return)
{
int32_t rseqid = 0;
@@ -27694,6 +28060,60 @@ void RemoteManagerProcessor::process_IsPrimaryController(int32_t seqid, ::apache
}
}
+void RemoteManagerProcessor::process_IsStaticUpdateController(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
+{
+ void* ctx = NULL;
+ if (eventHandler_.get() != NULL) {
+ ctx = eventHandler_->getContext("RemoteManager.IsStaticUpdateController", callContext);
+ }
+ ::apache::thrift::TProcessorContextFreer freer(eventHandler_.get(), ctx, "RemoteManager.IsStaticUpdateController");
+
+ if (eventHandler_.get() != NULL) {
+ eventHandler_->preRead(ctx, "RemoteManager.IsStaticUpdateController");
+ }
+
+ RemoteManager_IsStaticUpdateController_args args;
+ args.read(iprot);
+ iprot->readMessageEnd();
+ uint32_t bytes = iprot->getTransport()->readEnd();
+
+ if (eventHandler_.get() != NULL) {
+ eventHandler_->postRead(ctx, "RemoteManager.IsStaticUpdateController", bytes);
+ }
+
+ RemoteManager_IsStaticUpdateController_result result;
+ try {
+ result.success = iface_->IsStaticUpdateController(args._homeId);
+ result.__isset.success = true;
+ } catch (const std::exception& e) {
+ if (eventHandler_.get() != NULL) {
+ eventHandler_->handlerError(ctx, "RemoteManager.IsStaticUpdateController");
+ }
+
+ ::apache::thrift::TApplicationException x(e.what());
+ oprot->writeMessageBegin("IsStaticUpdateController", ::apache::thrift::protocol::T_EXCEPTION, seqid);
+ x.write(oprot);
+ oprot->writeMessageEnd();
+ oprot->getTransport()->writeEnd();
+ oprot->getTransport()->flush();
+ return;
+ }
+
+ if (eventHandler_.get() != NULL) {
+ eventHandler_->preWrite(ctx, "RemoteManager.IsStaticUpdateController");
+ }
+
+ oprot->writeMessageBegin("IsStaticUpdateController", ::apache::thrift::protocol::T_REPLY, seqid);
+ result.write(oprot);
+ oprot->writeMessageEnd();
+ bytes = oprot->getTransport()->writeEnd();
+ oprot->getTransport()->flush();
+
+ if (eventHandler_.get() != NULL) {
+ eventHandler_->postWrite(ctx, "RemoteManager.IsStaticUpdateController", bytes);
+ }
+}
+
void RemoteManagerProcessor::process_IsBridgeController(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
{
void* ctx = NULL;
@@ -29684,6 +30104,60 @@ void RemoteManagerProcessor::process_IsNodeInfoReceived(int32_t seqid, ::apache:
}
}
+void RemoteManagerProcessor::process_GetNodeClassInformation(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
+{
+ void* ctx = NULL;
+ if (eventHandler_.get() != NULL) {
+ ctx = eventHandler_->getContext("RemoteManager.GetNodeClassInformation", callContext);
+ }
+ ::apache::thrift::TProcessorContextFreer freer(eventHandler_.get(), ctx, "RemoteManager.GetNodeClassInformation");
+
+ if (eventHandler_.get() != NULL) {
+ eventHandler_->preRead(ctx, "RemoteManager.GetNodeClassInformation");
+ }
+
+ RemoteManager_GetNodeClassInformation_args args;
+ args.read(iprot);
+ iprot->readMessageEnd();
+ uint32_t bytes = iprot->getTransport()->readEnd();
+
+ if (eventHandler_.get() != NULL) {
+ eventHandler_->postRead(ctx, "RemoteManager.GetNodeClassInformation", bytes);
+ }
+
+ RemoteManager_GetNodeClassInformation_result result;
+ try {
+ iface_->GetNodeClassInformation(result.success, args._homeId, args._nodeId, args._commandClassId);
+ result.__isset.success = true;
+ } catch (const std::exception& e) {
+ if (eventHandler_.get() != NULL) {
+ eventHandler_->handlerError(ctx, "RemoteManager.GetNodeClassInformation");
+ }
+
+ ::apache::thrift::TApplicationException x(e.what());
+ oprot->writeMessageBegin("GetNodeClassInformation", ::apache::thrift::protocol::T_EXCEPTION, seqid);
+ x.write(oprot);
+ oprot->writeMessageEnd();
+ oprot->getTransport()->writeEnd();
+ oprot->getTransport()->flush();
+ return;
+ }
+
+ if (eventHandler_.get() != NULL) {
+ eventHandler_->preWrite(ctx, "RemoteManager.GetNodeClassInformation");
+ }
+
+ oprot->writeMessageBegin("GetNodeClassInformation", ::apache::thrift::protocol::T_REPLY, seqid);
+ result.write(oprot);
+ oprot->writeMessageEnd();
+ bytes = oprot->getTransport()->writeEnd();
+ oprot->getTransport()->flush();
+
+ if (eventHandler_.get() != NULL) {
+ eventHandler_->postWrite(ctx, "RemoteManager.GetNodeClassInformation", bytes);
+ }
+}
+
void RemoteManagerProcessor::process_GetValueLabel(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
{
void* ctx = NULL;
View
324 gen-cpp/RemoteManager.h
@@ -17,6 +17,7 @@ class RemoteManagerIf {
virtual void WriteConfig(const int32_t _homeId) = 0;
virtual int8_t GetControllerNodeId(const int32_t _homeId) = 0;
virtual bool IsPrimaryController(const int32_t _homeId) = 0;
+ virtual bool IsStaticUpdateController(const int32_t _homeId) = 0;
virtual bool IsBridgeController(const int32_t _homeId) = 0;
virtual void GetLibraryVersion(std::string& _return, const int32_t _homeId) = 0;
virtual void GetLibraryTypeName(std::string& _return, const int32_t _homeId) = 0;
@@ -54,6 +55,7 @@ class RemoteManagerIf {
virtual void SetNodeOff(const int32_t _homeId, const int8_t _nodeId) = 0;
virtual void SetNodeLevel(const int32_t _homeId, const int8_t _nodeId, const int8_t _level) = 0;
virtual bool IsNodeInfoReceived(const int32_t _homeId, const int8_t _nodeId) = 0;
+ virtual void GetNodeClassInformation(Bool_GetNodeClassInformation& _return, const int32_t _homeId, const int8_t _nodeId, const int8_t _commandClassId) = 0;
virtual void GetValueLabel(std::string& _return, const RemoteValueID _id) = 0;
virtual void SetValueLabel(const RemoteValueID _id, const std::string& _value) = 0;
virtual void GetValueUnits(std::string& _return, const RemoteValueID _id) = 0;
@@ -95,7 +97,7 @@ class RemoteManagerIf {
virtual void RequestConfigParam(const int32_t _homeId, const int8_t _nodeId, const int8_t _param) = 0;
virtual void RequestAllConfigParams(const int32_t _homeId, const int8_t _nodeId) = 0;
virtual int8_t GetNumGroups(const int32_t _homeId, const int8_t _nodeId) = 0;
- virtual void GetAssociations(std::vector<int8_t> & _return, const int32_t _homeId, const int8_t _nodeId, const int8_t _groupIdx) = 0;
+ virtual void GetAssociations(GetAssociationsReturnStruct& _return, const int32_t _homeId, const int8_t _nodeId, const int8_t _groupIdx) = 0;
virtual int8_t GetMaxAssociations(const int32_t _homeId, const int8_t _nodeId, const int8_t _groupIdx) = 0;
virtual void GetGroupLabel(std::string& _return, const int32_t _homeId, const int8_t _nodeId, const int8_t _groupIdx) = 0;
virtual void AddAssociation(const int32_t _homeId, const int8_t _nodeId, const int8_t _groupIdx, const int8_t _targetNodeId) = 0;
@@ -103,7 +105,7 @@ class RemoteManagerIf {
virtual void ResetController(const int32_t _homeId) = 0;
virtual void SoftReset(const int32_t _homeId) = 0;
virtual int8_t GetNumScenes() = 0;
- virtual void GetAllScenes(std::vector<int8_t> & _return) = 0;
+ virtual void GetAllScenes(GetAllScenesReturnStruct& _return) = 0;
virtual int8_t CreateScene() = 0;
virtual bool RemoveScene(const int8_t _sceneId) = 0;
virtual bool AddSceneValue_Bool(const int8_t _sceneId, const RemoteValueID _valueId, const bool _value) = 0;
@@ -115,7 +117,7 @@ class RemoteManagerIf {
virtual bool AddSceneValueListSelection_String(const int8_t _sceneId, const RemoteValueID _valueId, const std::string& _value) = 0;
virtual bool AddSceneValueListSelection_Int32(const int8_t _sceneId, const RemoteValueID _valueId, const int32_t _value) = 0;
virtual bool RemoveSceneValue(const int8_t _sceneId, const RemoteValueID _valueId) = 0;
- virtual void SceneGetValues(std::vector<RemoteValueID> & _return, const int8_t _sceneId) = 0;
+ virtual void SceneGetValues(SceneGetValuesReturnStruct& _return, const int8_t _sceneId) = 0;
virtual void SceneGetValueAsBool(Bool_Bool& _return, const int8_t _sceneId, const RemoteValueID _valueId) = 0;
virtual void SceneGetValueAsByte(Bool_UInt8& _return, const int8_t _sceneId, const RemoteValueID _valueId) = 0;
virtual void SceneGetValueAsFloat(Bool_Float& _return, const int8_t _sceneId, const RemoteValueID _valueId) = 0;
@@ -152,6 +154,10 @@ class RemoteManagerNull : virtual public RemoteManagerIf {
bool _return = false;
return _return;
}
+ bool IsStaticUpdateController(const int32_t /* _homeId */) {
+ bool _return = false;
+ return _return;
+ }
bool IsBridgeController(const int32_t /* _homeId */) {
bool _return = false;
return _return;
@@ -281,6 +287,9 @@ class RemoteManagerNull : virtual public RemoteManagerIf {
bool _return = false;
return _return;
}
+ void GetNodeClassInformation(Bool_GetNodeClassInformation& /* _return */, const int32_t /* _homeId */, const int8_t /* _nodeId */, const int8_t /* _commandClassId */) {
+ return;
+ }
void GetValueLabel(std::string& /* _return */, const RemoteValueID /* _id */) {
return;
}
@@ -423,7 +432,7 @@ class RemoteManagerNull : virtual public RemoteManagerIf {
int8_t _return = 0;
return _return;
}
- void GetAssociations(std::vector<int8_t> & /* _return */, const int32_t /* _homeId */, const int8_t /* _nodeId */, const int8_t /* _groupIdx */) {
+ void GetAssociations(GetAssociationsReturnStruct& /* _return */, const int32_t /* _homeId */, const int8_t /* _nodeId */, const int8_t /* _groupIdx */) {
return;
}
int8_t GetMaxAssociations(const int32_t /* _homeId */, const int8_t /* _nodeId */, const int8_t /* _groupIdx */) {
@@ -449,7 +458,7 @@ class RemoteManagerNull : virtual public RemoteManagerIf {
int8_t _return = 0;
return _return;
}
- void GetAllScenes(std::vector<int8_t> & /* _return */) {
+ void GetAllScenes(GetAllScenesReturnStruct& /* _return */) {
return;
}
int8_t CreateScene() {
@@ -496,7 +505,7 @@ class RemoteManagerNull : virtual public RemoteManagerIf {
bool _return = false;
return _return;
}
- void SceneGetValues(std::vector<RemoteValueID> & /* _return */, const int8_t /* _sceneId */) {
+ void SceneGetValues(SceneGetValuesReturnStruct& /* _return */, const int8_t /* _sceneId */) {
return;
}
void SceneGetValueAsBool(Bool_Bool& /* _return */, const int8_t /* _sceneId */, const RemoteValueID /* _valueId */) {
@@ -875,6 +884,114 @@ class RemoteManager_IsPrimaryController_presult {
};
+typedef struct _RemoteManager_IsStaticUpdateController_args__isset {
+ _RemoteManager_IsStaticUpdateController_args__isset() : _homeId(false) {}
+ bool _homeId;
+} _RemoteManager_IsStaticUpdateController_args__isset;
+
+class RemoteManager_IsStaticUpdateController_args {
+ public:
+
+ RemoteManager_IsStaticUpdateController_args() : _homeId(0) {
+ }
+
+ virtual ~RemoteManager_IsStaticUpdateController_args() throw() {}
+
+ int32_t _homeId;
+
+ _RemoteManager_IsStaticUpdateController_args__isset __isset;
+
+ void __set__homeId(const int32_t val) {
+ _homeId = val;
+ }
+
+ bool operator == (const RemoteManager_IsStaticUpdateController_args & rhs) const
+ {
+ if (!(_homeId == rhs._homeId))
+ return false;
+ return true;
+ }
+ bool operator != (const RemoteManager_IsStaticUpdateController_args &rhs) const {
+ return !(*this == rhs);
+ }
+
+ bool operator < (const RemoteManager_IsStaticUpdateController_args & ) const;
+
+ uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+ uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+
+class RemoteManager_IsStaticUpdateController_pargs {
+ public:
+
+
+ virtual ~RemoteManager_IsStaticUpdateController_pargs() throw() {}
+
+ const int32_t* _homeId;
+
+ uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _RemoteManager_IsStaticUpdateController_result__isset {
+ _RemoteManager_IsStaticUpdateController_result__isset() : success(false) {}
+ bool success;
+} _RemoteManager_IsStaticUpdateController_result__isset;
+
+class RemoteManager_IsStaticUpdateController_result {
+ public:
+
+ RemoteManager_IsStaticUpdateController_result() : success(0) {
+ }
+
+ virtual ~RemoteManager_IsStaticUpdateController_result() throw() {}
+
+ bool success;
+
+ _RemoteManager_IsStaticUpdateController_result__isset __isset;
+
+ void __set_success(const bool val) {
+ success = val;
+ }
+
+ bool operator == (const RemoteManager_IsStaticUpdateController_result & rhs) const
+ {
+ if (!(success == rhs.success))
+ return false;
+ return true;
+ }
+ bool operator != (const RemoteManager_IsStaticUpdateController_result &rhs) const {
+ return !(*this == rhs);
+ }
+
+ bool operator < (const RemoteManager_IsStaticUpdateController_result & ) const;
+
+ uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+ uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _RemoteManager_IsStaticUpdateController_presult__isset {
+ _RemoteManager_IsStaticUpdateController_presult__isset() : success(false) {}
+ bool success;
+} _RemoteManager_IsStaticUpdateController_presult__isset;
+
+class RemoteManager_IsStaticUpdateController_presult {
+ public:
+
+
+ virtual ~RemoteManager_IsStaticUpdateController_presult() throw() {}
+
+ bool* success;
+
+ _RemoteManager_IsStaticUpdateController_presult__isset __isset;
+
+ uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+
+};
+
typedef struct _RemoteManager_IsBridgeController_args__isset {
_RemoteManager_IsBridgeController_args__isset() : _homeId(false) {}
bool _homeId;
@@ -4994,6 +5111,132 @@ class RemoteManager_IsNodeInfoReceived_presult {
};
+typedef struct _RemoteManager_GetNodeClassInformation_args__isset {
+ _RemoteManager_GetNodeClassInformation_args__isset() : _homeId(false), _nodeId(false), _commandClassId(false) {}
+ bool _homeId;
+ bool _nodeId;
+ bool _commandClassId;
+} _RemoteManager_GetNodeClassInformation_args__isset;
+
+class RemoteManager_GetNodeClassInformation_args {
+ public:
+
+ RemoteManager_GetNodeClassInformation_args() : _homeId(0), _nodeId(0), _commandClassId(0) {
+ }
+
+ virtual ~RemoteManager_GetNodeClassInformation_args() throw() {}
+
+ int32_t _homeId;
+ int8_t _nodeId;
+ int8_t _commandClassId;
+
+ _RemoteManager_GetNodeClassInformation_args__isset __isset;
+
+ void __set__homeId(const int32_t val) {
+ _homeId = val;
+ }
+
+ void __set__nodeId(const int8_t val) {
+ _nodeId = val;
+ }
+
+ void __set__commandClassId(const int8_t val) {
+ _commandClassId = val;
+ }
+
+ bool operator == (const RemoteManager_GetNodeClassInformation_args & rhs) const
+ {
+ if (!(_homeId == rhs._homeId))
+ return false;
+ if (!(_nodeId == rhs._nodeId))
+ return false;
+ if (!(_commandClassId == rhs._commandClassId))
+ return false;
+ return true;
+ }
+ bool operator != (const RemoteManager_GetNodeClassInformation_args &rhs) const {
+ return !(*this == rhs);
+ }
+
+ bool operator < (const RemoteManager_GetNodeClassInformation_args & ) const;
+
+ uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+ uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+
+class RemoteManager_GetNodeClassInformation_pargs {
+ public:
+
+
+ virtual ~RemoteManager_GetNodeClassInformation_pargs() throw() {}
+
+ const int32_t* _homeId;
+ const int8_t* _nodeId;
+ const int8_t* _commandClassId;
+
+ uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _RemoteManager_GetNodeClassInformation_result__isset {
+ _RemoteManager_GetNodeClassInformation_result__isset() : success(false) {}
+ bool success;
+} _RemoteManager_GetNodeClassInformation_result__isset;
+
+class RemoteManager_GetNodeClassInformation_result {
+ public:
+
+ RemoteManager_GetNodeClassInformation_result() {
+ }
+
+ virtual ~RemoteManager_GetNodeClassInformation_result() throw() {}
+
+ Bool_GetNodeClassInformation success;
+
+ _RemoteManager_GetNodeClassInformation_result__isset __isset;
+
+ void __set_success(const Bool_GetNodeClassInformation& val) {
+ success = val;
+ }
+
+ bool operator == (const RemoteManager_GetNodeClassInformation_result & rhs) const
+ {
+ if (!(success == rhs.success))
+ return false;
+ return true;
+ }
+ bool operator != (const RemoteManager_GetNodeClassInformation_result &rhs) const {
+ return !(*this == rhs);
+ }
+
+ bool operator < (const RemoteManager_GetNodeClassInformation_result & ) const;
+
+ uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+ uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _RemoteManager_GetNodeClassInformation_presult__isset {
+ _RemoteManager_GetNodeClassInformation_presult__isset() : success(false) {}
+ bool success;
+} _RemoteManager_GetNodeClassInformation_presult__isset;
+
+class RemoteManager_GetNodeClassInformation_presult {
+ public:
+
+
+ virtual ~RemoteManager_GetNodeClassInformation_presult() throw() {}
+
+ Bool_GetNodeClassInformation* success;
+
+ _RemoteManager_GetNodeClassInformation_presult__isset __isset;
+
+ uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+
+};
+
typedef struct _RemoteManager_GetValueLabel_args__isset {
_RemoteManager_GetValueLabel_args__isset() : _id(false) {}
bool _id;
@@ -9560,11 +9803,11 @@ class RemoteManager_GetAssociations_result {
virtual ~RemoteManager_GetAssociations_result() throw() {}
- std::vector<int8_t> success;
+ GetAssociationsReturnStruct success;
_RemoteManager_GetAssociations_result__isset __isset;
- void __set_success(const std::vector<int8_t> & val) {
+ void __set_success(const GetAssociationsReturnStruct& val) {
success = val;
}
@@ -9596,7 +9839,7 @@ class RemoteManager_GetAssociations_presult {
virtual ~RemoteManager_GetAssociations_presult() throw() {}
- std::vector<int8_t> * success;
+ GetAssociationsReturnStruct* success;
_RemoteManager_GetAssociations_presult__isset __isset;
@@ -10406,11 +10649,11 @@ class RemoteManager_GetAllScenes_result {
virtual ~RemoteManager_GetAllScenes_result() throw() {}
- std::vector<int8_t> success;
+ GetAllScenesReturnStruct success;
_RemoteManager_GetAllScenes_result__isset __isset;
- void __set_success(const std::vector<int8_t> & val) {
+ void __set_success(const GetAllScenesReturnStruct& val) {
success = val;
}
@@ -10442,7 +10685,7 @@ class RemoteManager_GetAllScenes_presult {
virtual ~RemoteManager_GetAllScenes_presult() throw() {}
- std::vector<int8_t> * success;
+ GetAllScenesReturnStruct* success;
_RemoteManager_GetAllScenes_presult__isset __isset;
@@ -11841,11 +12084,11 @@ class RemoteManager_SceneGetValues_result {
virtual ~RemoteManager_SceneGetValues_result() throw() {}
- std::vector<RemoteValueID> success;
+ SceneGetValuesReturnStruct success;
_RemoteManager_SceneGetValues_result__isset __isset;
- void __set_success(const std::vector<RemoteValueID> & val) {
+ void __set_success(const SceneGetValuesReturnStruct& val) {
success = val;
}
@@ -11877,7 +12120,7 @@ class RemoteManager_SceneGetValues_presult {
virtual ~RemoteManager_SceneGetValues_presult() throw() {}
- std::vector<RemoteValueID> * success;
+ SceneGetValuesReturnStruct* success;
_RemoteManager_SceneGetValues_presult__isset __isset;
@@ -14279,6 +14522,9 @@ class RemoteManagerClient : virtual public RemoteManagerIf {
bool IsPrimaryController(const int32_t _homeId);
void send_IsPrimaryController(const int32_t _homeId);
bool recv_IsPrimaryController();
+ bool IsStaticUpdateController(const int32_t _homeId);
+ void send_IsStaticUpdateController(const int32_t _homeId);
+ bool recv_IsStaticUpdateController();
bool IsBridgeController(const int32_t _homeId);
void send_IsBridgeController(const int32_t _homeId);
bool recv_IsBridgeController();
@@ -14390,6 +14636,9 @@ class RemoteManagerClient : virtual public RemoteManagerIf {
bool IsNodeInfoReceived(const int32_t _homeId, const int8_t _nodeId);
void send_IsNodeInfoReceived(const int32_t _homeId, const int8_t _nodeId);
bool recv_IsNodeInfoReceived();
+ void GetNodeClassInformation(Bool_GetNodeClassInformation& _return, const int32_t _homeId, const int8_t _nodeId, const int8_t _commandClassId);
+ void send_GetNodeClassInformation(const int32_t _homeId, const int8_t _nodeId, const int8_t _commandClassId);
+ void recv_GetNodeClassInformation(Bool_GetNodeClassInformation& _return);
void GetValueLabel(std::string& _return, const RemoteValueID _id);
void send_GetValueLabel(const RemoteValueID _id);
void recv_GetValueLabel(std::string& _return);
@@ -14513,9 +14762,9 @@ class RemoteManagerClient : virtual public RemoteManagerIf {
int8_t GetNumGroups(const int32_t _homeId, const int8_t _nodeId);
void send_GetNumGroups(const int32_t _homeId, const int8_t _nodeId);
int8_t recv_GetNumGroups();
- void GetAssociations(std::vector<int8_t> & _return, const int32_t _homeId, const int8_t _nodeId, const int8_t _groupIdx);
+ void GetAssociations(GetAssociationsReturnStruct& _return, const int32_t _homeId, const int8_t _nodeId, const int8_t _groupIdx);
void send_GetAssociations(const int32_t _homeId, const int8_t _nodeId, const int8_t _groupIdx);
- void recv_GetAssociations(std::vector<int8_t> & _return);
+ void recv_GetAssociations(GetAssociationsReturnStruct& _return);
int8_t GetMaxAssociations(const int32_t _homeId, const int8_t _nodeId, const int8_t _groupIdx);
void send_GetMaxAssociations(const int32_t _homeId, const int8_t _nodeId, const int8_t _groupIdx);
int8_t recv_GetMaxAssociations();
@@ -14537,9 +14786,9 @@ class RemoteManagerClient : virtual public RemoteManagerIf {
int8_t GetNumScenes();
void send_GetNumScenes();
int8_t recv_GetNumScenes();
- void GetAllScenes(std::vector<int8_t> & _return);
+ void GetAllScenes(GetAllScenesReturnStruct& _return);
void send_GetAllScenes();
- void recv_GetAllScenes(std::vector<int8_t> & _return);
+ void recv_GetAllScenes(GetAllScenesReturnStruct& _return);
int8_t CreateScene();
void send_CreateScene();
int8_t recv_CreateScene();
@@ -14573,9 +14822,9 @@ class RemoteManagerClient : virtual public RemoteManagerIf {
bool RemoveSceneValue(const int8_t _sceneId, const RemoteValueID _valueId);
void send_RemoveSceneValue(const int8_t _sceneId, const RemoteValueID _valueId);
bool recv_RemoveSceneValue();
- void SceneGetValues(std::vector<RemoteValueID> & _return, const int8_t _sceneId);
+ void SceneGetValues(SceneGetValuesReturnStruct& _return, const int8_t _sceneId);
void send_SceneGetValues(const int8_t _sceneId);
- void recv_SceneGetValues(std::vector<RemoteValueID> & _return);
+ void recv_SceneGetValues(SceneGetValuesReturnStruct& _return);
void SceneGetValueAsBool(Bool_Bool& _return, const int8_t _sceneId, const RemoteValueID _valueId);
void send_SceneGetValueAsBool(const int8_t _sceneId, const RemoteValueID _valueId);
void recv_SceneGetValueAsBool(Bool_Bool& _return);
@@ -14652,6 +14901,7 @@ class RemoteManagerProcessor : virtual public ::apache::thrift::TProcessor {
void process_WriteConfig(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_GetControllerNodeId(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_IsPrimaryController(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+ void process_IsStaticUpdateController(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_IsBridgeController(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_GetLibraryVersion(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_GetLibraryTypeName(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
@@ -14689,6 +14939,7 @@ class RemoteManagerProcessor : virtual public ::apache::thrift::TProcessor {
void process_SetNodeOff(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_SetNodeLevel(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_IsNodeInfoReceived(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+ void process_GetNodeClassInformation(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_GetValueLabel(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_SetValueLabel(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_GetValueUnits(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
@@ -14777,6 +15028,7 @@ class RemoteManagerProcessor : virtual public ::apache::thrift::TProcessor {
processMap_["WriteConfig"] = &RemoteManagerProcessor::process_WriteConfig;
processMap_["GetControllerNodeId"] = &RemoteManagerProcessor::process_GetControllerNodeId;
processMap_["IsPrimaryController"] = &RemoteManagerProcessor::process_IsPrimaryController;
+ processMap_["IsStaticUpdateController"] = &RemoteManagerProcessor::process_IsStaticUpdateController;
processMap_["IsBridgeController"] = &RemoteManagerProcessor::process_IsBridgeController;
processMap_["GetLibraryVersion"] = &RemoteManagerProcessor::process_GetLibraryVersion;
processMap_["GetLibraryTypeName"] = &RemoteManagerProcessor::process_GetLibraryTypeName;
@@ -14814,6 +15066,7 @@ class RemoteManagerProcessor : virtual public ::apache::thrift::TProcessor {
processMap_["SetNodeOff"] = &RemoteManagerProcessor::process_SetNodeOff;
processMap_["SetNodeLevel"] = &RemoteManagerProcessor::process_SetNodeLevel;
processMap_["IsNodeInfoReceived"] = &RemoteManagerProcessor::process_IsNodeInfoReceived;
+ processMap_["GetNodeClassInformation"] = &RemoteManagerProcessor::process_GetNodeClassInformation;
processMap_["GetValueLabel"] = &RemoteManagerProcessor::process_GetValueLabel;
processMap_["SetValueLabel"] = &RemoteManagerProcessor::process_SetValueLabel;
processMap_["GetValueUnits"] = &RemoteManagerProcessor::process_GetValueUnits;
@@ -14943,6 +15196,17 @@ class RemoteManagerMultiface : virtual public RemoteManagerIf {
}
}
+ bool IsStaticUpdateController(const int32_t _homeId) {
+ size_t sz = ifaces_.size();
+ for (size_t i = 0; i < sz; ++i) {
+ if (i == sz - 1) {
+ return ifaces_[i]->IsStaticUpdateController(_homeId);
+ } else {
+ ifaces_[i]->IsStaticUpdateController(_homeId);
+ }
+ }
+ }
+
bool IsBridgeController(const int32_t _homeId) {
size_t sz = ifaces_.size();
for (size_t i = 0; i < sz; ++i) {
@@ -15329,6 +15593,18 @@ class RemoteManagerMultiface : virtual public RemoteManagerIf {
}
}
+ void GetNodeClassInformation(Bool_GetNodeClassInformation& _return, const int32_t _homeId, const int8_t _nodeId, const int8_t _commandClassId) {
+ size_t sz = ifaces_.size();
+ for (size_t i = 0; i < sz; ++i) {
+ if (i == sz - 1) {
+ ifaces_[i]->GetNodeClassInformation(_return, _homeId, _nodeId, _commandClassId);
+ return;
+ } else {
+ ifaces_[i]->GetNodeClassInformation(_return, _homeId, _nodeId, _commandClassId);
+ }
+ }
+ }
+
void GetValueLabel(std::string& _return, const RemoteValueID _id) {
size_t sz = ifaces_.size();
for (size_t i = 0; i < sz; ++i) {
@@ -15762,7 +16038,7 @@ class RemoteManagerMultiface : virtual public RemoteManagerIf {
}
}
- void GetAssociations(std::vector<int8_t> & _return, const int32_t _homeId, const int8_t _nodeId, const int8_t _groupIdx) {
+ void GetAssociations(GetAssociationsReturnStruct& _return, const int32_t _homeId, const int8_t _nodeId, const int8_t _groupIdx) {
size_t sz = ifaces_.size();
for (size_t i = 0; i < sz; ++i) {
if (i == sz - 1) {
@@ -15836,7 +16112,7 @@ class RemoteManagerMultiface : virtual public RemoteManagerIf {
}
}
- void GetAllScenes(std::vector<int8_t> & _return) {
+ void GetAllScenes(GetAllScenesReturnStruct& _return) {
size_t sz = ifaces_.size();
for (size_t i = 0; i < sz; ++i) {
if (i == sz - 1) {
@@ -15969,7 +16245,7 @@ class RemoteManagerMultiface : virtual public RemoteManagerIf {
}
}
- void SceneGetValues(std::vector<RemoteValueID> & _return, const int8_t _sceneId) {
+ void SceneGetValues(SceneGetValuesReturnStruct& _return, const int8_t _sceneId) {
size_t sz = ifaces_.size();
for (size_t i = 0; i < sz; ++i) {
if (i == sz - 1) {
View
93 gen-cpp/RemoteManager_server.cpp
@@ -45,6 +45,14 @@ class RemoteManagerHandler : virtual public RemoteManagerIf {
return(function_result);
}
+ bool IsStaticUpdateController(const int32_t _homeId) {
+ Manager* mgr = Manager::Get();
+ g_criticalSection.lock();
+ bool function_result = mgr->IsStaticUpdateController((::uint32 const) _homeId);
+ g_criticalSection.unlock();
+ return(function_result);
+ }
+
bool IsBridgeController(const int32_t _homeId) {
Manager* mgr = Manager::Get();
g_criticalSection.lock();
@@ -210,17 +218,17 @@ class RemoteManagerHandler : virtual public RemoteManagerIf {
}
void GetNodeNeighbors(UInt32_ListByte& _return, const int32_t _homeId, const int8_t _nodeId) {
- Manager* mgr = Manager::Get();
uint8* arr;
+ Manager* mgr = Manager::Get();
g_criticalSection.lock();
- _return.retval = mgr->GetNodeNeighbors((::uint32 const) _homeId, (::uint8 const) _nodeId, &arr);
+ _return.retval = mgr->GetNodeNeighbors((::uint32 const) _homeId, (::uint8 const) _nodeId, (::uint8**) &arr);
g_criticalSection.unlock();
- if (_return.retval > 0) {
- for (int i=0; i<_return.retval; i++) _return.arg.push_back(arr[i]);
+ if (_return.retval > 0) {
+ for (int i=0; i<_return.retval; i++) _return._nodeNeighbors.push_back(arr[i]);
delete arr;
- }
}
-
+ }
+
void GetNodeManufacturerName(std::string& _return, const int32_t _homeId, const int8_t _nodeId) {
Manager* mgr = Manager::Get();
g_criticalSection.lock();
@@ -327,6 +335,13 @@ class RemoteManagerHandler : virtual public RemoteManagerIf {
return(function_result);
}
+ void GetNodeClassInformation(Bool_GetNodeClassInformation& _return, const int32_t _homeId, const int8_t _nodeId, const int8_t _commandClassId) {
+ Manager* mgr = Manager::Get();
+ g_criticalSection.lock();
+ _return.retval = mgr->GetNodeClassInformation((::uint32 const) _homeId, (::uint8 const) _nodeId, (::uint8 const) _commandClassId, (std::string*) &_return._className, (::uint8*) &_return._classVersion);
+ g_criticalSection.unlock();
+ }
+
void GetValueLabel(std::string& _return, const RemoteValueID _id) {
Manager* mgr = Manager::Get();
g_criticalSection.lock();
@@ -412,70 +427,70 @@ class RemoteManagerHandler : virtual public RemoteManagerIf {
void GetValueAsBool(Bool_Bool& _return, const RemoteValueID _id) {
Manager* mgr = Manager::Get();
g_criticalSection.lock();
- _return.retval = mgr->GetValueAsBool(*g_values[_id], (bool*) &_return.arg);
+ _return.retval = mgr->GetValueAsBool(*g_values[_id], (bool*) &_return.o_value);
g_criticalSection.unlock();
}
void GetValueAsByte(Bool_UInt8& _return, const RemoteValueID _id) {
Manager* mgr = Manager::Get();
g_criticalSection.lock();
- _return.retval = mgr->GetValueAsByte(*g_values[_id], (::uint8*) &_return.arg);
+ _return.retval = mgr->GetValueAsByte(*g_values[_id], (::uint8*) &_return.o_value);
g_criticalSection.unlock();
}
void GetValueAsFloat(Bool_Float& _return, const RemoteValueID _id) {
Manager* mgr = Manager::Get();
g_criticalSection.lock();
- _return.retval = mgr->GetValueAsFloat(*g_values[_id], (float*) &_return.arg);
+ _return.retval = mgr->GetValueAsFloat(*g_values[_id], (float*) &_return.o_value);
g_criticalSection.unlock();
}
void GetValueAsInt(Bool_Int& _return, const RemoteValueID _id) {
Manager* mgr = Manager::Get();
g_criticalSection.lock();
- _return.retval = mgr->GetValueAsInt(*g_values[_id], (::int32*) &_return.arg);
+ _return.retval = mgr->GetValueAsInt(*g_values[_id], (::int32*) &_return.o_value);
g_criticalSection.unlock();
}
void GetValueAsShort(Bool_Int16& _return, const RemoteValueID _id) {
Manager* mgr = Manager::Get();
g_criticalSection.lock();
- _return.retval = mgr->GetValueAsShort(*g_values[_id], (::int16*) &_return.arg);
+ _return.retval = mgr->GetValueAsShort(*g_values[_id], (::int16*) &_return.o_value);
g_criticalSection.unlock();
}
void GetValueAsString(Bool_String& _return, const RemoteValueID _id) {
Manager* mgr = Manager::Get();
g_criticalSection.lock();
- _return.retval = mgr->GetValueAsString(*g_values[_id], (std::string*) &_return.arg);
+ _return.retval = mgr->GetValueAsString(*g_values[_id], (std::string*) &_return.o_value);
g_criticalSection.unlock();
}
void GetValueListSelection_String(Bool_String& _return, const RemoteValueID _id) {
Manager* mgr = Manager::Get();
g_criticalSection.lock();
- _return.retval = mgr->GetValueListSelection(*g_values[_id], (std::string*) &_return.arg);
+ _return.retval = mgr->GetValueListSelection(*g_values[_id], (std::string*) &_return.o_value);
g_criticalSection.unlock();
}
void GetValueListSelection_Int32(Bool_Int& _return, const RemoteValueID _id) {
Manager* mgr = Manager::Get();
g_criticalSection.lock();
- _return.retval = mgr->GetValueListSelection(*g_values[_id], (::int32*) &_return.arg);
+ _return.retval = mgr->GetValueListSelection(*g_values[_id], (::int32*) &_return.o_value);
g_criticalSection.unlock();
}
void GetValueListItems(Bool_ListString& _return, const RemoteValueID _id) {
Manager* mgr = Manager::Get();
g_criticalSection.lock();
- _return.retval = mgr->GetValueListItems(*g_values[_id], (std::vector<std::string, std::allocator<std::string> >*) &_return.arg);
+ _return.retval = mgr->GetValueListItems(*g_values[_id], (std::vector<std::string, std::allocator<std::string> >*) &_return.o_value);
g_criticalSection.unlock();
}
void GetValueFloatPrecision(Bool_UInt8& _return, const RemoteValueID _id) {
Manager* mgr = Manager::Get();
g_criticalSection.lock();
- _return.retval = mgr->GetValueFloatPrecision(*g_values[_id], (::uint8*) &_return.arg);
+ _return.retval = mgr->GetValueFloatPrecision(*g_values[_id], (::uint8*) &_return.o_value);
g_criticalSection.unlock();
}
@@ -633,14 +648,14 @@ class RemoteManagerHandler : virtual public RemoteManagerIf {
return(function_result);
}
- void GetAssociations(std::vector<int8_t> & _return, const int32_t _homeId, const int8_t _nodeId, const int8_t _groupIdx) {
+ void GetAssociations(GetAssociationsReturnStruct& _return, const int32_t _homeId, const int8_t _nodeId, const int8_t _groupIdx) {
+ uint8* o_associations;
Manager* mgr = Manager::Get();
g_criticalSection.lock();
- uint8* o_associations;
- uint num_assoc = mgr->GetAssociations((::uint32 const) _homeId, (::uint8 const) _nodeId, (::uint8 const) _groupIdx, &o_associations);
+ _return.retval = mgr->GetAssociations((::uint32 const) _homeId, (::uint8 const) _nodeId, (::uint8 const) _groupIdx, (::uint8**) &o_associations);
g_criticalSection.unlock();
- if (num_assoc > 0) {
- for (uint i=0; i<num_assoc; i++) _return.push_back(o_associations[i]);
+ if (_return.retval > 0) {
+ for (int i=0; i<_return.retval; i++) _return.o_associations.push_back(o_associations[i]);
delete o_associations;
}
}
@@ -696,18 +711,18 @@ class RemoteManagerHandler : virtual public RemoteManagerIf {
return(function_result);
}
- void GetAllScenes(std::vector<int8_t> & _return) {
- Manager* mgr = Manager::Get();
+ void GetAllScenes(GetAllScenesReturnStruct& _return) {
uint8* _sceneIds;
+ Manager* mgr = Manager::Get();
g_criticalSection.lock();
- uint num_scenes = mgr->GetAllScenes((::uint8**) &_sceneIds);
+ _return.retval = mgr->GetAllScenes((::uint8**) &_sceneIds);
g_criticalSection.unlock();
- if (num_scenes> 0) {
- for (uint i=0; i<num_scenes; i++) _return.push_back(_sceneIds[i]);
+ if (_return.retval>0) {
+ for (int i=0; i<_return.retval; i++) _return._sceneIds.push_back(_sceneIds[i]);
delete(_sceneIds);
}
}
-
+
int8_t CreateScene() {
Manager* mgr = Manager::Get();
g_criticalSection.lock();
@@ -796,70 +811,66 @@ class RemoteManagerHandler : virtual public RemoteManagerIf {
return(function_result);
}
- void SceneGetValues(std::vector<RemoteValueID> & _return, const int8_t _sceneId) {
+ void SceneGetValues(SceneGetValuesReturnStruct& _return, const int8_t _sceneId) {
Manager* mgr = Manager::Get();
- vector<ValueID> _valueIds;
g_criticalSection.lock();
- uint num_values = mgr->SceneGetValues((::uint8 const) _sceneId, &_valueIds);
+ _return.retval = mgr->SceneGetValues((::uint8 const) _sceneId, (std::vector<OpenZWave::ValueID, std::allocator<OpenZWave::ValueID> >*) &_return.o_value);
g_criticalSection.unlock();
- if (num_values > 0) {
- for (uint i=0; i<num_values; i++) _return.push_back(_valueIds[i].GetId());
- }
}
void SceneGetValueAsBool(Bool_Bool& _return, const int8_t _sceneId, const RemoteValueID _valueId) {
Manager* mgr = Manager::Get();
g_criticalSection.lock();
- _return.retval = mgr->SceneGetValueAsBool((::uint8 const) _sceneId, *g_values[_valueId], (bool*) &_return.arg);
+ _return.retval = mgr->SceneGetValueAsBool((::uint8 const) _sceneId, *g_values[_valueId], (bool*) &_return.o_value);
g_criticalSection.unlock();
}
void SceneGetValueAsByte(Bool_UInt8& _return, const int8_t _sceneId, const RemoteValueID _valueId) {
Manager* mgr = Manager::Get();
g_criticalSection.lock();
- _return.retval = mgr->SceneGetValueAsByte((::uint8 const) _sceneId, *g_values[_valueId], (::uint8*) &_return.arg);
+ _return.retval = mgr->SceneGetValueAsByte((::uint8 const) _sceneId, *g_values[_valueId], (::uint8*) &_return.o_value);
g_criticalSection.unlock();
}
void SceneGetValueAsFloat(Bool_Float& _return, const int8_t _sceneId, const RemoteValueID _valueId) {
Manager* mgr = Manager::Get();
g_criticalSection.lock();
- _return.retval = mgr->SceneGetValueAsFloat((::uint8 const) _sceneId, *g_values[_valueId], (float*) &_return.arg);
+ _return.retval = mgr->SceneGetValueAsFloat((::uint8 const) _sceneId, *g_values[_valueId], (float*) &_return.o_value);
g_criticalSection.unlock();
}
void SceneGetValueAsInt(Bool_Int& _return, const int8_t _sceneId, const RemoteValueID _valueId) {
Manager* mgr = Manager::Get();
g_criticalSection.lock();
- _return.retval = mgr->SceneGetValueAsInt((::uint8 const) _sceneId, *g_values[_valueId], (::int32*) &_return.arg);
+ _return.retval = mgr->SceneGetValueAsInt((::uint8 const) _sceneId, *g_values[_valueId], (::int32*) &_return.o_value);
g_criticalSection.unlock();
}
void SceneGetValueAsShort(Bool_Int16& _return, const int8_t _sceneId, const RemoteValueID _valueId) {
Manager* mgr = Manager::Get();
g_criticalSection.lock();
- _return.retval = mgr->SceneGetValueAsShort((::uint8 const) _sceneId, *g_values[_valueId], (::int16*) &_return.arg);
+ _return.retval = mgr->SceneGetValueAsShort((::uint8 const) _sceneId, *g_values[_valueId], (::int16*) &_return.o_value);
g_criticalSection.unlock();
}
void SceneGetValueAsString(Bool_String& _return, const int8_t _sceneId, const RemoteValueID _valueId) {
Manager* mgr = Manager::Get();
g_criticalSection.lock();
- _return.retval = mgr->SceneGetValueAsString((::uint8 const) _sceneId, *g_values[_valueId], (std::string*) &_return.arg);
+ _return.retval = mgr->SceneGetValueAsString((::uint8 const) _sceneId, *g_values[_valueId], (std::string*) &_return.o_value);
g_criticalSection.unlock();
}
void SceneGetValueListSelection_String(Bool_String& _return, const int8_t _sceneId, const RemoteValueID _valueId) {