diff --git a/.gitignore b/.gitignore index e0b17558..420205cc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ *.pyc *.o language.settings.xml -.DS_Store \ No newline at end of file +.DS_Store +.vscode \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index b15325b8..00000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "files.associations": { - "dfs_fs.h": "c" - } -} \ No newline at end of file diff --git a/projects/art_pi_ble_mesh_gateway/.gitignore b/projects/art_pi_ble_mesh_gateway/.gitignore index 59a5249d..7d5ef127 100644 --- a/projects/art_pi_ble_mesh_gateway/.gitignore +++ b/projects/art_pi_ble_mesh_gateway/.gitignore @@ -6,4 +6,5 @@ rt-thread.hex rtthread.bin rtthread.map .sconsign.dblite -.config.old \ No newline at end of file +.config.old +.settings/art_pi_ble_mesh_gateway.JLink.Debug.rttlaunch \ No newline at end of file diff --git a/projects/art_pi_ble_mesh_gateway/.settings/art_pi_ble_mesh_gateway.JLink.Debug.rttlaunch b/projects/art_pi_ble_mesh_gateway/.settings/art_pi_ble_mesh_gateway.JLink.Debug.rttlaunch deleted file mode 100644 index c960799a..00000000 --- a/projects/art_pi_ble_mesh_gateway/.settings/art_pi_ble_mesh_gateway.JLink.Debug.rttlaunch +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/projects/art_pi_ble_mesh_gateway/applications/app_mesh_device.c b/projects/art_pi_ble_mesh_gateway/applications/app_mesh_device.c index c7ee4338..9d58da36 100644 --- a/projects/art_pi_ble_mesh_gateway/applications/app_mesh_device.c +++ b/projects/art_pi_ble_mesh_gateway/applications/app_mesh_device.c @@ -118,7 +118,6 @@ static void command_handler(uint8_t *command) static void mesh_command_rx_thread_entry(void *parameter) { - rt_err_t result; rt_uint32_t rx_length = 0; char rx_buffer[11]; diff --git a/projects/art_pi_ble_mesh_gateway/modules/basic/basic.c b/projects/art_pi_ble_mesh_gateway/modules/basic/basic.c index eba9f8c4..1fc98187 100644 --- a/projects/art_pi_ble_mesh_gateway/modules/basic/basic.c +++ b/projects/art_pi_ble_mesh_gateway/modules/basic/basic.c @@ -32,7 +32,6 @@ 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; extern void mesh_send_command(command_opcode_t opc, uint16_t addr, uint8_t *data); @@ -45,8 +44,6 @@ static char *board_control(uint16_t addr, command_opcode_t code, uint8_t *data) static char *json_create_basic_info(void) { - char temp[100]; - //ram usage cJSON *root = mesh_nodes_dump();