Merge pull request #82 from WKJay/master

armink · web-flow · commit aec8b6be6aa9 · 2020-10-22T13:47:53.000+08:00
[FIX] wifi ssid and password config problem
diff --git a/projects/art_pi_factory/.cproject b/projects/art_pi_factory/.cproject
diff --git a/projects/art_pi_factory/.settings/projcfg.ini b/projects/art_pi_factory/.settings/projcfg.ini
@@ -1,5 +1,5 @@
 #RT-Thread Studio Project Configuration
-#Thu Oct 01 00:08:57 CST 2020
+#Wed Oct 21 22:04:18 CST 2020
 cfg_version=v3.0
 board_name=STM32H750-RT-ART-PI
 example_name=art_pi_factory
@@ -13,7 +13,7 @@ os_branch=full
 project_base_bsp=true
 is_use_scons_build=True
 is_base_example_project=True
-output_project_path=C\:/Projects/ART-PI/sdk-bsp-stm32h750-realthread-artpimy/projects
+output_project_path=E\:/Personal/RTT-Studio-Projects/sdk-bsp-stm32h750-realthread-artpimy/projects
 project_name=art_pi_factory
 bsp_path=repo/Local/Board_Support_Packages/RealThread/STM32H750-RT-ART-PI/0.3.0/sdk-bsp-stm32h750-realthread-artpi-master
 os_version=4.0.2
diff --git a/projects/art_pi_factory/applications/main.c b/projects/art_pi_factory/applications/main.c
@@ -33,13 +33,7 @@ int main(void)
     sys_monitor_init();
     web_init();
     bluetooth_init();
-
-
-    while (1)
-    {
-        rt_thread_mdelay(1000);
-
-    }
+    
     return RT_EOK;
 }
 
diff --git a/projects/art_pi_factory/modules/basic/basic.c b/projects/art_pi_factory/modules/basic/basic.c
@@ -29,7 +29,7 @@ Author:    WKJay
 
 #define BLUE_LED GET_PIN(I, 8)
 #define RED_LED GET_PIN(C, 15)
-static uint8_t blue_led_stat = 0, red_led_stat = 0, beep_stat = 0;
+static uint8_t blue_led_stat = 0, red_led_stat = 0;
 
 static char *board_control(const char *dev, uint8_t code)
 {
@@ -43,11 +43,6 @@ static char *board_control(const char *dev, uint8_t code)
         rt_pin_write(RED_LED, !code);
         red_led_stat = code;
     }
