Diff: mbed/jsonrpc/RpcDigitalOut.cpp

Revision:

85:416f8bbbdf54

Parent:

77:8651d3c19a55

--- a/mbed/jsonrpc/RpcDigitalOut.cpp	Fri Jul 04 02:10:40 2014 +0000
+++ b/mbed/jsonrpc/RpcDigitalOut.cpp	Fri Jul 04 14:28:46 2014 +0000
@@ -8,7 +8,7 @@
         static NyLPC_TBool new1(const union NyLPC_TJsonRpcParserResult* i_rpc,void* i_param)
         {
             //u
-            ModJsonRpc* mod=(ModJsonRpc*)i_param;
+            ModJsonRpc* mod=((ModJsonRpc::TcJsonRpcEx_t*)i_param)->cppmod_ptr;
             PinName pin;
             if(getParamsAsPin(mod,i_rpc,&pin,1)){
                 addNewObjectBatch(mod,i_rpc->method.id,new ModJsonRpc::RpcObject<DigitalOut>(new DigitalOut(pin)));
@@ -18,7 +18,7 @@
         static NyLPC_TBool new2(const union NyLPC_TJsonRpcParserResult* i_rpc,void* i_param)
         {
             //ud return iid
-            ModJsonRpc* mod=(ModJsonRpc*)i_param;
+            ModJsonRpc* mod=((ModJsonRpc::TcJsonRpcEx_t*)i_param)->cppmod_ptr;
             PinName pin;
             if(getParamsAsPin(mod,i_rpc,&pin,1)){
                 int v;
@@ -31,13 +31,13 @@
         static NyLPC_TBool write(const union NyLPC_TJsonRpcParserResult* i_rpc,void* i_param)
         {
             //dd return void
-            ModJsonRpc* mod=(ModJsonRpc*)i_param;
+            ModJsonRpc* mod=((ModJsonRpc::TcJsonRpcEx_t*)i_param)->cppmod_ptr;
             DigitalOut* inst=(DigitalOut*)getObjectBatch(mod,i_rpc);
             if(inst!=NULL){
                 int v;
                 if(getParamInt(mod,i_rpc,v,1)){
                     inst->write(v);
-                    mod->putResult(i_rpc->method.id,"");
+                    mod->putResult(i_rpc->method.id);
                 }
             }
             return NyLPC_TBool_TRUE;            
@@ -45,7 +45,7 @@
         static NyLPC_TBool read(const union NyLPC_TJsonRpcParserResult* i_rpc,void* i_param)
         {
             //d return d
-            ModJsonRpc* mod=(ModJsonRpc*)i_param;
+            ModJsonRpc* mod=((ModJsonRpc::TcJsonRpcEx_t*)i_param)->cppmod_ptr;
             DigitalOut* inst=(DigitalOut*)getObjectBatch(mod,i_rpc);
             if(inst!=NULL){
                 mod->putResult(i_rpc->method.id,"%d",(int)(inst->read()));