JSONバグの修正

[mimic/MiMicSDK.git] / projects / app.RemoteMCU / src / sketch.c

diff --git a/projects/app.RemoteMCU/src/sketch.c b/projects/app.RemoteMCU/src/sketch.c
index fb2c039..e1579f6 100644 (file)
--- a/projects/app.RemoteMCU/src/sketch.c
+++ b/projects/app.RemoteMCU/src/sketch.c
@@ -311,10 +311,10 @@ static NyLPC_TBool mvmputs_json(struct NyLPC_TcMiMicVM_TEvent* i_eh,NyLPC_TUInt3
        struct NyLPC_TRemoteMCU_EventHandler* eh=(struct NyLPC_TRemoteMCU_EventHandler*)i_eh;\r
        if(eh->st_len>0){\r
                eh->st_len++;\r
-               return NyLPC_cHttpBodyWriter_format(&(eh->bw),",0x%x",i_val);\r
+               return NyLPC_cHttpBodyWriter_format(&(eh->bw),",%u",i_val);\r
        }else{\r
                eh->st_len++;\r
-               return NyLPC_cHttpBodyWriter_format(&(eh->bw),"0x%x",i_val);\r
+               return NyLPC_cHttpBodyWriter_format(&(eh->bw),"%u",i_val);\r
        }\r
 }\r
 \r
@@ -423,7 +423,7 @@ static NyLPC_TBool writeSetupUpdateJson(NyLPC_TcHttpStream_t* i_st,const struct
 \r
        //JSONを書く。\r
        if(!NyLPC_cHttpBodyWriter_format(&(work.bw),\r
-               "{application:\""APPLICATION_VERSION";%s\",result:0x%x}",\r
+               "{\"application\":\""APPLICATION_VERSION";%s\",\"result\":%u}",\r
                _platform_name,ret?0x80000000:0x00000000))\r
        {\r
                return NyLPC_TBool_FALSE;\r
@@ -466,7 +466,7 @@ static NyLPC_TBool writeSetupCurrentJson(NyLPC_TcHttpStream_t* i_st,const struct
 \r
        //JSONを書く。\r
        if(!NyLPC_cHttpBodyWriter_format(&(work.bw),\r
-               "{application:\""APPLICATION_VERSION";%s\",mac00010203:0x%x,mac0405xxxx:0x%x,ip:0x%x,mask:0x%x,droute:0x%x,port:0x%x,access:0x%x}",\r
+               "{\"application\":\""APPLICATION_VERSION";%s\",\"mac00010203\":%u,\"mac0405xxxx\":%u,\"ip\":%u,\"mask\":%u,\"droute\":%u,\"port\":%u,\"access\":%u}",\r
                _platform_name,\r
                config->mac_00_01_02_03,\r
                config->mac_04_05_xx_xx,\r
@@ -514,7 +514,7 @@ static NyLPC_TBool writeStatus(NyLPC_TcHttpStream_t* i_st,const struct TRemoteMc
        NyLPC_cHttpBodyWriter_setChunked(&(work.bw));\r
 \r
        //JSONを書く。\r
-       if(!NyLPC_cHttpBodyWriter_format(&(work.bw),"{application:\""APPLICATION_VERSION";%s\"}",_platform_name)){\r
+       if(!NyLPC_cHttpBodyWriter_format(&(work.bw),"{\"application\":\""APPLICATION_VERSION";%s\"}",_platform_name)){\r
                return NyLPC_TBool_FALSE;\r
        }\r
        //エラーチェック\r
@@ -576,13 +576,13 @@ static NyLPC_TBool mvm(NyLPC_TcHttpStream_t* i_st,const struct TRemoteMcuRequest
        NyLPC_cHttpBodyWriter_setChunked(&(work.bw.eh.bw));\r
 \r
        //JSONを書く。\r
-       if(!NyLPC_cHttpBodyWriter_format(&(work.bw.eh.bw),"{version:\""MVM_VERSION"\",stream:[")){\r
+       if(!NyLPC_cHttpBodyWriter_format(&(work.bw.eh.bw),"{\"version\":\""MVM_VERSION"\",\"stream\":[")){\r
                NyLPC_OnErrorGoto(Error_NyLPC_cHttpBodyWriter_format);\r
        }\r
 \r
        //VMの実行\r
        work.bw.vmret=NyLPC_cMiMicVM_run(&(work.bw.vm),i_rqh->content.mvm.vm_instruction.bc_buf,i_rqh->content.mvm.vm_instruction.txt_len);\r
-       if(!NyLPC_cHttpBodyWriter_format(&(work.bw.eh.bw),"],result:0x%x}",work.bw.vmret)){\r
+       if(!NyLPC_cHttpBodyWriter_format(&(work.bw.eh.bw),"],\"result\":%u}",work.bw.vmret)){\r
                NyLPC_OnErrorGoto(Error_NyLPC_cHttpBodyWriter_format);\r
        }\r
        //エラーチェック\r