-    else if (strcmp(dev, BEEP_DEV_NAME) == 0)
-    {
-        //beep control
-        beep_stat = code;
-    }
     else
     {
         return json_create_web_response(-1, "unknown control device!");
@@ -159,6 +154,7 @@ static char *json_create_basic_info(void)
 static void cgi_basic_info(struct webnet_session *session)
 {
     cgi_head();
+    request = request;//clear warning
     body = json_create_basic_info();
     webnet_session_printf(session, body);
     rt_free(body);
@@ -167,6 +163,7 @@ static void cgi_basic_info(struct webnet_session *session)
 static void cgi_board_control(struct webnet_session *session)
 {
     cgi_head();
+    request = request;//clear warning
     if (session->request->query)
     {
         cJSON *root = cJSON_Parse(session->request->query);
diff --git a/projects/art_pi_factory/modules/bt_module/bt_module.c b/projects/art_pi_factory/modules/bt_module/bt_module.c
@@ -67,7 +67,6 @@ int bluetooth_firmware_check(void)
 
 int bluetooth_init(void)
 {
-    int fd = -1;
     rt_device_t wifi = NULL, bt_firmware = NULL;
     //wait for wifi is ready
     while (wifi == NULL)
diff --git a/projects/art_pi_factory/modules/monitor/monitor.c b/projects/art_pi_factory/modules/monitor/monitor.c
@@ -61,7 +61,7 @@ static void ntp_sync_handler(void)
     }
 }
 
-static void sys_monitor_thread(void)
+static void sys_monitor_thread(void *param)
 {
     while (1)
     {
diff --git a/projects/art_pi_factory/modules/wifi/wifi.c b/projects/art_pi_factory/modules/wifi/wifi.c
@@ -44,6 +44,8 @@ int wifi_connect(char *conn_str)
     {
         cJSON *ssid = cJSON_GetObjectItem(conn, "ssid");
         cJSON *passwd = cJSON_GetObjectItem(conn, "passwd");
+        rt_memset(wifi.ssid,0,sizeof(wifi.ssid));
+        rt_memset(wifi.passwd,0,sizeof(wifi.passwd));
         if (ssid && passwd)
         {
             if (rt_strlen(ssid->valuestring) > MAX_SSID_PASSWD_STR_LEN ||
@@ -92,26 +94,26 @@ char *wifi_get_ip(void)
 
 char *wifi_status_get(void)
 {
-    memset(wifi_status_str, 0, sizeof(wifi_status_str));
+    rt_memset(wifi_status_str, 0, sizeof(wifi_status_str));
     uint8_t wifi_status = wifi_is_ready();
     char *wifi_ip = wifi_get_ip();
-    sprintf(wifi_status_str, "{wifi:'%s', url:'%s'}", wifi_status ? "on" : "off", wifi_ip);
+    rt_sprintf(wifi_status_str, "{wifi:'%s', url:'%s'}", wifi_status ? "on" : "off", wifi_ip);
     return wifi_status_str;
 }
 
-static void wifi_ready_handler(void *param)
+static void wifi_ready_handler(int event, struct rt_wlan_buff *buff, void *parameter)
 {
     int cnt = BT_SEND_TIMES;
     //adb init
     adb_socket_init();
 
     //wifi status send
-    memset(wifi_status_str, 0, sizeof(wifi_status_str));
+    rt_memset(wifi_status_str, 0, sizeof(wifi_status_str));
     while (cnt--)
     {
         char *wifi_status = wifi_status_get();
         int retry_cnt = BT_SEND_FAIL_RETRY;
-        while (bt_stack_blufi_send(wifi_status, strlen(wifi_status)) < 0)
+        while (bt_stack_blufi_send((uint8_t *)wifi_status, rt_strlen(wifi_status)) < 0)
         {
             if (retry_cnt == 0)
                 break;
diff --git a/projects/art_pi_factory/packages/btstack-v0.0.1/SConscript b/projects/art_pi_factory/packages/btstack-v0.0.1/SConscript
@@ -56,6 +56,10 @@ path += [cwd + '/chipset/bcm']
 path += [cwd + '/port/posix-h4-bcm']
 path += [cwd + '/rtt_adapter']
 
-group = DefineGroup('RTT_BTSTACK', src, depend = [''], CPPPATH = path)
+LOCAL_CCFLAGS = ''
+if rtconfig.CROSS_TOOL == 'keil':
+    LOCAL_CCFLAGS += ' --gnu'
+
+group = DefineGroup('RTT_BTSTACK', src, depend = [''], CPPPATH = path, LOCAL_CCFLAGS = LOCAL_CCFLAGS)
 
 Return('group')
diff --git a/projects/art_pi_factory/packages/btstack-v0.0.1/chipset/bcm/btstack_chipset_bcm.c b/projects/art_pi_factory/packages/btstack-v0.0.1/chipset/bcm/btstack_chipset_bcm.c
@@ -110,7 +110,7 @@ static void chipset_set_bd_addr_command(bd_addr_t addr, uint8_t *hci_cmd_buffer)
 static const char * hcd_file_path;
 static const char * hcd_folder_path = "";
 static int hcd_fd;
-static char matched_file[1000];
+//static char matched_file[1000];
 
 
 static void chipset_init(const void * config){
@@ -127,9 +127,9 @@ static void chipset_init(const void * config){
 static const uint8_t download_command[] = {0x2e, 0xfc, 0x00};
 
 static btstack_chipset_result_t chipset_next_command(uint8_t * hci_cmd_buffer){
-    static hcd_file_length;
+    static int hcd_file_length;
     if (hcd_fd < 0){
-        fal_partition_t *hcd_part = fal_partition_find("bt_image");
+        const struct fal_partition *hcd_part = fal_partition_find("bt_image");
         log_info("chipset-bcm: hcd_file_path open file %s", hcd_file_path);
         hcd_fd = open(hcd_file_path, O_RDONLY);
         if (hcd_fd < 0){
@@ -187,16 +187,16 @@ void btstack_chipset_bcm_set_hcd_folder_path(const char * path){
     hcd_folder_path = path;
 }
 
-static int equal_ignore_case(const char *str1, const char *str2){
-    if (!str1 || !str2) return (1);
-    int i = 0;
-    while (true){
-        if (!str1[i] && !str2[i]) return 1;
-        if (tolower(str1[i]) != tolower(str2[i])) return 0;
-        if (!str1[i] || !str2[i]) return 0;
-        i++;
-    }
-}
+//static int equal_ignore_case(const char *str1, const char *str2){
+//    if (!str1 || !str2) return (1);
+//    int i = 0;
+//    while (true){
+//        if (!str1[i] && !str2[i]) return 1;
+//        if (tolower(str1[i]) != tolower(str2[i])) return 0;
+//        if (!str1[i] || !str2[i]) return 0;
+//        i++;
+//    }
+//}
 
 // assumption starts with BCM or bcm
 #define MAX_DEVICE_NAME_LEN 25
diff --git a/projects/art_pi_factory/packages/btstack-v0.0.1/platform/posix/btstack_run_loop_posix.c b/projects/art_pi_factory/packages/btstack-v0.0.1/platform/posix/btstack_run_loop_posix.c
@@ -53,11 +53,12 @@
 #include "btstack_linked_list.h"
 #include "btstack_debug.h"
 
+#include <rtthread.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/select.h>
 #include <sys/time.h>
 #include <time.h>
+#include <sys/select.h>
 #include <unistd.h>
 
 static void btstack_run_loop_posix_dump_timer(void);
@@ -123,10 +124,11 @@ static bool btstack_run_loop_posix_remove_timer(btstack_timer_source_t *ts){
 
 static void btstack_run_loop_posix_dump_timer(void){
     btstack_linked_item_t *it;
-    int i = 0;
     for (it = (btstack_linked_item_t *) timers; it ; it = it->next){
+#ifdef ENABLE_LOG_INFO
         btstack_timer_source_t *ts = (btstack_timer_source_t*) it;
         log_info("timer %u (%p): timeout %u\n", i, ts, ts->timeout);
+#endif
     }
 }
 
@@ -184,9 +186,7 @@ static uint32_t btstack_run_loop_posix_get_time_ms(void){
     clock_gettime(CLOCK_MONOTONIC, &now_ts);
     time_ms = (uint32_t) timespec_diff_milis(&init_ts, &now_ts);
 #else
-    struct timeval tv;
-    gettimeofday(&tv, NULL);
-    time_ms = (uint32_t) ((tv.tv_sec  - init_tv.tv_sec) * 1000) + (tv.tv_usec / 1000);
+    time_ms = rt_tick_get()*1000ULL/RT_TICK_PER_SECOND;
 #endif
     return time_ms;
 }
diff --git a/projects/art_pi_factory/packages/btstack-v0.0.1/port/posix-h4-bcm/btstack_main.c b/projects/art_pi_factory/packages/btstack-v0.0.1/port/posix-h4-bcm/btstack_main.c
@@ -146,7 +146,7 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
 }
 
 static void phase2(int status);
-int bt_stack_main(int argc, const char *argv[])
+void bt_stack_main(void *param)
 {
 
     /// GET STARTED with BTstack ///
@@ -211,9 +211,6 @@ int bt_stack_main(int argc, const char *argv[])
     // handle CTRL-c
     signal(SIGINT, sigint_handler);
 
-    main_argc = argc;
-    main_argv = argv;
-
     // phase #1 download firmware
     printf("Phase 1: Download firmware\n");
 
@@ -234,7 +231,6 @@ int bt_stack_main(int argc, const char *argv[])
     hci_set_bd_addr(own_address);
     // go
     btstack_run_loop_execute();
-    return 0;
 }
 
 void bt_stack_port_main(void)
@@ -247,7 +243,6 @@ void bt_stack_port_main(void)
                             5, 5);
     if (tid1 != RT_NULL)
         rt_thread_startup(tid1);
-    return RT_EOK;
 }
 MSH_CMD_EXPORT(bt_stack_port_main, btstack start);
 
diff --git a/projects/art_pi_factory/packages/btstack-v0.0.1/rtt_adapter/rtt_btstack_gatt_blufi.c b/projects/art_pi_factory/packages/btstack-v0.0.1/rtt_adapter/rtt_btstack_gatt_blufi.c
@@ -32,7 +32,7 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
 static uint16_t att_read_callback(hci_con_handle_t con_handle, uint16_t att_handle, uint16_t offset, uint8_t *buffer, uint16_t buffer_size);
 static int att_write_callback(hci_con_handle_t con_handle, uint16_t att_handle, uint16_t transaction_mode, uint16_t offset, uint8_t *buffer, uint16_t buffer_size);
 static void heartbeat_handler(struct btstack_timer_source *ts);
-static void beat(void);
+//static void beat(void);
 
 const uint8_t adv_data[] = {
     // Flags general discoverable, BR/EDR not supported
@@ -92,7 +92,7 @@ static void le_counter_setup(void)
  */
 
 /* LISTING_START(heartbeat): Hearbeat Handler */
-static int counter = 0;
+//static int counter = 0;
 static char counter_string[1024];
 static int counter_string_len;
 static uint32_t send_buffer_index = 0;
@@ -160,7 +160,7 @@ void bt_send_api(void)
     temp_length = sprintf(temp_string, "{wifi:'%s', url:' http://%d.%d.%d.%d/index.html'}", wifi_status ? "on" : "off", ip_address[0], ip_address[1], ip_address[2], ip_address[3]);
     log_debug("\r\n======counter_string_len:%d======\r\n", temp_length);
 
-    bt_stack_blufi_send(temp_string, temp_length);
+    bt_stack_blufi_send((uint8_t *)temp_string, temp_length);
 }
 MSH_CMD_EXPORT(bt_send_api, send data);
 
@@ -298,7 +298,7 @@ static int att_write_callback(hci_con_handle_t connection_handle, uint16_t att_h
 
                 while (retry_cnt)
                 {
-                    if (bt_stack_blufi_send(wifi_status, strlen(wifi_status)) < 0)
+                    if (bt_stack_blufi_send((uint8_t *)wifi_status, strlen(wifi_status)) < 0)
                     {
                         retry_cnt--;
                     }
diff --git a/projects/art_pi_factory/packages/btstack-v0.0.1/src/hci_dump.c b/projects/art_pi_factory/packages/btstack-v0.0.1/src/hci_dump.c
@@ -339,6 +339,7 @@ void hci_dump_packet(uint8_t packet_type, uint8_t in, uint8_t *packet, uint16_t
     int res = 0;
     res = write (dump_file, &header, header_len);
     res = write (dump_file, packet, len );
+    res=res;
     UNUSED(res);
 #endif
 
diff --git a/projects/art_pi_factory/packages/cJSON-v1.0.2/cJSON.c b/projects/art_pi_factory/packages/cJSON-v1.0.2/cJSON.c
@@ -355,7 +355,7 @@ char *cJSON_PrintBuffered(cJSON *item,int prebuffer,int fmt)
 	p.length=prebuffer;
 	p.offset=0;
 	return print_value(item,0,fmt,&p);
-	return p.buffer;
+//	return p.buffer;
 }
 
 
diff --git a/projects/art_pi_factory/packages/cJSON-v1.0.2/cJSON_util.c b/projects/art_pi_factory/packages/cJSON-v1.0.2/cJSON_util.c
@@ -16,7 +16,7 @@ void cJSON_free(void *ptr)
 const char * cJSON_item_get_string(cJSON *object, const char *item_name)
 {
     cJSON *item;
-    const char * string;
+//    const char * string;
 
     item = cJSON_GetObjectItem(object, item_name);
 
@@ -35,7 +35,7 @@ const char * cJSON_item_get_string(cJSON *object, const char *item_name)
 int cJSON_item_get_number(cJSON *object, const char *item_name, int * result)
 {
     cJSON *item;
-    const char * string;
+//    const char * string;
 
     item = cJSON_GetObjectItem(object, item_name);
 
diff --git a/projects/art_pi_factory/packages/webnet-v2.0.2/src/wn_module.c b/projects/art_pi_factory/packages/webnet-v2.0.2/src/wn_module.c
@@ -513,7 +513,7 @@ static const char *default_files[] =
  */
 int webnet_module_handle_uri(struct webnet_session *session)
 {
-    int result, fd;
+    int result;
     char *full_path;
     rt_uint32_t index;
     struct webnet_request *request;
diff --git a/projects/art_pi_factory/project.uvprojx b/projects/art_pi_factory/project.uvprojx

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ Author: WKJay`
`29`	`29`
`30`	`30`	`#define BLUE_LED GET_PIN(I, 8)`
`31`	`31`	`#define RED_LED GET_PIN(C, 15)`
`32`		`-static uint8_t blue_led_stat = 0, red_led_stat = 0, beep_stat = 0;`
	`32`	`+static uint8_t blue_led_stat = 0, red_led_stat = 0;`
`33`	`33`
`34`	`34`	`static char board_control(const char dev, uint8_t code)`
`35`	`35`	`{`
`@@ -43,11 +43,6 @@ static char board_control(const char dev, uint8_t code)`
`43`	`43`	`rt_pin_write(RED_LED, !code);`
`44`	`44`	`red_led_stat = code;`
`45`	`45`	`}`
`46`		`- else if (strcmp(dev, BEEP_DEV_NAME) == 0)`
`47`		`- {`
`48`		`- //beep control`
`49`		`- beep_stat = code;`
`50`		`- }`
`51`	`46`	`else`
`52`	`47`	`{`
`53`	`48`	`return json_create_web_response(-1, "unknown control device!");`
`@@ -159,6 +154,7 @@ static char *json_create_basic_info(void)`
`159`	`154`	`static void cgi_basic_info(struct webnet_session *session)`
`160`	`155`	`{`
`161`	`156`	`cgi_head();`
	`157`	`+ request = request;//clear warning`
`162`	`158`	`body = json_create_basic_info();`
`163`	`159`	`webnet_session_printf(session, body);`
`164`	`160`	`rt_free(body);`
`@@ -167,6 +163,7 @@ static void cgi_basic_info(struct webnet_session *session)`
`167`	`163`	`static void cgi_board_control(struct webnet_session *session)`
`168`	`164`	`{`
`169`	`165`	`cgi_head();`
	`166`	`+ request = request;//clear warning`
`170`	`167`	`if (session->request->query)`
`171`	`168`	`{`
`172`	`169`	`cJSON *root = cJSON_Parse(session->request->query);`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,6 @@ int bluetooth_firmware_check(void)`
`67`	`67`
`68`	`68`	`int bluetooth_init(void)`
`69`	`69`	`{`
`70`		`- int fd = -1;`
`71`	`70`	`rt_device_t wifi = NULL, bt_firmware = NULL;`
`72`	`71`	`//wait for wifi is ready`
`73`	`72`	`while (wifi == NULL)`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ static void ntp_sync_handler(void)`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`
`64`		`-static void sys_monitor_thread(void)`
	`64`	`+static void sys_monitor_thread(void *param)`
`65`	`65`	`{`
`66`	`66`	`while (1)`
`67`	`67`	`{`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,8 @@ int wifi_connect(char *conn_str)`
`44`	`44`	`{`
`45`	`45`	`cJSON *ssid = cJSON_GetObjectItem(conn, "ssid");`
`46`	`46`	`cJSON *passwd = cJSON_GetObjectItem(conn, "passwd");`
	`47`	`+ rt_memset(wifi.ssid,0,sizeof(wifi.ssid));`
	`48`	`+ rt_memset(wifi.passwd,0,sizeof(wifi.passwd));`
`47`	`49`	`if (ssid && passwd)`
`48`	`50`	`{`
`49`	`51`	`if (rt_strlen(ssid->valuestring) > MAX_SSID_PASSWD_STR_LEN \|\|`
`@@ -92,26 +94,26 @@ char *wifi_get_ip(void)`
`92`	`94`
`93`	`95`	`char *wifi_status_get(void)`
`94`	`96`	`{`
`95`		`- memset(wifi_status_str, 0, sizeof(wifi_status_str));`
	`97`	`+ rt_memset(wifi_status_str, 0, sizeof(wifi_status_str));`
`96`	`98`	`uint8_t wifi_status = wifi_is_ready();`
`97`	`99`	`char *wifi_ip = wifi_get_ip();`
`98`		`- sprintf(wifi_status_str, "{wifi:'%s', url:'%s'}", wifi_status ? "on" : "off", wifi_ip);`
	`100`	`+ rt_sprintf(wifi_status_str, "{wifi:'%s', url:'%s'}", wifi_status ? "on" : "off", wifi_ip);`
`99`	`101`	`return wifi_status_str;`
`100`	`102`	`}`
`101`	`103`
`102`		`-static void wifi_ready_handler(void *param)`
	`104`	`+static void wifi_ready_handler(int event, struct rt_wlan_buff buff, void parameter)`
`103`	`105`	`{`
`104`	`106`	`int cnt = BT_SEND_TIMES;`
`105`	`107`	`//adb init`
`106`	`108`	`adb_socket_init();`
`107`	`109`
`108`	`110`	`//wifi status send`
`109`		`- memset(wifi_status_str, 0, sizeof(wifi_status_str));`
	`111`	`+ rt_memset(wifi_status_str, 0, sizeof(wifi_status_str));`
`110`	`112`	`while (cnt--)`
`111`	`113`	`{`
`112`	`114`	`char *wifi_status = wifi_status_get();`
`113`	`115`	`int retry_cnt = BT_SEND_FAIL_RETRY;`
`114`		`- while (bt_stack_blufi_send(wifi_status, strlen(wifi_status)) < 0)`
	`116`	`+ while (bt_stack_blufi_send((uint8_t *)wifi_status, rt_strlen(wifi_status)) < 0)`
`115`	`117`	`{`
`116`	`118`	`if (retry_cnt == 0)`
`117`	`119`	`break;`