Ryo Iizuka
This is Webservice SDK for mbed. LPCXpresso1769/LPC1768/FRDM-K64F/LPC4088
Dependents: MbedFileServer_1768MiniDK2 RedWireBridge IssueDebug_gcc MiMicRemoteMCU-for-Mbed ... more
libMiMic(MiMic library for mbed)は、WebService機能を提供するSDKです。 mbedでWebAPIに対応したネットワークデバイスを簡単に作ることが出来ます。
libMiMicはMiMic projectで開発しています。MiMic projectについてはこちらをご覧ください。 http://nyatla.jp/mimic/wp/
構成
libMiMicはmbedRTOS上で動作し、ユーザアプリケーションにAPIを提供します。コアAPIはC言語で記述されていますが、使用頻度の高いものについてはmbed向けのC++APIが準備されています。
※libMiMicはmbedの標準イーサネットドライバをしようしていません。
標準イーサネットドライバと同時に使用することはできません。
- MiMicIP - IPv4スタックです。レテンシとメモリ消費量を抑えたuipベースのライブラリです。
- ARP/ICMP/UDP/TCP - 基礎的なソケットAPIを提供します。APIは独自です。
- HTTP/1.1 Server - HTTP/1.1に対応したサーバです。マルチセッション・Chunked・持続性接続に対応しています。
- HTTP Modules - HTTP/1.1の機能モジュールです。以下のモジュールがあります。
- ROM file provider - ROMに格納したファイルイメージを公開します。
- File system provider - mbedファイルシステムを公開します。
- Onchip configuration - プログラムフラッシュを利用して設定を保存します。
- MiMicVM processor - RPCリクエスト(MiMicVM)を処理します。
- FileUpload - ファイルアップロードを受け取ります。
- URL decoder - HTTPリクエストを解析します。
- UPnP handler -UPnPメッセージを処理します。
- WebSocket - Websocketサーバです。
- mDNS - マルチキャストDNSサービスです。
- UPnP - UPnP/1.0の機能を提供します。UPnP handlerと協調して動作します。(現在はデバイス探索(SSDP)・デスクリプション(Description)のみ実装してあります。)
- DHCP/APIPA - ゼロコンフィギュレーション用のモジュールです。
- HTTP/1.1 Client
- mbed C++ class library - mbed向けのC++CPIです。C言語のものより簡単です。
対応機種
- mbed(mbed LPC1768)
- LPCXpresso1769
プログラム
Import programMiMicRemoteMCU-for-Mbed
MiMic RemoteMCU for mbed. This program provides MCU control API over REST API. It can control MCU from Javascript,PHP or any HTTP rest client directly. And, The application has self development environment.
Last commit 30 May 2014 by 
Ryo Iizuka
Import programMbedFileServer
The program publishes files at local directory and SD filesystem. It is a full-fledged webServer somewhat.
Last commit 15 Sep 2015 by Ryo Iizuka
サンプル
Import programMiMicSimpleHttpd
This is a simplest HTTP server made of libMiMic. It will echo back a request path.
Last commit 15 Sep 2015 by Ryo Iizuka
Import programUPnPBasicDevice
Simplest UPnP basic device example. This program to run UPnP basic device on the mbed.
Last commit 15 Sep 2015 by Ryo Iizuka
Import programWebSocketSample
MiMicSDK Websocket module sample program.
Last commit 15 Sep 2015 by Ryo Iizuka
Import programTcpSocketClientSamlpe
MiMicSDK Tcp client socket sample program.
Last commit 15 Sep 2015 by Ryo Iizuka
Import programUdpSocketSamlpe
Udp socket sample program. This program will send back the received packet.
Last commit 15 Sep 2015 by Ryo Iizuka
チュートリアル
- HTTPD解説
- UPnPデバイスの作り方
- MiMicRemoteMCUの紹介(pdf)
- MiMicRemoteMCUのマニュアル(pdf)
English
libMiMic(MiMic library for mbed) is SDK which provides Webservice functions. It can be created networking device easily using mbed.
See more MiMic information, See MiMic project website. http://nyatla.jp/mimic/wp/
Structure
libMiMic run on mbed RTOS and provides networking API to user application. This library has C++ class API for the mbed, and low-level C language API.
For WebService general, it can be written in a simple C + + API.
libMiMic does not have the standard Ethernet driver of mbed. It is not possible that will be used with the standard Ethernet driver.
- MiMicIP - IPv4 protocol stack. This is based uip which is reduced memory and latency.
- ARP / ICMP / UDP / TCP - Those are provide basic IP protocols.
- HTTP/1.1 Server - The Http server compatible HTTP/1.1. It supports multi-session, chunked transport, persistent connection.
- HTTP Modules - There are addon-module for HTTP server. The following modules.
- ROM file module - Publish the file images in ROM.
- File system module - Publish thefiles in mbed file system.
- Onchip configuration module - To save the network settings to the program flash via REST.
- MiMicVM module - To handle the (MiMicVM) RPC request.
- FileUpload module - Accept a file via HTTP POST.
- URL dedoce module - A versatility URL decoder.
- UPnP handle module - To handle UPnP messages.
- UPnP - This provides UPnP/1.0 device functions. It works together with UPnP handler.
- Websocket - websocket (version13) server
- mDNS Service - DNS-SD protocol server.
- UPnP - This provides UPnP/1.0 device functions which works with UPnP handler. (You have been implemented (SSDP) ? description only (Description) device search now.) It is a module zero configuration for - DHCP / APIPA. mbed C + + class library - C of mbed for + + is the CPI. It is simple than that of the C language.
- DHCP/APIPA - It support zero-cpnfigulation.
- mbed C++ class library. Almost APIs for Web applications are available.
- HTTP/1.1 Client
Supported target
- mbed(mbed LPC1768)
- LPCXpresso1769
Application
Import programMiMicRemoteMCU-for-Mbed
MiMic RemoteMCU for mbed. This program provides MCU control API over REST API. It can control MCU from Javascript,PHP or any HTTP rest client directly. And, The application has self development environment.
Last commit 30 May 2014 by Ryo Iizuka
Import programMbedFileServer
The program publishes files at local directory and SD filesystem. It is a full-fledged webServer somewhat.
Last commit 15 Sep 2015 by Ryo Iizuka
Sample
Import programMiMicSimpleHttpd
This is a simplest HTTP server made of libMiMic. It will echo back a request path.
Last commit 15 Sep 2015 by Ryo Iizuka
Import programUPnPBasicDevice
Simplest UPnP basic device example. This program to run UPnP basic device on the mbed.
Last commit 15 Sep 2015 by Ryo Iizuka
Import programWebSocketSample
MiMicSDK Websocket module sample program.
Last commit 15 Sep 2015 by Ryo Iizuka
Import programTcpSocketClientSamlpe
MiMicSDK Tcp client socket sample program.
Last commit 15 Sep 2015 by Ryo Iizuka
Import programUdpSocketSamlpe
Udp socket sample program. This program will send back the received packet.
Last commit 15 Sep 2015 by Ryo Iizuka
Tutorial
- HTTPD hello world.
- How to make own UPnP device.
- MiMicRemoteMCUの紹介(pdf)
- MiMicRemoteMCUのマニュアル(pdf)
Revision 85:416f8bbbdf54, committed 2014-07-04
- Comitter:
- nyatla
- Date:
- Fri Jul 04 14:28:46 2014 +0000
- Parent:
- 84:a5f5973591d8
- Child:
- 86:a042fb18911b
- Commit message:
- RPC???I2C/Slave/Memory/Serial???; ?????????????RPC????????;
Changed in this revision
--- a/mbed/jsonrpc/MbedJsApi.h Fri Jul 04 02:10:40 2014 +0000
+++ b/mbed/jsonrpc/MbedJsApi.h Fri Jul 04 14:28:46 2014 +0000
@@ -17,5 +17,9 @@
const static struct NyLPC_TJsonRpcClassDef RPC_MBED_PORT_IN;
const static struct NyLPC_TJsonRpcClassDef RPC_MBED_SPI;
const static struct NyLPC_TJsonRpcClassDef RPC_MBED_SPI_SLAVE;
+ const static struct NyLPC_TJsonRpcClassDef RPC_MBED_SERIAL;
+ const static struct NyLPC_TJsonRpcClassDef RPC_MBED_I2C;
+ const static struct NyLPC_TJsonRpcClassDef RPC_MBED_I2C_SLAVE;
+ const static struct NyLPC_TJsonRpcClassDef RPC_MBED_MCU;
};
}
--- a/mbed/jsonrpc/RpcAnalogIn.cpp Fri Jul 04 02:10:40 2014 +0000
+++ b/mbed/jsonrpc/RpcAnalogIn.cpp Fri Jul 04 14:28:46 2014 +0000
@@ -7,7 +7,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<AnalogIn>(new AnalogIn(pin)));
@@ -17,7 +17,7 @@
static NyLPC_TBool read_u16(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;
AnalogIn* inst=(AnalogIn*)getObjectBatch(mod,i_rpc);
if(inst!=NULL){
int v=inst->read_u16();
@@ -29,7 +29,7 @@
static NyLPC_TBool read_fx(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;
AnalogIn* inst=(AnalogIn*)getObjectBatch(mod,i_rpc);
if(inst!=NULL){
mod->putResult(i_rpc->method.id,"%d",(int)(inst->read()*10000));
--- a/mbed/jsonrpc/RpcAnalogOut.cpp Fri Jul 04 02:10:40 2014 +0000
+++ b/mbed/jsonrpc/RpcAnalogOut.cpp Fri Jul 04 14:28:46 2014 +0000
@@ -7,7 +7,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<AnalogOut>(new AnalogOut(pin)));
@@ -18,7 +18,7 @@
static NyLPC_TBool read_fx(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;
AnalogOut* inst=(AnalogOut*)getObjectBatch(mod,i_rpc);
if(inst!=NULL){
mod->putResult(i_rpc->method.id,"%d",(int)(inst->read()*10000));
@@ -28,26 +28,26 @@
static NyLPC_TBool write_fx(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;
AnalogOut* inst=(AnalogOut*)getObjectBatch(mod,i_rpc);
if(inst!=NULL){
int v;
if(getParamInt(mod,i_rpc,v,1)){
inst->write((float)v/10000.0f);
- mod->putResult(i_rpc->method.id,"");
+ mod->putResult(i_rpc->method.id);
}
}
return NyLPC_TBool_TRUE;
}
static NyLPC_TBool write_u16(const union NyLPC_TJsonRpcParserResult* i_rpc,void* i_param)
{
- ModJsonRpc* mod=(ModJsonRpc*)i_param;
+ ModJsonRpc* mod=((ModJsonRpc::TcJsonRpcEx_t*)i_param)->cppmod_ptr;
AnalogOut* inst=(AnalogOut*)getObjectBatch(mod,i_rpc);
if(inst!=NULL){
unsigned int v;
if(getParamUInt(mod,i_rpc,v,1)){
inst->write((unsigned int)v);
- mod->putResult(i_rpc->method.id,"");
+ mod->putResult(i_rpc->method.id);
}
}
return NyLPC_TBool_TRUE;
--- a/mbed/jsonrpc/RpcBusIn.cpp Fri Jul 04 02:10:40 2014 +0000
+++ b/mbed/jsonrpc/RpcBusIn.cpp Fri Jul 04 14:28:46 2014 +0000
@@ -7,7 +7,7 @@
static NyLPC_TBool new1(const union NyLPC_TJsonRpcParserResult* i_rpc,void* i_param)
{
//uuuuuuuuuuuuuuuu
- ModJsonRpc* mod=(ModJsonRpc*)i_param;
+ ModJsonRpc* mod=((ModJsonRpc::TcJsonRpcEx_t*)i_param)->cppmod_ptr;
PinName pin[16];
if(getParamsAsPin(mod,i_rpc,pin,16)){
addNewObjectBatch(mod,i_rpc->method.id,new ModJsonRpc::RpcObject<BusIn>(new BusIn(pin)));
@@ -17,7 +17,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;
BusIn* inst=(BusIn*)getObjectBatch(mod,i_rpc);
if(inst!=NULL){
mod->putResult(i_rpc->method.id,"%d",(int)(inst->read()));
@@ -27,13 +27,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;
BusIn* inst=(BusIn*)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;
--- a/mbed/jsonrpc/RpcBusInOut.cpp Fri Jul 04 02:10:40 2014 +0000
+++ b/mbed/jsonrpc/RpcBusInOut.cpp Fri Jul 04 14:28:46 2014 +0000
@@ -7,7 +7,7 @@
static NyLPC_TBool new1(const union NyLPC_TJsonRpcParserResult* i_rpc,void* i_param)
{
//uuuuuuuuuuuuuuuu
- ModJsonRpc* mod=(ModJsonRpc*)i_param;
+ ModJsonRpc* mod=((ModJsonRpc::TcJsonRpcEx_t*)i_param)->cppmod_ptr;
PinName pin[16];
if(getParamsAsPin(mod,i_rpc,pin,16)){
addNewObjectBatch(mod,i_rpc->method.id,new ModJsonRpc::RpcObject<BusInOut>(new BusInOut(pin)));
@@ -17,7 +17,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;
BusInOut* inst=(BusInOut*)getObjectBatch(mod,i_rpc);
if(inst!=NULL){
mod->putResult(i_rpc->method.id,"%d",(int)(inst->read()));
@@ -27,13 +27,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;
BusInOut* inst=(BusInOut*)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;
@@ -41,35 +41,35 @@
static NyLPC_TBool output(const union NyLPC_TJsonRpcParserResult* i_rpc,void* i_param)
{
//d return void
- ModJsonRpc* mod=(ModJsonRpc*)i_param;
+ ModJsonRpc* mod=((ModJsonRpc::TcJsonRpcEx_t*)i_param)->cppmod_ptr;
BusInOut* inst=(BusInOut*)getObjectBatch(mod,i_rpc);
if(inst!=NULL){
inst->output();
- mod->putResult(i_rpc->method.id,"");
+ mod->putResult(i_rpc->method.id);
}
return NyLPC_TBool_TRUE;
}
static NyLPC_TBool input(const union NyLPC_TJsonRpcParserResult* i_rpc,void* i_param)
{
//d return void
- ModJsonRpc* mod=(ModJsonRpc*)i_param;
+ ModJsonRpc* mod=((ModJsonRpc::TcJsonRpcEx_t*)i_param)->cppmod_ptr;
BusInOut* inst=(BusInOut*)getObjectBatch(mod,i_rpc);
if(inst!=NULL){
inst->input();
- mod->putResult(i_rpc->method.id,"");
+ mod->putResult(i_rpc->method.id);
}
return NyLPC_TBool_TRUE;
}
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;
BusInOut* inst=(BusInOut*)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;
--- a/mbed/jsonrpc/RpcBusOut.cpp Fri Jul 04 02:10:40 2014 +0000
+++ b/mbed/jsonrpc/RpcBusOut.cpp Fri Jul 04 14:28:46 2014 +0000
@@ -7,7 +7,7 @@
static NyLPC_TBool new1(const union NyLPC_TJsonRpcParserResult* i_rpc,void* i_param)
{
//uuuuuuuuuuuuuuuu
- ModJsonRpc* mod=(ModJsonRpc*)i_param;
+ ModJsonRpc* mod=((ModJsonRpc::TcJsonRpcEx_t*)i_param)->cppmod_ptr;
PinName pin[16];
if(getParamsAsPin(mod,i_rpc,pin,16)){
addNewObjectBatch(mod,i_rpc->method.id,new ModJsonRpc::RpcObject<BusOut>(new BusOut(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;
BusOut* inst=(BusOut*)getObjectBatch(mod,i_rpc);
if(inst!=NULL){
mod->putResult(i_rpc->method.id,"%d",(int)(inst->read()));
@@ -28,13 +28,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;
BusOut* inst=(BusOut*)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;
--- 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;
--- 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()));
--- a/mbed/jsonrpc/RpcHandlerBase.h Fri Jul 04 02:10:40 2014 +0000
+++ b/mbed/jsonrpc/RpcHandlerBase.h Fri Jul 04 14:28:46 2014 +0000
@@ -64,6 +64,30 @@
}
return true;
}
+ static bool getParamByte(ModJsonRpc* i_mod,const union NyLPC_TJsonRpcParserResult* i_rpc,unsigned char &o_val,int i_idx)
+ {
+ if(!NyLPC_TJsonRpcParserResult_getByte(i_rpc,i_idx,(NyLPC_TUInt8*)&o_val)){
+ i_mod->putError(i_rpc->method.id,ModJsonRpc::INVALID_PARAMS);
+ return false;
+ }
+ return true;
+ }
+ static bool getParamByteArray(ModJsonRpc* i_mod,const union NyLPC_TJsonRpcParserResult* i_rpc,const unsigned char* &o_val,unsigned char &o_len,int i_idx)
+ {
+ if(!NyLPC_TJsonRpcParserResult_getByteArray(i_rpc,i_idx,(const NyLPC_TUInt8**)&o_val,&o_len)){
+ i_mod->putError(i_rpc->method.id,ModJsonRpc::INVALID_PARAMS);
+ return false;
+ }
+ return true;
+ }
+ static bool getParamString(ModJsonRpc* i_mod,const union NyLPC_TJsonRpcParserResult* i_rpc,const char* &o_val,int i_idx)
+ {
+ if(!NyLPC_TJsonRpcParserResult_getStr(i_rpc,i_idx,(const NyLPC_TChar**)&o_val,NULL)){
+ i_mod->putError(i_rpc->method.id,ModJsonRpc::INVALID_PARAMS);
+ return false;
+ }
+ return true;
+ }
static bool getParamInt(ModJsonRpc* i_mod,const union NyLPC_TJsonRpcParserResult* i_rpc,int& o_val,int i_idx)
{
if(!NyLPC_TJsonRpcParserResult_getInt32(i_rpc,i_idx,((NyLPC_TInt32*)&o_val))){
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mbed/jsonrpc/RpcI2C.cpp Fri Jul 04 14:28:46 2014 +0000
@@ -0,0 +1,139 @@
+#include "RpcHandlerBase.h"
+namespace MiMic
+{
+ class I2CHandler :RpcHandlerBase
+ {
+ public:
+ static NyLPC_TBool new1(const union NyLPC_TJsonRpcParserResult* i_rpc,void* i_param)
+ {
+ //u
+ ModJsonRpc* mod=((ModJsonRpc::TcJsonRpcEx_t*)i_param)->cppmod_ptr;
+ PinName pins[2];
+ if(getParamsAsPin(mod,i_rpc,pins,2)){
+ addNewObjectBatch(mod,i_rpc->method.id,new ModJsonRpc::RpcObject<I2C>(new I2C(pins[0],pins[1])));
+ }
+ return NyLPC_TBool_TRUE;
+ }
+ static NyLPC_TBool frequency(const union NyLPC_TJsonRpcParserResult* i_rpc,void* i_param)
+ {
+ //d return d
+ ModJsonRpc* mod=((ModJsonRpc::TcJsonRpcEx_t*)i_param)->cppmod_ptr;
+ I2C* inst=(I2C*)getObjectBatch(mod,i_rpc);
+ if(inst!=NULL){
+ int v;
+ if(getParamInt(mod,i_rpc,v,1)){
+ inst->frequency(v);
+ mod->putResult(i_rpc->method.id);
+ }
+ }
+ return NyLPC_TBool_TRUE;
+ }
+ static NyLPC_TBool read1(const union NyLPC_TJsonRpcParserResult* i_rpc,void* i_param)
+ {
+ //ddd return dB
+ ModJsonRpc* mod=((ModJsonRpc::TcJsonRpcEx_t*)i_param)->cppmod_ptr;
+ I2C* inst=(I2C*)getObjectBatch(mod,i_rpc);
+ if(inst!=NULL){
+ int addr;
+ unsigned char repeated,len;
+ if(getParamInt(mod,i_rpc,addr,1)){
+ if(getParamByte(mod,i_rpc,len,2)){
+ if(getParamByte(mod,i_rpc,repeated,3)){
+ char* data=new char[len];
+ int r=inst->read(addr,data,len,repeated?true:false);
+ mod->putResult(i_rpc->method.id,"%d,\"%.*B\"",r,(int)len,data);
+ delete[] data;
+ }
+ }
+ }
+ }
+ return NyLPC_TBool_TRUE;
+ }
+ static NyLPC_TBool read2(const union NyLPC_TJsonRpcParserResult* i_rpc,void* i_param)
+ {
+ //dd return d
+ ModJsonRpc* mod=((ModJsonRpc::TcJsonRpcEx_t*)i_param)->cppmod_ptr;
+ I2C* inst=(I2C*)getObjectBatch(mod,i_rpc);
+ if(inst!=NULL){
+ int ack;
+ if(getParamInt(mod,i_rpc,ack,1)){
+ mod->putResult(i_rpc->method.id,"%d",inst->read(ack));
+ }
+ }
+ return NyLPC_TBool_TRUE;
+ }
+ static NyLPC_TBool write1(const union NyLPC_TJsonRpcParserResult* i_rpc,void* i_param)
+ {
+ //ddBd return d
+ ModJsonRpc* mod=((ModJsonRpc::TcJsonRpcEx_t*)i_param)->cppmod_ptr;
+ I2C* inst=(I2C*)getObjectBatch(mod,i_rpc);
+ if(inst!=NULL){
+ int addr;
+ const unsigned char* data;
+ unsigned char repeated,len;
+ if(getParamInt(mod,i_rpc,addr,1)){
+ if(getParamByteArray(mod,i_rpc,data,len,2)){
+ if(getParamByte(mod,i_rpc,repeated,3)){
+ mod->putResult(i_rpc->method.id,"%d",inst->write(addr,(const char*)data,len,repeated?true:false));
+ }
+ }
+ }
+ }
+ return NyLPC_TBool_TRUE;
+ }
+ static NyLPC_TBool write2(const union NyLPC_TJsonRpcParserResult* i_rpc,void* i_param)
+ {
+ //dd return d
+ ModJsonRpc* mod=((ModJsonRpc::TcJsonRpcEx_t*)i_param)->cppmod_ptr;
+ I2C* inst=(I2C*)getObjectBatch(mod,i_rpc);
+ if(inst!=NULL){
+ int ack;
+ if(getParamInt(mod,i_rpc,ack,1)){
+ mod->putResult(i_rpc->method.id,"%d",inst->write(ack));
+ }
+ }
+ return NyLPC_TBool_TRUE;
+ }
+ static NyLPC_TBool start(const union NyLPC_TJsonRpcParserResult* i_rpc,void* i_param)
+ {
+ //d return d
+ ModJsonRpc* mod=((ModJsonRpc::TcJsonRpcEx_t*)i_param)->cppmod_ptr;
+ I2C* inst=(I2C*)getObjectBatch(mod,i_rpc);
+ if(inst!=NULL){
+ inst->start();
+ mod->putResult(i_rpc->method.id);
+ }
+ return NyLPC_TBool_TRUE;
+ }
+ static NyLPC_TBool stop(const union NyLPC_TJsonRpcParserResult* i_rpc,void* i_param)
+ {
+ //d return d
+ ModJsonRpc* mod=((ModJsonRpc::TcJsonRpcEx_t*)i_param)->cppmod_ptr;
+ I2C* inst=(I2C*)getObjectBatch(mod,i_rpc);
+ if(inst!=NULL){
+ inst->stop();
+ mod->putResult(i_rpc->method.id);
+ }
+ return NyLPC_TBool_TRUE;
+ }
+ };
+
+
+ const static struct NyLPC_TJsonRpcMethodDef func_table[]=
+ {
+ { "_new1" ,"uu" ,I2CHandler::new1},
+ { "frequency" ,"dd" ,I2CHandler::frequency},
+ { "read1" ,"ddbb" ,I2CHandler::read1},
+ { "read2" ,"dd" ,I2CHandler::read2},
+ { "write1" ,"ddBb" ,I2CHandler::write1},
+ { "write2" ,"dd" ,I2CHandler::write2},
+ { "start" ,"d" ,I2CHandler::start},
+ { "stop" ,"d" ,I2CHandler::stop},
+ { NULL ,NULL ,NULL}
+ };
+
+ const struct NyLPC_TJsonRpcClassDef MbedJsApi::RPC_MBED_I2C={
+ "mbedJS","I2C",func_table
+ };
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mbed/jsonrpc/RpcI2CSlave.cpp Fri Jul 04 14:28:46 2014 +0000
@@ -0,0 +1,140 @@
+#include "RpcHandlerBase.h"
+namespace MiMic
+{
+ class I2CSlaveHandler :RpcHandlerBase
+ {
+ public:
+ static NyLPC_TBool new1(const union NyLPC_TJsonRpcParserResult* i_rpc,void* i_param)
+ {
+ //u
+ ModJsonRpc* mod=((ModJsonRpc::TcJsonRpcEx_t*)i_param)->cppmod_ptr;
+ PinName pins[2];
+ if(getParamsAsPin(mod,i_rpc,pins,2)){
+ addNewObjectBatch(mod,i_rpc->method.id,new ModJsonRpc::RpcObject<I2CSlave>(new I2CSlave(pins[0],pins[1])));
+ }
+ return NyLPC_TBool_TRUE;
+ }
+ static NyLPC_TBool frequency(const union NyLPC_TJsonRpcParserResult* i_rpc,void* i_param)
+ {
+ //d return d
+ ModJsonRpc* mod=((ModJsonRpc::TcJsonRpcEx_t*)i_param)->cppmod_ptr;
+ I2CSlave* inst=(I2CSlave*)getObjectBatch(mod,i_rpc);
+ if(inst!=NULL){
+ int v;
+ if(getParamInt(mod,i_rpc,v,1)){
+ inst->frequency(v);
+ mod->putResult(i_rpc->method.id);
+ }
+ }
+ return NyLPC_TBool_TRUE;
+ }
+ static NyLPC_TBool receive(const union NyLPC_TJsonRpcParserResult* i_rpc,void* i_param)
+ {
+ //d return d
+ ModJsonRpc* mod=((ModJsonRpc::TcJsonRpcEx_t*)i_param)->cppmod_ptr;
+ I2CSlave* inst=(I2CSlave*)getObjectBatch(mod,i_rpc);
+ if(inst!=NULL){
+ mod->putResult(i_rpc->method.id,"%d",inst->receive());
+ }
+ return NyLPC_TBool_TRUE;
+ }
+ static NyLPC_TBool read1(const union NyLPC_TJsonRpcParserResult* i_rpc,void* i_param)
+ {
+ //db return dB
+ ModJsonRpc* mod=((ModJsonRpc::TcJsonRpcEx_t*)i_param)->cppmod_ptr;
+ I2CSlave* inst=(I2CSlave*)getObjectBatch(mod,i_rpc);
+ if(inst!=NULL){
+ unsigned char len;
+ if(getParamByte(mod,i_rpc,len,1)){
+ char* data=new char[len];
+ int r=inst->read(data,len);
+ mod->putResult(i_rpc->method.id,"%d,\"%.*B\"",r,(int)len,data);
+ delete[] data;
+ }
+ }
+ return NyLPC_TBool_TRUE;
+ }
+ static NyLPC_TBool read2(const union NyLPC_TJsonRpcParserResult* i_rpc,void* i_param)
+ {
+ //dd return d
+ ModJsonRpc* mod=((ModJsonRpc::TcJsonRpcEx_t*)i_param)->cppmod_ptr;
+ I2CSlave* inst=(I2CSlave*)getObjectBatch(mod,i_rpc);
+ if(inst!=NULL){
+ mod->putResult(i_rpc->method.id,"%d",inst->read());
+ }
+ return NyLPC_TBool_TRUE;
+ }
+ static NyLPC_TBool write1(const union NyLPC_TJsonRpcParserResult* i_rpc,void* i_param)
+ {
+ //ddBd return d
+ ModJsonRpc* mod=((ModJsonRpc::TcJsonRpcEx_t*)i_param)->cppmod_ptr;
+ I2CSlave* inst=(I2CSlave*)getObjectBatch(mod,i_rpc);
+ if(inst!=NULL){
+ const unsigned char* data;
+ unsigned char len;
+ if(getParamByteArray(mod,i_rpc,data,len,1)){
+ mod->putResult(i_rpc->method.id,"%d",inst->write((const char*)data,len));
+ }
+ }
+ return NyLPC_TBool_TRUE;
+ }
+ static NyLPC_TBool write2(const union NyLPC_TJsonRpcParserResult* i_rpc,void* i_param)
+ {
+ //dd return d
+ ModJsonRpc* mod=((ModJsonRpc::TcJsonRpcEx_t*)i_param)->cppmod_ptr;
+ I2CSlave* inst=(I2CSlave*)getObjectBatch(mod,i_rpc);
+ if(inst!=NULL){
+ int data;
+ if(getParamInt(mod,i_rpc,data,1)){
+ mod->putResult(i_rpc->method.id,"%d",inst->write(data));
+ }
+ }
+ return NyLPC_TBool_TRUE;
+ }
+ static NyLPC_TBool address(const union NyLPC_TJsonRpcParserResult* i_rpc,void* i_param)
+ {
+ //dd return d
+ ModJsonRpc* mod=((ModJsonRpc::TcJsonRpcEx_t*)i_param)->cppmod_ptr;
+ I2CSlave* inst=(I2CSlave*)getObjectBatch(mod,i_rpc);
+ if(inst!=NULL){
+ int addr;
+ if(getParamInt(mod,i_rpc,addr,1)){
+ inst->address(addr);
+ mod->putResult(i_rpc->method.id);
+ }
+ }
+ return NyLPC_TBool_TRUE;
+ }
+ static NyLPC_TBool stop(const union NyLPC_TJsonRpcParserResult* i_rpc,void* i_param)
+ {
+ //d return d
+ ModJsonRpc* mod=((ModJsonRpc::TcJsonRpcEx_t*)i_param)->cppmod_ptr;
+ I2CSlave* inst=(I2CSlave*)getObjectBatch(mod,i_rpc);
+ if(inst!=NULL){
+ inst->stop();
+ mod->putResult(i_rpc->method.id);
+ }
+ return NyLPC_TBool_TRUE;
+ }
+ };
+
+
+ const static struct NyLPC_TJsonRpcMethodDef func_table[]=
+ {
+ { "_new1" ,"uu" ,I2CSlaveHandler::new1},
+ { "frequency" ,"dd" ,I2CSlaveHandler::frequency},
+ { "receive" ,"d" ,I2CSlaveHandler::receive},
+ { "read1" ,"db" ,I2CSlaveHandler::read1},
+ { "read2" ,"d" ,I2CSlaveHandler::read2},
+ { "write1" ,"dB" ,I2CSlaveHandler::write1},
+ { "write2" ,"dd" ,I2CSlaveHandler::write2},
+ { "address" ,"dd" ,I2CSlaveHandler::address},
+ { "stop" ,"d" ,I2CSlaveHandler::stop},
+ { NULL ,NULL ,NULL}
+ };
+
+ const struct NyLPC_TJsonRpcClassDef MbedJsApi::RPC_MBED_I2C_SLAVE={
+ "mbedJS","I2CSlave",func_table
+ };
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mbed/jsonrpc/RpcMcu.cpp Fri Jul 04 14:28:46 2014 +0000
@@ -0,0 +1,80 @@
+#include "RpcHandlerBase.h"
+/**
+ * malloc出来る最大サイズを得る関数
+ */
+static int getFreeMemory()
+{
+ int size=1;
+ for(;;){
+ void* buf=malloc(size);
+ if(buf==NULL){
+ break;
+ }
+ free(buf);
+ size*=2;
+ }
+ int min=size/2;
+ int max=size;
+ for(;;){
+ int n=(max+min)/2;
+ void* b=malloc(n);
+ if(b){
+ free(b);
+ min=n;
+ }else{
+ max=n;
+ }
+ if(max-min==1){
+ return min;
+ }
+ }
+}
+namespace MiMic
+{
+ class McuHandler :RpcHandlerBase
+ {
+ public:
+ static NyLPC_TBool disposeObject(const union NyLPC_TJsonRpcParserResult* i_rpc,void* i_param)
+ {
+ //d
+ ModJsonRpc* mod=((ModJsonRpc::TcJsonRpcEx_t*)i_param)->cppmod_ptr;
+ int id;
+ if(getParamInt(mod,i_rpc,id,0)){
+ mod->putResult(i_rpc->method.id,"%d",mod->removeObject(id));
+ }
+ return NyLPC_TBool_TRUE;
+ }
+ /** idに合致するオブジェクトを削除します。
+ * RPC-returnは1:成功、0:失敗です。
+ */
+ static NyLPC_TBool getInfo(const union NyLPC_TJsonRpcParserResult* i_rpc,void* i_param)
+ {
+ //d return d
+ ModJsonRpc* mod=((ModJsonRpc::TcJsonRpcEx_t*)i_param)->cppmod_ptr;
+ //version,mcu,memoryの順
+ mod->putResult(i_rpc->method.id,
+ "\"%s\",\"%s\",\"%s\",\"%s\",%d",
+ NyLPC_cMiMicEnv_getStrProperty(NyLPC_cMiMicEnv_VERSION),
+ NyLPC_cMiMicEnv_getStrProperty(NyLPC_cMiMicEnv_SHORT_NAME),
+ NyLPC_cMiMicEnv_getStrProperty(NyLPC_cMiMicEnv_ETHERNET_PHY),
+ NyLPC_cMiMicEnv_getStrProperty(NyLPC_cMiMicEnv_MCU_NAME),
+ /*getFreeMemory()*/-1);
+ return NyLPC_TBool_TRUE;
+ }
+ };
+
+const static struct NyLPC_TJsonRpcMethodDef func_table[]=
+{
+ { "getInfo" ,"" ,McuHandler::getInfo},
+ { "disposeObject","d",McuHandler::disposeObject},
+ { NULL ,NULL ,NULL}
+};
+
+const struct NyLPC_TJsonRpcClassDef MbedJsApi::RPC_MBED_MCU={
+ "mbedJS","Mcu",func_table
+};
+
+
+
+}
+
--- a/mbed/jsonrpc/RpcPortIn.cpp Fri Jul 04 02:10:40 2014 +0000
+++ b/mbed/jsonrpc/RpcPortIn.cpp Fri Jul 04 14:28:46 2014 +0000
@@ -7,7 +7,7 @@
static NyLPC_TBool new1(const union NyLPC_TJsonRpcParserResult* i_rpc,void* i_param)
{
//ud
- ModJsonRpc* mod=(ModJsonRpc*)i_param;
+ ModJsonRpc* mod=((ModJsonRpc::TcJsonRpcEx_t*)i_param)->cppmod_ptr;
unsigned int port;
int mask;
if(getParamUInt(mod,i_rpc,port,0)){
@@ -20,7 +20,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;
PortIn* inst=(PortIn*)getObjectBatch(mod,i_rpc);
if(inst!=NULL){
mod->putResult(i_rpc->method.id,"%d",(int)(inst->read()));
--- a/mbed/jsonrpc/RpcPortOut.cpp Fri Jul 04 02:10:40 2014 +0000
+++ b/mbed/jsonrpc/RpcPortOut.cpp Fri Jul 04 14:28:46 2014 +0000
@@ -7,7 +7,7 @@
static NyLPC_TBool new1(const union NyLPC_TJsonRpcParserResult* i_rpc,void* i_param)
{
//ud
- ModJsonRpc* mod=(ModJsonRpc*)i_param;
+ ModJsonRpc* mod=((ModJsonRpc::TcJsonRpcEx_t*)i_param)->cppmod_ptr;
unsigned int port;
int mask;
if(getParamUInt(mod,i_rpc,port,0)){
@@ -20,7 +20,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;
PortOut* inst=(PortOut*)getObjectBatch(mod,i_rpc);
if(inst!=NULL){
mod->putResult(i_rpc->method.id,"%d",(int)(inst->read()));
@@ -30,13 +30,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;
PortOut* inst=(PortOut*)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;
--- a/mbed/jsonrpc/RpcPwmOut.cpp Fri Jul 04 02:10:40 2014 +0000
+++ b/mbed/jsonrpc/RpcPwmOut.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<PwmOut>(new PwmOut(pin)));
@@ -18,13 +18,13 @@
static NyLPC_TBool write_fx(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;
PwmOut* inst=(PwmOut*)getObjectBatch(mod,i_rpc);
if(inst!=NULL){
int v;
if(getParamInt(mod,i_rpc,v,1)){
inst->write((float)v/10000.f);
- mod->putResult(i_rpc->method.id,"");
+ mod->putResult(i_rpc->method.id);
}
}
return NyLPC_TBool_TRUE;
@@ -32,7 +32,7 @@
static NyLPC_TBool read_fx(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;
PwmOut* inst=(PwmOut*)getObjectBatch(mod,i_rpc);
if(inst!=NULL){
mod->putResult(i_rpc->method.id,"%d",(int)(inst->read()*10000));
@@ -42,13 +42,13 @@
static NyLPC_TBool period_fx(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;
PwmOut* inst=(PwmOut*)getObjectBatch(mod,i_rpc);
if(inst!=NULL){
int v;
if(getParamInt(mod,i_rpc,v,1)){
inst->period((float)v/10000.f);
- mod->putResult(i_rpc->method.id,"");
+ mod->putResult(i_rpc->method.id);
}
}
return NyLPC_TBool_TRUE;
@@ -56,13 +56,13 @@
static NyLPC_TBool period_ms(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;
PwmOut* inst=(PwmOut*)getObjectBatch(mod,i_rpc);
if(inst!=NULL){
int v;
if(getParamInt(mod,i_rpc,v,1)){
inst->period_ms(v);
- mod->putResult(i_rpc->method.id,"");
+ mod->putResult(i_rpc->method.id);
}
}
return NyLPC_TBool_TRUE;
@@ -70,13 +70,13 @@
static NyLPC_TBool period_us(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;
PwmOut* inst=(PwmOut*)getObjectBatch(mod,i_rpc);
if(inst!=NULL){
int v;
if(getParamInt(mod,i_rpc,v,1)){
inst->period_us(v);
- mod->putResult(i_rpc->method.id,"");
+ mod->putResult(i_rpc->method.id);
}
}
return NyLPC_TBool_TRUE;
@@ -84,13 +84,13 @@
static NyLPC_TBool pulsewidth_fx(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;
PwmOut* inst=(PwmOut*)getObjectBatch(mod,i_rpc);
if(inst!=NULL){
int v;
if(getParamInt(mod,i_rpc,v,1)){
inst->pulsewidth((float)v/10000.0f);
- mod->putResult(i_rpc->method.id,"");
+ mod->putResult(i_rpc->method.id);
}
}
return NyLPC_TBool_TRUE;
@@ -98,13 +98,13 @@
static NyLPC_TBool pulsewidth_ms(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;
PwmOut* inst=(PwmOut*)getObjectBatch(mod,i_rpc);
if(inst!=NULL){
int v;
if(getParamInt(mod,i_rpc,v,1)){
inst->pulsewidth_ms(v);
- mod->putResult(i_rpc->method.id,"");
+ mod->putResult(i_rpc->method.id);
}
}
return NyLPC_TBool_TRUE;
@@ -112,13 +112,13 @@
static NyLPC_TBool pulsewidth_us(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;
PwmOut* inst=(PwmOut*)getObjectBatch(mod,i_rpc);
if(inst!=NULL){
int v;
if(getParamInt(mod,i_rpc,v,1)){
inst->pulsewidth_us(v);
- mod->putResult(i_rpc->method.id,"");
+ mod->putResult(i_rpc->method.id);
}
}
return NyLPC_TBool_TRUE;
--- a/mbed/jsonrpc/RpcSPI.cpp Fri Jul 04 02:10:40 2014 +0000
+++ b/mbed/jsonrpc/RpcSPI.cpp Fri Jul 04 14:28:46 2014 +0000
@@ -7,7 +7,7 @@
static NyLPC_TBool new1(const union NyLPC_TJsonRpcParserResult* i_rpc,void* i_param)
{
//uuuu
- ModJsonRpc* mod=(ModJsonRpc*)i_param;
+ ModJsonRpc* mod=((ModJsonRpc::TcJsonRpcEx_t*)i_param)->cppmod_ptr;
PinName pin[4];
if(getParamsAsPin(mod,i_rpc,pin,4)){
addNewObjectBatch(mod,i_rpc->method.id,new ModJsonRpc::RpcObject<SPI>(new SPI(pin[0],pin[1],pin[2],pin[3])));
@@ -17,13 +17,13 @@
static NyLPC_TBool format(const union NyLPC_TJsonRpcParserResult* i_rpc,void* i_param)
{
//ddd return void
- ModJsonRpc* mod=(ModJsonRpc*)i_param;
+ ModJsonRpc* mod=((ModJsonRpc::TcJsonRpcEx_t*)i_param)->cppmod_ptr;
SPI* inst=(SPI*)getObjectBatch(mod,i_rpc);
if(inst!=NULL){
int p[2];
if(getParamsInt(mod,i_rpc,p,2,1)){
inst->format(p[0],p[1]);
- mod->putResult(i_rpc->method.id,"");
+ mod->putResult(i_rpc->method.id);
}
}
@@ -32,13 +32,13 @@
static NyLPC_TBool frequency(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;
SPI* inst=(SPI*)getObjectBatch(mod,i_rpc);
if(inst!=NULL){
int v;
if(getParamInt(mod,i_rpc,v,1)){
inst->frequency(v);
- mod->putResult(i_rpc->method.id,"");
+ mod->putResult(i_rpc->method.id);
}
}
return NyLPC_TBool_TRUE;
@@ -46,7 +46,7 @@
static NyLPC_TBool write(const union NyLPC_TJsonRpcParserResult* i_rpc,void* i_param)
{
//dd return d
- ModJsonRpc* mod=(ModJsonRpc*)i_param;
+ ModJsonRpc* mod=((ModJsonRpc::TcJsonRpcEx_t*)i_param)->cppmod_ptr;
SPI* inst=(SPI*)getObjectBatch(mod,i_rpc);
if(inst!=NULL){
int v;
--- a/mbed/jsonrpc/RpcSPISlave.cpp Fri Jul 04 02:10:40 2014 +0000
+++ b/mbed/jsonrpc/RpcSPISlave.cpp Fri Jul 04 14:28:46 2014 +0000
@@ -7,7 +7,7 @@
static NyLPC_TBool new1(const union NyLPC_TJsonRpcParserResult* i_rpc,void* i_param)
{
//uuuu
- ModJsonRpc* mod=(ModJsonRpc*)i_param;
+ ModJsonRpc* mod=((ModJsonRpc::TcJsonRpcEx_t*)i_param)->cppmod_ptr;
PinName pin[4];
if(getParamsAsPin(mod,i_rpc,pin,4)){
addNewObjectBatch(mod,i_rpc->method.id,new ModJsonRpc::RpcObject<SPISlave>(new SPISlave(pin[0],pin[1],pin[2],pin[3])));
@@ -17,13 +17,13 @@
static NyLPC_TBool format(const union NyLPC_TJsonRpcParserResult* i_rpc,void* i_param)
{
//ddd return void
- ModJsonRpc* mod=(ModJsonRpc*)i_param;
+ ModJsonRpc* mod=((ModJsonRpc::TcJsonRpcEx_t*)i_param)->cppmod_ptr;
SPISlave* inst=(SPISlave*)getObjectBatch(mod,i_rpc);
if(inst!=NULL){
int p[2];
if(getParamsInt(mod,i_rpc,p,2,1)){
inst->format(p[0],p[1]);
- mod->putResult(i_rpc->method.id,"");
+ mod->putResult(i_rpc->method.id);
}
}
return NyLPC_TBool_TRUE;
@@ -31,13 +31,13 @@
static NyLPC_TBool frequency(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;
SPISlave* inst=(SPISlave*)getObjectBatch(mod,i_rpc);
if(inst!=NULL){
int v;
if(getParamInt(mod,i_rpc,v,1)){
inst->frequency(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)
{
//dd return d
- ModJsonRpc* mod=(ModJsonRpc*)i_param;
+ ModJsonRpc* mod=((ModJsonRpc::TcJsonRpcEx_t*)i_param)->cppmod_ptr;
SPISlave* inst=(SPISlave*)getObjectBatch(mod,i_rpc);
if(inst!=NULL){
mod->putResult(i_rpc->method.id,"%d",(int)(inst->read()));
@@ -55,7 +55,7 @@
static NyLPC_TBool receive(const union NyLPC_TJsonRpcParserResult* i_rpc,void* i_param)
{
//dd return d
- ModJsonRpc* mod=(ModJsonRpc*)i_param;
+ ModJsonRpc* mod=((ModJsonRpc::TcJsonRpcEx_t*)i_param)->cppmod_ptr;
SPISlave* inst=(SPISlave*)getObjectBatch(mod,i_rpc);
if(inst!=NULL){
mod->putResult(i_rpc->method.id,"%d",(int)(inst->receive()));
@@ -65,13 +65,13 @@
static NyLPC_TBool reply(const union NyLPC_TJsonRpcParserResult* i_rpc,void* i_param)
{
//dd return d
- ModJsonRpc* mod=(ModJsonRpc*)i_param;
+ ModJsonRpc* mod=((ModJsonRpc::TcJsonRpcEx_t*)i_param)->cppmod_ptr;
SPISlave* inst=(SPISlave*)getObjectBatch(mod,i_rpc);
if(inst!=NULL){
int v;
if(getParamInt(mod,i_rpc,v,1)){
inst->reply(v);
- mod->putResult(i_rpc->method.id,"");
+ mod->putResult(i_rpc->method.id);
}
}
return NyLPC_TBool_TRUE;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mbed/jsonrpc/RpcSerial.cpp Fri Jul 04 14:28:46 2014 +0000
@@ -0,0 +1,153 @@
+#include "RpcHandlerBase.h"
+namespace MiMic
+{
+ class SerialHandler :RpcHandlerBase
+ {
+ public:
+ static NyLPC_TBool new1(const union NyLPC_TJsonRpcParserResult* i_rpc,void* i_param)
+ {
+ //uu
+ ModJsonRpc* mod=((ModJsonRpc::TcJsonRpcEx_t*)i_param)->cppmod_ptr;
+ PinName pins[2];
+ if(getParamsAsPin(mod,i_rpc,pins,2)){
+ addNewObjectBatch(mod,i_rpc->method.id,new ModJsonRpc::RpcObject<Serial>(new Serial(pins[0],pins[1])));
+ }
+ return NyLPC_TBool_TRUE;
+ }
+ static NyLPC_TBool format(const union NyLPC_TJsonRpcParserResult* i_rpc,void* i_param)
+ {
+ //dddd return none
+ ModJsonRpc* mod=((ModJsonRpc::TcJsonRpcEx_t*)i_param)->cppmod_ptr;
+ Serial* inst=(Serial*)getObjectBatch(mod,i_rpc);
+ if(inst!=NULL){
+ int p[3];
+ if(getParamsInt(mod,i_rpc,p,3,1)){
+ inst->format(p[0],(SerialBase::Parity)p[1],p[2]);
+ mod->putResult(i_rpc->method.id);
+ }
+ }
+ return NyLPC_TBool_TRUE;
+ };
+ static NyLPC_TBool readable(const union NyLPC_TJsonRpcParserResult* i_rpc,void* i_param)
+ {
+ //d return d
+ ModJsonRpc* mod=((ModJsonRpc::TcJsonRpcEx_t*)i_param)->cppmod_ptr;
+ Serial* inst=(Serial*)getObjectBatch(mod,i_rpc);
+ if(inst!=NULL){
+ mod->putResult(i_rpc->method.id,"%d",inst->readable());
+ }
+ return NyLPC_TBool_TRUE;
+ }
+ static NyLPC_TBool writeable(const union NyLPC_TJsonRpcParserResult* i_rpc,void* i_param)
+ {
+ //d return d
+ ModJsonRpc* mod=((ModJsonRpc::TcJsonRpcEx_t*)i_param)->cppmod_ptr;
+ Serial* inst=(Serial*)getObjectBatch(mod,i_rpc);
+ if(inst!=NULL){
+ mod->putResult(i_rpc->method.id,"%d",inst->writeable());
+ }
+ return NyLPC_TBool_TRUE;
+ }
+ static NyLPC_TBool send_break(const union NyLPC_TJsonRpcParserResult* i_rpc,void* i_param)
+ {
+ //d return none
+ ModJsonRpc* mod=((ModJsonRpc::TcJsonRpcEx_t*)i_param)->cppmod_ptr;
+ Serial* inst=(Serial*)getObjectBatch(mod,i_rpc);
+ if(inst!=NULL){
+ mod->putResult(i_rpc->method.id);
+ }
+ return NyLPC_TBool_TRUE;
+ }
+ static NyLPC_TBool putc(const union NyLPC_TJsonRpcParserResult* i_rpc,void* i_param)
+ {
+ //d return d
+ ModJsonRpc* mod=((ModJsonRpc::TcJsonRpcEx_t*)i_param)->cppmod_ptr;
+ Serial* inst=(Serial*)getObjectBatch(mod,i_rpc);
+ if(inst!=NULL){
+ int v;
+ if(getParamInt(mod,i_rpc,v,1)){
+ mod->putResult(i_rpc->method.id,"%d",inst->putc(v));
+ }
+ }
+ return NyLPC_TBool_TRUE;
+ }
+ static NyLPC_TBool puts(const union NyLPC_TJsonRpcParserResult* i_rpc,void* i_param)
+ {
+ //ds return d
+ ModJsonRpc* mod=((ModJsonRpc::TcJsonRpcEx_t*)i_param)->cppmod_ptr;
+ Serial* inst=(Serial*)getObjectBatch(mod,i_rpc);
+ if(inst!=NULL){
+ const char* s;
+ if(getParamString(mod,i_rpc,s,1)){
+ mod->putResult(i_rpc->method.id,"%d",inst->puts(s));
+ }
+ }
+ return NyLPC_TBool_TRUE;
+ }
+ static NyLPC_TBool getc(const union NyLPC_TJsonRpcParserResult* i_rpc,void* i_param)
+ {
+ //d return d
+ ModJsonRpc* mod=((ModJsonRpc::TcJsonRpcEx_t*)i_param)->cppmod_ptr;
+ Serial* inst=(Serial*)getObjectBatch(mod,i_rpc);
+ if(inst!=NULL){
+ mod->putResult(i_rpc->method.id,"%d",inst->getc());
+ }
+ return NyLPC_TBool_TRUE;
+ }
+ static NyLPC_TBool gets(const union NyLPC_TJsonRpcParserResult* i_rpc,void* i_param)
+ {
+ //dd return s
+ ModJsonRpc* mod=((ModJsonRpc::TcJsonRpcEx_t*)i_param)->cppmod_ptr;
+ Serial* inst=(Serial*)getObjectBatch(mod,i_rpc);
+ if(inst!=NULL){
+ unsigned char l;
+ if(getParamByte(mod,i_rpc,l,1)){
+ char* b=new char[l];
+ inst->gets(b,l);
+ mod->putResult(i_rpc->method.id,"\"%s\"",b);
+ delete[] b;
+ }
+ }
+ return NyLPC_TBool_TRUE;
+ }
+ static NyLPC_TBool baud(const union NyLPC_TJsonRpcParserResult* i_rpc,void* i_param)
+ {
+ //d return d
+ ModJsonRpc* mod=((ModJsonRpc::TcJsonRpcEx_t*)i_param)->cppmod_ptr;
+ Serial* inst=(Serial*)getObjectBatch(mod,i_rpc);
+ if(inst!=NULL){
+ int v;
+ if(getParamInt(mod,i_rpc,v,1)){
+ inst->baud(v);
+ mod->putResult(i_rpc->method.id);
+ }
+ }
+ return NyLPC_TBool_TRUE;
+ }
+ };
+
+
+
+ const static struct NyLPC_TJsonRpcMethodDef func_table[]=
+ {
+ { "_new1" ,"uu" ,SerialHandler::new1},
+ { "format" ,"dddd" ,SerialHandler::format},
+ { "readable" ,"d" ,SerialHandler::readable},
+ { "writeable" ,"d" ,SerialHandler::writeable},
+ { "send_break" ,"d" ,SerialHandler::send_break},
+ { "putc" ,"dd" ,SerialHandler::putc},
+ { "puts" ,"ds" ,SerialHandler::puts},
+ { "getc" ,"d" ,SerialHandler::getc},
+ { "gets" ,"db" ,SerialHandler::gets},
+ { "baud" ,"dd" ,SerialHandler::baud},
+ { NULL ,NULL ,NULL}
+ };
+
+ const struct NyLPC_TJsonRpcClassDef MbedJsApi::RPC_MBED_SERIAL={
+ "mbedJS","Serial",func_table
+ };
+
+
+
+}
+
--- a/mbed/mod/ModBaseClass.cpp Fri Jul 04 02:10:40 2014 +0000
+++ b/mbed/mod/ModBaseClass.cpp Fri Jul 04 14:28:46 2014 +0000
@@ -1,5 +1,3 @@
-#pragma once
-
#include "ModBaseClass.h"
#include "HttpdConnection.h"
#include "NyLPC_cHttpdConnection_protected.h"
@@ -55,4 +53,4 @@
}
return true;
}
-}
\ No newline at end of file
+}
--- a/mbed/mod/ModJsonRpc.cpp Fri Jul 04 02:10:40 2014 +0000
+++ b/mbed/mod/ModJsonRpc.cpp Fri Jul 04 14:28:46 2014 +0000
@@ -4,7 +4,7 @@
namespace MiMic
{
- #define NUM_OF_OBJECTS 32
+ #define NUM_OF_OBJECTS 16
ModJsonRpc::BasicRpcObject** newObjectArray()
{
ModJsonRpc::BasicRpcObject** r=new ModJsonRpc::BasicRpcObject*[NUM_OF_OBJECTS];
@@ -33,7 +33,7 @@
ModJsonRpc::~ModJsonRpc()
{
if(this->_mod!=NULL){
- NyLPC_cModJsonRpc_finalize(this->_mod);
+ NyLPC_cModJsonRpc_finalize(&(this->_mod->super));
free(this->_mod);
deleteObjectArray(this->_objects);
this->_mod=NULL;
@@ -54,23 +54,23 @@
i_connection.unlockHttpd();
return false;
}
- this->_mod=(NyLPC_TcModJsonRpc_t*)malloc(sizeof(NyLPC_TcModJsonRpc_t));
+ this->_mod=(TcJsonRpcEx_t*)malloc(sizeof(TcJsonRpcEx_t));
i_connection.unlockHttpd();
-
if(this->_mod==NULL){
return false;
}
+ this->_mod->cppmod_ptr=this;
//initialize websocket
- NyLPC_cModJsonRpc_initialize(this->_mod,this->_path,this->_rpc_table);
- if(NyLPC_cModJsonRpc_canHandle(this->_mod,i_connection._ref_inst)){
- if(NyLPC_cModJsonRpc_execute(this->_mod,i_connection._ref_inst)){
+ NyLPC_cModJsonRpc_initialize(&(this->_mod->super),this->_path,this->_rpc_table);
+ if(NyLPC_cModJsonRpc_canHandle(&(this->_mod->super),i_connection._ref_inst)){
+ if(NyLPC_cModJsonRpc_execute(&(this->_mod->super),i_connection._ref_inst)){
//initialize object array
this->_objects=newObjectArray();
return true;
}
}
- NyLPC_cModJsonRpc_finalize(this->_mod);
+ NyLPC_cModJsonRpc_finalize(&(this->_mod->super));
free(this->_mod);
i_connection.lockHttpd();
this->_mod=NULL;
@@ -85,17 +85,17 @@
return;
}
for(;;){
- if(!NyLPC_cModJsonRpc_processRpcMessage(this->_mod)){
+ if(!NyLPC_cModJsonRpc_processRpcMessage(&(this->_mod->super))){
break;
}
//メッセージ取得を試行
- rpc_result=NyLPC_cModJsonRpc_getMessage(this->_mod);
+ rpc_result=NyLPC_cModJsonRpc_getMessage(&(this->_mod->super));
if(rpc_result==NULL){
//nothing
continue;
}
if(NyLPC_TJsonRpcParserResult_hasMethodHandler(rpc_result)){
- if(NyLPC_TJsonRpcParserResult_callMethodHandler(rpc_result,this)){
+ if(NyLPC_TJsonRpcParserResult_callMethodHandler(rpc_result,this->_mod)){
continue;
}else{
//function failed.
@@ -106,25 +106,29 @@
break;
}
}
- NyLPC_cModJsonRpc_close(this->_mod,1000);
- NyLPC_cModJsonRpc_finalize(this->_mod);
+ NyLPC_cModJsonRpc_close(&(this->_mod->super),1000);
+ NyLPC_cModJsonRpc_finalize(&(this->_mod->super));
deleteObjectArray(this->_objects);
free(this->_mod);
this->_mod=NULL;
return;
}
+ bool ModJsonRpc::putResult(unsigned int i_id)
+ {
+ return this->putResult(i_id,"");
+ }
bool ModJsonRpc::putResult(unsigned int i_id,const char* i_params_fmt,...)
{
bool ret;
va_list a;
va_start(a,i_params_fmt);
- ret=NyLPC_cModJsonRpc_putResultV(this->_mod,i_id,i_params_fmt,a)?true:false;
+ ret=NyLPC_cModJsonRpc_putResultV(&(this->_mod->super),i_id,i_params_fmt,a)?true:false;
va_end(a);
return ret;
}
bool ModJsonRpc::putError(unsigned int i_id,int i_code)
{
- return NyLPC_cModJsonRpc_putError(this->_mod,i_id,i_code)?true:false;
+ return NyLPC_cModJsonRpc_putError(&(this->_mod->super),i_id,i_code)?true:false;
}
int ModJsonRpc::addObject(BasicRpcObject* i_object)
@@ -137,6 +141,17 @@
}
return -1;
}
+ bool ModJsonRpc::removeObject(int i_id)
+ {
+ if(0<=i_id && i_id<NUM_OF_OBJECTS){
+ if(this->_objects[i_id]!=NULL){
+ delete this->_objects[i_id];
+ this->_objects[i_id]=NULL;
+ return true;
+ }
+ }
+ return false;
+ }
void* ModJsonRpc::getObject(int i_oid)
{
return this->_objects[i_oid]->obj;
--- a/mbed/mod/ModJsonRpc.h Fri Jul 04 02:10:40 2014 +0000
+++ b/mbed/mod/ModJsonRpc.h Fri Jul 04 14:28:46 2014 +0000
@@ -3,7 +3,7 @@
#include "HttpdConnection.h"
#include "Httpd.h"
#include "Net.h"
-#include <vector>
+
namespace MiMic
{
@@ -21,6 +21,11 @@
class ModJsonRpc:ModBaseClass
{
public:
+ typedef struct TcJsonRpcEx{
+ NyLPC_TcModJsonRpc_t super;
+ ModJsonRpc* cppmod_ptr;
+ }TcJsonRpcEx_t;
+ public:
class BasicRpcObject
{
public:
@@ -50,7 +55,7 @@
BasicRpcObject** _objects;
const struct NyLPC_TJsonRpcClassDef** _rpc_table;
protected:
- NyLPC_TcModJsonRpc_t* _mod;
+ TcJsonRpcEx_t* _mod;
public:
ModJsonRpc();
/**
@@ -72,7 +77,10 @@
public:
//for development
int addObject(BasicRpcObject* i_object);
- void* getObject(int i_oid);
+ bool removeObject(int i_id);
+
+ void* getObject(int i_oid);
+ bool putResult(unsigned int i_id);
bool putResult(unsigned int i_id,const char* i_params_fmt,...);
bool putError(unsigned int i_id,int i_code);
};
Repository toolbox
| Export to desktop IDE |
Repository details
| Type: | Library |
|---|---|
| Created: | 28 Mar 2013 |
| Imports: | 145 |
| Forks: | 1 |
| Commits: | 115 |
| Dependents: | 14 |
| Dependencies: | 0 |
| Followers: | 17 |
| Issues: | 5 |
Components
MiMic Webservice library