OSDN Git Service

JSAPIのSerial,I2C,Memoryクラスを追加
[mimic/MiMicSDK.git] / misc / mbedJS / mbddJS.API / mbedJS / MiMicCore.js
index b1c82d1..9194bd7 100644 (file)
@@ -13,7 +13,7 @@ var MiMicJS={};
         * MiMicJsAPIのバージョン文字列。\r
         * @name MiMicJS#VERSION\r
         */\r
-       NS.VERSION="MiMicJsAPI/2.0.0";\r
+       NS.VERSION="MiMicJsAPI/2.0.1";\r
        /**\r
         * 配列要素、又は値がすべてInt値でない場合に例外を起こします。\r
         * @name MiMicJS.assertInt\r
@@ -52,6 +52,13 @@ var MiMicJS={};
                }\r
        };\r
        /**\r
+        * @private\r
+        */\r
+       NS.isUndefined=function(v,def){\r
+               if(arguments.length==1){return v === void 0;}\r
+               return (v === void 0)?def:v;\r
+       };\r
+       /**\r
         * 数値であるかを確認します。\r
         * @private\r
         */\r
@@ -530,7 +537,8 @@ var MiMicJS={};
                                                case '}':\r
                                                        rx+='})';\r
                                                        rxst=0;\r
-                                                       {log(rx);\r
+                                                       {\r
+//                                                             log(rx);//Debug\r
                                                                //JSONがたぶん確定\r
                                                                var j=eval(rx);\r
                                                                for(var i2=q.length-1;i2>=0;i2--){\r
@@ -598,8 +606,8 @@ var MiMicJS={};
                 */\r
                sendMethod:function callJsonRpc(i_method,i_params,i_callback)\r
                {\r
-                       var v="{\"verdion\":\"2.0\",\"method\":\""+i_method+"\",\"params\":["+i_params+"],\"id\":"+this._method_id+"}";\r
-                       log(v);\r
+                       var v="{\"jsonrpc\":\"2.0\",\"method\":\""+i_method+"\",\"params\":["+i_params+"],\"id\":"+this._method_id+"}";\r
+//                     log(v);//Debug\r
                        this._ws.send(v);\r
                        this._q.push([this._method_id,i_callback]);//キューに記録\r
                        this._method_id=(this._method_id+1)&0x0fffffff;//IDインクリメント\r