Minor fixes, added some functionality to send data, but still some way to go

diff --git a/client/cmdscript.c b/client/cmdscript.c
index f9bbe56e0ed61a50b1bf8dbe4b6b31251c21d20b..bd4a300686ab14b404c6974b6cbaa46d904461d5 100644 (file)
--- a/client/cmdscript.c
+++ b/client/cmdscript.c
@@ -218,7 +218,7 @@ int CmdRun(const char *Cmd)
     char buf[256];
     snprintf(buf, sizeof buf, "./scripts/%s", cmd_name);
 
     char buf[256];
     snprintf(buf, sizeof buf, "./scripts/%s", cmd_name);
 

-    printf("Executing file '%s'\n---------------------------\n" , cmd_name);
+    printf("-----Executing file '%s'\n" , cmd_name);

     // run the Lua script
 
     int error = luaL_loadfile(lua_state, buf);
     // run the Lua script
 
     int error = luaL_loadfile(lua_state, buf);


@@ -241,6 +241,6 @@ int CmdRun(const char *Cmd)
     //luaL_dofile(lua_state, buf);
     // close the Lua state
     lua_close(lua_state);
     //luaL_dofile(lua_state, buf);
     // close the Lua state
     lua_close(lua_state);

-    printf("-----------------Finished\n");
+    printf("\n-----Finished\n");

 }
 
 }
 

diff --git a/client/scripting.c b/client/scripting.c
index f9f4999df37b5d2280bad1800b9383d0abe60b3a..6db27dc7ed8ac684e7619e7acaf217e9d9247a48 100644 (file)
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -40,10 +40,23 @@ static int l_SendCommand(lua_State *L){
     ==> A 544 byte buffer will do.
     **/
     //Pop cmd
     ==> A 544 byte buffer will do.
     **/
     //Pop cmd

-    UsbCommand *c = (UsbCommand *)lua_touserdata(L, 1);
-    luaL_argcheck(L, c != NULL, 1, "'UsbCommand' expected");
-    SendCommand(c);
+    size_t size;
+    const char *data = luaL_checklstring(L, 1, &size);
+    if(size != sizeof(UsbCommand))
+    {
+        printf("Got data size %d, expected %d" , size,sizeof(UsbCommand));
+        lua_pushstring(L,"Wrong data size");
+        return 1;
+    }
+
+//    UsbCommand c = (*data);
+    SendCommand(data);

     return 0;
     return 0;

+    //UsbCommand *c = (UsbCommand *)lua_touserdata(L, 1);
+    //luaL_argcheck(L, c != NULL, 1, "'UsbCommand' expected");
+
+    //SendCommand(c);
+    //return 0;

 }
 /**
  * @brief The following params expected:
 }
 /**
  * @brief The following params expected:


@@ -59,7 +72,7 @@ static int l_WaitForResponseTimeout(lua_State *L){
     printf("in l_WaitForResponseTimeout, got cmd 0x%0x\n",(int) cmd);
     //UsbCommand response;
 
     printf("in l_WaitForResponseTimeout, got cmd 0x%0x\n",(int) cmd);
     //UsbCommand response;
 

-    //We allocate the usbcommand as userdata on the Lua-stack
+     //We allocate the usbcommand as userdata on the Lua-stack

     size_t nbytes = sizeof(UsbCommand);
 
     UsbCommand *response = (UsbCommand *)lua_newuserdata(L, nbytes);
     size_t nbytes = sizeof(UsbCommand);
 
     UsbCommand *response = (UsbCommand *)lua_newuserdata(L, nbytes);