fix includes and type

software/pc_client/src/devicemgr.h

@@ -7,7 +7,7 @@
  *
  */
 
-#include "sfbus.h"
+#include "serial/sfbus.h"
 #include <ctype.h>
 #include <errno.h> // Error integer and strerror() function
 #include <fcntl.h> // Contains file controls like O_RDWR

software/pc_client/src/main.c

@@ -18,9 +18,9 @@
 
 #include "console.h"
 #include "devicemgr.h"
-#include "ftdi485.h"
 #include "logging/logger.h"
-#include "sfbus.h"
+#include "serial/ftdi485.h"
+#include "serial/sfbus.h"
 
 extern char *optarg;
 

software/pc_client/src/sfbus-util.h

@@ -7,7 +7,7 @@
  *
  */
 
-#include "sfbus.h"
+#include "serial/sfbus.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

software/pc_client/src/wsserver.c

@@ -55,7 +55,7 @@ void ws_messagehandler(ws_cli_conn_t client, const unsigned char *msg, uint64_t
     log_message(LOG_DEBUG, "WebSocket received message: %s (%zu), from: %s", msg, size, cli);
 
     json_tokener *tok = json_tokener_new();
-    json_object *req = json_tokener_parse_ex(tok, msg, size);
+    json_object *req = json_tokener_parse_ex(tok, (const char*)msg, size);
     enum json_tokener_error jerr;
     jerr = json_tokener_get_error(tok);
     if (jerr != json_tokener_success)