Diff: mbed/jsonrpc/RpcDigitalIn.cpp

Revision:

85:416f8bbbdf54

Parent:

78:8cdb8fc7eda8

--- a/mbed/jsonrpc/RpcDigitalIn.cpp	Fri Jul 04 02:10:40 2014 +0000
+++ b/mbed/jsonrpc/RpcDigitalIn.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<DigitalIn>(new DigitalIn(pin)));
@@ -18,7 +18,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;
             DigitalIn* inst=(DigitalIn*)getObjectBatch(mod,i_rpc);
 			if(inst!=NULL){
 				mod->putResult(i_rpc->method.id,"%d",(int)(inst->read()));
@@ -28,13 +28,13 @@
         static NyLPC_TBool mode(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;
             DigitalIn* inst=(DigitalIn*)getObjectBatch(mod,i_rpc);
 			if(inst!=NULL){
 				int v;
 	        	if(getParamInt(mod,i_rpc,v,1)){
 					inst->mode(pinmodeId2PinMode(v));
-					mod->putResult(i_rpc->method.id,"");
+					mod->putResult(i_rpc->method.id);
 	        	}
 			}
             return NyLPC_TBool_TRUE;