fix str() for bytes

package/PikaStdLib/PikaStdLib_SysObj.c

@@ -124,9 +124,9 @@ int PikaStdLib_SysObj_bool(PikaObj* self, Arg* arg) {
 }
 
 char* PikaStdLib_SysObj_str(PikaObj* self, Arg* arg) {
-    if (arg_getType(arg) == ARG_TYPE_BYTES) {
-        return obj_cacheStr(self, (char*)arg_getBytes(arg));
-    }
+    // if (arg_getType(arg) == ARG_TYPE_BYTES) {
+    //     return obj_cacheStr(self, (char*)arg_getBytes(arg));
+    // }
     Arg* arg_str = arg_toStrArg(arg);
     if (NULL == arg_str) {
         obj_setSysOut(self, "Error: convert to str type failed.");

port/linux/package/pikascript/pikascript-lib/PikaStdDevice/pika_hal.h

@@ -428,7 +428,8 @@ typedef struct pika_hal_WIFI_config {
 
 typedef struct pika_hal_WIFI_record {
     char ssid[PIKA_HAL_WIFI_PARAM_MAX_LEN];
-    char bssid[PIKA_HAL_WIFI_PARAM_MAX_LEN];
+    uint8_t bssid[PIKA_HAL_WIFI_PARAM_MAX_LEN];
+    size_t bssid_len;
     int channel;
     int rssi;
     int authmode;

port/linux/package/pikascript/pikascript-lib/PikaStdLib/PikaStdLib_SysObj.c

@@ -124,9 +124,9 @@ int PikaStdLib_SysObj_bool(PikaObj* self, Arg* arg) {
 }
 
 char* PikaStdLib_SysObj_str(PikaObj* self, Arg* arg) {
-    if (arg_getType(arg) == ARG_TYPE_BYTES) {
-        return obj_cacheStr(self, (char*)arg_getBytes(arg));
-    }
+    // if (arg_getType(arg) == ARG_TYPE_BYTES) {
+    //     return obj_cacheStr(self, (char*)arg_getBytes(arg));
+    // }
     Arg* arg_str = arg_toStrArg(arg);
     if (NULL == arg_str) {
         obj_setSysOut(self, "Error: convert to str type failed.");

port/linux/package/pikascript/pikascript-lib/network/_network_WLAN.c

@@ -98,11 +98,8 @@ void _network_WLAN_connectWithBssid(PikaObj* self,
         return;
     }
     pika_hal_WIFI_config cfg = {0};
-    strcpy(cfg.ssid, ssid);
-    strcpy(cfg.password, key);
     strcpy(cfg.bssid, bssid);
-    check_res(pika_hal_ioctl(hal_wifi, PIKA_HAL_IOCTL_CONFIG, &cfg));
-    check_res(pika_hal_ioctl(hal_wifi, PIKA_HAL_IOCTL_ENABLE));
+    _network_WLAN_connect(self, ssid, key);
 }
 
 void _network_WLAN_disconnect(PikaObj* self) {
@@ -196,7 +193,8 @@ PikaObj* _network_WLAN_scan(PikaObj* self) {
         Arg* arg = arg_newStr(result->records[i].ssid);
         PikaStdData_List_append(record, arg);
         arg_deinit(arg);
-        arg = arg_newStr(result->records[i].bssid);
+        arg = arg_newBytes(result->records[i].bssid,
+                           result->records[i].bssid_len);
         PikaStdData_List_append(record, arg);
         arg_deinit(arg);
         arg = arg_newInt(result->records[i].channel);

src/PikaObj.h

@@ -518,7 +518,7 @@ Arg* pks_eventListener_sendSignalAwaitResult(PikaEventListener* self,
 void obj_printModules(PikaObj* self);
 #if PIKA_DEBUG_ENABLE
 #define pika_debug(fmt, ...) \
-    pika_platform_printf("[PIKA DBG] " fmt, ##__VA_ARGS__)
+    pika_platform_printf("PikaDBG: " fmt "\r\n", ##__VA_ARGS__)
 #else
 #define pika_debug(...) \
     do {                \

test/ctypes-test.cpp

@@ -24,7 +24,7 @@ TEST(ctypes, test2) {
     /* run */
     obj_run(pikaMain,
             "len(b'test\\x0')\n"
-            "len(str(b'test\\x0'))\n");
+            "len(b'test\\x0'.decode())\n");
     /* collect */
     /* assert */
     EXPECT_STREQ(log_buff[0], "4\r\n");

test/network-test.cpp

@@ -45,17 +45,14 @@ int pika_hal_platform_WIFI_ioctl_others(pika_dev* dev,
         memset(result, 0, size);
         result->count = count;
         strcpy(result->records[0].ssid, "ssid1");
-        strcpy(result->records[0].bssid, "bssid1");
         result->records[0].channel = 1;
         result->records[0].rssi = -10;
         result->records[0].authmode = 0;
         strcpy(result->records[1].ssid, "ssid2");
-        strcpy(result->records[1].bssid, "bssid2");
         result->records[1].channel = 2;
         result->records[1].rssi = -20;
         result->records[1].authmode = 1;
         strcpy(result->records[2].ssid, "ssid3");
-        strcpy(result->records[2].bssid, "bssid3");
         result->records[2].channel = 3;
         result->records[2].rssi = -30;
         result->records[2].authmode = 2;
@@ -90,8 +87,8 @@ TEST(network, scan) {
     pikaVM_runSingleFile(pikaMain, "test/python/network/network_scan.py");
     /* assert */
     EXPECT_STREQ(log_buff[0],
-                 "[('ssid1', 'bssid1', 1, -10, 0, 0), ('ssid2', 'bssid2', 2, "
-                 "-20, 1, 0), ('ssid3', 'bssid3', 3, -30, 2, 0)]\r\n");
+                 "[('ssid1', b'', 1, -10, 0, 0), ('ssid2', b'', 2, "
+                 "-20, 1, 0), ('ssid3', b'', 3, -30, 2, 0)]\r\n");
     EXPECT_STREQ(log_buff[1],
                  "pika_hal_platform_WIFI_ioctl_others: "
                  "PIKA_HAL_IOCTL_WIFI_SCAN\r\n");

test/python/PikaCV/PikaCV_test11.py

@@ -5,7 +5,7 @@ img.read("test/assets/test2.jpg")
 
 cv.Converter.toGray(img)
 data = img.data()
-print(str(binascii.b2a_hex(img.data())))
+print(binascii.b2a_hex(img.data()).decode())
 cv.Converter.toBMP(img)
 img.write("test/out/test.bmp")
 

test/stddata-test.cpp

@@ -36,7 +36,7 @@ TEST(stddata, test2) {
     __platform_printf("BEGIN\r\n");
     obj_run(pikaMain,
             "import binascii\n"
-            "res = str(binascii.b2a_hex(b'德卡科技'))\n");
+            "res = binascii.b2a_hex(b'德卡科技').decode()\n");
     /* collect */
     char* res = obj_getStr(pikaMain, "res");
     /* assert */
@@ -55,7 +55,7 @@ TEST(stddata, a2b_hex) {
     obj_run(pikaMain,
             "import binascii\n"
             "text = binascii.a2b_hex('e4b8ade69687e6b58be8af95e794a8e4be8b')\n"
-            "res = str(text)\n");
+            "res = text.decode()\n");
     /* collect */
     char* res = obj_getStr(pikaMain, "res");
     /* assert */